| Index: media/gpu/gpu_video_decode_accelerator_factory_impl.h
|
| diff --git a/media/gpu/gpu_video_decode_accelerator_factory_impl.h b/media/gpu/gpu_video_decode_accelerator_factory_impl.h
|
| index db383062a2933f66d48c429429367a968421b1e3..931d160b5ddc749e8a0feb3b1ec4414d737daa9e 100644
|
| --- a/media/gpu/gpu_video_decode_accelerator_factory_impl.h
|
| +++ b/media/gpu/gpu_video_decode_accelerator_factory_impl.h
|
| @@ -74,9 +74,9 @@ class MEDIA_GPU_EXPORT GpuVideoDecodeAcceleratorFactoryImpl {
|
| static gpu::VideoDecodeAcceleratorCapabilities GetDecoderCapabilities(
|
| const gpu::GpuPreferences& gpu_preferences);
|
|
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateVDA(
|
| - media::VideoDecodeAccelerator::Client* client,
|
| - const media::VideoDecodeAccelerator::Config& config,
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateVDA(
|
| + VideoDecodeAccelerator::Client* client,
|
| + const VideoDecodeAccelerator::Config& config,
|
| const gpu::GpuPreferences& gpu_preferences);
|
|
|
| private:
|
| @@ -87,25 +87,25 @@ class MEDIA_GPU_EXPORT GpuVideoDecodeAcceleratorFactoryImpl {
|
| const GetGLES2DecoderCallback& get_gles2_decoder_cb);
|
|
|
| #if defined(OS_WIN)
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateDXVAVDA(
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateDXVAVDA(
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| #endif
|
| #if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateV4L2VDA(
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateV4L2VDA(
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateV4L2SVDA(
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateV4L2SVDA(
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| #endif
|
| #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateVaapiVDA(
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateVaapiVDA(
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| #endif
|
| #if defined(OS_MACOSX)
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateVTVDA(
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateVTVDA(
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| #endif
|
| #if defined(OS_ANDROID)
|
| - std::unique_ptr<media::VideoDecodeAccelerator> CreateAndroidVDA(
|
| + std::unique_ptr<VideoDecodeAccelerator> CreateAndroidVDA(
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| #endif
|
|
|
|
|