| Index: media/mojo/services/mojo_renderer_service.h
|
| diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
|
| index 1bccd350180c691e0eb8f5a589c951cb33db5274..67fca15c21588b0afcb223723d25bdd35e812f31 100644
|
| --- a/media/mojo/services/mojo_renderer_service.h
|
| +++ b/media/mojo/services/mojo_renderer_service.h
|
| @@ -15,11 +15,13 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/timer/timer.h"
|
| #include "media/base/buffering_state.h"
|
| +#include "media/base/demuxer_stream_provider.h"
|
| #include "media/base/pipeline_status.h"
|
| #include "media/base/renderer_client.h"
|
| #include "media/mojo/interfaces/renderer.mojom.h"
|
| #include "media/mojo/services/media_mojo_export.h"
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace media {
|
|
|
| @@ -46,6 +48,8 @@ class MEDIA_MOJO_EXPORT MojoRendererService
|
| void Initialize(mojom::RendererClientPtr client,
|
| mojom::DemuxerStreamPtr audio,
|
| mojom::DemuxerStreamPtr video,
|
| + const mojo::String& url,
|
| + int64_t surface_id,
|
| const InitializeCallback& callback) final;
|
| void Flush(const FlushCallback& callback) final;
|
| void StartPlayingFrom(int64_t time_delta_usec) final;
|
| @@ -70,6 +74,7 @@ class MEDIA_MOJO_EXPORT MojoRendererService
|
| void OnWaitingForDecryptionKey() final;
|
| void OnVideoNaturalSizeChange(const gfx::Size& size) final;
|
| void OnVideoOpacityChange(bool opaque) final;
|
| + void OnDurationChange(base::TimeDelta duration) final;
|
|
|
| // Called when the DemuxerStreamProviderShim is ready to go (has a config,
|
| // pipe handle, etc) and can be handed off to a renderer for use.
|
| @@ -100,7 +105,7 @@ class MEDIA_MOJO_EXPORT MojoRendererService
|
|
|
| State state_;
|
|
|
| - std::unique_ptr<DemuxerStreamProviderShim> stream_provider_;
|
| + std::unique_ptr<DemuxerStreamProvider> stream_provider_;
|
|
|
| base::RepeatingTimer time_update_timer_;
|
| uint64_t last_media_time_usec_;
|
|
|