| 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..9b422adebded9ff6eb0b93a889629487b09d9b9c 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,
|
| @@ -65,10 +64,6 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
|
| kError
|
| };
|
|
|
| - // Callback to set CDM. |cdm_attached_cb| is called when the decryptor in the
|
| - // CDM has been completely attached to the pipeline.
|
| - void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
|
| -
|
| // Initializes the audio decoder on the |decryptor_| with |config_|.
|
| void InitializeDecoder();
|
|
|
| @@ -107,9 +102,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.
|
|
|