MojoVideoDecoder: Add histogram to track initialization and error.

The autotest video_ChromeHWDecodeUsed verifies Chrome used the HW
decoding when playing a video stream by checking the histogram value,
which is reported from GpuVideoDecoder.
In order to keep the test pass during switching from GpuVideoDecoder
to MojoVideoDecoder, we have to report the same histogram value
temporarily from MojoVideoDecoder.

With this CL, we can enable MojoVideoDecoder at ChromeOS platform.

BUG=chromium:902968
TEST=Pass video_ChromeHWDecodeUsed autotest on Eve
TEST=Play video at Youtube on Eve and confirm the successfull option
     of Media.GpuVideoDecoderInitializeStatus are increased.

Change-Id: I26fc53704843e9b153bbee304e8f60ab3a7b0417
Reviewed-on: https://chromium-review.googlesource.com/c/1328634
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607890}

media/base/media_switches.cc

@@ -260,16 +260,8 @@ const base::Feature kMemoryPressureBasedSourceBufferGC{
     "MemoryPressureBasedSourceBufferGC", base::FEATURE_DISABLED_BY_DEFAULT};
 
 // Enable MojoVideoDecoder, replacing GpuVideoDecoder.
-const base::Feature kMojoVideoDecoder {
-  "MojoVideoDecoder",
-#if defined(OS_CHROMEOS)
-      // TODO(posciak): Re-enable once the feature is verified on CrOS.
-      // https://crbug.com/902968.
-      base::FEATURE_DISABLED_BY_DEFAULT
-#else
-      base::FEATURE_ENABLED_BY_DEFAULT
-#endif
-};
+const base::Feature kMojoVideoDecoder{"MojoVideoDecoder",
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enable The D3D11 Video decoder. Must also enable MojoVideoDecoder for
 // this to have any effect.

media/mojo/clients/mojo_video_decoder.cc

@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
@@ -29,6 +30,37 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace media {
+namespace {
+
+void ReportMojoVideoDecoderInitializeStatusToUMAAndRunCB(
+    const VideoDecoder::InitCB& init_cb,
+    bool success) {
+  // Send the same histogram as GpuVideoDecoder to avoid breaking the existing
+  // tests.
+  // TODO(crbug.com/902968): Remove it after deprecating GpuVideoDecoder.
+  PipelineStatus status = success ? PIPELINE_OK : DECODER_ERROR_NOT_SUPPORTED;
+  UMA_HISTOGRAM_ENUMERATION("Media.GpuVideoDecoderInitializeStatus", status,
+                            PIPELINE_STATUS_MAX + 1);
+
+  init_cb.Run(success);
+}
+
+void ReportMojoVideoDecoderErrorStatusToUMAAndRunCB(
+    const VideoDecoder::DecodeCB& decode_cb,
+    DecodeStatus status) {
+  // Send the same histogram as GpuVideoDecoder to avoid breaking the existing
+  // tests.
+  // TODO(crbug.com/902968): Remove it after deprecating GpuVideoDecoder.
+  if (status == DecodeStatus::DECODE_ERROR) {
+    UMA_HISTOGRAM_ENUMERATION("Media.GpuVideoDecoderError",
+                              media::VideoDecodeAccelerator::PLATFORM_FAILURE,
+                              media::VideoDecodeAccelerator::ERROR_MAX + 1);
+  }
+
+  decode_cb.Run(status);
+}
+
+}  // namespace
 
 // Provides a thread-safe channel for VideoFrame destruction events.
 class MojoVideoFrameHandleReleaser
@@ -121,12 +153,16 @@ void MojoVideoDecoder::Initialize(
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
+  InitCB bound_init_cb =
+      base::Bind(&ReportMojoVideoDecoderInitializeStatusToUMAAndRunCB, init_cb);
+
   // Fail immediately if we know that the remote side cannot support |config|.
   if (gpu_factories_ && !gpu_factories_->IsDecoderConfigSupported(config)) {
     // TODO(liberato): Remove bypass once D3D11VideoDecoder provides
     // SupportedVideoDecoderConfigs.
     if (!base::FeatureList::IsEnabled(kD3D11VideoDecoder)) {
-      task_runner_->PostTask(FROM_HERE, base::BindRepeating(init_cb, false));
+      task_runner_->PostTask(FROM_HERE,
+                             base::BindRepeating(bound_init_cb, false));
       return;
     }
   }
@@ -141,7 +177,7 @@ void MojoVideoDecoder::Initialize(
   // is passed for reinitialization.
   if (config.is_encrypted() && CdmContext::kInvalidCdmId == cdm_id) {
     DVLOG(1) << __func__ << ": Invalid CdmContext.";
-    task_runner_->PostTask(FROM_HERE, base::BindOnce(init_cb, false));
+    task_runner_->PostTask(FROM_HERE, base::BindOnce(bound_init_cb, false));
     return;
   }
 
@@ -149,12 +185,13 @@ void MojoVideoDecoder::Initialize(
     BindRemoteDecoder();
 
   if (has_connection_error_) {
-    task_runner_->PostTask(FROM_HERE, base::BindRepeating(init_cb, false));
+    task_runner_->PostTask(FROM_HERE,
+                           base::BindRepeating(bound_init_cb, false));
     return;
   }
 
   initialized_ = false;
-  init_cb_ = init_cb;
+  init_cb_ = bound_init_cb;
   output_cb_ = output_cb;
   remote_decoder_->Initialize(
       config, low_delay, cdm_id,
@@ -177,22 +214,25 @@ void MojoVideoDecoder::Decode(scoped_refptr<DecoderBuffer> buffer,
   DVLOG(3) << __func__ << ": " << buffer->AsHumanReadableString();
   DCHECK(task_runner_->BelongsToCurrentThread());
 
+  DecodeCB bound_decode_cb =
+      base::Bind(&ReportMojoVideoDecoderErrorStatusToUMAAndRunCB, decode_cb);
+
   if (has_connection_error_) {
-    task_runner_->PostTask(FROM_HERE,
-                           base::Bind(decode_cb, DecodeStatus::DECODE_ERROR));
+    task_runner_->PostTask(
+        FROM_HERE, base::Bind(bound_decode_cb, DecodeStatus::DECODE_ERROR));
     return;
   }
 
   mojom::DecoderBufferPtr mojo_buffer =
       mojo_decoder_buffer_writer_->WriteDecoderBuffer(std::move(buffer));
   if (!mojo_buffer) {
-    task_runner_->PostTask(FROM_HERE,
-                           base::Bind(decode_cb, DecodeStatus::DECODE_ERROR));
+    task_runner_->PostTask(
+        FROM_HERE, base::Bind(bound_decode_cb, DecodeStatus::DECODE_ERROR));
     return;
   }
 
   uint64_t decode_id = decode_counter_++;
-  pending_decodes_[decode_id] = decode_cb;
+  pending_decodes_[decode_id] = bound_decode_cb;
   remote_decoder_->Decode(std::move(mojo_buffer),
                           base::Bind(&MojoVideoDecoder::OnDecodeDone,
                                      base::Unretained(this), decode_id));