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

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

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated tests Created 6 years, 10 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
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 61fc9fbd54f0eb9241a684ccfb1851de2df60f1f..b4179e2aab37e8bcf918dc88b295908322b6df4c 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -33,17 +33,17 @@ namespace media {
// static
bool MediaSourcePlayer::IsTypeSupported(
- const std::vector<uint8>& scheme_uuid,
+ const std::string& key_system,
MediaDrmBridge::SecurityLevel security_level,
const std::string& container,
const std::vector<std::string>& codecs) {
- if (!MediaDrmBridge::IsCryptoSchemeSupported(scheme_uuid, container)) {
- DVLOG(1) << "UUID and container '" << container << "' not supported.";
+ if (!MediaDrmBridge::IsCryptoSchemeSupported(key_system, container)) {
+ DVLOG(1) << "Key system and container '" << container << "' not supported.";
return false;
}
- if (!MediaDrmBridge::IsSecurityLevelSupported(scheme_uuid, security_level)) {
- DVLOG(1) << "UUID and security level '" << security_level
+ if (!MediaDrmBridge::IsSecurityLevelSupported(key_system, security_level)) {
+ DVLOG(1) << "Key system and security level '" << security_level
<< "' not supported.";
return false;
}

Powered by Google App Engine
This is Rietveld 408576698