| Index: content/common/gpu/gpu_command_buffer_stub.cc
|
| diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
|
| index 1222f41426360f1d431af3f60f0e75e022d85d42..d94ed26ea7f1203f6ed1d6f7bd489b061b1d6de9 100644
|
| --- a/content/common/gpu/gpu_command_buffer_stub.cc
|
| +++ b/content/common/gpu/gpu_command_buffer_stub.cc
|
| @@ -20,6 +20,7 @@
|
| #include "content/common/gpu/gpu_watchdog.h"
|
| #include "content/common/gpu/image_transport_surface.h"
|
| #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
|
| +#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
|
| #include "content/common/gpu/sync_point_manager.h"
|
| #include "content/public/common/content_client.h"
|
| #include "gpu/command_buffer/common/constants.h"
|
| @@ -206,6 +207,8 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) {
|
| OnGetTransferBuffer);
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_CreateVideoDecoder,
|
| OnCreateVideoDecoder)
|
| + IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_CreateVideoEncoder,
|
| + OnCreateVideoEncoder)
|
| IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SetSurfaceVisible,
|
| OnSetSurfaceVisible)
|
| IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_RetireSyncPoint,
|
| @@ -752,7 +755,7 @@ void GpuCommandBufferStub::OnCreateVideoDecoder(
|
| media::VideoCodecProfile profile,
|
| IPC::Message* reply_message) {
|
| TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnCreateVideoDecoder");
|
| - int decoder_route_id = channel_->GenerateRouteID();
|
| + int32 decoder_route_id = channel_->GenerateRouteID();
|
| GpuVideoDecodeAccelerator* decoder = new GpuVideoDecodeAccelerator(
|
| decoder_route_id, this, channel_->io_message_loop());
|
| decoder->Initialize(profile, reply_message);
|
| @@ -760,6 +763,25 @@ void GpuCommandBufferStub::OnCreateVideoDecoder(
|
| // self-delete during destruction of this stub.
|
| }
|
|
|
| +void GpuCommandBufferStub::OnCreateVideoEncoder(
|
| + media::VideoFrame::Format input_format,
|
| + const gfx::Size& input_visible_size,
|
| + media::VideoCodecProfile output_profile,
|
| + uint32 initial_bitrate,
|
| + IPC::Message* reply_message) {
|
| + TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnCreateVideoEncoder");
|
| + int32 encoder_route_id = channel_->GenerateRouteID();
|
| + GpuVideoEncodeAccelerator* encoder =
|
| + new GpuVideoEncodeAccelerator(encoder_route_id, this);
|
| + encoder->Initialize(input_format,
|
| + input_visible_size,
|
| + output_profile,
|
| + initial_bitrate,
|
| + reply_message);
|
| + // encoder is registered as a DestructionObserver of this stub and will
|
| + // self-delete during destruction of this stub.
|
| +}
|
| +
|
| void GpuCommandBufferStub::OnSetSurfaceVisible(bool visible) {
|
| TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnSetSurfaceVisible");
|
| if (memory_manager_client_state_)
|
|
|