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

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 2199913002: Notify demux stream clients when a stream is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't pass DemuxerStream into the status callback Created 4 years, 4 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 | « media/filters/ffmpeg_demuxer.h ('k') | media/mojo/services/mojo_demuxer_stream_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 2cf751dda302da653d91a5e51b52d029d3bbe7c2..b34d8bc3cb784c81bdae8ca48c4c1ee5d77076b5 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -711,19 +711,20 @@ void FFmpegDemuxerStream::set_enabled(bool enabled, base::TimeDelta timestamp) {
is_enabled_ = enabled;
if (is_enabled_) {
waiting_for_keyframe_ = true;
- if (!stream_restarted_cb_.is_null())
- stream_restarted_cb_.Run(this, timestamp);
}
if (!is_enabled_ && !read_cb_.is_null()) {
DVLOG(1) << "Read from disabled stream, returning EOS";
base::ResetAndReturn(&read_cb_).Run(kOk, DecoderBuffer::CreateEOSBuffer());
return;
}
+ if (!stream_status_change_cb_.is_null())
+ stream_status_change_cb_.Run(is_enabled_, timestamp);
}
-void FFmpegDemuxerStream::SetStreamRestartedCB(const StreamRestartedCB& cb) {
+void FFmpegDemuxerStream::SetStreamStatusChangeCB(
+ const StreamStatusChangeCB& cb) {
DCHECK(!cb.is_null());
- stream_restarted_cb_ = cb;
+ stream_status_change_cb_ = cb;
}
void FFmpegDemuxerStream::SetLiveness(Liveness liveness) {
« no previous file with comments | « media/filters/ffmpeg_demuxer.h ('k') | media/mojo/services/mojo_demuxer_stream_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698