MediaResource refactoring to support multiple streams

media/mojo/clients/mojo_renderer.h

Index: media/mojo/clients/mojo_renderer.h
diff --git a/media/mojo/clients/mojo_renderer.h b/media/mojo/clients/mojo_renderer.h
index 221b9b1121441ed01a79f7ed8de6b5501d613a1b..53c38b8f7004caf48bad9359ac9599a3d853878a 100644
--- a/media/mojo/clients/mojo_renderer.h
+++ b/media/mojo/clients/mojo_renderer.h
@@ -22,7 +22,7 @@ class SingleThreadTaskRunner;
 
 namespace media {
 
-class DemuxerStreamProvider;
+class MediaResource;
 class MojoDemuxerStreamImpl;
 class VideoOverlayFactory;
 class VideoRendererSink;
@@ -46,7 +46,7 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
   ~MojoRenderer() override;
 
   // Renderer implementation.
-  void Initialize(DemuxerStreamProvider* demuxer_stream_provider,
+  void Initialize(MediaResource* media_resource,
                   media::RendererClient* client,
                   const PipelineStatusCB& init_cb) override;
   void SetCdm(CdmContext* cdm_context,
@@ -85,11 +85,11 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
   // called asynchronously.
   void BindRemoteRendererIfNeeded();
 
-  // Initialize the remote renderer when |demuxer_stream_provider| is of type
+  // Initialize the remote renderer when |media_resource| is of type
   // DemuxerSteamProvider::Type::STREAM.

[tguilbert, 2017/01/24 23:24:41]

MediaResource::Type

[servolk, 2017/01/25 00:57:32]

Done.

   void InitializeRendererFromStreams(media::RendererClient* client);
 
-  // Initialize the remote renderer when |demuxer_stream_provider| is of type
+  // Initialize the remote renderer when |media_resource| is of type
   // DemuxerSteamProvider::Type::URL.

[tguilbert, 2017/01/24 23:24:40]

Same thing here.

[servolk, 2017/01/25 00:57:32]

Done.

   void InitializeRendererFromUrl(media::RendererClient* client);
 
@@ -120,7 +120,7 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
 
   // Provider of audio/video DemuxerStreams. Must be valid throughout the
   // lifetime of |this|.
-  DemuxerStreamProvider* demuxer_stream_provider_ = nullptr;
+  MediaResource* media_resource_ = nullptr;
 
   // Client of |this| renderer passed in Initialize.
   media::RendererClient* client_ = nullptr;
@@ -128,7 +128,7 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
   // Mojo demuxer streams.
   // Owned by MojoRenderer instead of remote mojom::Renderer
   // becuase these demuxer streams need to be destroyed as soon as |this| is
-  // destroyed. The local demuxer streams returned by DemuxerStreamProvider
+  // destroyed. The local demuxer streams returned by MediaResource
   // cannot be used after |this| is destroyed.
   // TODO(alokp): Add tests for MojoDemuxerStreamImpl.
   std::vector<std::unique_ptr<MojoDemuxerStreamImpl>> streams_;