Generate and assign media track ids in demuxers.

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 be0f9dbc38be5283202b297eb17167414d6be383..123d60d444f63ed9543f1c270aec5af48c011afc 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -19,6 +19,7 @@
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/demuxer_stream.h"
+#include "media/base/media_tracks.h"
 #include "media/base/ranges.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/media_source_state.h"
@@ -32,7 +33,9 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
-  ChunkDemuxerStream(Type type, bool splice_frames_enabled);
+  ChunkDemuxerStream(Type type,
+                     bool splice_frames_enabled,
+                     MediaTrack::Id media_track_id);
   ~ChunkDemuxerStream() override;
 
   // ChunkDemuxerStream control methods.
@@ -118,6 +121,8 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
 
   void SetLiveness(Liveness liveness);
 
+  MediaTrack::Id media_track_id() const { return media_track_id_; }
+
  private:
   enum State {
     UNINITIALIZED,
@@ -138,6 +143,8 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
 
   std::unique_ptr<SourceBufferStream> stream_;
 
+  const MediaTrack::Id media_track_id_;
+
   mutable base::Lock lock_;
   State state_;
   ReadCB read_cb_;
@@ -326,6 +333,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   void OnNewTextTrack(ChunkDemuxerStream* text_stream,
                       const TextTrackConfig& config);
 
+  void OnInitSegmentReported(const MediaTracksUpdatedCB& tracks_updated_cb,

[chcunningham, 2016/06/13 19:30:43]

Is this being used somewhere? I think you mean to remove it

[servolk, 2016/06/13 22:00:15]

Done.

+                             std::unique_ptr<MediaTracks> tracks);
+
   // Returns true if |source_id| is valid, false otherwise.
   bool IsValidId(const std::string& source_id) const;
 
@@ -355,6 +365,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   // Seeks all SourceBufferStreams to |seek_time|.
   void SeekAllSources(base::TimeDelta seek_time);
 
+  // Generates and returns a unique media track id.
+  static MediaTrack::Id GenerateMediaTrackId();
+
   // Shuts down all DemuxerStreams by calling Shutdown() on
   // all objects in |source_state_map_|.
   void ShutdownAllStreams();