MediaResource refactoring to support multiple streams

media/filters/ffmpeg_demuxer.h

Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index d12ec8911d99337ed5bc1f8c9c2a3f8df22652b5..54f77cc0cd5de82174bbf023a346e2ae9f4c7d6c 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -116,7 +116,7 @@ class FFmpegDemuxerStream : public DemuxerStream {
   VideoRotation video_rotation() override;
   bool enabled() const override;
   void set_enabled(bool enabled, base::TimeDelta timestamp) override;
-  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
+  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb);

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

ditto about enabled() and add an empty line

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

Done (in later CL where SetStreamStatusChangeCB is moved to MediaResource)

 
   void SetLiveness(Liveness liveness);
 
@@ -218,7 +218,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
   void CancelPendingSeek(base::TimeDelta seek_time) 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;
 
@@ -276,9 +277,10 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
   // Called by |url_protocol_| whenever |data_source_| returns a read error.
   void OnDataSourceError();
 
-  // Returns the stream from |streams_| that matches |type| as an
-  // FFmpegDemuxerStream.
-  FFmpegDemuxerStream* GetFFmpegStream(DemuxerStream::Type type) const;
+  // Returns the first stream from |streams_| that matches |type| as an
+  // FFmpegDemuxerStream and is enabled.

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

Add a TODO to support multiple streams? Or a comment if we don't plan to support
it.

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

This is an internal function that is only used for determining which ffmpeg
stream to use for seeking. It doesn't need to support multiple streams, the
change to support multiple streams is actually done above at line 221.

+  FFmpegDemuxerStream* GetFirstEnabledFFmpegStream(
+      DemuxerStream::Type type) const;
 
   // Called after the streams have been collected from the media, to allow
   // the text renderer to bind each text stream to the cue rendering engine.