Add dedicated PipelineStatus UMAs for encrypted content to differentiate...

Add dedicated PipelineStatus UMAs for encrypted content to differentiate DecryptingVideoDecoder (DVD) & DecryptingDemuxerStream (DDS) codepath.

Tested the DVD path using netflix/Linux. DDS needs a chromeOS build.

BUG=435374

Review URL: https://codereview.chromium.org/770423004

Cr-Commit-Position: refs/heads/master@{#307062}

content/browser/media/media_internals.cc

@@ -17,6 +17,7 @@
 #include "content/public/browser/web_ui.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_log_event.h"
+#include "media/filters/decrypting_video_decoder.h"
 #include "media/filters/gpu_video_decoder.h"
 
 namespace {
@@ -198,18 +199,23 @@ class MediaInternals::MediaInternalsUMAHandler : public NotificationObserver {
     media::PipelineStatus last_pipeline_status;
     bool has_audio;
     bool has_video;
+    bool video_dds;
     std::string audio_codec_name;
     std::string video_codec_name;
     std::string video_decoder;
     PipelineInfo()
         : last_pipeline_status(media::PIPELINE_OK),
           has_audio(false),
-          has_video(false) {}
+          has_video(false),
+          video_dds(false) {}
   };
 
   // Helper function to report PipelineStatus associated with a player to UMA.
   void ReportUMAForPipelineStatus(const PipelineInfo& player_info);
 
+  // Helper to generate PipelineStatus UMA name for AudioVideo streams.
+  std::string GetUMANameForAVStream(const PipelineInfo& player_info);
+
   // Key is playerid
   typedef std::map<int, PipelineInfo> PlayerInfoMap;
 
@@ -286,6 +292,9 @@ void MediaInternals::MediaInternalsUMAHandler::SavePlayerState(
         event.params.GetString("video_decoder",
                                &player_info[event.id].video_decoder);
       }
+      if (event.params.HasKey("video_dds")) {
+        event.params.GetBoolean("video_dds", &player_info[event.id].video_dds);
+      }
       break;
     default:
       break;
@@ -293,33 +302,47 @@ void MediaInternals::MediaInternalsUMAHandler::SavePlayerState(
   return;
 }
 
+std::string MediaInternals::MediaInternalsUMAHandler::GetUMANameForAVStream(
+    const PipelineInfo& player_info) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  static const char kPipelineUmaPrefix[] = "Media.PipelineStatus.AudioVideo.";
+  std::string uma_name = kPipelineUmaPrefix;
+  if (player_info.video_codec_name == "vp8") {
+    uma_name += "VP8.";
+  } else if (player_info.video_codec_name == "vp9") {
+    uma_name += "VP9.";
+  } else if (player_info.video_codec_name == "h264") {
+    uma_name += "H264.";
+  } else {
+    return uma_name + "Other";
+  }
+
+  if (player_info.video_decoder ==
+      media::DecryptingVideoDecoder::kDecoderName) {
+    return uma_name + "DVD";
+  }
+
+  if (player_info.video_dds) {
+    uma_name += "DDS.";
+  }
+
+  if (player_info.video_decoder == media::GpuVideoDecoder::kDecoderName) {
+    uma_name += "HW";
+  } else {
+    uma_name += "SW";
+  }
+  return uma_name;
+}
+
 void MediaInternals::MediaInternalsUMAHandler::ReportUMAForPipelineStatus(
     const PipelineInfo& player_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (player_info.has_video && player_info.has_audio) {
-    if (player_info.video_codec_name == "vp8") {
-      UMA_HISTOGRAM_ENUMERATION("Media.PipelineStatus.AudioVideo.VP8.SW",
-                                player_info.last_pipeline_status,
-                                media::PIPELINE_STATUS_MAX + 1);
-    } else if (player_info.video_codec_name == "vp9") {
-      UMA_HISTOGRAM_ENUMERATION("Media.PipelineStatus.AudioVideo.VP9.SW",
-                                player_info.last_pipeline_status,
-                                media::PIPELINE_STATUS_MAX + 1);
-    } else if (player_info.video_codec_name == "h264") {
-      if (player_info.video_decoder == media::GpuVideoDecoder::kDecoderName) {
-        UMA_HISTOGRAM_ENUMERATION("Media.PipelineStatus.AudioVideo.H264.HW",
-                                  player_info.last_pipeline_status,
-                                  media::PIPELINE_STATUS_MAX + 1);
-      } else {
-        UMA_HISTOGRAM_ENUMERATION("Media.PipelineStatus.AudioVideo.H264.SW",
-                                  player_info.last_pipeline_status,
-                                  media::PIPELINE_STATUS_MAX + 1);
-      }
-    } else {
-      UMA_HISTOGRAM_ENUMERATION("Media.PipelineStatus.AudioVideo.Other",
-                                player_info.last_pipeline_status,
-                                media::PIPELINE_STATUS_MAX + 1);
-    }
+    base::LinearHistogram::FactoryGet(
+        GetUMANameForAVStream(player_info), 1, media::PIPELINE_STATUS_MAX,
+        media::PIPELINE_STATUS_MAX + 1,
+        base::HistogramBase::kUmaTargetedHistogramFlag)
+        ->Add(player_info.last_pipeline_status);
   } else if (player_info.has_audio) {
     UMA_HISTOGRAM_ENUMERATION("Media.PipelineStatus.AudioOnly",
                               player_info.last_pipeline_status,

media/filters/decrypting_video_decoder.cc

@@ -19,6 +19,8 @@
 
 namespace media {
 
+const char DecryptingVideoDecoder::kDecoderName[] = "DecryptingVideoDecoder";
+
 DecryptingVideoDecoder::DecryptingVideoDecoder(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     const SetDecryptorReadyCB& set_decryptor_ready_cb)
@@ -31,7 +33,7 @@ DecryptingVideoDecoder::DecryptingVideoDecoder(
       weak_factory_(this) {}
 
 std::string DecryptingVideoDecoder::GetDisplayName() const {
-  return "DecryptingVideoDecoder";
+  return kDecoderName;
 }
 
 void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,

media/filters/decrypting_video_decoder.h

@@ -41,6 +41,8 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder {
               const DecodeCB& decode_cb) override;
   void Reset(const base::Closure& closure) override;
 
+  static const char kDecoderName[];
+
  private:
   // For a detailed state diagram please see this link: http://goo.gl/8jAok
   // TODO(xhwang): Add a ASCII state diagram in this file after this class

tools/metrics/histograms/histograms.xml

@@ -58639,15 +58639,46 @@ To add a new entry, add it with any value and run test to compute valid value.
   <suffix name="AudioVideo.Other"
       label="PipelineStatus for the codecs that dont have an explicit metric."/>
   <suffix name="AudioVideo.VP8.SW"
-      label="PipelineStatus for AV streams with VP8 Software decoder."/>
+      label="PipelineStatus for AV streams with VP8 software decoder."/>
+  <suffix name="AudioVideo.VP8.HW"
+      label="PipelineStatus for AV streams with VP8 hardware decoder."/>
+  <suffix name="AudioVideo.VP8.DDS.SW"
+      label="PipelineStatus for AV streams with VP8 software codec and that
+             go through the DecryptingDemuxerStream (DDS)."/>
+  <suffix name="AudioVideo.VP8.DDS.HW"
+      label="PipelineStatus for AV streams with VP8 hardware codec and that
+             go through the DecryptingDemuxerStream (DDS)."/>
+  <suffix name="AudioVideo.VP8.DVD"
+      label="PipelineStatus for AV streams with VP8 codec and that go through
+             the DecryptingVideoDecoder (DVD)."/>
   <suffix name="AudioVideo.VP9.SW"
-      label="PipelineStatus for AV streams with VP9 Software decoder."/>
-  <suffix name="AudioVideo.H264.HW"
-      label="PipelineStatus for hardware decoded AV streams with H264
-             decoder."/>
+      label="PipelineStatus for AV streams with VP9 software decoder."/>
+  <suffix name="AudioVideo.VP9.HW"
+      label="PipelineStatus for AV streams with VP9 hardware decoder."/>
+  <suffix name="AudioVideo.VP9.DDS.SW"
+      label="PipelineStatus for AV streams with VP9 codec and that go through
+             the DecryptingDemuxerStream (DDS)."/>
+  <suffix name="AudioVideo.VP9.DDS.HW"
+      label="PipelineStatus for AV streams with VP9 hardware codec and that
+             go through the DecryptingDemuxerStream (DDS)."/>
+  <suffix name="AudioVideo.VP9.DVD"
+      label="PipelineStatus for AV streams with VP9 software codec and that
+             go through the DecryptingVideoDecoder (DVD)."/>
   <suffix name="AudioVideo.H264.SW"
       label="PipelineStatus for software decoded AV streams with H264
              decoder."/>
+  <suffix name="AudioVideo.H264.HW"
+      label="PipelineStatus for hardware decoded AV streams with H264
+             decoder."/>
+  <suffix name="AudioVideo.H264.DDS.SW"
+      label="PipelineStatus for AV streams with H264 software decoder and
+             that go through the DecryptingDemuxerStream (DDS)."/>
+  <suffix name="AudioVideo.H264.DDS.HW"
+      label="PipelineStatus for AV streams with H264 hardware decoder and
+             that go through the DecryptingDemuxerStream (DDS)."/>
+  <suffix name="AudioVideo.H264.DVD"
+      label="PipelineStatus for AV streams with H264 decoder and that go
+             through the DecryptingVideoDecoder (DVD)."/>
   <suffix name="AudioOnly" label="PipelineStatus for Audio-only streams."/>
   <suffix name="VideoOnly" label="PipelineStatus for Video-only streams."/>
   <suffix name="Unsupported" label="PipelineStatus for unsupported streams."/>