Add UMA metrics for VideoCodec.MP4 and VideoCodec.WebM

media/filters/ffmpeg_glue.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_glue.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/synchronization/lock.h"
@@ skipping 82 matching lines @@
       return false;
 
     // Now register the rest of FFmpeg.
     av_register_all();
     return true;
   }();
 
   CHECK(initialized);
 }
 
-FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol)
-    : open_called_(false) {
+FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
   InitializeFFmpeg();
 
   // Initialize an AVIOContext using our custom read and seek operations.  Don't
   // keep pointers to the buffer since FFmpeg may reallocate it on the fly.  It
   // will be cleaned up
   format_context_ = avformat_alloc_context();
   avio_context_.reset(avio_alloc_context(
       static_cast<unsigned char*>(av_malloc(kBufferSize)), kBufferSize, 0,
       protocol, &AVIOReadOperation, nullptr, &AVIOSeekOperation));
 
@@ skipping 35 matching lines @@
 
     const int64_t pos = AVIOSeekOperation(avio_context_->opaque, 0, SEEK_SET);
     if (pos < 0)
       return false;
 
     const int num_read =
         AVIOReadOperation(avio_context_->opaque, buffer.data(), buffer.size());
     if (num_read < container_names::kMinimumContainerSize)
       return false;
 
-    UMA_HISTOGRAM_SPARSE_SLOWLY(
-        "Media.DetectedContainer",
-        container_names::DetermineContainer(buffer.data(), num_read));
+    container_ = container_names::DetermineContainer(buffer.data(), num_read);
+    UMA_HISTOGRAM_SPARSE_SLOWLY("Media.DetectedContainer", container_);
     return false;
   } else if (ret < 0) {
     return false;
   }
 
   // Rely on ffmpeg's parsing if we're able to succesfully open the file.
-  container_names::MediaContainerName container =
-      container_names::CONTAINER_UNKNOWN;
   if (strcmp(format_context_->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2") == 0)
-    container = container_names::CONTAINER_MOV;
+    container_ = container_names::CONTAINER_MOV;
   else if (strcmp(format_context_->iformat->name, "flac") == 0)
-    container = container_names::CONTAINER_FLAC;
+    container_ = container_names::CONTAINER_FLAC;
   else if (strcmp(format_context_->iformat->name, "matroska,webm") == 0)
-    container = container_names::CONTAINER_WEBM;
+    container_ = container_names::CONTAINER_WEBM;
   else if (strcmp(format_context_->iformat->name, "ogg") == 0)
-    container = container_names::CONTAINER_OGG;
+    container_ = container_names::CONTAINER_OGG;
   else if (strcmp(format_context_->iformat->name, "wav") == 0)
-    container = container_names::CONTAINER_WAV;
+    container_ = container_names::CONTAINER_WAV;
   else if (strcmp(format_context_->iformat->name, "aac") == 0)
-    container = container_names::CONTAINER_AAC;
+    container_ = container_names::CONTAINER_AAC;
   else if (strcmp(format_context_->iformat->name, "mp3") == 0)
-    container = container_names::CONTAINER_MP3;
+    container_ = container_names::CONTAINER_MP3;
   else if (strcmp(format_context_->iformat->name, "amr") == 0)
-    container = container_names::CONTAINER_AMR;
+    container_ = container_names::CONTAINER_AMR;
   else if (strcmp(format_context_->iformat->name, "avi") == 0)
-    container = container_names::CONTAINER_AVI;
+    container_ = container_names::CONTAINER_AVI;
   // TODO(jrummell): Remove GSM detection. http://crbug.com/711774
   else if (strcmp(format_context_->iformat->name, "gsm") == 0)
-    container = container_names::CONTAINER_GSM;
+    container_ = container_names::CONTAINER_GSM;
 
-  DCHECK_NE(container, container_names::CONTAINER_UNKNOWN);
-  UMA_HISTOGRAM_SPARSE_SLOWLY("Media.DetectedContainer", container);
+  DCHECK_NE(container_, container_names::CONTAINER_UNKNOWN);
+  UMA_HISTOGRAM_SPARSE_SLOWLY("Media.DetectedContainer", container_);
 
   return true;
 }
 
 FFmpegGlue::~FFmpegGlue() {
   // In the event of avformat_open_input() failure, FFmpeg may sometimes free
   // our AVFormatContext behind the scenes, but leave the buffer alive.  It will
   // helpfully set |format_context_| to nullptr in this case.
   if (!format_context_) {
     av_free(avio_context_->buffer);
     return;
   }
 
   // If avformat_open_input() hasn't been called, we should simply free the
   // AVFormatContext and buffer instead of using avformat_close_input().
   if (!open_called_) {
     avformat_free_context(format_context_);
     av_free(avio_context_->buffer);
     return;
   }
 
   avformat_close_input(&format_context_);
   av_free(avio_context_->buffer);
 }
 
 }  // namespace media