Merge PlatformVideoDecoder into PPB_VideoDecoder_Impl

Merge PlatformVideoDecoder into PPB_VideoDecoder_Impl

PlatformVideoDecoder is just a simple shell around
media::VideoDecodeAccelerator, dating from when PPB* were in webkit/
It's not needed any more, so just merge it into PPB_VideoDecoder_Impl.

BUG=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=263436

[bbudge, 2014-04-11 21:26:57]

LGTM with 2 comments.
Looks like a nice simplification. Thanks!

https://codereview.chromium.org/235953002/diff/1/content/renderer/pepper/ppb_...
File content/renderer/pepper/ppb_video_decoder_impl.h (right):

https://codereview.chromium.org/235953002/diff/1/content/renderer/pepper/ppb_...
content/renderer/pepper/ppb_video_decoder_impl.h:76: // swapped with another.
I don't understand what the old comment means by 'swap' here.

[piman, 2014-04-11 21:35:28]

https://codereview.chromium.org/235953002/diff/1/content/renderer/pepper/ppb_...
File content/renderer/pepper/ppb_video_decoder_impl.h (right):

https://codereview.chromium.org/235953002/diff/1/content/renderer/pepper/ppb_...
content/renderer/pepper/ppb_video_decoder_impl.h:76: // swapped with another.
On 2014/04/11 21:26:57, bbudge wrote:
> I don't understand what the old comment means by 'swap' here.

You're right, I don't know either. Seems obsolete, I will delete.

[piman, 2014-04-11 21:36:59]

The CQ bit was checked by piman@chromium.org

