Support multiple media tracks in MSE / ChunkDemuxer

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>
 
 #include <deque>
 #include <map>
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_tracks.h"
@@ skipping 187 matching lines @@
   void StartWaitingForSeek(base::TimeDelta seek_time) override;
   void CancelPendingSeek(base::TimeDelta seek_time) override;
 
   // Registers a new |id| to use for AppendData() calls. |type| indicates
   // the MIME type for the data that we intend to append for this ID.
   // kOk is returned if the demuxer has enough resources to support another ID
   //    and supports the format indicated by |type|.
   // kNotSupported is returned if |type| is not a supported format.
   // kReachedIdLimit is returned if the demuxer cannot handle another ID right
   //    now.
-  Status AddId(const std::string& id, const std::string& type,
-               std::vector<std::string>& codecs);
+  Status AddId(const std::string& id,
+               const std::string& type,
+               const std::string& codecs);
 
   // Notifies a caller via |tracks_updated_cb| that the set of media tracks
   // for a given |id| has changed.
   void SetTracksWatcher(const std::string& id,
                         const MediaTracksUpdatedCB& tracks_updated_cb);
 
   // Removed an ID & associated resources that were previously added with
   // AddId().
   void RemoveId(const std::string& id);
 
@@ skipping 105 matching lines @@
   void ReportError_Locked(PipelineStatus error);
 
   // Returns true if any stream has seeked to a time without buffered data.
   bool IsSeekWaitingForData_Locked() const;
 
   // Returns true if all streams can successfully call EndOfStream,
   // false if any can not.
   bool CanEndOfStream_Locked() const;
 
   // MediaSourceState callbacks.
-  void OnSourceInitDone(const StreamParser::InitParameters& params);
+  void OnSourceInitDone(const std::string& source_id,
+                        const StreamParser::InitParameters& params);
 
   // Creates a DemuxerStream for the specified |type|.
   // Returns a new ChunkDemuxerStream instance if a stream of this type
   // has not been created before. Returns NULL otherwise.
   ChunkDemuxerStream* CreateDemuxerStream(DemuxerStream::Type type);
 
   void OnNewTextTrack(ChunkDemuxerStream* text_stream,
                       const TextTrackConfig& config);
 
   // Returns true if |source_id| is valid, false otherwise.
@@ skipping 43 matching lines @@
   // MediaLog for reporting messages and properties to debug content and engine.
   scoped_refptr<MediaLog> media_log_;
 
   PipelineStatusCB init_cb_;
   // Callback to execute upon seek completion.
   // TODO(wolenetz/acolwell): Protect against possible double-locking by first
   // releasing |lock_| before executing this callback. See
   // http://crbug.com/308226
   PipelineStatusCB seek_cb_;
 
-  std::unique_ptr<ChunkDemuxerStream> audio_;
-  std::unique_ptr<ChunkDemuxerStream> video_;
+  std::vector<std::unique_ptr<ChunkDemuxerStream>> audio_streams_;
+  std::vector<std::unique_ptr<ChunkDemuxerStream>> video_streams_;
 
-  // Counter to ensure that we do not transition too early to INITIALIZED.
-  // Incremented in AddId(), decremented in OnSourceInitDone().
-  int pending_source_init_done_count_;
+  // Keep track of which ids still remain uninitialized so that we transition
+  // into the INITIALIZED only after all ids/SourceBuffers got init segment.
+  std::set<std::string> pending_source_init_ids_;
 
   base::TimeDelta duration_;
 
   // The duration passed to the last SetDuration(). If
   // SetDuration() is never called or an AppendData() call or
   // a EndOfStream() call changes |duration_|, then this
   // variable is set to < 0 to indicate that the |duration_| represents
   // the actual duration instead of a user specified value.
   double user_specified_duration_;
 
   base::Time timeline_offset_;
   DemuxerStream::Liveness liveness_;
 
   typedef std::map<std::string, MediaSourceState*> MediaSourceStateMap;
   MediaSourceStateMap source_state_map_;
 
-  // Used to ensure that (1) config data matches the type and codec provided in
-  // AddId(), (2) only 1 audio and 1 video sources are added, and (3) ids may be
-  // removed with RemoveID() but can not be re-added (yet).
-  std::string source_id_audio_;
-  std::string source_id_video_;
-
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   // Accumulate, by type, detected track counts across the SourceBuffers.
   int detected_audio_track_count_;
   int detected_video_track_count_;
   int detected_text_track_count_;
 
-  std::map<MediaTrack::Id, const DemuxerStream*> track_id_to_demux_stream_map_;
+  std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_