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

Unified Diff: media/base/android/media_codec_audio_decoder.h

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Created 5 years, 3 months 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
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..dd1cd9c157431f0891664bf3fe324e40428bfeb7 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& key_required_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;

Powered by Google App Engine
This is Rietveld 408576698