Fix UMA metrics for MediaSourcePlayer.

media/base/android/media_source_player.cc

Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index fd52bba4662fc47d321d82835ee0cffb8d295f65..b826bfc8f97712551ad64616ce64227ce26eacc0 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -90,6 +90,9 @@ void MediaSourcePlayer::ScheduleSeekEventAndStopDecoding(
   DVLOG(1) << __FUNCTION__ << "(" << seek_time.InSecondsF() << ")";
   DCHECK(!IsEventPending(SEEK_EVENT_PENDING));
 
+  // Need to stop here to prevent false reports while seek and drag.

[qinmin, 2015/11/18 18:12:27]

Do we need this? We should have captured this situation in
MediaDecoderCallback().

[Tima Vaisburd, 2015/11/18 18:31:13]

I think we do. During the seek-and-drag II did not see the MediaDecoderCallback
coming. We have many Starts in rapid sequence without StopAndReport, which leads
to another wrong long duration. And we need the first Start to take effect
instead of the last one because of starvations that can be "invisible" (come and
go, playback continues).

[qinmin, 2015/11/18 19:11:43]

Start() will automatically kick off the MediaDecoderJob to start requesting or
decoding data, wouldn't that leads to MediaDecoderCallback() later?

[Tima Vaisburd, 2015/11/18 20:02:12]

Yes, you are right, sorry I misled you. The bug was in the MediaStatistics where
I did wrong treatment of the unknown current time.

+  media_stat_->StopAndReport(GetCurrentTime());
+
   pending_seek_ = false;
 
   interpolator_.SetBounds(seek_time, seek_time);
@@ -182,6 +185,8 @@ base::TimeDelta MediaSourcePlayer::GetDuration() {
 void MediaSourcePlayer::Release() {
   DVLOG(1) << __FUNCTION__;
 
+  media_stat_->StopAndReport(GetCurrentTime());
+
   audio_decoder_job_->ReleaseDecoderResources();
   video_decoder_job_->ReleaseDecoderResources();
 
@@ -479,7 +484,8 @@ void MediaSourcePlayer::MediaDecoderCallback(
     DVLOG(1) << __FUNCTION__ << " : decode error";
     Release();
     manager()->OnError(player_id(), MEDIA_ERROR_DECODE);
-    media_stat_->StopAndReport(GetCurrentTime());
+    if (is_clock_manager)
+      media_stat_->StopAndReport(GetCurrentTime());
     return;
   }
 
@@ -499,7 +505,9 @@ void MediaSourcePlayer::MediaDecoderCallback(
   // any other pending events only after handling EOS detection.
   if (IsEventPending(SEEK_EVENT_PENDING)) {
     ProcessPendingEvents();
-    media_stat_->StopAndReport(GetCurrentTime());
+    // In case of Seek GetCurrentTime() already tells the time to seek to.
+    if (is_clock_manager)
+      media_stat_->StopAndReport(current_presentation_timestamp);
     return;
   }
 
@@ -521,7 +529,8 @@ void MediaSourcePlayer::MediaDecoderCallback(
   }
 
   if (status == MEDIA_CODEC_OUTPUT_END_OF_STREAM) {
-    media_stat_->StopAndReport(GetCurrentTime());
+    if (is_clock_manager)
+      media_stat_->StopAndReport(GetCurrentTime());
     return;
   }
 
@@ -529,7 +538,8 @@ void MediaSourcePlayer::MediaDecoderCallback(
     if (is_clock_manager)
       interpolator_.StopInterpolating();
 
-    media_stat_->StopAndReport(GetCurrentTime());
+    if (is_clock_manager)
+      media_stat_->StopAndReport(GetCurrentTime());
     return;
   }
 
@@ -540,7 +550,8 @@ void MediaSourcePlayer::MediaDecoderCallback(
     } else {
       is_waiting_for_key_ = true;
       manager()->OnWaitingForDecryptionKey(player_id());
-      media_stat_->StopAndReport(GetCurrentTime());
+      if (is_clock_manager)
+        media_stat_->StopAndReport(GetCurrentTime());
     }
     return;
   }
@@ -559,7 +570,8 @@ void MediaSourcePlayer::MediaDecoderCallback(
   // in the middle of a seek or stop event and needs to wait for the IPCs to
   // come.
   if (status == MEDIA_CODEC_ABORT) {
-    media_stat_->StopAndReport(GetCurrentTime());
+    if (is_clock_manager)
+      media_stat_->StopAndReport(GetCurrentTime());
     return;
   }