Index: media/base/android/media_codec_player.cc |
diff --git a/media/base/android/media_codec_player.cc b/media/base/android/media_codec_player.cc |
index 565c7452c3a5d392796552680f33d7cd82108c6d..3b316f5dec12aea3862ba06ec7f571fc6fa03b8c 100644 |
--- a/media/base/android/media_codec_player.cc |
+++ b/media/base/android/media_codec_player.cc |
@@ -102,6 +102,10 @@ MediaCodecPlayer::~MediaCodecPlayer() |
audio_decoder_->ReleaseDecoderResources(); |
if (cdm_) { |
+ // Cancel previously registered callback (if any). |
+ static_cast<MediaDrmBridge*>(cdm_.get()) |
+ ->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB()); |
+ |
DCHECK(cdm_registration_id_); |
static_cast<MediaDrmBridge*>(cdm_.get()) |
->UnregisterPlayer(cdm_registration_id_); |