Implement proper synchronization between HW video decode IPC and CommandBuffer.

webkit/plugins/ppapi/ppb_video_decoder_impl.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "gpu/command_buffer/client/gles2_implementation.h"
 #include "media/video/picture.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/dev/ppp_video_decoder_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/enter.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ skipping 99 matching lines @@
   PPB_Context3D_Impl* context3d =
       static_cast<PPB_Context3D_Impl*>(enter.object());
 
   int command_buffer_route_id =
       context3d->platform_context()->GetCommandBufferRouteId();
   if (command_buffer_route_id == 0)
     return PP_ERROR_FAILED;
 
   platform_video_decoder_.reset(
       instance()->delegate()->CreateVideoDecoder(
-          this, command_buffer_route_id));
+          this, command_buffer_route_id, context3d->gles2_impl()->helper()));
 
   if (!platform_video_decoder_.get())
     return PP_ERROR_FAILED;
 
   std::vector<uint32> copied;
   // TODO(vrk): Validate configs before copy.
   CopyToConfigList(decoder_config, &copied);
   if (platform_video_decoder_->Initialize(copied)) {
     initialization_callback_ = callback;
     return PP_OK_COMPLETIONPENDING;
@@ skipping 12 matching lines @@
   if (enter.failed())
     return PP_ERROR_FAILED;
 
   PPB_Buffer_Impl* buffer = static_cast<PPB_Buffer_Impl*>(enter.object());
   media::BitstreamBuffer decode_buffer(bitstream_buffer->id,
                                        buffer->shared_memory()->handle(),
                                        static_cast<size_t>(buffer->size()));
   CHECK(bitstream_buffer_callbacks_.insert(std::make_pair(
       bitstream_buffer->id, callback)).second);
 
-  if (platform_video_decoder_->Decode(decode_buffer))
-    return PP_OK_COMPLETIONPENDING;
-  else
-    return PP_ERROR_FAILED;
+  platform_video_decoder_->Decode(decode_buffer);
+  return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_VideoDecoder_Impl::AssignGLESBuffers(
     uint32_t no_of_buffers,
     const PP_GLESBuffer_Dev* buffers) {
   if (!platform_video_decoder_.get())
     return;
 
   std::vector<media::GLESBuffer> wrapped_buffers;
   for (uint32 i = 0; i < no_of_buffers; i++) {
     PP_GLESBuffer_Dev in_buf = buffers[i];
-    media::GLESBuffer buffer(in_buf);
+    media::GLESBuffer buffer(
+        in_buf.info.id,
+        gfx::Size(in_buf.info.size.width, in_buf.info.size.height),
+        in_buf.texture_id);
     wrapped_buffers.push_back(buffer);
   }
   platform_video_decoder_->AssignGLESBuffers(wrapped_buffers);
 }
 
 void PPB_VideoDecoder_Impl::AssignSysmemBuffers(
     uint32_t no_of_buffers,
     const PP_SysmemBuffer_Dev* buffers) {
   if (!platform_video_decoder_.get())
     return;
 
   std::vector<media::SysmemBuffer> wrapped_buffers;
   for (uint32 i = 0; i < no_of_buffers; i++) {
     PP_SysmemBuffer_Dev in_buf = buffers[i];
-    media::SysmemBuffer buffer(in_buf);
+    // TODO(brettw) we should properly handle the errors here if the buffer
+    // isn't a valid image rather than CHECKing.
+    EnterResourceNoLock<PPB_Buffer_API> enter(in_buf.data, true);
+    CHECK(enter.succeeded());
+    webkit::ppapi::PPB_Buffer_Impl* pepper_buffer =
+        static_cast<webkit::ppapi::PPB_Buffer_Impl*>(enter.object());
+    CHECK(pepper_buffer->IsMapped());
+    media::SysmemBuffer buffer(
+        in_buf.info.id,
+        gfx::Size(in_buf.info.size.width, in_buf.info.size.height),
+        pepper_buffer->Map());
     wrapped_buffers.push_back(buffer);
   }
   platform_video_decoder_->AssignSysmemBuffers(wrapped_buffers);
 }
 
 void PPB_VideoDecoder_Impl::ReusePictureBuffer(int32_t picture_buffer_id) {
   if (!platform_video_decoder_.get())
     return;
   platform_video_decoder_->ReusePictureBuffer(picture_buffer_id);
 }
 
 int32_t PPB_VideoDecoder_Impl::Flush(PP_CompletionCallback callback) {
   if (!platform_video_decoder_.get())
     return PP_ERROR_BADRESOURCE;
 
   // Store the callback to be called when Flush() is done.
   // TODO(vmr): Check for current flush/abort operations.
   flush_callback_ = callback;
 
-  if (platform_video_decoder_->Flush())
-    return PP_OK_COMPLETIONPENDING;
-  else
-    return PP_ERROR_FAILED;
+  platform_video_decoder_->Flush();
+  return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_VideoDecoder_Impl::Abort(PP_CompletionCallback callback) {
   if (!platform_video_decoder_.get())
     return PP_ERROR_BADRESOURCE;
 
   // Store the callback to be called when Abort() is done.
   // TODO(vmr): Check for current flush/abort operations.
   abort_callback_ = callback;
 
-  if (platform_video_decoder_->Abort())
-    return PP_OK_COMPLETIONPENDING;
-  else
-    return PP_ERROR_FAILED;
+  platform_video_decoder_->Abort();
+  return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
     uint32 requested_num_of_buffers,
     const gfx::Size& dimensions,
     media::VideoDecodeAccelerator::MemoryType type) {
   if (!ppp_videodecoder_)
     return;
 
   // TODO(vrk): Compiler assert or use switch statement instead of making
@@ skipping 77 matching lines @@
 
 void PPB_VideoDecoder_Impl::NotifyInitializeDone() {
   if (initialization_callback_.func == NULL)
     return;
 
   PP_RunAndClearCompletionCallback(&initialization_callback_, PP_OK);
 }
 
 }  // namespace ppapi
 }  // namespace webkit
-
-// These functions are declared in picture.h but are defined here because of
-// dependencies (we can't depend on ppapi types from media).
-// TODO(fischman/vrk): Find a way to clean this up as it violates the spirit of
-// checkdeps.
-namespace media {
-BaseBuffer::BaseBuffer(const PP_BufferInfo_Dev& info)
-    : id_(info.id),
-      size_(info.size.width, info.size.height) {
-}
-
-GLESBuffer::GLESBuffer(const PP_GLESBuffer_Dev& buffer)
-    : BaseBuffer(buffer.info),
-      texture_id_(buffer.texture_id) {
-}
-
-SysmemBuffer::SysmemBuffer(const PP_SysmemBuffer_Dev& buffer)
-    : BaseBuffer(buffer.info) {
-  // TODO(brettw) we should properly handle the errors here if the buffer
-  // isn't a valid image rather than CHECKing.
-  EnterResourceNoLock<PPB_Buffer_API> enter(buffer.data, true);
-  CHECK(enter.succeeded());
-  webkit::ppapi::PPB_Buffer_Impl* pepper_buffer =
-      static_cast<webkit::ppapi::PPB_Buffer_Impl*>(enter.object());
-  CHECK(pepper_buffer->IsMapped());
-  data_ = pepper_buffer->Map();
-}
-
-Picture::Picture(const PP_Picture_Dev& picture)
-    : picture_buffer_id_(picture.picture_buffer_id),
-      bitstream_buffer_id_(picture.bitstream_buffer_id),
-      visible_size_(picture.visible_size.width, picture.visible_size.height),
-      decoded_size_(picture.decoded_size.width, picture.decoded_size.height) {
-}
-
-}  // namespace media