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

media/formats/webm/webm_tracks_parser.cc

Index: media/formats/webm/webm_tracks_parser.cc
diff --git a/media/formats/webm/webm_tracks_parser.cc b/media/formats/webm/webm_tracks_parser.cc
index 112427f691a9f50cc7915d52e05564caeaf8ec59..a626cade7400c9eccbcaf5f53295c4f17746085f 100644
--- a/media/formats/webm/webm_tracks_parser.cc
+++ b/media/formats/webm/webm_tracks_parser.cc
@@ -47,20 +47,10 @@ static base::TimeDelta PrecisionCappedDefaultDuration(
 
 WebMTracksParser::WebMTracksParser(const scoped_refptr<MediaLog>& media_log,
                                    bool ignore_text_tracks)
-    : track_type_(-1),
-      track_num_(-1),

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

Nit: You might be better off with a private method "reset" method that you can
call here and in the top of ::Parse

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

Agreed. Will be in later patch set.

[wolenetz, 2016/03/28 20:41:46]

I've sent this particular cleanup as a prereq CL [1]. I'll rebase this CL onto
that one, once that one lands.
[1] https://codereview.chromium.org/1842503002

-      seek_preroll_(-1),
-      codec_delay_(-1),
-      default_duration_(-1),
-      audio_track_num_(-1),
-      audio_default_duration_(-1),
-      video_track_num_(-1),
-      video_default_duration_(-1),
-      ignore_text_tracks_(ignore_text_tracks),
+    : ignore_text_tracks_(ignore_text_tracks),
       media_log_(media_log),
       audio_client_(media_log),
-      video_client_(media_log) {
-}
+      video_client_(media_log) {}
 
 WebMTracksParser::~WebMTracksParser() {}
 
@@ -78,6 +68,9 @@ int WebMTracksParser::Parse(const uint8_t* buf, int size) {
   video_decoder_config_ = VideoDecoderConfig();
   text_tracks_.clear();
   ignored_tracks_.clear();
+  detected_audio_track_count_ = 0;
+  detected_video_track_count_ = 0;
+  detected_text_track_count_ = 0;
   media_tracks_.reset(new MediaTracks());
 
   WebMListParser parser(kWebMIdTracks, this);
@@ -198,6 +191,7 @@ bool WebMTracksParser::OnListEnd(int id) {
         encryption_key_id.empty() ? Unencrypted() : AesCtrEncryptionScheme();
 
     if (track_type_ == kWebMTrackTypeAudio) {
+      detected_audio_track_count_++;
       if (audio_track_num_ == -1) {
         audio_track_num_ = track_num_;
         audio_encryption_key_id_ = encryption_key_id;
@@ -223,6 +217,7 @@ bool WebMTracksParser::OnListEnd(int id) {
         ignored_tracks_.insert(track_num_);
       }
     } else if (track_type_ == kWebMTrackTypeVideo) {
+      detected_video_track_count_++;
       if (video_track_num_ == -1) {
         video_track_num_ = track_num_;
         video_encryption_key_id_ = encryption_key_id;
@@ -249,6 +244,7 @@ bool WebMTracksParser::OnListEnd(int id) {
       }
     } else if (track_type_ == kWebMTrackTypeSubtitlesOrCaptions ||
                track_type_ == kWebMTrackTypeDescriptionsOrMetadata) {
+      detected_text_track_count_++;

[wolenetz, 2016/03/23 01:45:50]

aside: For better data (and similar to ffmpeg_demuxer.cc), we detect and report
even if the actual use later in the parser/pipeline of text track is not
enabled.

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

Acknowledged.

       if (ignore_text_tracks_) {
         MEDIA_LOG(DEBUG, media_log_) << "Ignoring text track " << track_num_;
         ignored_tracks_.insert(track_num_);