Index: content/common/gpu/client/command_buffer_proxy_impl.h |
diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h |
index 02d66da088c0a58e283b8811f2884c7277137fbf..4163cb615b156622b4eb4bc31e4c238bec0c5b13 100644 |
--- a/content/common/gpu/client/command_buffer_proxy_impl.h |
+++ b/content/common/gpu/client/command_buffer_proxy_impl.h |
@@ -20,7 +20,6 @@ |
#include "gpu/command_buffer/common/gpu_control.h" |
#include "gpu/command_buffer/common/gpu_memory_allocation.h" |
#include "ipc/ipc_listener.h" |
-#include "media/video/video_decode_accelerator.h" |
#include "ui/events/latency_info.h" |
struct GPUCommandBufferConsoleMessage; |
@@ -37,6 +36,11 @@ namespace gpu { |
struct Mailbox; |
} |
+namespace media { |
+class VideoDecodeAccelerator; |
+class VideoEncodeAccelerator; |
+} |
+ |
namespace content { |
class GpuChannelHost; |
@@ -69,8 +73,15 @@ class CommandBufferProxyImpl |
// Note that the GpuVideoDecodeAccelerator may still fail to be created in |
// the GPU process, even if this returns non-NULL. In this case the VDA client |
// is notified of an error later, after Initialize(). |
- scoped_ptr<media::VideoDecodeAccelerator> CreateVideoDecoder( |
- media::VideoCodecProfile profile); |
+ scoped_ptr<media::VideoDecodeAccelerator> CreateVideoDecoder(); |
+ |
+ // Sends an IPC message to create a GpuVideoEncodeAccelerator. Creates and |
+ // returns it as an owned pointer to a media::VideoEncodeAccelerator. Returns |
+ // NULL on failure to create the GpuVideoEncodeAcceleratorHost. |
+ // Note that the GpuVideoEncodeAccelerator may still fail to be created in |
+ // the GPU process, even if this returns non-NULL. In this case the VEA client |
+ // is notified of an error later, after Initialize(); |
+ scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncoder(); |
// IPC::Listener implementation: |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
@@ -156,10 +167,7 @@ class CommandBufferProxyImpl |
void TryUpdateState(); |
// The shared memory area used to update state. |
- gpu::CommandBufferSharedState* shared_state() const { |
- return reinterpret_cast<gpu::CommandBufferSharedState*>( |
- shared_state_shm_->memory()); |
- } |
+ gpu::CommandBufferSharedState* shared_state() const; |
// Unowned list of DeletionObservers. |
ObserverList<DeletionObserver> deletion_observers_; |