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

Unified Diff: media/filters/decrypting_audio_decoder.h

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/filters/decrypting_audio_decoder.h
diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h
index 36013b86777f93e08d2023b54ffbb7bfcc443652..99d2934fbb5cd4a74a508e4136d268b3ddb5c9d1 100644
--- a/media/filters/decrypting_audio_decoder.h
+++ b/media/filters/decrypting_audio_decoder.h
@@ -42,7 +42,7 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
// AudioDecoder implementation.
std::string GetDisplayName() const override;
void Initialize(const AudioDecoderConfig& config,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const InitCB& init_cb,
const OutputCB& output_cb) override;
void Decode(const scoped_refptr<DecoderBuffer>& buffer,
@@ -56,7 +56,6 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
// TODO(xhwang): Update this diagram for DecryptingAudioDecoder.
enum State {
kUninitialized = 0,
- kDecryptorRequested,
kPendingDecoderInit,
kIdle,
kPendingDecode,
@@ -107,9 +106,6 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
// The current decoder configuration.
AudioDecoderConfig config_;
- // Callback to request/cancel CDM ready notification.
- SetCdmReadyCB set_cdm_ready_cb_;
-
Decryptor* decryptor_;
// The buffer that needs decrypting/decoding.

Powered by Google App Engine
This is Rietveld 408576698