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

Unified Diff: android_webview/renderer/aw_key_systems.cc

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/media/encrypted_media_message_filter_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/renderer/aw_key_systems.cc
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc
index 81859d0b9b6004d3ce8e22ee94785ec97e25e4da..dc61bf93429ee6b506ef5df31cb9febbc1f57557 100644
--- a/android_webview/renderer/aw_key_systems.cc
+++ b/android_webview/renderer/aw_key_systems.cc
@@ -20,10 +20,6 @@ const char kVideoMp4[] = "video/mp4";
const char kMp4a[] = "mp4a";
const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3";
-const uint8 kWidevineUuid[16] = {
- 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
- 0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
-
// Return |name|'s parent key system.
std::string GetDirectParentName(const std::string& name) {
int last_period = name.find_last_of('.');
@@ -31,10 +27,9 @@ std::string GetDirectParentName(const std::string& name) {
return name.substr(0, last_period);
}
-void AddWidevineWithCodecs(
- const std::string& key_system_name,
- bool add_parent_name,
- std::vector<KeySystemInfo>* concrete_key_systems) {
+void AddWidevineWithCodecs(const std::string& key_system_name,
+ bool add_parent_name,
+ std::vector<KeySystemInfo>* concrete_key_systems) {
KeySystemInfo info(key_system_name);
if (add_parent_name)
@@ -43,8 +38,6 @@ void AddWidevineWithCodecs(
info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a));
info.supported_types.push_back(std::make_pair(kVideoMp4, kMp4aAvc1Avc3));
- info.uuid.assign(kWidevineUuid, kWidevineUuid + arraysize(kWidevineUuid));
-
concrete_key_systems->push_back(info);
}
« no previous file with comments | « no previous file | chrome/browser/media/encrypted_media_message_filter_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698