aw: Support the platform specific key-systems.

media/base/android/media_drm_bridge.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_drm_bridge.h"
 
 #include <algorithm>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback_helpers.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #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.
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaLocalRef;
 
@@ skipping 240 matching lines @@
     return false;
 
   scoped_ptr<MediaDrmBridge> media_drm_bridge =
       MediaDrmBridge::CreateSessionless(key_system);
   if (!media_drm_bridge)
     return false;
 
   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,
+                                    jlong uuid_msb, jlong uuid_lsb) {
+  std::string key_system = ConvertJavaStringToUTF8(env, j_key_system);
+  // MSB (byte) should be positioned at the first element.
+  uuid_msb = base::HostToNet64(uuid_msb);
+  uuid_lsb = base::HostToNet64(uuid_lsb);
+  std::vector<uint8> uuid;
+  uuid.insert(uuid.end(), reinterpret_cast<uint8*>(&uuid_msb),
+              reinterpret_cast<uint8*>(&uuid_msb + 1));
+  uuid.insert(uuid.end(), reinterpret_cast<uint8*>(&uuid_lsb),
+              reinterpret_cast<uint8*>(&uuid_lsb + 1));

[xhwang, 2014/06/16 15:58:32]

nit: Can you convert the UUID to an array or vector in Java code so we don't
need all of these in native code?

[ycheo (away), 2014/06/16 21:42:11]

In UUID, there is no method to return an array or vector.
http://developer.android.com/reference/java/util/UUID.html

Is what you want just to move the converting routine from jlong to ByteArray in
Java? 

[xhwang, 2014/06/16 21:46:50]

Yes, I saw that, so you have to do some kind of convertion. I meant, in stead of
converting it here, can we do it in Java?

[ycheo (away), 2014/06/16 23:40:36]

Done.

   g_key_system_uuid_manager.Get().AddMapping(key_system, uuid);
 }
 
 // static
 std::vector<std::string> MediaDrmBridge::GetPlatformKeySystemNames() {
   return g_key_system_uuid_manager.Get().GetPlatformKeySystemNames();
 }
 
 // static
 bool MediaDrmBridge::IsKeySystemSupported(const std::string& key_system) {
@@ skipping 267 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj());
 }
 
 void MediaDrmBridge::OnResetDeviceCredentialsCompleted(
     JNIEnv* env, jobject, bool success) {
   base::ResetAndReturn(&reset_credentials_cb_).Run(success);
 }
 
 }  // namespace media