Index: media/renderers/renderer_impl.cc |
diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc |
index 6de238c68ce39ea96f3a74813e535b21bb177605..9df1703cfe75f4ea6d5217869677252f4405847d 100644 |
--- a/media/renderers/renderer_impl.cc |
+++ b/media/renderers/renderer_impl.cc |
@@ -201,6 +201,55 @@ void RendererImpl::StartPlayingFrom(base::TimeDelta time) { |
video_renderer_->StartPlayingFrom(time); |
} |
+void RendererImpl::RestartStreamPlayback(DemuxerStream* stream, |
+ base::TimeDelta time) { |
+ DVLOG(1) << __FUNCTION__ << " stream=" << stream |
+ << " time=" << time.InSecondsF(); |
+ DCHECK(task_runner_->BelongsToCurrentThread()); |
+ if (stream->type() == DemuxerStream::VIDEO) { |
+ DCHECK(video_renderer_); |
+ DCHECK(video_ended_); |
+ video_ended_ = false; |
+ restarting_video_ = true; |
+ video_renderer_->Flush(base::Bind( |
+ &RendererImpl::OnVideoRendererFlushDone_ForRestart, weak_this_, time)); |
+ } else if (stream->type() == DemuxerStream::AUDIO) { |
+ DCHECK(audio_renderer_); |
+ DCHECK(time_source_); |
+ DCHECK(audio_ended_); |
+ audio_ended_ = false; |
+ restarting_audio_ = true; |
+ // We need to stop ticking (transition into paused state) before calling |
+ // Flush, since after Flush we'll need to restart playback by invoking |
+ // StartPlaying that dchecks we are not in playing state. |
wolenetz
2016/05/27 20:49:42
nit: we usually don't refer to implementation deta
servolk
2016/06/01 17:36:16
Done.
|
+ time_ticking_ = false; |
+ time_source_->StopTicking(); |
+ audio_renderer_->Flush(base::Bind( |
+ &RendererImpl::OnAudioRendererFlushDone_ForRestart, weak_this_, time)); |
+ } |
+} |
+ |
+void RendererImpl::OnVideoRendererFlushDone_ForRestart(base::TimeDelta time) { |
+ DCHECK(task_runner_->BelongsToCurrentThread()); |
+ if (state_ == STATE_PLAYING) { |
+ DCHECK(video_renderer_); |
+ // TODO(servolk): VideoRenderer should ensure that Flush callback is called |
+ // outside of its internal lock, to allow calling renderer methods directly. |
+ task_runner_->PostTask( |
+ FROM_HERE, base::Bind(&VideoRenderer::StartPlayingFrom, |
+ base::Unretained(video_renderer_.get()), time)); |
+ } |
+} |
+ |
+void RendererImpl::OnAudioRendererFlushDone_ForRestart(base::TimeDelta time) { |
+ DCHECK(task_runner_->BelongsToCurrentThread()); |
+ if (state_ == STATE_PLAYING) { |
+ DCHECK(time_source_); |
+ DCHECK(audio_renderer_); |
+ audio_renderer_->StartPlaying(); |
+ } |
+} |
+ |
void RendererImpl::SetPlaybackRate(double playback_rate) { |
DVLOG(1) << __FUNCTION__ << "(" << playback_rate << ")"; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
@@ -502,6 +551,47 @@ void RendererImpl::OnBufferingStateChange(DemuxerStream::Type type, |
bool was_waiting_for_enough_data = WaitingForEnoughData(); |
+ // When restarting video stream playback we want to ignore the |
+ // BUFFERING_HAVE_NOTHING notification so that audio keeps playing while |
+ // video decoder is catching up. |
+ if (type == DemuxerStream::VIDEO && restarting_video_) { |
+ if (new_buffering_state == BUFFERING_HAVE_NOTHING) { |
+ DVLOG(1) << __FUNCTION__ << " Ignoring BUFFERING_HAVE_NOTHING for video " |
+ "stream which is being restarted."; |
+ } else if (new_buffering_state == BUFFERING_HAVE_ENOUGH) { |
+ DVLOG(1) |
+ << __FUNCTION__ |
+ << " Got BUFFERING_HAVE_ENOUGH for video stream, resuming playback."; |
+ restarting_video_ = false; |
+ if (playback_rate_ > 0) |
+ video_renderer_->OnTimeStateChanged(true); |
+ } |
+ return; |
+ } |
+ |
+ if (type == DemuxerStream::AUDIO && restarting_audio_) { |
+ if (new_buffering_state == BUFFERING_HAVE_NOTHING) { |
+ DVLOG(1) << __FUNCTION__ << " Ignoring BUFFERING_HAVE_NOTHING for " |
+ << (type == DemuxerStream::AUDIO ? "audio" : "video") |
+ << " stream"; |
+ } else if (new_buffering_state == BUFFERING_HAVE_ENOUGH) { |
+ DVLOG(1) << __FUNCTION__ << " Got BUFFERING_HAVE_ENOUGH for " |
+ << (type == DemuxerStream::AUDIO ? "audio" : "video") |
+ << " stream"; |
+ |
+ restarting_audio_ = false; |
+ |
+ // Now that we have decoded enough audio, pause and unpause playback |
+ // momentarily to ensure video renderer is synchronised with audio. |
+ double curr_playback_rate = playback_rate_; |
+ SetPlaybackRate(0); |
+ SetPlaybackRate(curr_playback_rate); |
+ |
+ time_source_->StartTicking(); |
+ } |
+ return; |
+ } |
+ |
// When audio is present and has enough data, defer video underflow callbacks |
// for some time to avoid unnecessary glitches in audio; see |
// http://crbug.com/144683#c53. |
@@ -612,7 +702,8 @@ void RendererImpl::StartPlayback() { |
} |
void RendererImpl::OnRendererEnded(DemuxerStream::Type type) { |
- DVLOG(1) << __FUNCTION__; |
+ DVLOG(1) << __FUNCTION__ |
+ << (type == DemuxerStream::AUDIO ? " audio" : " video"); |
DCHECK(task_runner_->BelongsToCurrentThread()); |
DCHECK((type == DemuxerStream::AUDIO) || (type == DemuxerStream::VIDEO)); |