| 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 c4998e8174e6eef78d442af9cb8f3030c20fc934..2911ea58939c1b9a2c49800d49202e457d94f66f 100644
|
| --- a/media/base/android/media_source_player.cc
|
| +++ b/media/base/android/media_source_player.cc
|
| @@ -374,7 +374,7 @@ void MediaSourcePlayer::OnMediaCryptoReady() {
|
| StartInternal();
|
| }
|
|
|
| -void MediaSourcePlayer::SetDrmBridge(MediaDrmBridge* drm_bridge) {
|
| +void MediaSourcePlayer::SetCdm(MediaKeys* cdm) {
|
| // Currently we don't support DRM change during the middle of playback, even
|
| // if the player is paused.
|
| // TODO(qinmin): support DRM change after playback has started.
|
| @@ -384,7 +384,8 @@ void MediaSourcePlayer::SetDrmBridge(MediaDrmBridge* drm_bridge) {
|
| << "This is not well supported!";
|
| }
|
|
|
| - drm_bridge_ = drm_bridge;
|
| + // Only MediaDrmBridge will be set on MediaSourcePlayer.
|
| + drm_bridge_ = static_cast<MediaDrmBridge*>(cdm);
|
|
|
| if (drm_bridge_->GetMediaCrypto().is_null()) {
|
| drm_bridge_->SetMediaCryptoReadyCB(base::Bind(
|
|
|