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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 748473002: Introduce CdmContext interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@set_cdm
Patch Set: Created 6 years, 1 month 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
Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index deb3417c3bd29a37e265987f8f6e33fb06dd2236..df811d5bb6689743a68707d34ab297301dd10439 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -33,6 +33,7 @@
#include "media/base/android/media_common_android.h"
#include "media/base/android/media_player_android.h"
#include "media/base/bind_to_current_loop.h"
+#include "media/base/cdm_context.h"
#include "media/base/key_systems.h"
#include "media/base/media_keys.h"
#include "media/base/media_log.h"
@@ -178,7 +179,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
// Set the initial CDM, if specified.
if (initial_cdm) {
web_cdm_ = media::ToWebContentDecryptionModuleImpl(initial_cdm);
- if (web_cdm_->GetCdmId() != media::MediaKeys::kInvalidCdmId)
+ if (web_cdm_->GetCdmId() != media::CdmContext::kInvalidCdmId)
player_manager_->SetCdm(player_id_, web_cdm_->GetCdmId());
}
}
@@ -1531,7 +1532,7 @@ WebMediaPlayerAndroid::GenerateKeyRequestInternal(
// Only browser CDMs have CDM ID. Render side CDMs (e.g. ClearKey CDM) do
// not have a CDM ID and there is no need to call player_manager_->SetCdm().
- if (proxy_decryptor_->GetCdmId() != media::MediaKeys::kInvalidCdmId)
+ if (proxy_decryptor_->GetCdmId() != media::CdmContext::kInvalidCdmId)
player_manager_->SetCdm(player_id_, proxy_decryptor_->GetCdmId());
current_key_system_ = key_system;
@@ -1650,7 +1651,7 @@ void WebMediaPlayerAndroid::setContentDecryptionModule(
.Run(web_cdm_->GetDecryptor(), base::Bind(DoNothing));
}
- if (web_cdm_->GetCdmId() != media::MediaKeys::kInvalidCdmId)
+ if (web_cdm_->GetCdmId() != media::CdmContext::kInvalidCdmId)
player_manager_->SetCdm(player_id_, web_cdm_->GetCdmId());
}
@@ -1684,7 +1685,7 @@ void WebMediaPlayerAndroid::setContentDecryptionModule(
ContentDecryptionModuleAttached(result, true);
}
- if (web_cdm_->GetCdmId() != media::MediaKeys::kInvalidCdmId)
+ if (web_cdm_->GetCdmId() != media::CdmContext::kInvalidCdmId)
player_manager_->SetCdm(player_id_, web_cdm_->GetCdmId());
}

Powered by Google App Engine
This is Rietveld 408576698