Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/android/media_source_player.cc

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android changes Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/base/android/cdm_factory_android.cc ('K') | « media/base/android/media_source_player.h ('k') | media/base/cdm_factory.h » ('j') | media/base/cdm_promise.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 081d69174577426b7553b8c64a796d14a27303a8..ef83e29c56c7cf7c2bc6c7edddcd3b2abfcd6d59 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -355,7 +355,7 @@ void MediaSourcePlayer::OnMediaCryptoReady() {
StartInternal();
}
-void MediaSourcePlayer::SetCdm(MediaKeys* cdm) {
+void MediaSourcePlayer::SetCdm(MediaDrmBridge* 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.
@@ -366,7 +366,7 @@ void MediaSourcePlayer::SetCdm(MediaKeys* cdm) {
}
// Only MediaDrmBridge will be set on MediaSourcePlayer.
- drm_bridge_ = static_cast<MediaDrmBridge*>(cdm);
+ drm_bridge_ = cdm;
if (drm_bridge_->GetMediaCrypto().is_null()) {
drm_bridge_->SetMediaCryptoReadyCB(base::Bind(
« media/base/android/cdm_factory_android.cc ('K') | « media/base/android/media_source_player.h ('k') | media/base/cdm_factory.h » ('j') | media/base/cdm_promise.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698