| Index: media/mojo/services/mojo_renderer_impl.h
|
| diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h
|
| index 9a7bb0f92a21a7241b4f8d30c6adcf9e39e539ca..0949832edf27d3631e140907e666f7597503be3b 100644
|
| --- a/media/mojo/services/mojo_renderer_impl.h
|
| +++ b/media/mojo/services/mojo_renderer_impl.h
|
| @@ -19,6 +19,9 @@ class SingleThreadTaskRunner;
|
| namespace media {
|
|
|
| class DemuxerStreamProvider;
|
| +class GpuVideoAcceleratorFactories;
|
| +class VideoOverlayFactory;
|
| +class VideoRendererSink;
|
|
|
| // A media::Renderer that proxies to a interfaces::Renderer. That
|
| // interfaces::Renderer proxies back to the MojoRendererImpl via the
|
| @@ -34,6 +37,8 @@ class MojoRendererImpl : public Renderer, public interfaces::RendererClient {
|
| public:
|
| MojoRendererImpl(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| + VideoRendererSink* video_renderer_sink,
|
| + GpuVideoAcceleratorFactories* gpu_factories,
|
| interfaces::RendererPtr remote_renderer);
|
| ~MojoRendererImpl() override;
|
|
|
| @@ -42,6 +47,7 @@ class MojoRendererImpl : public Renderer, public interfaces::RendererClient {
|
| const PipelineStatusCB& init_cb,
|
| const StatisticsCB& statistics_cb,
|
| const BufferingStateCB& buffering_state_cb,
|
| + const NaturalSizeChangedCB& natural_size_changed_cb,
|
| const base::Closure& ended_cb,
|
| const PipelineStatusCB& error_cb,
|
| const base::Closure& waiting_for_decryption_key_cb) override;
|
| @@ -60,6 +66,7 @@ class MojoRendererImpl : public Renderer, public interfaces::RendererClient {
|
| // |task_runner_|.
|
| void OnTimeUpdate(int64_t time_usec, int64_t max_time_usec) override;
|
| void OnBufferingStateChange(interfaces::BufferingState state) override;
|
| + void OnNaturalSizeChanged(mojo::SizePtr size) override;
|
| void OnEnded() override;
|
| void OnError() override;
|
|
|
| @@ -72,6 +79,8 @@ class MojoRendererImpl : public Renderer, public interfaces::RendererClient {
|
| // |task_runner| on which all methods are invoked, except for GetMediaTime(),
|
| // which can be called on any thread.
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| + VideoRendererSink* video_renderer_sink_;
|
| + GpuVideoAcceleratorFactories* gpu_factories_;
|
|
|
| // Provider of audio/video DemuxerStreams. Must be valid throughout the
|
| // lifetime of |this|.
|
| @@ -94,11 +103,14 @@ class MojoRendererImpl : public Renderer, public interfaces::RendererClient {
|
| base::Closure ended_cb_;
|
| PipelineStatusCB error_cb_;
|
| BufferingStateCB buffering_state_cb_;
|
| + NaturalSizeChangedCB natural_size_changed_cb_;
|
|
|
| // Lock used to serialize access for |time_|.
|
| mutable base::Lock lock_;
|
| base::TimeDelta time_;
|
|
|
| + scoped_ptr<VideoOverlayFactory> video_overlay_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl);
|
| };
|
|
|
|
|