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

Unified Diff: media/filters/decrypting_demuxer_stream.cc

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
Index: media/filters/decrypting_demuxer_stream.cc
diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
index c4e6b8478380de81a70ee42ac894d376a3cf770a..ea93bfc42a81321e4df292bcda30940a863e2eb3 100644
--- a/media/filters/decrypting_demuxer_stream.cc
+++ b/media/filters/decrypting_demuxer_stream.cc
@@ -126,6 +126,11 @@ DemuxerStream::Type DecryptingDemuxerStream::type() {
return demuxer_stream_->type();
}
+DemuxerStream::Liveness DecryptingDemuxerStream::liveness() {
+ DCHECK(state_ != kUninitialized && state_ != kDecryptorRequested) << state_;
+ return demuxer_stream_->liveness();
+}
+
void DecryptingDemuxerStream::EnableBitstreamConverter() {
demuxer_stream_->EnableBitstreamConverter();
}

Powered by Google App Engine
This is Rietveld 408576698