Chromium Code Reviews| Index: media/filters/decoder_stream.cc |
| diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc |
| index b3d58aecbbb48a1386d66836fe117a0a72759763..f8142c649bc8e406d8476c4490261b6b53426039 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,16 @@ void DecoderStream<StreamType>::OnDecoderSelected( |
| decoder_ = selected_decoder.Pass(); |
| decrypting_demuxer_stream_ = decrypting_demuxer_stream.Pass(); |
| + if (decrypting_demuxer_stream_) |
| + media_log_->SetStringProperty("decrypting_demuxer_stream", "yes"); |
|
DaleCurtis
2014/09/08 18:41:39
Always set w/ yes/no ?
xhwang
2014/09/08 20:12:10
Changed to binary property.
|
| + |
| + if (StreamType == DemuxerStream::VIDEO) |
| + media_log_->SetStringProperty("video_decoder", decoder_->GetDisplayName()); |
| + else if (StreamType == DemuxerStream::AUDIO) |
| + media_log_->SetStringProperty("audio_decoder", decoder_->GetDisplayName()); |
| + else |
| + NOTREACHED(); |
|
DaleCurtis
2014/09/08 18:41:39
I take it TEXT type streams never reach this point
xhwang
2014/09/08 20:12:10
Using ToString() now so the check is moved to comp
|
| + |
| if (StreamTraits::NeedsBitstreamConversion(decoder_.get())) |
| stream_->EnableBitstreamConverter(); |
| base::ResetAndReturn(&init_cb_).Run(true); |