MediaResource refactoring to support multiple streams

media/mojo/clients/mojo_renderer.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/time/default_tick_clock.h"
 #include "base/unguessable_token.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/renderer.h"
 #include "media/base/time_delta_interpolator.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
-class DemuxerStreamProvider;
+class MediaResource;
 class MojoDemuxerStreamImpl;
 class VideoOverlayFactory;
 class VideoRendererSink;
 
 // A media::Renderer that proxies to a mojom::Renderer. That
 // mojom::Renderer proxies back to the MojoRenderer via the
 // mojom::RendererClient interface.
 //
 // This class can be created on any thread, where the |remote_renderer| is
 // connected and passed in the constructor. Then Initialize() will be called on
 // the |task_runner| and starting from that point this class is bound to the
 // |task_runner|*. That means all Renderer and RendererClient methods will be
 // called/dispached on the |task_runner|. The only exception is GetMediaTime(),
 // which can be called on any thread.
 class MojoRenderer : public Renderer, public mojom::RendererClient {
  public:
   MojoRenderer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                std::unique_ptr<VideoOverlayFactory> video_overlay_factory,
                VideoRendererSink* video_renderer_sink,
                mojom::RendererPtr remote_renderer);
   ~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,
               const CdmAttachedCB& cdm_attached_cb) override;
   void Flush(const base::Closure& flush_cb) override;
   void StartPlayingFrom(base::TimeDelta time) override;
   void SetPlaybackRate(double playback_rate) override;
   void SetVolume(float volume) override;
   base::TimeDelta GetMediaTime() override;
 
@@ skipping 18 matching lines @@
   void OnVideoOpacityChange(bool opaque) override;
   void OnWaitingForDecryptionKey() override;
   void OnStatisticsUpdate(const PipelineStatistics& stats) override;
   void OnDurationChange(base::TimeDelta duration) override;
 
   // Binds |remote_renderer_| to the mojo message pipe. Can be called multiple
   // times. If an error occurs during connection, OnConnectionError will be
   // called asynchronously.
   void BindRemoteRendererIfNeeded();
 
-  // Initialize the remote renderer when |demuxer_stream_provider| is of type
-  // DemuxerSteamProvider::Type::STREAM.
+  // Initialize the remote renderer when |media_resource| is of type
+  // MediaResource::Type::STREAM.
   void InitializeRendererFromStreams(media::RendererClient* client);
 
-  // Initialize the remote renderer when |demuxer_stream_provider| is of type
-  // DemuxerSteamProvider::Type::URL.
+  // Initialize the remote renderer when |media_resource| is of type
+  // MediaResource::Type::URL.
   void InitializeRendererFromUrl(media::RendererClient* client);
 
   // Callback for connection error on |remote_renderer_|.
   void OnConnectionError();
 
   // Callback for connection error on any of |streams_|. The |stream| parameter
   // indicates which stream the error happened on.
   void OnDemuxerStreamConnectionError(MojoDemuxerStreamImpl* stream);
 
   // Callbacks for |remote_renderer_| methods.
@@ skipping 10 matching lines @@
   // Overlay factory used to create overlays for video frames rendered
   // by the remote renderer.
   std::unique_ptr<VideoOverlayFactory> video_overlay_factory_;
 
   // Video frame overlays are rendered onto this sink.
   // Rendering of a new overlay is only needed when video natural size changes.
   VideoRendererSink* video_renderer_sink_ = nullptr;
 
   // 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;
 
   // 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

[xhwang, 2017/02/01 18:26:04]

nit: reflow comments

[servolk, 2017/02/01 22:29:17]

Done.

   // cannot be used after |this| is destroyed.
   // TODO(alokp): Add tests for MojoDemuxerStreamImpl.
   std::vector<std::unique_ptr<MojoDemuxerStreamImpl>> streams_;
 
   // This class is constructed on one thread and used exclusively on another
   // thread. This member is used to safely pass the RendererPtr from one thread
   // to another. It is set in the constructor and is consumed in Initialize().
   mojom::RendererPtrInfo remote_renderer_info_;
 
   // Remote Renderer, bound to |task_runner_| during Initialize().
@@ skipping 12 matching lines @@
   mutable base::Lock lock_;
   base::DefaultTickClock media_clock_;
   media::TimeDeltaInterpolator media_time_interpolator_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRenderer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_RENDERER_H_