Generate and assign media track ids in demuxers.

media/base/media_tracks.cc

 // Copyright 2016 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.
 
 #include "media/base/media_tracks.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 MediaTracks::MediaTracks() {}
 
 MediaTracks::~MediaTracks() {}
 
-void MediaTracks::AddAudioTrack(const AudioDecoderConfig& config,
-                                StreamParser::TrackId byteStreamTrackId,
-                                const std::string& kind,
-                                const std::string& label,
-                                const std::string& language) {
+MediaTrack* MediaTracks::AddAudioTrack(const AudioDecoderConfig& config,
+                                       StreamParser::TrackId byteStreamTrackId,
+                                       const std::string& kind,
+                                       const std::string& label,
+                                       const std::string& language) {
   DCHECK(config.IsValidConfig());
   CHECK(audio_configs_.find(byteStreamTrackId) == audio_configs_.end());
   std::unique_ptr<MediaTrack> track = base::WrapUnique(new MediaTrack(
       MediaTrack::Audio, byteStreamTrackId, kind, label, language));
   tracks_.push_back(std::move(track));
   audio_configs_[byteStreamTrackId] = config;
+  return tracks_.back().get();
 }
 
-void MediaTracks::AddVideoTrack(const VideoDecoderConfig& config,
-                                StreamParser::TrackId byteStreamTrackId,
-                                const std::string& kind,
-                                const std::string& label,
-                                const std::string& language) {
+MediaTrack* MediaTracks::AddVideoTrack(const VideoDecoderConfig& config,
+                                       StreamParser::TrackId byteStreamTrackId,
+                                       const std::string& kind,
+                                       const std::string& label,
+                                       const std::string& language) {
   DCHECK(config.IsValidConfig());
   CHECK(video_configs_.find(byteStreamTrackId) == video_configs_.end());
   std::unique_ptr<MediaTrack> track = base::WrapUnique(new MediaTrack(
       MediaTrack::Video, byteStreamTrackId, kind, label, language));
   tracks_.push_back(std::move(track));
   video_configs_[byteStreamTrackId] = config;
+  return tracks_.back().get();

[xhwang, 2016/06/09 06:06:02]

nit: You can store a raw pointer of track.get() above, and return it here.

[servolk, 2016/06/09 19:14:46]

Done.

 }
 
 const AudioDecoderConfig& MediaTracks::getAudioConfig(
     StreamParser::TrackId byteStreamTrackId) const {
   auto it = audio_configs_.find(byteStreamTrackId);
   if (it != audio_configs_.end())
     return it->second;
   static AudioDecoderConfig invalidConfig;
   return invalidConfig;
 }
@@ skipping 21 matching lines @@
   for (const auto& track : tracks()) {
     if (track->type() == MediaTrack::Video) {
       return getVideoConfig(track->byteStreamTrackId());
     }
   }
   static VideoDecoderConfig invalidConfig;
   return invalidConfig;
 }
 
 }  // namespace media