Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(909)

Unified Diff: media/base/android/media_source_player.cc

Issue 601783004: MediaSourcePlayer: Only StopInterpolating() when it's interpolating. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mp4_stream_parser_hack
Patch Set: comments addressed Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bad50cf42d9b1fabe2b20c63c5069a8c9a55cf2e..5ef824ba443cb627ed2627e226c02baf8290a81d 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -481,8 +481,11 @@ void MediaSourcePlayer::MediaDecoderCallback(
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_.StopInterpolating();
+ }
if (pending_event_ != NO_EVENT_PENDING) {
ProcessPendingEvents();
@@ -576,7 +579,6 @@ void MediaSourcePlayer::PlaybackCompleted(bool is_audio) {
if (AudioFinished() && VideoFinished()) {
playing_ = false;
- interpolator_.StopInterpolating();
start_time_ticks_ = base::TimeTicks();
manager()->OnPlaybackComplete(player_id());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698