MSE: Record counts of detected MSE audio, video and text tracks

media/formats/webm/webm_stream_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_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 224 matching lines @@
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(), tracks_parser.audio_track_num(),
       tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us),
       tracks_parser.video_track_num(),
       tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us),
       tracks_parser.text_tracks(), tracks_parser.ignored_tracks(),
       tracks_parser.audio_encryption_key_id(),
       tracks_parser.video_encryption_key_id(), audio_config.codec(),
       media_log_));
 
-  if (!init_cb_.is_null())
+  if (!init_cb_.is_null()) {
+    params.detected_audio_track_count =

[chcunningham, 2016/03/23 23:05:56]

Should also do a test for this guy. Should be easy in
webm_stream_parser_unittests.cc

[wolenetz, 2016/03/25 23:25:08]

Upcoming in later patch set.

[wolenetz, 2016/03/29 00:14:42]

Done.

+        tracks_parser.detected_audio_track_count();
+    params.detected_video_track_count =
+        tracks_parser.detected_video_track_count();
+    params.detected_text_track_count =
+        tracks_parser.detected_text_track_count();
     base::ResetAndReturn(&init_cb_).Run(params);
+  }
 
   return bytes_parsed;
 }
 
 int WebMStreamParser::ParseCluster(const uint8_t* data, int size) {
   if (!cluster_parser_)
     return -1;
 
   int bytes_parsed = cluster_parser_->Parse(data, size);
   if (bytes_parsed < 0)
@@ skipping 18 matching lines @@
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) {
   std::vector<uint8_t> key_id_vector(key_id.begin(), key_id.end());
   encrypted_media_init_data_cb_.Run(EmeInitDataType::WEBM, key_id_vector);
 }
 
 }  // namespace media