| Index: content/common/gpu/client/gpu_channel_host.h
|
| diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h
|
| index e073db004d4d056ec4620eb2943912369ff12bc5..d5146d77762812f62d3873c929c27ab92d0d2adf 100644
|
| --- a/content/common/gpu/client/gpu_channel_host.h
|
| +++ b/content/common/gpu/client/gpu_channel_host.h
|
| @@ -22,8 +22,6 @@
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_channel_proxy.h"
|
| #include "ipc/ipc_sync_channel.h"
|
| -#include "media/video/video_decode_accelerator.h"
|
| -#include "media/video/video_encode_accelerator.h"
|
| #include "ui/gfx/gpu_memory_buffer.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/size.h"
|
| @@ -43,6 +41,11 @@ namespace IPC {
|
| class SyncMessageFilter;
|
| }
|
|
|
| +namespace media {
|
| +class VideoDecodeAccelerator;
|
| +class VideoEncodeAccelerator;
|
| +}
|
| +
|
| namespace content {
|
| class CommandBufferProxyImpl;
|
| class GpuChannelHost;
|
| @@ -125,11 +128,11 @@ class GpuChannelHost : public IPC::Sender,
|
|
|
| // Creates a video decoder in the GPU process.
|
| scoped_ptr<media::VideoDecodeAccelerator> CreateVideoDecoder(
|
| - int command_buffer_route_id,
|
| - media::VideoCodecProfile profile);
|
| + int command_buffer_route_id);
|
|
|
| // Creates a video encoder in the GPU process.
|
| - scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncoder();
|
| + scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncoder(
|
| + int command_buffer_route_id);
|
|
|
| // Destroy a command buffer created by this channel.
|
| void DestroyCommandBuffer(CommandBufferProxyImpl* command_buffer);
|
|
|