Index: media/filters/decoder_stream.cc |
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc |
index b3d58aecbbb48a1386d66836fe117a0a72759763..8f2deaf984b0a518beecfdb929db059ce9c7d045 100644 |
--- a/media/filters/decoder_stream.cc |
+++ b/media/filters/decoder_stream.cc |
@@ -42,8 +42,10 @@ template <DemuxerStream::Type StreamType> |
DecoderStream<StreamType>::DecoderStream( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
ScopedVector<Decoder> decoders, |
- const SetDecryptorReadyCB& set_decryptor_ready_cb) |
+ const SetDecryptorReadyCB& set_decryptor_ready_cb, |
+ const scoped_refptr<MediaLog>& media_log) |
: task_runner_(task_runner), |
+ media_log_(media_log), |
state_(STATE_UNINITIALIZED), |
stream_(NULL), |
low_delay_(false), |
@@ -236,6 +238,12 @@ void DecoderStream<StreamType>::OnDecoderSelected( |
decoder_ = selected_decoder.Pass(); |
decrypting_demuxer_stream_ = decrypting_demuxer_stream.Pass(); |
+ const std::string stream_type = DecoderStreamTraits<StreamType>::ToString(); |
+ media_log_->SetBooleanProperty((stream_type + "_dds").c_str(), |
+ decrypting_demuxer_stream_); |
+ media_log_->SetStringProperty((stream_type + "_decoder").c_str(), |
+ decoder_->GetDisplayName()); |
+ |
if (StreamTraits::NeedsBitstreamConversion(decoder_.get())) |
stream_->EnableBitstreamConverter(); |
base::ResetAndReturn(&init_cb_).Run(true); |