| Index: content/common/gpu/media/gpu_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| index 21247b210207b02721048c743dcf0e9f55e48751..f3713ee5676c3a573d31c5dfb765285355f88010 100644
|
| --- a/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| @@ -15,9 +15,9 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/shared_memory.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "content/common/gpu/gpu_command_buffer_stub.h"
|
| #include "gpu/command_buffer/service/texture_manager.h"
|
| #include "gpu/config/gpu_info.h"
|
| +#include "gpu/ipc/service/gpu_command_buffer_stub.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| @@ -33,14 +33,14 @@ class GpuVideoDecodeAccelerator
|
| : public IPC::Listener,
|
| public IPC::Sender,
|
| public media::VideoDecodeAccelerator::Client,
|
| - public GpuCommandBufferStub::DestructionObserver {
|
| + public gpu::GpuCommandBufferStub::DestructionObserver {
|
| public:
|
| // Each of the arguments to the constructor must outlive this object.
|
| // |stub->decoder()| will be made current around any operation that touches
|
| // the underlying VDA so that it can make GL calls safely.
|
| GpuVideoDecodeAccelerator(
|
| int32_t host_route_id,
|
| - GpuCommandBufferStub* stub,
|
| + gpu::GpuCommandBufferStub* stub,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
|
|
|
| // Static query for the capabilities, which includes the supported profiles.
|
| @@ -72,8 +72,8 @@ class GpuVideoDecodeAccelerator
|
|
|
| // Initialize VDAs from the set of VDAs supported for current platform until
|
| // one of them succeeds for given |config|. Send the |init_done_msg| when
|
| - // done. filter_ is passed to GpuCommandBufferStub channel only if the chosen
|
| - // VDA can decode on IO thread.
|
| + // done. filter_ is passed to gpu::GpuCommandBufferStub channel only if the
|
| + // chosen VDA can decode on IO thread.
|
| bool Initialize(const media::VideoDecodeAccelerator::Config& config);
|
|
|
| private:
|
| @@ -131,10 +131,10 @@ class GpuVideoDecodeAccelerator
|
| // Route ID to communicate with the host.
|
| const int32_t host_route_id_;
|
|
|
| - // Unowned pointer to the underlying GpuCommandBufferStub. |this| is
|
| + // Unowned pointer to the underlying gpu::GpuCommandBufferStub. |this| is
|
| // registered as a DestuctionObserver of |stub_| and will self-delete when
|
| // |stub_| is destroyed.
|
| - GpuCommandBufferStub* const stub_;
|
| + gpu::GpuCommandBufferStub* const stub_;
|
|
|
| // The underlying VideoDecodeAccelerator.
|
| scoped_ptr<media::VideoDecodeAccelerator> video_decode_accelerator_;
|
|
|