Support multiple HW video decoders per context.

content/renderer/gpu/gpu_video_decode_accelerator_host.h

 // 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.
 
 #ifndef CONTENT_RENDERER_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HOST_H_
 #define CONTENT_RENDERER_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HOST_H_
 
 #include <vector>
 
 #include "base/threading/non_thread_safe.h"
 #include "ipc/ipc_channel.h"
 #include "media/video/video_decode_accelerator.h"
 
+class GpuChannelHost;
+
 // This class is used to talk to VideoDecodeAccelerator in the Gpu process
 // through IPC messages.
 class GpuVideoDecodeAcceleratorHost
     : public IPC::Channel::Listener,
       public media::VideoDecodeAccelerator,
       public base::NonThreadSafe {
  public:
   // |router| is used to dispatch IPC messages to this object.

[vrk (LEFT CHROMIUM), 2011/08/16 22:06:21]

nit: router is not a parameter; update comment

[Ami GONE FROM CHROMIUM, 2011/08/16 22:56:26]

Done.

-  // |ipc_sender| is used to send IPC messages to Gpu process.
-  GpuVideoDecodeAcceleratorHost(IPC::Message::Sender* ipc_sender,
-                                int32 command_buffer_route_id,
+  // |channel| is used to send IPC messages to GPU process.
+  GpuVideoDecodeAcceleratorHost(GpuChannelHost* channel,
+                                int32 decoder_route_id,
                                 media::VideoDecodeAccelerator::Client* client);
   virtual ~GpuVideoDecodeAcceleratorHost();
 
   // IPC::Channel::Listener implementation.
   virtual void OnChannelError() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // media::VideoDecodeAccelerator implementation.
   virtual bool Initialize(const std::vector<int32>& configs) OVERRIDE;
   virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
@@ skipping 11 matching lines @@
   void OnProvidePictureBuffer(
     uint32 num_requested_buffers, const gfx::Size& buffer_size);
   void OnDismissPictureBuffer(int32 picture_buffer_id);
   void OnPictureReady(int32 picture_buffer_id, int32 bitstream_buffer_id);
   void OnFlushDone();
   void OnResetDone();
   void OnEndOfStream();
   void OnErrorNotification(uint32 error);
 
   // Sends IPC messages to the Gpu process.
-  IPC::Message::Sender* ipc_sender_;
+  GpuChannelHost* channel_;
 
-  // Route ID for the command buffer associated with the context the GPU Video
-  // Decoder uses.
+  // Route ID for the associated decoder in the GPU process.
   // TODO(fischman): storing route_id's for GPU process entities in the renderer
   // process is vulnerable to GPU process crashing & being respawned, and
   // attempting to use an outdated or reused route id.
-  int32 command_buffer_route_id_;
+  int32 decoder_route_id_;
 
   // Reference to the client that will receive callbacks from the decoder.
   media::VideoDecodeAccelerator::Client* client_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecodeAcceleratorHost);
 };
 
 #endif  // CONTENT_RENDERER_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HOST_H_