Implement PPAPI VideoDecode out-of-process support

webkit/plugins/ppapi/ppb_video_decoder_impl.h

 // Copyright (c) 2011 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 WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/shared_impl/video_decoder_impl.h"
 #include "ppapi/thunk/ppb_video_decoder_api.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/resource.h"
 
 struct PP_PictureBuffer_Dev;
 struct PP_VideoDecoderConfig_Dev;
 struct PP_VideoBitstreamBuffer_Dev;
 struct PPB_VideoDecoder_Dev;
 struct PPP_VideoDecoder_Dev;
 
 namespace gpu {
 namespace gles2 {
 class GLES2Implementation;
 }
 }
 
 namespace webkit {
 namespace ppapi {
 
 class PluginInstance;
 
 class PPB_VideoDecoder_Impl : public Resource,
-                              public ::ppapi::thunk::PPB_VideoDecoder_API,
+                              public ::ppapi::VideoDecoderImpl,
                               public media::VideoDecodeAccelerator::Client {
  public:
   virtual ~PPB_VideoDecoder_Impl();
   // See PPB_VideoDecoder_Dev::Create.  Returns 0 on failure to create &
   // initialize.
   static PP_Resource Create(PluginInstance* instance,
                             PP_Resource context3d_id,
                             const PP_VideoConfigElement* config);
 
   // ResourceObjectBase overrides.
   virtual PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
 
   // PPB_VideoDecoder_API implementation.
   virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
                          PP_CompletionCallback callback) OVERRIDE;
   virtual void AssignPictureBuffers(
       uint32_t no_of_buffers, const PP_PictureBuffer_Dev* buffers) OVERRIDE;
   virtual void ReusePictureBuffer(int32_t picture_buffer_id) OVERRIDE;
   virtual int32_t Flush(PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Reset(PP_CompletionCallback callback) OVERRIDE;
   virtual void Destroy() OVERRIDE;

[Ami GONE FROM CHROMIUM, 2011/08/02 00:49:08]

The section-heading comment is now out of date, since this is actually
overriding VDI, not PPB_VD_A.  Not sure if it's worth clarifying.

[vrk (LEFT CHROMIUM), 2011/08/03 19:04:30]

Kept it the same for now because I think a reference to PPB_VideoDecoder_API is
more helpful. Let me know if you disagree.

 
   // media::VideoDecodeAccelerator::Client implementation.
   virtual void ProvidePictureBuffers(
       uint32 requested_num_of_buffers, const gfx::Size& dimensions) OVERRIDE;
   virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void PictureReady(const media::Picture& picture) OVERRIDE;
   virtual void NotifyInitializeDone() OVERRIDE;
   virtual void NotifyEndOfStream() OVERRIDE;
   virtual void NotifyError(
       media::VideoDecodeAccelerator::Error error) OVERRIDE;
   virtual void NotifyFlushDone() OVERRIDE;
   virtual void NotifyEndOfBitstreamBuffer(int32 buffer_id) OVERRIDE;
   virtual void NotifyResetDone() OVERRIDE;
 
+  // Initialize the underlying decoder and return success status.

[Ami GONE FROM CHROMIUM, 2011/08/02 00:49:08]

s/public/protected/?

[vrk (LEFT CHROMIUM), 2011/08/03 19:04:30]

Done.

+  virtual bool Init(PP_Resource context_id,
+                    const PP_VideoConfigElement* dec_config);

[Ami GONE FROM CHROMIUM, 2011/08/02 00:49:08]

OVERRIDE

[vrk (LEFT CHROMIUM), 2011/08/03 19:04:30]

Done.

+
  private:
-  // Key: bitstream_buffer_id, value: callback to run when bitstream decode is
-  // done.
-  typedef std::map<int32, PP_CompletionCallback> CallbackById;
-
   explicit PPB_VideoDecoder_Impl(PluginInstance* instance);
 
-  // Initialize the underlying decoder and return success status.
-  bool Init(PP_Resource context_id, const PP_VideoConfigElement* dec_config);
-
-  // Tell command buffer to process all commands it has received so far.
-  void FlushCommandBuffer();
-
   // This is NULL before initialization, and if this PPB_VideoDecoder_Impl is
   // swapped with another.
   scoped_refptr<PluginDelegate::PlatformVideoDecoder> platform_video_decoder_;
 
-  // Factory to produce our callbacks.
-  base::ScopedCallbackFactory<PPB_VideoDecoder_Impl> callback_factory_;
-
-  // The resource ID of the underlying Context3d object being used.  Used only
-  // for reference counting to keep it alive for the lifetime of |*this|.
-  PP_Resource context3d_id_;
-
-  PP_CompletionCallback flush_callback_;
-  PP_CompletionCallback reset_callback_;
-  CallbackById bitstream_buffer_callbacks_;
-
   // Reference to the plugin requesting this interface.
   const PPP_VideoDecoder_Dev* ppp_videodecoder_;
 
-  // Reference to the GLES2Implementation owned by PPB_Context3D_Impl.
-  // PPB_Context3D_Impl is guaranteed to be alive for the lifetime of this
-  // class.
-  // In the out-of-process case, Context3D's gles2_impl() exists in the plugin
-  // process only, so gles2_impl_ is NULL in that case.
-  gpu::gles2::GLES2Implementation* gles2_impl_;
-
   DISALLOW_COPY_AND_ASSIGN(PPB_VideoDecoder_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_