Plumb texture target to VideoDecodeAccelerator::Client

ppapi/proxy/ppp_video_decoder_proxy.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppp_video_decoder_proxy.h"
 
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_video_decoder_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::thunk::PPB_VideoDecoder_API;
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 void ProvidePictureBuffers(PP_Instance instance, PP_Resource decoder,
                            uint32_t req_num_of_bufs,
-                           const PP_Size* dimensions) {
+                           const PP_Size* dimensions,
+                           uint32_t texture_target) {
   HostResource decoder_resource;
   decoder_resource.SetHostResource(instance, decoder);
 
   HostDispatcher::GetForInstance(instance)->Send(
       new PpapiMsg_PPPVideoDecoder_ProvidePictureBuffers(
           API_ID_PPP_VIDEO_DECODER_DEV,
-          decoder_resource, req_num_of_bufs, *dimensions));
+          decoder_resource, req_num_of_bufs, *dimensions, texture_target));
 }
 
 void DismissPictureBuffer(PP_Instance instance, PP_Resource decoder,
                           int32_t picture_buffer_id) {
   HostResource decoder_resource;
   decoder_resource.SetHostResource(instance, decoder);
 
   HostDispatcher::GetForInstance(instance)->Send(
       new PpapiMsg_PPPVideoDecoder_DismissPictureBuffer(
           API_ID_PPP_VIDEO_DECODER_DEV,
@@ skipping 31 matching lines @@
   return new PPP_VideoDecoder_Proxy(dispatcher);
 }
 
 }  // namespace
 
 PPP_VideoDecoder_Proxy::PPP_VideoDecoder_Proxy(Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher),
       ppp_video_decoder_impl_(NULL) {
   if (dispatcher->IsPlugin()) {
     ppp_video_decoder_impl_ = static_cast<const PPP_VideoDecoder_Dev*>(
         dispatcher->local_get_interface()(PPP_VIDEODECODER_DEV_INTERFACE));

[brettw, 2012/06/04 23:42:33]

This code doesn't provide backwards compat. We may not care about this, though.
I assume our older versions of Flash that are distributed don't use HW decode at
all? If that's the case, this is OK, otherwise we should add backwards compat.

[sail, 2012/06/04 23:49:47]

Yea, hardware decoding is disabled by default.

   }
 }
 
 PPP_VideoDecoder_Proxy::~PPP_VideoDecoder_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPP_VideoDecoder_Proxy::GetInfo() {
   static const Info info = {
     &video_decoder_interface,
@@ skipping 16 matching lines @@
                         OnMsgPictureReady)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPVideoDecoder_NotifyError,
                         OnMsgNotifyError)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgProvidePictureBuffers(
-    const HostResource& decoder, uint32_t req_num_of_bufs,
-    const PP_Size& dimensions) {
+    const HostResource& decoder,
+    uint32_t req_num_of_bufs,
+    const PP_Size& dimensions,
+    uint32_t texture_target) {
   PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
       PluginResourceForHostResource(decoder);
   CallWhileUnlocked(ppp_video_decoder_impl_->ProvidePictureBuffers,
                     decoder.instance(),
                     plugin_decoder,
                     req_num_of_bufs,
-                    &dimensions);
+                    &dimensions,
+                    texture_target);
 }
 
 void PPP_VideoDecoder_Proxy::OnMsgDismissPictureBuffer(
     const HostResource& decoder, int32_t picture_id) {
   PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
       PluginResourceForHostResource(decoder);
   CallWhileUnlocked(ppp_video_decoder_impl_->DismissPictureBuffer,
                     decoder.instance(),
                     plugin_decoder,
                     picture_id);
@@ skipping 14 matching lines @@
   PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
       PluginResourceForHostResource(decoder);
   CallWhileUnlocked(ppp_video_decoder_impl_->NotifyError,
                     decoder.instance(),
                     plugin_decoder,
                     error);
 }
 
 }  // namespace proxy
 }  // namespace ppapi