MediaResource refactoring to support multiple streams

media/filters/chunk_demuxer.h

Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 32eaded69fb2e42e255b8ba866af7b4c3c5e04bd..e6401748c31182749b0dfdce7a50bd0f3e07033b 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -116,7 +116,7 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
   VideoRotation video_rotation() override;
   bool enabled() const override;

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

From code search, this is not used by the media pipeline (e.g. Renderer). Do we
really need it on the DemuxerStream interface?

This is also related to the discussion on whether we should expose disabled
streams.

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

We definitely need this in the DemuxerStream interface since either the renderer
or demuxer needs to check this to figure out if the stream needs to be
decoded/rendered or not. Also this is necessary to properly reflect the
enabled/disabled status of the DecryptingDemuxerStream, which wraps a generic
DemuxerStream* object.

   void set_enabled(bool enabled, base::TimeDelta timestamp) override;

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

add an empty line here

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

Done (in the next CL)

-  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
+  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb);
 
   // Returns the text track configuration.  It is an error to call this method
   // if type() != TEXT.
@@ -196,7 +196,8 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   void Stop() override;
   void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
   base::Time GetTimelineOffset() const override;
-  DemuxerStream* GetStream(DemuxerStream::Type type) override;
+  std::vector<DemuxerStream*> GetStreams() override;
+  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
   base::TimeDelta GetStartTime() const override;
   int64_t GetMemoryUsage() const override;
   void AbortPendingReads() override;