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

Unified Diff: media/filters/decoder_stream.h

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)
Patch Set: comments addressed Created 3 years, 10 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/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index cf9dcd91ae756983d1d2c030222a3c7fc7028dcd..0056269389290bcec15ae01cfe81af0cf3e59bb5 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -205,12 +205,14 @@ class MEDIA_EXPORT DecoderStream {
std::unique_ptr<DecoderSelector<StreamType>> decoder_selector_;
std::unique_ptr<Decoder> decoder_;
+
// When falling back from H/W decoding to S/W decoding, destructing the
// GpuVideoDecoder too early results in black frames being displayed.
// |previous_decoder_| is used to keep it alive. It is destroyed once we've
// decoded at least media::limits::kMaxVideoFrames frames after fallback.
int decoded_frames_since_fallback_;
std::unique_ptr<Decoder> previous_decoder_;
+
std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
ConfigChangeObserverCB config_change_observer_cb_;
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698