Index: media/base/android/media_codec_video_decoder.h |
diff --git a/media/base/android/media_codec_video_decoder.h b/media/base/android/media_codec_video_decoder.h |
index e92da297a6fcffc9aee0bc1044bbcac74623614e..5b8bdf2e144309afad4e61683375c3fae1416566 100644 |
--- a/media/base/android/media_codec_video_decoder.h |
+++ b/media/base/android/media_codec_video_decoder.h |
@@ -32,6 +32,7 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder { |
const base::Closure& starvation_cb, |
const base::Closure& drained_requested_cb, |
const base::Closure& stop_done_cb, |
+ const base::Closure& key_required_cb, |
const base::Closure& error_cb, |
const SetTimeCallback& update_current_time_cb, |
const VideoSizeChangedCallback& video_size_changed_cb, |
@@ -42,6 +43,7 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder { |
bool HasStream() const override; |
void SetDemuxerConfigs(const DemuxerConfigs& configs) override; |
+ bool IsContentEncrypted() const override; |
void ReleaseDecoderResources() override; |
void ReleaseMediaCodec() override; |
@@ -53,7 +55,7 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder { |
protected: |
bool IsCodecReconfigureNeeded(const DemuxerConfigs& next) const override; |
- ConfigStatus ConfigureInternal() override; |
+ ConfigStatus ConfigureInternal(jobject media_crypto) override; |
void AssociateCurrentTimeWithPTS(base::TimeDelta pts) override; |
void DissociatePTSFromTime() override; |
void OnOutputFormatChanged() override; |