Add a function to convert key system into UUID

media/base/android/media_drm_bridge.cc

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 8760900a8879af28953035571011e4d7ce01dec1..202ebec5b5c343d07fc94d7c15ed7261945be401 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -8,6 +8,27 @@
 
 using base::android::ScopedJavaLocalRef;
 
+namespace {
+
+// TODO(qinmin): figure out what is the UUID for com.widevine.alpha, and also

[ddorwin, 2013/06/19 23:14:41]

See below for com.widevine.alpha.

[qinmin, 2013/06/20 00:49:26]

Done.

+// other key systems.
+const uint8 kWideVineUUID[] = {
+  0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE, // Widevine UUID
+  0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED,
+};
+
+static std::vector<uint8> ConvertKeySystemToUUID(
+    const std::string& key_system) {

[ddorwin, 2013/06/19 23:14:41]

There are constants for the key systems in key_system*, although I don't think
we actually expose them. It might be preferable to add a
ConvertKeySystemToAndroidUUID method to that file.

The one issue is that this code is part of the renderer at the moment. As with
all functionality, it might be better to do as much of this as possible in the
renderer. That would mean that the Android proxy and below would use a const
vector& instead of const string& like the rest of the stack, but it might be
worth it.

[qinmin, 2013/06/20 00:49:26]

Done. Changing the MediaDrmBridge ctor back to accept a vector param so renderer
will send the uuid in an IPC.

On 2013/06/19 23:14:41, ddorwin wrote:

+  std::vector<uint8> uuid;
+  if (key_system == "com.widevine")

[ddorwin, 2013/06/19 23:14:41]

com.widevine.alpha
com.widevine is a parent key system only used for canPlayType(). It is not
actually a supported key system on its own.

[qinmin, 2013/06/20 00:49:26]

Done.

+    uuid.assign(kWideVineUUID, kWideVineUUID + 16);
+  else
+    NOTIMPLEMENTED();

[ddorwin, 2013/06/19 23:14:41]

not necessarily - it's just not recognized. You could DLOG or something, but
there's not necessarily anything to implement for ALL other strings.

[qinmin, 2013/06/20 00:49:26]

Done.

+  return uuid;
+}
+
+}  // namespace
+
 namespace media {
 
 // static
@@ -16,8 +37,11 @@ bool MediaDrmBridge::IsAvailable() {
 }
 
 MediaDrmBridge::MediaDrmBridge(
-    int media_keys_id, const std::vector<uint8>& uuid)
-    : media_keys_id_(media_keys_id) {}
+    int media_keys_id, const std::string& key_system)
+    : media_keys_id_(media_keys_id),
+      uuid_(ConvertKeySystemToUUID(key_system)) {

[ddorwin, 2013/06/19 23:14:41]

With a Create() method, you can do the conversion and fail if the conversion
fails (rather than creating an invalid object).

[qinmin, 2013/06/20 00:49:26]

Done.

+  // TODO(qinmin): pass the uuid to DRM engine.
+}
 
 MediaDrmBridge::~MediaDrmBridge() {}