[commit-bot: I haz the power, 2014-04-11 21:37:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/235953002/20001

[commit-bot: I haz the power, 2014-04-11 21:37:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-11 21:37:43]

Failed to apply patch for content/renderer/pepper/ppb_video_decoder_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/renderer/pepper/ppb_video_decoder_impl.cc
  Hunk #3 succeeded at 138 (offset -3 lines).
  Hunk #4 succeeded at 174 (offset -4 lines).
  Hunk #5 succeeded at 200 (offset -4 lines).
  Hunk #6 succeeded at 249 (offset -4 lines).
  Hunk #7 succeeded at 262 (offset -1 lines).
  Hunk #8 succeeded at 273 with fuzz 1 (offset -1 lines).
  Hunk #9 succeeded at 282 (offset -1 lines).
  Hunk #10 FAILED at 295.
  1 out of 10 hunks FAILED -- saving rejects to file
content/renderer/pepper/ppb_video_decoder_impl.cc.rej

Patch:       content/renderer/pepper/ppb_video_decoder_impl.cc
Index: content/renderer/pepper/ppb_video_decoder_impl.cc
diff --git a/content/renderer/pepper/ppb_video_decoder_impl.cc
b/content/renderer/pepper/ppb_video_decoder_impl.cc
index
05feadc97704cbe387375ab6e562436d7236c86d..781be1d605eaa0d97c757fccae1efae8beadeb7b
100644
--- a/content/renderer/pepper/ppb_video_decoder_impl.cc
+++ b/content/renderer/pepper/ppb_video_decoder_impl.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "content/renderer/media/pepper_platform_video_decoder.h"
+#include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_platform_context_3d.h"
@@ -17,6 +17,7 @@
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/ppb_buffer_impl.h"
 #include "content/renderer/pepper/ppb_graphics_3d_impl.h"
+#include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "media/video/picture.h"
 #include "media/video/video_decode_accelerator.h"
@@ -140,19 +141,27 @@ bool PPB_VideoDecoder_Impl::Init(
   if (command_buffer_route_id == 0)
     return false;
 
-  platform_video_decoder_.reset(
-      new PlatformVideoDecoder(command_buffer_route_id));
-  if (!platform_video_decoder_)
+  FlushCommandBuffer();
+
+  RenderThreadImpl* render_thread = RenderThreadImpl::current();
+
+  // This is not synchronous, but subsequent IPC messages will be buffered, so
+  // it is okay to immediately send IPC messages through the returned channel.
+  GpuChannelHost* channel =
+      render_thread->EstablishGpuChannelSync(
+          CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
+
+  if (!channel)
     return false;
 
-  FlushCommandBuffer();
-  return platform_video_decoder_->Initialize(PPToMediaProfile(profile), this);
+  decoder_ = channel->CreateVideoDecoder(command_buffer_route_id);
+  return (decoder_ && decoder_->Initialize(PPToMediaProfile(profile), this));
 }
 
 int32_t PPB_VideoDecoder_Impl::Decode(
     const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
     scoped_refptr<TrackedCallback> callback) {
-  if (!platform_video_decoder_)
+  if (!decoder_)
     return PP_ERROR_BADRESOURCE;
 
   EnterResourceNoLock<PPB_Buffer_API> enter(bitstream_buffer->data, true);
@@ -169,14 +178,14 @@ int32_t PPB_VideoDecoder_Impl::Decode(
     return PP_ERROR_BADARGUMENT;
 
   FlushCommandBuffer();
-  platform_video_decoder_->Decode(decode_buffer);
+  decoder_->Decode(decode_buffer);
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_VideoDecoder_Impl::AssignPictureBuffers(
     uint32_t no_of_buffers,
     const PP_PictureBuffer_Dev* buffers) {
-  if (!platform_video_decoder_)
+  if (!decoder_)
     return;
   UMA_HISTOGRAM_COUNTS_100("Media.PepperVideoDecoderPictureCount",
                            no_of_buffers);
@@ -195,46 +204,46 @@ void PPB_VideoDecoder_Impl::AssignPictureBuffers(
   }
 
   FlushCommandBuffer();
-  platform_video_decoder_->AssignPictureBuffers(wrapped_buffers);
+  decoder_->AssignPictureBuffers(wrapped_buffers);
 }
 
 void PPB_VideoDecoder_Impl::ReusePictureBuffer(int32_t picture_buffer_id) {
-  if (!platform_video_decoder_)
+  if (!decoder_)
     return;
 
   FlushCommandBuffer();
-  platform_video_decoder_->ReusePictureBuffer(picture_buffer_id);
+  decoder_->ReusePictureBuffer(picture_buffer_id);
 }
 
 int32_t PPB_VideoDecoder_Impl::Flush(scoped_refptr<TrackedCallback> callback) {
-  if (!platform_video_decoder_)
+  if (!decoder_)
     return PP_ERROR_BADRESOURCE;
 
   if (!SetFlushCallback(callback))
     return PP_ERROR_INPROGRESS;
 
   FlushCommandBuffer();
-  platform_video_decoder_->Flush();
+  decoder_->Flush();
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_VideoDecoder_Impl::Reset(scoped_refptr<TrackedCallback> callback) {
-  if (!platform_video_decoder_)
+  if (!decoder_)
     return PP_ERROR_BADRESOURCE;
 
   if (!SetResetCallback(callback))
     return PP_ERROR_INPROGRESS;
 
   FlushCommandBuffer();
-  platform_video_decoder_->Reset();
+  decoder_->Reset();
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_VideoDecoder_Impl::Destroy() {
   FlushCommandBuffer();
 
-  if (platform_video_decoder_)
-    platform_video_decoder_.release()->Destroy();
+  if (decoder_)
+    decoder_.release()->Destroy();
   ppp_videodecoder_ = NULL;
 
   ::ppapi::PPB_VideoDecoder_Shared::Destroy();
@@ -244,6 +253,7 @@ void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
     uint32 requested_num_of_buffers,
     const gfx::Size& dimensions,
     uint32 texture_target) {
+  DCHECK(RenderThreadImpl::current());
   if (!ppp_videodecoder_)
     return;
 
@@ -253,6 +263,7 @@ void PPB_VideoDecoder_Impl::ProvidePictureBuffers(
 }
 
 void PPB_VideoDecoder_Impl::PictureReady(const media::Picture& picture) {
+  DCHECK(RenderThreadImpl::current());
   if (!ppp_videodecoder_)
     return;
 
@@ -263,6 +274,7 @@ void PPB_VideoDecoder_Impl::PictureReady(const
media::Picture& picture) {
 }
 
 void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32 picture_buffer_id) {
+  DCHECK(RenderThreadImpl::current());
   if (!ppp_videodecoder_)
     return;
   ppp_videodecoder_->DismissPictureBuffer(pp_instance(), pp_resource(),
@@ -271,6 +283,7 @@ void PPB_VideoDecoder_Impl::DismissPictureBuffer(int32
picture_buffer_id) {
 
 void PPB_VideoDecoder_Impl::NotifyError(
     media::VideoDecodeAccelerator::Error error) {
+  DCHECK(RenderThreadImpl::current());
   if (!ppp_videodecoder_)
     return;
 
@@ -282,15 +295,18 @@ void PPB_VideoDecoder_Impl::NotifyError(
 }
 
 void PPB_VideoDecoder_Impl::NotifyResetDone() {
+  DCHECK(RenderThreadImpl::current());
   RunResetCallback(PP_OK);
 }
 
 void PPB_VideoDecoder_Impl::NotifyEndOfBitstreamBuffer(
     int32 bitstream_buffer_id) {
+  DCHECK(RenderThreadImpl::current());
   RunBitstreamBufferCallback(bitstream_buffer_id, PP_OK);
 }
 
 void PPB_VideoDecoder_Impl::NotifyFlushDone() {
+  DCHECK(RenderThreadImpl::current());
   RunFlushCallback(PP_OK);
 }

[piman, 2014-04-11 21:49:32]

The CQ bit was checked by piman@chromium.org

[commit-bot: I haz the power, 2014-04-11 21:50:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/235953002/40001

[commit-bot: I haz the power, 2014-04-12 01:08:52]

Change committed as 263436