Index: media/filters/decrypting_video_decoder.h |
diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h |
index bdcc34ffdca7629a53b15a07abb0263ad8d3f073..cd3549ced23cffef95481670bc4b5d657f146ba0 100644 |
--- a/media/filters/decrypting_video_decoder.h |
+++ b/media/filters/decrypting_video_decoder.h |
@@ -41,7 +41,7 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder { |
std::string GetDisplayName() const override; |
void Initialize(const VideoDecoderConfig& config, |
bool low_delay, |
- 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 DecryptingVideoDecoder : public VideoDecoder { |
// stabilizes. |
enum State { |
kUninitialized = 0, |
- kDecryptorRequested, |
kPendingDecoderInit, |
kIdle, |
kPendingDecode, |
@@ -65,10 +64,6 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder { |
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); |
- |
// Callback for Decryptor::InitializeVideoDecoder() during initialization. |
void FinishInitialization(bool success); |
@@ -100,9 +95,6 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder { |
VideoDecoderConfig config_; |
- // Callback to request/cancel CDM ready notification. |
- SetCdmReadyCB set_cdm_ready_cb_; |
- |
Decryptor* decryptor_; |
// The buffer that needs decrypting/decoding. |