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

Unified Diff: media/filters/decoder_stream_traits.cc

Issue 1447533006: media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « media/filters/decoder_stream_traits.h ('k') | media/filters/decrypting_audio_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « media/filters/decoder_stream_traits.h ('k') | media/filters/decrypting_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698