Index: content/public/gpu/gpu_video_decode_accelerator_factory.cc |
diff --git a/content/public/gpu/gpu_video_decode_accelerator_factory.cc b/content/public/gpu/gpu_video_decode_accelerator_factory.cc |
index 26cf35746ca22bb9b4001c22819d10d17d4909ab..1bb2d5f7f7de9b1439770ea733cc01f8a2f22e55 100644 |
--- a/content/public/gpu/gpu_video_decode_accelerator_factory.cc |
+++ b/content/public/gpu/gpu_video_decode_accelerator_factory.cc |
@@ -5,8 +5,8 @@ |
#include "content/public/gpu/gpu_video_decode_accelerator_factory.h" |
#include "base/memory/ptr_util.h" |
-#include "content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h" |
#include "content/gpu/gpu_child_thread.h" |
+#include "media/gpu/ipc/service/gpu_video_decode_accelerator_factory_impl.h" |
namespace content { |
@@ -18,7 +18,7 @@ GpuVideoDecodeAcceleratorFactory::Create( |
const GetGLContextCallback& get_gl_context_cb, |
const MakeGLContextCurrentCallback& make_context_current_cb, |
const BindGLImageCallback& bind_image_cb) { |
- auto gvdafactory_impl = GpuVideoDecodeAcceleratorFactoryImpl::Create( |
+ auto gvdafactory_impl = media::GpuVideoDecodeAcceleratorFactoryImpl::Create( |
get_gl_context_cb, make_context_current_cb, bind_image_cb); |
if (!gvdafactory_impl) |
return nullptr; |
@@ -35,7 +35,7 @@ GpuVideoDecodeAcceleratorFactory::CreateWithGLES2Decoder( |
const BindGLImageCallback& bind_image_cb, |
const GetGLES2DecoderCallback& get_gles2_decoder_cb) { |
auto gvdafactory_impl = |
- GpuVideoDecodeAcceleratorFactoryImpl::CreateWithGLES2Decoder( |
+ media::GpuVideoDecodeAcceleratorFactoryImpl::CreateWithGLES2Decoder( |
get_gl_context_cb, make_context_current_cb, bind_image_cb, |
get_gles2_decoder_cb); |
if (!gvdafactory_impl) |
@@ -50,7 +50,7 @@ gpu::VideoDecodeAcceleratorCapabilities |
GpuVideoDecodeAcceleratorFactory::GetDecoderCapabilities() { |
const gpu::GpuPreferences gpu_preferences = |
GpuChildThread::current()->gpu_preferences(); |
- return GpuVideoDecodeAcceleratorFactoryImpl::GetDecoderCapabilities( |
+ return media::GpuVideoDecodeAcceleratorFactoryImpl::GetDecoderCapabilities( |
gpu_preferences); |
} |
@@ -67,7 +67,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA( |
} |
GpuVideoDecodeAcceleratorFactory::GpuVideoDecodeAcceleratorFactory( |
- std::unique_ptr<GpuVideoDecodeAcceleratorFactoryImpl> gvdafactory_impl) |
- : gvdafactory_impl_(std::move(gvdafactory_impl)) {} |
+ std::unique_ptr<media::GpuVideoDecodeAcceleratorFactoryImpl> |
+ gvdafactory_impl) : gvdafactory_impl_(std::move(gvdafactory_impl)) {} |
} // namespace content |