Add a function to convert key system into UUID

webkit/renderer/media/crypto/key_systems.cc

 // Copyright 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 <map>
 
 #include "webkit/renderer/media/crypto/key_systems.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/renderer/media/crypto/key_systems_info.h"
 

[ddorwin, 2013/06/20 03:07:27]

All the system specifics go in key_systems_info.h/.cc This file just wraps those
calls. See KeySystemNameForUMAGeneric, for example.

[qinmin, 2013/06/20 17:41:53]

Done.

+namespace {
+
+// TODO(qinmin): add UUIDs for other key systems.

[ddorwin, 2013/06/20 03:07:27]

#ifdef all the new code to Android

[qinmin, 2013/06/20 17:41:53]

Done.

+const uint8 kWideVineUUID[] = {

[ddorwin, 2013/06/20 03:07:27]

nit: media code uses static instead of unnamed namespaces. See below. Put this
with the local method.

[qinmin, 2013/06/20 17:41:53]

Done.

+  0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
+  0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED,

[xhwang, 2013/06/20 04:02:08]

nit: drop the last comma.

[qinmin, 2013/06/20 17:41:53]

Done.

+};
+
+}  // namespace
+
 namespace webkit_media {
 
 // Convert a WebString to ASCII, falling back on an empty string in the case
 // of a non-ASCII string.
 static std::string ToASCIIOrEmpty(const WebKit::WebString& string) {
   return IsStringASCII(string) ? UTF16ToASCII(string) : std::string();
 }
 
 class KeySystems {
  public:
@@ skipping 126 matching lines @@
 std::string GetPepperType(const std::string& key_system) {
   for (int i = 0; i < kNumKeySystemToPepperTypeMapping; ++i) {
     if (kKeySystemToPepperTypeMapping[i].key_system == key_system)
       return kKeySystemToPepperTypeMapping[i].type;
   }
 
   return std::string();
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
+std::vector<uint8> ConvertKeySystemToAndroidUUID(

[ddorwin, 2013/06/20 03:07:27]

nit: Updating my previous suggesetion, GetAndroidUUIDForKeySystem might be
better.

[xhwang, 2013/06/20 04:02:08]

I wonder whats' the extent of this UUID? Is this only used for PSSH as the
System ID, or is it a general UUID for a given key_system that could possibly be
used in other containers/streams? Why we limit it to Android? If it's general,
how about just name it as GetUUID(key_system), which is consistent with
GetPepperType() above?

[ddorwin, 2013/06/20 04:12:44]

Good point about GetPepperType(). I'm fine with GetUUID(). I still think it
should be #ifdef'd,though, like GetPepperType().

As I understand it, UUID is used to select the DRM system in the Android API.
The IDs *happen* to match the PS ID in CENC PSSHes. But, those are not used in
the Chromium code for anything except on Android.

[qinmin, 2013/06/20 17:41:53]

Done.

+    const std::string& key_system) {
+  std::vector<uint8> uuid;
+  if (key_system == "com.widevine.alpha")

[ddorwin, 2013/06/20 03:07:27]

There is a constant for this in the _info file.

[qinmin, 2013/06/20 17:41:53]

Seems that I need defined(WIDEVINE_CDM_AVAILABLE) in order to use
kWidevineKeySystem. Not sure whether this is needed for android though, is that
needed for all the builds that supports widevine?

On 2013/06/20 03:07:27, ddorwin wrote:

[ddorwin, 2013/06/20 22:20:15]

Yes. That currently does two things for non-Pepper CDM platforms:
 1) Enable content_browsertests
 2) Enable canPlayType() responses.
But there are some caveats. Most importantly, we shouldn't do that until
everything is working because it enables tests that will fail and lies about
support to applications.

+    uuid.assign(kWideVineUUID, kWideVineUUID + 16);
+  else
+    LOG(ERROR) << "Unrecognized key system: " << key_system;
+  return uuid;
+}
+
 }  // namespace webkit_media