| Index: media/base/android/media_source_player.cc
|
| diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
|
| index 4551520b25f14950dad1b51d4376767869e70af7..52b5eb44560f0c093c6df7dc22bbad667a5ed9f7 100644
|
| --- a/media/base/android/media_source_player.cc
|
| +++ b/media/base/android/media_source_player.cc
|
| @@ -258,9 +258,13 @@ void MediaSourcePlayer::OnDemuxerDurationChanged(base::TimeDelta duration) {
|
| duration_ = duration;
|
| }
|
|
|
| -void MediaSourcePlayer::OnMediaCryptoReady() {
|
| +void MediaSourcePlayer::OnMediaCryptoReady(
|
| + MediaDrmBridge::JavaObjectPtr /* media_crypto */,
|
| + bool /* needs_protected_surface */) {
|
| + // Callback parameters are ignored in this player. They are intended for
|
| + // MediaCodecPlayer which uses a different threading scheme.
|
| DCHECK(!drm_bridge_->GetMediaCrypto().is_null());
|
| - drm_bridge_->SetMediaCryptoReadyCB(base::Closure());
|
| + drm_bridge_->SetMediaCryptoReadyCB(MediaDrmBridge::MediaCryptoReadyCB());
|
|
|
| // Retry decoder creation if the decoders are waiting for MediaCrypto.
|
| RetryDecoderCreation(true, true);
|
|
|