Added UMA metrics for MediaSourcePlayer and MediaCodecPlayer

media/base/android/media_codec_decoder.cc

 // Copyright 2015 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/base/android/media_codec_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 const int kNextFrameDelay = 1;
 
 // Timeout for dequeuing an input buffer from MediaCodec in milliseconds.
 const int kInputBufferTimeout = 20;
 
 // Timeout for dequeuing an output buffer from MediaCodec in milliseconds.
 const int kOutputBufferTimeout = 20;
 }
 
 MediaCodecDecoder::MediaCodecDecoder(
+    const char* decoder_thread_name,
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
+    FrameStatistics* frame_statistics,
     const base::Closure& external_request_data_cb,
     const base::Closure& starvation_cb,
     const base::Closure& decoder_drained_cb,
     const base::Closure& stop_done_cb,
     const base::Closure& waiting_for_decryption_key_cb,
-    const base::Closure& error_cb,
-    const char* decoder_thread_name)
-    : media_task_runner_(media_task_runner),
-      decoder_thread_(decoder_thread_name),
+    const base::Closure& error_cb)
+    : decoder_thread_(decoder_thread_name),
+      media_task_runner_(media_task_runner),
+      frame_statistics_(frame_statistics),
       needs_reconfigure_(false),
       drain_decoder_(false),
       always_reconfigure_for_tests_(false),
       external_request_data_cb_(external_request_data_cb),
       starvation_cb_(starvation_cb),
       decoder_drained_cb_(decoder_drained_cb),
       stop_done_cb_(stop_done_cb),
       waiting_for_decryption_key_cb_(waiting_for_decryption_key_cb),
       error_cb_(error_cb),
       state_(kStopped),
@@ skipping 455 matching lines @@
 void MediaCodecDecoder::CheckLastFrame(bool eos_encountered,
                                        bool has_delayed_tasks) {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
   bool last_frame_when_stopping = GetState() == kStopping && !has_delayed_tasks;
 
   if (last_frame_when_stopping || eos_encountered) {
     media_task_runner_->PostTask(
         FROM_HERE, base::Bind(&MediaCodecDecoder::OnLastFrameRendered,
                               weak_factory_.GetWeakPtr(), eos_encountered));
     last_frame_posted_ = true;

[xhwang, 2015/10/01 21:58:57]

The naming of this member variable still can be improved. See my previous
comment. You can do it later of course.

[Tima Vaisburd, 2015/10/02 00:44:32]

Acknowledged.

   }
 }
 
 void MediaCodecDecoder::OnCodecError() {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
   // Ignore codec errors from the moment surface is changed till the
   // |media_codec_bridge_| is deleted.
   if (needs_reconfigure_) {
     DVLOG(1) << class_name() << "::" << __FUNCTION__
@@ skipping 416 matching lines @@
     RETURN_STRING(kStopping);
     RETURN_STRING(kInEmergencyStop);
     RETURN_STRING(kError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media