Add UMA metrics for VideoCodec.MP4 and VideoCodec.WebM

media/filters/ffmpeg_demuxer.cc

 // 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.
 
 #include "media/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 142 matching lines @@
   if (ToAudioSampleRate(audio_config.samples_per_second(), &asr)) {
     UMA_HISTOGRAM_ENUMERATION("Media.AudioSamplesPerSecond", asr,
                               kAudioSampleRateMax + 1);
   } else {
     UMA_HISTOGRAM_COUNTS("Media.AudioSamplesPerSecondUnexpected",
                          audio_config.samples_per_second());
   }
 }
 
 // Record video decoder config UMA stats corresponding to a src= playback.
-static void RecordVideoCodecStats(const VideoDecoderConfig& video_config,
+// |format_names| is a comma separated list of short names for the media file
+// format, e.g. "matroska,webm", "mov,mp4,3gp,3g2,mj2".
+static void RecordVideoCodecStats(const char* format_names,
+                                  const VideoDecoderConfig& video_config,
                                   AVColorRange color_range,
                                   MediaLog* media_log) {
   media_log->RecordRapporWithSecurityOrigin("Media.OriginUrl.SRC.VideoCodec." +
                                             GetCodecName(video_config.codec()));
 
   UMA_HISTOGRAM_ENUMERATION("Media.VideoCodec", video_config.codec(),
                             kVideoCodecMax + 1);
+  if (strstr(format_names, "mp4")) {

[DaleCurtis, 2017/04/27 19:05:28]

ffmpeg_glue has copies of these names too. I think we should find a way to
dedupe them. Probably we should make constants out of the exact names and put
them in ffmpeg_Common. ffmpeg_common could actually declare the proper extern to
access the ff_mov_demuxer.name value too if we wanted.

[kqyang, 2017/04/27 21:07:59]

How about make container[1] a member variable of ffmpeg_glue? We can then access
the container from here? 

container should have already been filled in as RecordVideoCodecStats is done
after glue->OpenContext.

[1]
https://cs.chromium.org/chromium/src/media/filters/ffmpeg_glue.cc?rcl=94ad18d...
 

[DaleCurtis, 2017/04/27 21:10:43]

Good suggestion, sgtm.

+    UMA_HISTOGRAM_ENUMERATION("Media.VideoCodec.MP4", video_config.codec(),
+                              kVideoCodecMax + 1);
+  } else if (strstr(format_names, "webm")) {
+    UMA_HISTOGRAM_ENUMERATION("Media.VideoCodec.WebM", video_config.codec(),
+                              kVideoCodecMax + 1);
+  }
 
   // Drop UNKNOWN because U_H_E() uses one bucket for all values less than 1.
   if (video_config.profile() >= 0) {
     UMA_HISTOGRAM_ENUMERATION("Media.VideoCodecProfile", video_config.profile(),
                               VIDEO_CODEC_PROFILE_MAX + 1);
   }
   UMA_HISTOGRAM_COUNTS_10000("Media.VideoVisibleWidth",
                              video_config.visible_rect().width());
   UmaHistogramAspectRatio("Media.VideoVisibleAspectRatio",
                           video_config.visible_rect());
@@ skipping 1197 matching lines @@
 
       media_track = media_tracks->AddAudioTrack(audio_config, track_id, "main",
                                                 track_label, track_language);
       media_track->set_id(base::UintToString(track_id));
       DCHECK(track_id_to_demux_stream_map_.find(media_track->id()) ==
              track_id_to_demux_stream_map_.end());
       track_id_to_demux_stream_map_[media_track->id()] = streams_[i].get();
     } else if (codec_type == AVMEDIA_TYPE_VIDEO) {
       VideoDecoderConfig video_config = streams_[i]->video_decoder_config();
 
-      RecordVideoCodecStats(video_config, stream->codecpar->color_range,
-                            media_log_);
+      RecordVideoCodecStats(format_context->iformat->name, video_config,
+                            stream->codecpar->color_range, media_log_);
 
       media_track = media_tracks->AddVideoTrack(video_config, track_id, "main",
                                                 track_label, track_language);
       media_track->set_id(base::UintToString(track_id));
       DCHECK(track_id_to_demux_stream_map_.find(media_track->id()) ==
              track_id_to_demux_stream_map_.end());
       track_id_to_demux_stream_map_[media_track->id()] = streams_[i].get();
     }
 
     max_duration = std::max(max_duration, streams_[i]->duration());
@@ skipping 481 matching lines @@
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
 }  // namespace media