MediaSourcePlayer: Only StopInterpolating() when it's interpolating.

media/base/android/media_source_player.cc

 // Copyright (c) 2013 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_source_player.h"
 
 #include <limits>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 463 matching lines @@
     ProcessPendingEvents();
     return;
   }
 
   if ((status == MEDIA_CODEC_OK || status == MEDIA_CODEC_INPUT_END_OF_STREAM) &&
       is_clock_manager && current_presentation_timestamp != kNoTimestamp()) {
     UpdateTimestamps(current_presentation_timestamp,
                      max_presentation_timestamp);
   }
 
-  if (status == MEDIA_CODEC_OUTPUT_END_OF_STREAM)
+  if (status == MEDIA_CODEC_OUTPUT_END_OF_STREAM) {
     PlaybackCompleted(is_audio);
+    if (is_clock_manager && interpolator_.interpolating())

[qinmin, 2014/09/25 20:23:17]

we probably don't need interpolator_.interpolating() as it should always be true
when reaching here.
If it is not true, then there is definitely some bugs.

+      interpolator_.StopInterpolating();
+  }
 
   if (pending_event_ != NO_EVENT_PENDING) {
     ProcessPendingEvents();
     return;
   }
 
   if (status == MEDIA_CODEC_OUTPUT_END_OF_STREAM)
     return;
 
   if (!playing_) {
-    if (is_clock_manager)
+    if (is_clock_manager && interpolator_.interpolating())
       interpolator_.StopInterpolating();
     return;
   }
 
   if (status == MEDIA_CODEC_NO_KEY) {
     is_waiting_for_key_ = true;
     return;
   }
 
   // If the status is MEDIA_CODEC_STOPPED, stop decoding new data. The player is
@@ skipping 62 matching lines @@
   is_waiting_for_video_decoder_ = true;
   if (!IsEventPending(DECODER_CREATION_EVENT_PENDING))
     SetPendingEvent(DECODER_CREATION_EVENT_PENDING);
 }
 
 void MediaSourcePlayer::PlaybackCompleted(bool is_audio) {
   DVLOG(1) << __FUNCTION__ << "(" << is_audio << ")";
 
   if (AudioFinished() && VideoFinished()) {
     playing_ = false;
-    interpolator_.StopInterpolating();
     start_time_ticks_ = base::TimeTicks();
     manager()->OnPlaybackComplete(player_id());
   }
 }
 
 void MediaSourcePlayer::ClearDecodingData() {
   DVLOG(1) << __FUNCTION__;
   audio_decoder_job_->Flush();
   video_decoder_job_->Flush();
   start_time_ticks_ = base::TimeTicks();
@@ skipping 164 matching lines @@
   // release MediaDrm when the video is paused, or when the device goes to
   // sleep (see http://crbug.com/272421).
   NOTREACHED() << "CDM detachment not supported.";
   DCHECK(drm_bridge_);
   audio_decoder_job_->SetDrmBridge(NULL);
   video_decoder_job_->SetDrmBridge(NULL);
   drm_bridge_ = NULL;
 }
 
 }  // namespace media