1 files changed, 18 insertions, 12 deletions
diff --git a/chromium/ppapi/thunk/ppb_video_decoder_api.h b/chromium/ppapi/thunk/ppb_video_decoder_api.h
index e26c887ebcc..c40845ec1de 100644
--- a/chromium/ppapi/thunk/ppb_video_decoder_api.h
+++ b/chromium/ppapi/thunk/ppb_video_decoder_api.h
@@ -1,12 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_THUNK_VIDEO_DECODER_API_H_
-#define PPAPI_THUNK_VIDEO_DECODER_API_H_
+#ifndef PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_
+#define PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_
 
-#include "base/memory/ref_counted.h"
-#include "ppapi/c/dev/ppb_video_decoder_dev.h"
+#include "ppapi/c/pp_codecs.h"
+#include "ppapi/c/ppb_video_decoder.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 
@@ -14,21 +15,26 @@ class TrackedCallback;
 
 namespace thunk {
 
-class PPB_VideoDecoder_API {
+class PPAPI_THUNK_EXPORT PPB_VideoDecoder_API {
  public:
   virtual ~PPB_VideoDecoder_API() {}
 
-  virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
+  virtual int32_t Initialize(PP_Resource context,
+                             PP_VideoProfile profile,
+                             PP_Bool allow_software_fallback,
+                             scoped_refptr<TrackedCallback> callback) = 0;
+  virtual int32_t Decode(uint32_t decode_id,
+                         uint32_t size,
+                         const void* buffer,
                          scoped_refptr<TrackedCallback> callback) = 0;
-  virtual void AssignPictureBuffers(uint32_t no_of_buffers,
-                                    const PP_PictureBuffer_Dev* buffers) = 0;
-  virtual void ReusePictureBuffer(int32_t picture_buffer_id) = 0;
+  virtual int32_t GetPicture(PP_VideoPicture* picture,
+                             scoped_refptr<TrackedCallback> callback) = 0;
+  virtual void RecyclePicture(const PP_VideoPicture* picture) = 0;
   virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) = 0;
   virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) = 0;
-  virtual void Destroy() = 0;
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_VIDEO_DECODER_API_H_
+#endif  // PPAPI_THUNK_PPB_VIDEO_DECODER_API_H_