Index: media/base/android/media_codec_audio_decoder.h |
diff --git a/media/base/android/media_codec_audio_decoder.h b/media/base/android/media_codec_audio_decoder.h |
index df0193fe5c09d24b56466d1c17ef81057599d51f..03df46b0ab1e5c4e3b1f22eb321238a8d9a5c57c 100644 |
--- a/media/base/android/media_codec_audio_decoder.h |
+++ b/media/base/android/media_codec_audio_decoder.h |
@@ -23,6 +23,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder { |
const base::Closure& starvation_cb, |
const base::Closure& decoder_drained_cb, |
const base::Closure& stop_done_cb, |
+ const base::Closure& waiting_for_decryption_key_cb, |
const base::Closure& error_cb, |
const SetTimeCallback& update_current_time_cb); |
~MediaCodecAudioDecoder() override; |
@@ -31,6 +32,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder { |
bool HasStream() const override; |
void SetDemuxerConfigs(const DemuxerConfigs& configs) override; |
+ bool IsContentEncrypted() const override; |
void ReleaseDecoderResources() override; |
void Flush() override; |
@@ -42,7 +44,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder { |
protected: |
bool IsCodecReconfigureNeeded(const DemuxerConfigs& next) const override; |
- ConfigStatus ConfigureInternal() override; |
+ ConfigStatus ConfigureInternal(jobject media_crypto) override; |
void OnOutputFormatChanged() override; |
void Render(int buffer_index, |
size_t offset, |