Generate and assign media track ids in demuxers.

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 <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"
 #include "media/base/ranges.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/media_source_state.h"
 #include "media/filters/source_buffer_stream.h"
 
 namespace media {
 
 class FFmpegURLProtocol;
 
 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.
   void StartReturningData();
   void AbortReads();
   void CompletePendingReadIfPossible();
   void Shutdown();
 
   // SourceBufferStream manipulation methods.
   void Seek(base::TimeDelta time);
@@ skipping 65 matching lines @@
 
   // 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_;
   }
 
   void SetLiveness(Liveness liveness);
 
+  MediaTrack::Id media_track_id() const { return media_track_id_; }
+
  private:
   enum State {
     UNINITIALIZED,
     RETURNING_DATA_FOR_READS,
     RETURNING_ABORT_FOR_READS,
     SHUTDOWN,
   };
 
   // Assigns |state_| to |state|
   void ChangeState_Locked(State state);
 
   void CompletePendingReadIfPossible_Locked();
 
   // Specifies the type of the stream.
   Type type_;
 
   Liveness liveness_;
 
   std::unique_ptr<SourceBufferStream> stream_;
 
+  const MediaTrack::Id media_track_id_;
+
   mutable base::Lock lock_;
   State state_;
   ReadCB read_cb_;
   bool splice_frames_enabled_;
   bool partial_append_window_trimming_enabled_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
 };
 
 // Demuxer implementation that allows chunks of media data to be passed
@@ skipping 168 matching lines @@
   void OnSourceInitDone(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);
 
+  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;
 
   // Increases |duration_| to |new_duration|, if |new_duration| is higher.
   void IncreaseDurationIfNecessary(base::TimeDelta new_duration);
 
   // Decreases |duration_| if the buffered region is less than |duration_| when
   // EndOfStream() is called.
   void DecreaseDurationIfNecessary();
 
   // Sets |duration_| to |new_duration|, sets |user_specified_duration_| to -1
   // and notifies |host_|.
   void UpdateDuration(base::TimeDelta new_duration);
 
   // Returns the ranges representing the buffered data in the demuxer.
   Ranges<base::TimeDelta> GetBufferedRanges_Locked() const;
 
   // Start returning data on all DemuxerStreams.
   void StartReturningData();
 
   // Aborts pending reads on all DemuxerStreams.
   void AbortPendingReads();
 
   // Completes any pending reads if it is possible to do so.
   void CompletePendingReadsIfPossible();
 
   // 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();
 
   mutable base::Lock lock_;
   State state_;
   bool cancel_next_seek_;
 
   DemuxerHost* host_;
   base::Closure open_cb_;
@@ skipping 45 matching lines @@
   int detected_audio_track_count_;
   int detected_video_track_count_;
   int detected_text_track_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_