| Index: media/gpu/gpu_video_decode_accelerator_factory.cc
|
| diff --git a/media/gpu/gpu_video_decode_accelerator_factory.cc b/media/gpu/gpu_video_decode_accelerator_factory.cc
|
| index c3eebb10d6e438aafba5aa92c68b0835bdda0f8e..6b809fd81c84303788208960365b50111cedba0b 100644
|
| --- a/media/gpu/gpu_video_decode_accelerator_factory.cc
|
| +++ b/media/gpu/gpu_video_decode_accelerator_factory.cc
|
| @@ -43,7 +43,7 @@ GpuVideoDecodeAcceleratorFactory::Create(
|
| const BindGLImageCallback& bind_image_cb) {
|
| return base::WrapUnique(new GpuVideoDecodeAcceleratorFactory(
|
| get_gl_context_cb, make_context_current_cb, bind_image_cb,
|
| - GetGLES2DecoderCallback()));
|
| + GetGLES2DecoderCallback(), AndroidOverlayMojoFactoryCB()));
|
| }
|
|
|
| // static
|
| @@ -52,10 +52,11 @@ GpuVideoDecodeAcceleratorFactory::CreateWithGLES2Decoder(
|
| const GetGLContextCallback& get_gl_context_cb,
|
| const MakeGLContextCurrentCallback& make_context_current_cb,
|
| const BindGLImageCallback& bind_image_cb,
|
| - const GetGLES2DecoderCallback& get_gles2_decoder_cb) {
|
| + const GetGLES2DecoderCallback& get_gles2_decoder_cb,
|
| + const AndroidOverlayMojoFactoryCB& overlay_factory_cb) {
|
| return base::WrapUnique(new GpuVideoDecodeAcceleratorFactory(
|
| get_gl_context_cb, make_context_current_cb, bind_image_cb,
|
| - get_gles2_decoder_cb));
|
| + get_gles2_decoder_cb, overlay_factory_cb));
|
| }
|
|
|
| // static
|
| @@ -254,7 +255,7 @@ GpuVideoDecodeAcceleratorFactory::CreateAndroidVDA(
|
| decoder.reset(new AndroidVideoDecodeAccelerator(
|
| AVDACodecAllocator::GetInstance(),
|
| base::MakeUnique<AndroidVideoSurfaceChooserImpl>(),
|
| - make_context_current_cb_, get_gles2_decoder_cb_,
|
| + make_context_current_cb_, get_gles2_decoder_cb_, overlay_factory_cb_,
|
| AndroidVideoDecodeAccelerator::PlatformConfig::CreateDefault()));
|
| return decoder;
|
| }
|
| @@ -264,11 +265,13 @@ GpuVideoDecodeAcceleratorFactory::GpuVideoDecodeAcceleratorFactory(
|
| const GetGLContextCallback& get_gl_context_cb,
|
| const MakeGLContextCurrentCallback& make_context_current_cb,
|
| const BindGLImageCallback& bind_image_cb,
|
| - const GetGLES2DecoderCallback& get_gles2_decoder_cb)
|
| + const GetGLES2DecoderCallback& get_gles2_decoder_cb,
|
| + const AndroidOverlayMojoFactoryCB& overlay_factory_cb)
|
| : get_gl_context_cb_(get_gl_context_cb),
|
| make_context_current_cb_(make_context_current_cb),
|
| bind_image_cb_(bind_image_cb),
|
| - get_gles2_decoder_cb_(get_gles2_decoder_cb) {}
|
| + get_gles2_decoder_cb_(get_gles2_decoder_cb),
|
| + overlay_factory_cb_(overlay_factory_cb) {}
|
|
|
| GpuVideoDecodeAcceleratorFactory::~GpuVideoDecodeAcceleratorFactory() {}
|
|
|
|
|