MediaResource refactoring to support multiple streams

media/filters/chunk_demuxer.h

 // Copyright (c) 2012 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_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 96 matching lines @@
   void UnmarkEndOfStream();
 
   // DemuxerStream methods.
   void Read(const ReadCB& read_cb) override;
   Type type() const override;
   Liveness liveness() const override;
   AudioDecoderConfig audio_decoder_config() override;
   VideoDecoderConfig video_decoder_config() override;
   bool SupportsConfigChanges() override;
   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.
   TextTrackConfig text_track_config();
 
   // Sets the memory limit, in bytes, on the SourceBufferStream.
   void SetStreamMemoryLimit(size_t memory_limit);
 
   bool supports_partial_append_window_trimming() const {
     return partial_append_window_trimming_enabled_;
@@ skipping 59 matching lines @@
   std::string GetDisplayName() const override;
 
   // |enable_text| Process inband text tracks in the normal way when true,
   //   otherwise ignore them.
   void Initialize(DemuxerHost* host,
                   const PipelineStatusCB& init_cb,
                   bool enable_text_tracks) override;
   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;
 
   // ChunkDemuxer reads are abortable. StartWaitingForSeek() and
   // CancelPendingSeek() always abort pending and future reads until the
   // expected seek occurs, so that ChunkDemuxer can stay synchronized with the
   // associated JS method calls.
   void StartWaitingForSeek(base::TimeDelta seek_time) override;
   void CancelPendingSeek(base::TimeDelta seek_time) override;
@@ skipping 242 matching lines @@
   int detected_text_track_count_;
 
   std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_