Chromium Code Reviews| Index: content/common/gpu/media/gpu_video_encode_accelerator.h |
| diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.h b/content/common/gpu/media/gpu_video_encode_accelerator.h |
| index f535f09339c70ed236d1fb28be4b4bf461e41aec..479cacb0e42609cb8a83477271ce5039fa2246cd 100644 |
| --- a/content/common/gpu/media/gpu_video_encode_accelerator.h |
| +++ b/content/common/gpu/media/gpu_video_encode_accelerator.h |
| @@ -10,6 +10,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/memory/weak_ptr.h" |
| #include "content/common/gpu/gpu_command_buffer_stub.h" |
| +#include "gpu/command_buffer/common/mailbox_holder.h" |
| #include "gpu/config/gpu_info.h" |
| #include "ipc/ipc_listener.h" |
| #include "media/video/video_encode_accelerator.h" |
| @@ -74,11 +75,14 @@ class GpuVideoEncodeAccelerator |
| // IPC handlers, proxying media::VideoEncodeAccelerator for the renderer |
| // process. |
| - void OnEncode(int32 frame_id, |
| - base::SharedMemoryHandle buffer_handle, |
| - uint32 buffer_offset, |
| - uint32 buffer_size, |
| - bool force_keyframe); |
| + void OnEncodeSharedMemory(int32 frame_id, |
| + base::SharedMemoryHandle buffer_handle, |
| + uint32 buffer_offset, |
| + uint32 buffer_size, |
| + bool force_keyframe); |
| + void OnEncodeNativeTexture(int32 frame_id, |
| + gpu::MailboxHolder buffer_handle, |
| + bool force_keyframe); |
| void OnUseOutputBitstreamBuffer(int32 buffer_id, |
| base::SharedMemoryHandle buffer_handle, |
| uint32 buffer_size); |
| @@ -88,6 +92,8 @@ class GpuVideoEncodeAccelerator |
| void EncodeFrameFinished(int32 frame_id, scoped_ptr<base::SharedMemory> shm); |
|
magjed_chromium
2015/06/03 08:40:00
Maybe rename this function to EncodeSharedMemoryFr
Pawel Osciak
2015/06/03 10:28:56
+1.
emircan
2015/06/03 20:56:12
Done.
|
| + void EncodeNativeTextureFrameFinished(int32 frame_id); |
| + |
| void Send(IPC::Message* message); |
| // Helper for replying to the creation request. |
| void SendCreateEncoderReply(IPC::Message* message, bool succeeded); |