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..e70193c0ab0f055ccbe95dd8134ff5dd1bf3d90b 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 mailbox_holder, |
+ bool force_keyframe); |
void OnUseOutputBitstreamBuffer(int32 buffer_id, |
base::SharedMemoryHandle buffer_handle, |
uint32 buffer_size); |
@@ -86,7 +90,10 @@ class GpuVideoEncodeAccelerator |
void OnDestroy(); |
- void EncodeFrameFinished(int32 frame_id, scoped_ptr<base::SharedMemory> shm); |
+ void EncodeSharedMemoryFrameFinished(int32 frame_id, |
+ scoped_ptr<base::SharedMemory> shm); |
+ |
+ void EncodeNativeTextureFrameFinished(int32 frame_id); |
void Send(IPC::Message* message); |
// Helper for replying to the creation request. |