Implement reading of media track info from WebM and MP4 containers

media/formats/webm/webm_tracks_parser.cc

 // Copyright 2014 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/formats/webm/webm_tracks_parser.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "media/base/timestamp_constants.h"
@@ skipping 59 matching lines @@
   track_name_.clear();
   track_language_.clear();
   audio_track_num_ = -1;
   audio_default_duration_ = -1;
   audio_decoder_config_ = AudioDecoderConfig();
   video_track_num_ = -1;
   video_default_duration_ = -1;
   video_decoder_config_ = VideoDecoderConfig();
   text_tracks_.clear();
   ignored_tracks_.clear();
+  media_tracks_.reset(new MediaTracks());
 
   WebMListParser parser(kWebMIdTracks, this);
   int result = parser.Parse(buf, size);
 
   if (result <= 0)
     return result;
 
   // For now we do all or nothing parsing.
   return parser.IsParsingComplete() ? result : 0;
 }
@@ skipping 113 matching lines @@
           return false;
         }
         audio_default_duration_ = default_duration_;
 
         DCHECK(!audio_decoder_config_.IsValidConfig());
         if (!audio_client_.InitializeConfig(
                 codec_id_, codec_private_, seek_preroll_, codec_delay_,
                 !audio_encryption_key_id_.empty(), &audio_decoder_config_)) {
           return false;
         }
+        media_tracks_->AddAudioTrack(audio_decoder_config_,
+                                     base::Uint64ToString(track_num_), "main",
+                                     track_name_, track_language_);
       } else {
         MEDIA_LOG(DEBUG, media_log_) << "Ignoring audio track " << track_num_;
         ignored_tracks_.insert(track_num_);
       }
     } else if (track_type_ == kWebMTrackTypeVideo) {
       if (video_track_num_ == -1) {
         video_track_num_ = track_num_;
         video_encryption_key_id_ = encryption_key_id;
 
         if (default_duration_ == 0) {
           MEDIA_LOG(ERROR, media_log_) << "Illegal 0ns video TrackEntry "
                                           "DefaultDuration";
           return false;
         }
         video_default_duration_ = default_duration_;
 
         DCHECK(!video_decoder_config_.IsValidConfig());
         if (!video_client_.InitializeConfig(
                 codec_id_, codec_private_, !video_encryption_key_id_.empty(),
                 &video_decoder_config_)) {
           return false;
         }
+        media_tracks_->AddVideoTrack(video_decoder_config_,
+                                     base::Uint64ToString(track_num_), "main",
+                                     track_name_, track_language_);
       } else {
         MEDIA_LOG(DEBUG, media_log_) << "Ignoring video track " << track_num_;
         ignored_tracks_.insert(track_num_);
       }
     } else if (track_type_ == kWebMTrackTypeSubtitlesOrCaptions ||
                track_type_ == kWebMTrackTypeDescriptionsOrMetadata) {
       if (ignore_text_tracks_) {
         MEDIA_LOG(DEBUG, media_log_) << "Ignoring text track " << track_num_;
         ignored_tracks_.insert(track_num_);
       } else {
@@ skipping 83 matching lines @@
     codec_id_ = str;
     return true;
   }
 
   if (id == kWebMIdName) {
     track_name_ = str;
     return true;
   }
 
   if (id == kWebMIdLanguage) {
     track_language_ = str;

[wolenetz, 2016/03/05 03:26:21]

Either here or when using track_language_ elsewhere, we should probably sanitize
that it's a real 639-2 string and default to "und" otherwise. IIUC, 639-2 should
be 3 alpha chars, all lower case.

[servolk, 2016/03/07 23:45:02]

Done.

     return true;
   }
 
   return true;
 }
 
 }  // namespace media