| Index: media/gpu/gpu_video_decode_accelerator_factory.h
|
| diff --git a/media/gpu/gpu_video_decode_accelerator_factory.h b/media/gpu/gpu_video_decode_accelerator_factory.h
|
| index 71d5a304ba4b54a1cca9ebccc5f7b2f7053723a0..538d0fbf362195bbd13adf0732f394986bd09792 100644
|
| --- a/media/gpu/gpu_video_decode_accelerator_factory.h
|
| +++ b/media/gpu/gpu_video_decode_accelerator_factory.h
|
| @@ -12,6 +12,7 @@
|
| #include "gpu/command_buffer/service/gpu_preferences.h"
|
| #include "gpu/config/gpu_driver_bug_workarounds.h"
|
| #include "gpu/config/gpu_info.h"
|
| +#include "media/base/android_overlay_config.h"
|
| #include "media/gpu/media_gpu_export.h"
|
| #include "media/video/video_decode_accelerator.h"
|
|
|
| @@ -28,6 +29,10 @@ class GLES2Decoder;
|
| }
|
| }
|
|
|
| +namespace service_manager {
|
| +class Connector;
|
| +}
|
| +
|
| namespace media {
|
|
|
| class MEDIA_GPU_EXPORT GpuVideoDecodeAcceleratorFactory {
|
| @@ -65,7 +70,9 @@ class MEDIA_GPU_EXPORT 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,
|
| + service_manager::Connector* connector,
|
| + const char* browser_service_name);
|
|
|
| static std::unique_ptr<GpuVideoDecodeAcceleratorFactory> CreateWithNoGL();
|
|
|
| @@ -84,7 +91,9 @@ class MEDIA_GPU_EXPORT 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,
|
| + service_manager::Connector* connector,
|
| + const char* browser_service_name);
|
|
|
| #if defined(OS_WIN)
|
| std::unique_ptr<VideoDecodeAccelerator> CreateD3D11VDA(
|
| @@ -116,12 +125,20 @@ class MEDIA_GPU_EXPORT GpuVideoDecodeAcceleratorFactory {
|
| std::unique_ptr<VideoDecodeAccelerator> CreateAndroidVDA(
|
| const gpu::GpuDriverBugWorkarounds& workarounds,
|
| const gpu::GpuPreferences& gpu_preferences) const;
|
| +
|
| + static std::unique_ptr<media::AndroidOverlay> CreateAndroidOverlay(
|
| + service_manager::Connector* connector,
|
| + const char* browser_service_name,
|
| + const base::UnguessableToken& routing_token,
|
| + media::AndroidOverlayConfig config);
|
| #endif
|
|
|
| const GetGLContextCallback get_gl_context_cb_;
|
| const MakeGLContextCurrentCallback make_context_current_cb_;
|
| const BindGLImageCallback bind_image_cb_;
|
| const GetGLES2DecoderCallback get_gles2_decoder_cb_;
|
| + service_manager::Connector* connector_ = nullptr;
|
| + const char* browser_service_name_ = nullptr;
|
|
|
| base::ThreadChecker thread_checker_;
|
|
|
|
|