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

Unified Diff: media/renderers/renderer_impl.cc

Issue 1935873002: Implement disabling and enabling media tracks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@track-control2
Patch Set: Updated comments + dchecks in ffmpeg demux stream Created 4 years, 7 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
« media/renderers/renderer_impl.h ('K') | « media/renderers/renderer_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/renderer_impl.cc
diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc
index 6de238c68ce39ea96f3a74813e535b21bb177605..ce2f49215862dea12e4954047f964e35725ca29d 100644
--- a/media/renderers/renderer_impl.cc
+++ b/media/renderers/renderer_impl.cc
@@ -201,6 +201,51 @@ 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;
+ // Stop ticking (transition into paused state) in audio renderer before
+ // calling Flush, since after Flush we are going to restart playback by
+ // calling audio renderer StartPlaying which would fail in playing state.
+ 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_);
+ video_renderer_->StartPlayingFrom(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 +547,48 @@ 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) {
chcunningham 2016/06/03 01:38:49 What if the new buffering state never reaches HAVE
servolk 2016/06/03 02:53:15 If MSE apps decide to not bother appending video t
chcunningham 2016/06/03 20:54:59 I don't think its a matter of worrying just to hel
+ DVLOG(1)
+ << __FUNCTION__
+ << " Got BUFFERING_HAVE_ENOUGH for video stream, resuming playback.";
+ restarting_video_ = false;
+ if (playback_rate_ > 0)
+ video_renderer_->OnTimeStateChanged(true);
chcunningham 2016/06/03 01:38:49 Not really related to this line, but it triggered
servolk 2016/06/03 02:53:15 Yes, it sounds reasonable to me. I'm not sure why
+ }
+ 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);
chcunningham 2016/06/03 01:38:49 Why does this help sync? I think you're already pa
chcunningham 2016/06/03 20:55:37 (reminder about this one in case you missed it)
+ SetPlaybackRate(curr_playback_rate);
+
+ time_ticking_ = true;
+ 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 +699,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));
« media/renderers/renderer_impl.h ('K') | « media/renderers/renderer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698