| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index 67f55b23612e9764087927b8b3a326f79725beae..917f77c0e9c57e99ca67cf4e3894deabef8e0e03 100644
|
| --- a/content/common/gpu/gpu_messages.h
|
| +++ b/content/common/gpu/gpu_messages.h
|
| @@ -571,7 +571,17 @@ IPC_SYNC_MESSAGE_ROUTED1_2(GpuCommandBufferMsg_GetTransferBuffer,
|
| // no longer needed.
|
| IPC_SYNC_MESSAGE_ROUTED1_1(GpuCommandBufferMsg_CreateVideoDecoder,
|
| media::VideoCodecProfile /* profile */,
|
| - int /* route_id */)
|
| + int32 /* route_id */)
|
| +
|
| +// Create and initialize a hardware video encoder, returning its new route_id.
|
| +// Created encoders should be freed with AcceleratedVideoEncoderMsg_Destroy when
|
| +// no longer needed.
|
| +IPC_SYNC_MESSAGE_ROUTED4_1(GpuCommandBufferMsg_CreateVideoEncoder,
|
| + media::VideoFrame::Format /* input_format */,
|
| + gfx::Size /* input_visible_size */,
|
| + media::VideoCodecProfile /* output_profile */,
|
| + uint32 /* initial_bitrate */,
|
| + int32 /* route_id */)
|
|
|
| // Tells the proxy that there was an error and the command buffer had to be
|
| // destroyed for some reason.
|
| @@ -722,13 +732,6 @@ IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification,
|
| // Accelerated Video Encoder Messages
|
| // These messages are sent from the Renderer process to GPU process.
|
|
|
| -// Initialize the accelerated encoder.
|
| -IPC_MESSAGE_ROUTED4(AcceleratedVideoEncoderMsg_Initialize,
|
| - media::VideoFrame::Format /* input_format */,
|
| - gfx::Size /* input_visible_size */,
|
| - media::VideoCodecProfile /* output_profile */,
|
| - uint32 /* initial_bitrate */)
|
| -
|
| // Queue a input buffer to the encoder to encode. |frame_id| will be returned by
|
| // AcceleratedVideoEncoderHostMsg_NotifyEncodeDone.
|
| IPC_MESSAGE_ROUTED4(AcceleratedVideoEncoderMsg_Encode,
|
| @@ -753,9 +756,6 @@ IPC_MESSAGE_ROUTED2(AcceleratedVideoEncoderMsg_RequestEncodingParametersChange,
|
| // Accelerated Video Encoder Host Messages
|
| // These messages are sent from GPU process to Renderer process.
|
|
|
| -// Notify of the completion of initialization.
|
| -IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderHostMsg_NotifyInitializeDone)
|
| -
|
| // Notify renderer of the input/output buffer requirements of the encoder.
|
| IPC_MESSAGE_ROUTED3(AcceleratedVideoEncoderHostMsg_RequireBitstreamBuffers,
|
| uint32 /* input_count */,
|
| @@ -778,3 +778,6 @@ IPC_MESSAGE_ROUTED3(AcceleratedVideoEncoderHostMsg_BitstreamBufferReady,
|
| // Report error condition.
|
| IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError,
|
| media::VideoEncodeAccelerator::Error /* error */)
|
| +
|
| +// Send destroy request to the encoder.
|
| +IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy)
|
|
|