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

Unified Diff: media/filters/decoder_selector.cc

Issue 2712843002: media: Add DecoderConfigType in DecoderStreamTraits (Closed)
Patch Set: 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 | « no previous file | media/filters/decoder_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_selector.cc
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index 75eb07f2b8939eaa730560d6017e99874e5bfdb0..4ab98e20535228a630c7843ea5c7f34468a68e14 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -133,7 +133,8 @@ void DecoderSelector<StreamType>::InitializeDecryptingDecoder() {
task_runner_, media_log_, waiting_for_decryption_key_cb_));
traits_->InitializeDecoder(
- decoder_.get(), input_stream_, cdm_context_,
+ decoder_.get(), StreamTraits::GetDecoderConfig(input_stream_),
+ input_stream_->liveness() == DemuxerStream::LIVENESS_LIVE, cdm_context_,
base::Bind(&DecoderSelector<StreamType>::DecryptingDecoderInitDone,
weak_ptr_factory_.GetWeakPtr()),
output_cb_);
@@ -208,7 +209,8 @@ void DecoderSelector<StreamType>::InitializeDecoder() {
decoders_.weak_erase(decoders_.begin());
traits_->InitializeDecoder(
- decoder_.get(), input_stream_, cdm_context_,
+ decoder_.get(), StreamTraits::GetDecoderConfig(input_stream_),
+ input_stream_->liveness() == DemuxerStream::LIVENESS_LIVE, cdm_context_,
base::Bind(&DecoderSelector<StreamType>::DecoderInitDone,
weak_ptr_factory_.GetWeakPtr()),
output_cb_);
« no previous file with comments | « no previous file | media/filters/decoder_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698