Delete GpuVideoService and move GpuVideoDecodeAccelerator ownership to stubs

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"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "content/common/child_process.h"
 #include "content/common/content_client.h"
 #include "content/common/content_switches.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/common/gpu/media/gpu_video_service.h"
 #include "content/common/gpu/transport_texture.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager,
                        GpuWatchdog* watchdog,
@@ skipping 199 matching lines @@
   bool handled = true;
   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)
-    IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroyVideoDecoder,
-        OnDestroyVideoDecoder)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_CreateTransportTexture,
         OnCreateTransportTexture)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << msg.type();
   return handled;
 }
 
 int GpuChannel::GenerateRouteID() {
   static int last_id = 0;
@@ skipping 74 matching lines @@
 
 void GpuChannel::OnDestroySurface(int route_id) {
 #if defined(ENABLE_GPU)
   if (router_.ResolveRoute(route_id)) {
     router_.RemoveRoute(route_id);
     surfaces_.Remove(route_id);
   }
 #endif
 }
 
-void GpuChannel::OnCreateVideoDecoder(int32 decoder_host_id,
-                                      uint32 command_buffer_route_id,
-                                      const std::vector<uint32>& configs) {
-  GpuVideoService* service = GpuVideoService::GetInstance();
-  if (service == NULL) {
-    // TODO(hclam): Need to send a failure message.
-    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 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, 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);
-#endif
-}
-
 void GpuChannel::OnCreateTransportTexture(int32 context_route_id,
                                           int32 host_id) {
  #if defined(ENABLE_GPU)
    GpuCommandBufferStub* stub = stubs_.Lookup(context_route_id);
    int32 route_id = GenerateRouteID();
 
    scoped_ptr<TransportTexture> transport(
        new TransportTexture(this, channel_.get(), stub->scheduler()->decoder(),
                             host_id, route_id));
    router_.AddRoute(route_id, transport.get());
@@ skipping 30 matching lines @@
 
 #if defined(OS_POSIX)
 int GpuChannel::GetRendererFileDescriptor() {
   int fd = -1;
   if (channel_.get()) {
     fd = channel_->GetClientFileDescriptor();
   }
   return fd;
 }
 #endif  // defined(OS_POSIX)