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

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

Issue 333003003: aw: Support the platform specific key-systems. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added 'media/base/android/java' into android_webview/java/DEPS. Created 6 years, 6 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_drm_bridge.cc
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index 60215ea6148437cab339d3e67cb287443f3b2ed8..197973588a9e9cf5d5e3bd390a61b30d55eba38d 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -16,6 +16,7 @@
#include "base/logging.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/string_util.h"
+#include "base/sys_byteorder.h"
#include "jni/MediaDrmBridge_jni.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
@@ -276,9 +277,12 @@ bool MediaDrmBridge::IsSecurityLevelSupported(const std::string& key_system,
return media_drm_bridge->SetSecurityLevel(security_level);
}
-// static
-void MediaDrmBridge::AddKeySystemUuidMapping(const std::string& key_system,
- const std::vector<uint8>& uuid) {
+static void AddKeySystemUuidMapping(JNIEnv* env, jclass clazz,
+ jstring j_key_system,
+ jobject j_buffer) {
+ std::string key_system = ConvertJavaStringToUTF8(env, j_key_system);
+ uint8* buffer = static_cast<uint8*>(env->GetDirectBufferAddress(j_buffer));
+ UUID uuid(buffer, buffer + 16);
g_key_system_uuid_manager.Get().AddMapping(key_system, uuid);
}

Powered by Google App Engine
This is Rietveld 408576698