| Index: media/filters/decoder_stream_traits.cc
|
| diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc
|
| index 7583b172b27ad89031ef52892ada8b798e626c44..c40d69fa518f922cbe60919005c5a2470eac6bdd 100644
|
| --- a/media/filters/decoder_stream_traits.cc
|
| +++ b/media/filters/decoder_stream_traits.cc
|
| @@ -21,10 +21,12 @@ std::string DecoderStreamTraits<DemuxerStream::AUDIO>::ToString() {
|
| void DecoderStreamTraits<DemuxerStream::AUDIO>::InitializeDecoder(
|
| DecoderType* decoder,
|
| DemuxerStream* stream,
|
| + const SetCdmReadyCB& set_cdm_ready_cb,
|
| const InitCB& init_cb,
|
| const OutputCB& output_cb) {
|
| DCHECK(stream->audio_decoder_config().IsValidConfig());
|
| - decoder->Initialize(stream->audio_decoder_config(), init_cb, output_cb);
|
| + decoder->Initialize(stream->audio_decoder_config(), set_cdm_ready_cb, init_cb,
|
| + output_cb);
|
| }
|
|
|
| void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
|
| @@ -47,12 +49,13 @@ std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() {
|
| void DecoderStreamTraits<DemuxerStream::VIDEO>::InitializeDecoder(
|
| DecoderType* decoder,
|
| DemuxerStream* stream,
|
| + const SetCdmReadyCB& set_cdm_ready_cb,
|
| const InitCB& init_cb,
|
| const OutputCB& output_cb) {
|
| DCHECK(stream->video_decoder_config().IsValidConfig());
|
| decoder->Initialize(stream->video_decoder_config(),
|
| stream->liveness() == DemuxerStream::LIVENESS_LIVE,
|
| - init_cb, output_cb);
|
| + set_cdm_ready_cb, init_cb, output_cb);
|
| }
|
|
|
| bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
|
|
|