| Index: media/filters/decoder_stream_traits.cc
|
| diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc
|
| index de8f86009b7f5c298ae5c655cd0e2f4bf8f1a2aa..f5732e84fc466d680b85b32421f515c0e3e21b4b 100644
|
| --- a/media/filters/decoder_stream_traits.cc
|
| +++ b/media/filters/decoder_stream_traits.cc
|
| @@ -22,9 +22,11 @@ void DecoderStreamTraits<DemuxerStream::AUDIO>::InitializeDecoder(
|
| DecoderType* decoder,
|
| DemuxerStream* stream,
|
| const PipelineStatusCB& status_cb,
|
| - const OutputCB& output_cb) {
|
| + const OutputCB& output_cb,
|
| + const base::Closure& waiting_for_encryption_key_cb) {
|
| DCHECK(stream->audio_decoder_config().IsValidConfig());
|
| - decoder->Initialize(stream->audio_decoder_config(), status_cb, output_cb);
|
| + decoder->Initialize(stream->audio_decoder_config(), status_cb, output_cb,
|
| + waiting_for_encryption_key_cb);
|
| }
|
|
|
| void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
|
| @@ -48,11 +50,12 @@ void DecoderStreamTraits<DemuxerStream::VIDEO>::InitializeDecoder(
|
| DecoderType* decoder,
|
| DemuxerStream* stream,
|
| const PipelineStatusCB& status_cb,
|
| - const OutputCB& output_cb) {
|
| + const OutputCB& output_cb,
|
| + const base::Closure& waiting_for_encryption_key_cb) {
|
| DCHECK(stream->video_decoder_config().IsValidConfig());
|
| decoder->Initialize(stream->video_decoder_config(),
|
| stream->liveness() == DemuxerStream::LIVENESS_LIVE,
|
| - status_cb, output_cb);
|
| + status_cb, output_cb, waiting_for_encryption_key_cb);
|
| }
|
|
|
| bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
|
|
|