Chromium Code Reviews| Index: content/common/gpu/gpu_messages.h |
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h |
| index a9c84a4e5399f25a1269693ad8ea3e5c88575cd0..4d95837b02d4f2a28f8f4d93b5efc119b333383c 100644 |
| --- a/content/common/gpu/gpu_messages.h |
| +++ b/content/common/gpu/gpu_messages.h |
| @@ -682,8 +682,7 @@ IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_CreateStreamTexture, |
| IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_Decode, |
| AcceleratedVideoDecoderMsg_Decode_Params) |
| -// Sent from Renderer process to the GPU process to give the texture IDs for |
| -// the textures the decoder will use for output. |
| +// Give the texture IDs for the textures the decoder will use for output. |
| IPC_MESSAGE_ROUTED2(AcceleratedVideoDecoderMsg_AssignPictureBuffers, |
| std::vector<int32>, /* Picture buffer ID */ |
| std::vector<uint32>) /* Texture ID */ |
| @@ -699,6 +698,10 @@ IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Flush) |
| // Send reset request to the decoder. |
| IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Reset) |
| +// Set a CDM on the decoder to handle encrypted buffers. |
| +IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_SetCdm, |
| + int32) /* CDM ID */ |
| + |
| // Send destroy request to the decoder. |
| IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Destroy) |
| @@ -737,6 +740,10 @@ IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone) |
| // Confirm decoder has been reset. |
| IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone) |
| +// Notify the CDM setting result. |
| +IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_CdmSet, |
|
liberato (no reviews please)
2015/11/11 23:29:10
if you're feeling sufficiently obsessive-compulsiv
dcheng
2015/11/12 18:48:43
I think this could be named more intuitively (beca
xhwang
2015/11/13 01:16:55
I fixed gpu_vda, which is in a mess.
xhwang
2015/11/13 01:16:55
Renamed to CdmAttached which is already used in va
|
| + bool) /* success */ |
| + |
| // Video decoder has encountered an error. |
| IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification, |
| uint32) /* Error ID */ |