| Index: media/gpu/ipc/service/gpu_video_decode_accelerator.h
|
| diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.h b/media/gpu/ipc/service/gpu_video_decode_accelerator.h
|
| index 6c6d0bff669394dfcb204194f60bed81127ebc0e..7165477b5ec7b855256da1b49168c217fc0829bf 100644
|
| --- a/media/gpu/ipc/service/gpu_video_decode_accelerator.h
|
| +++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.h
|
| @@ -21,6 +21,7 @@
|
| #include "gpu/ipc/service/gpu_command_buffer_stub.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| +#include "media/base/android_overlay_mojo_factory.h"
|
| #include "media/gpu/gpu_video_decode_accelerator_helpers.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -44,7 +45,8 @@ class GpuVideoDecodeAccelerator
|
| GpuVideoDecodeAccelerator(
|
| int32_t host_route_id,
|
| gpu::GpuCommandBufferStub* stub,
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
|
| + const AndroidOverlayMojoFactoryCB& factory);
|
|
|
| // Static query for the capabilities, which includes the supported profiles.
|
| // This query calls the appropriate platform-specific version. The returned
|
| @@ -151,6 +153,9 @@ class GpuVideoDecodeAccelerator
|
| // GPU IO thread task runner.
|
| const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
|
|
|
| + // Optional factory for mojo-based android overlays.
|
| + AndroidOverlayMojoFactoryCB overlay_factory_cb_;
|
| +
|
| // Weak pointers will be invalidated on IO thread.
|
| base::WeakPtrFactory<Client> weak_factory_for_io_;
|
|
|
|
|