| 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 ed63e58dfcb5a38842d045e1b5c85547ce5f5f62..34b448613abacf4b35d3ed87f24f145d863b4c4a 100644
|
| --- a/media/mojo/services/mojo_renderer_service.h
|
| +++ b/media/mojo/services/mojo_renderer_service.h
|
| @@ -14,10 +14,12 @@
|
| #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 "mojo/public/cpp/bindings/strong_binding.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace media {
|
|
|
| @@ -42,6 +44,8 @@ class MojoRendererService : public mojom::Renderer, public RendererClient {
|
| void Initialize(mojom::RendererClientPtr client,
|
| mojom::DemuxerStreamPtr audio,
|
| mojom::DemuxerStreamPtr video,
|
| + const mojo::String& url,
|
| + int64_t surface_id,
|
| const mojo::Callback<void(bool)>& callback) final;
|
| void Flush(const mojo::Closure& callback) final;
|
| void StartPlayingFrom(int64_t time_delta_usec) final;
|
| @@ -66,6 +70,7 @@ class MojoRendererService : public mojom::Renderer, public RendererClient {
|
| 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.
|
| @@ -96,7 +101,7 @@ class MojoRendererService : public mojom::Renderer, public RendererClient {
|
|
|
| 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_;
|
|
|