Implement proper synchronization between HW video decode IPC and CommandBuffer.

content/common/gpu/gpu_channel.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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "content/common/gpu/gpu_channel.h"
 
@@ skipping 220 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(GpuChannel, msg)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_Initialize, OnInitialize)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_CreateOffscreenCommandBuffer,
         OnCreateOffscreenCommandBuffer)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroyCommandBuffer,
         OnDestroyCommandBuffer)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_CreateOffscreenSurface,
                         OnCreateOffscreenSurface)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroySurface, OnDestroySurface)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_CreateVideoDecoder,
-        OnCreateVideoDecoder)
+                        OnCreateVideoDecoder)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroyVideoDecoder,
         OnDestroyVideoDecoder)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_CreateTransportTexture,
         OnCreateTransportTexture)
-    IPC_MESSAGE_HANDLER(GpuChannelMsg_AssignTexturesToVideoDecoder,
-        OnAssignTexturesToVideoDecoder)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << msg.type();
   return handled;
 }
 
 int GpuChannel::GenerateRouteID() {
   static int last_id = 0;
   return ++last_id;
 }
@@ skipping 88 matching lines @@
     return;
   }
 
   GpuCommandBufferStub* stub = stubs_.Lookup(command_buffer_route_id);
   // TODO(vrk): Need to notify renderer that given route is invalid.
   if (!stub)
     return;
 
   int32 decoder_id = GenerateRouteID();
 
-  // TODO(fischman): this is a BUG.  We hand off stub->scheduler()->decoder()
-  // to be baked into the resulting GpuVideoDecodeAccelerator, but we don't own
-  // that GVDA, and we make no attempt to tear it down if/when
-  // stub->scheduler()->decoder() is destroyed.  GpuVideoService should be
-  // subsumed into this class and GpuVideoDecodeAccelerator should be owned by
-  // the GpuCommandBufferStub that owns the commandbuffer GVDA is using.
+  // TODO(fischman): this is a BUG.  We hand off stub to be baked into the
+  // resulting GpuVideoDecodeAccelerator, but we don't own that GVDA, and we
+  // make no attempt to tear it down if/when stub is destroyed.  GpuVideoService
+  // should be subsumed into this class and GpuVideoDecodeAccelerator should be
+  // owned by GpuCommandBufferStub.
   bool ret = service->CreateVideoDecoder(
-      this, &router_, decoder_host_id, decoder_id, stub->scheduler()->decoder(),
-      configs);
+      this, &router_, decoder_host_id, decoder_id, stub, configs);
   DCHECK(ret) << "Failed to create a GpuVideoDecodeAccelerator";
 }
 
 void GpuChannel::OnDestroyVideoDecoder(int32 decoder_id) {
 #if defined(ENABLE_GPU)
   LOG(ERROR) << "GpuChannel::OnDestroyVideoDecoder";
   GpuVideoService* service = GpuVideoService::GetInstance();
   if (service == NULL)
     return;
   service->DestroyVideoDecoder(&router_, decoder_id);
@@ skipping 11 matching lines @@
                             host_id, route_id));
    router_.AddRoute(route_id, transport.get());
    transport_textures_.AddWithID(transport.release(), route_id);
 
    IPC::Message* msg = new GpuTransportTextureHostMsg_TransportTextureCreated(
        host_id, route_id);
    Send(msg);
  #endif
 }
 
-void GpuChannel::OnAssignTexturesToVideoDecoder(
-    int32 decoder_id,
-    const std::vector<int32>& buffer_ids,
-    const std::vector<uint32>& texture_ids,
-    const std::vector<gfx::Size>& sizes) {
-  GpuVideoService* service = GpuVideoService::GetInstance();
-  service->AssignTexturesToDecoder(decoder_id, buffer_ids, texture_ids, sizes);
-}
-
 bool GpuChannel::Init(base::MessageLoopProxy* io_message_loop,
                       base::WaitableEvent* shutdown_event) {
   // Check whether we're already initialized.
   if (channel_.get())
     return true;
 
   // Map renderer ID to a (single) channel to that process.
   std::string channel_name = GetChannelName();
   channel_.reset(new IPC::SyncChannel(
       channel_name,
@@ skipping 12 matching lines @@
 
 #if defined(OS_POSIX)
 int GpuChannel::GetRendererFileDescriptor() {
   int fd = -1;
   if (channel_.get()) {
     fd = channel_->GetClientFileDescriptor();
   }
   return fd;
 }
 #endif  // defined(OS_POSIX)