Populate canPlayType to renderer

chrome/renderer/media/chrome_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 "chrome/renderer/media/chrome_key_systems.h"
 
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/renderer/render_thread.h"
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
 // The following must be after widevine_cdm_version.h.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
 #include <gnu/libc-version.h>
 #include "base/version.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/common/encrypted_media_messages_android.h"
+#endif
+
 using content::KeySystemInfo;
 
 static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
 
 static const char kAudioWebM[] = "audio/webm";
 static const char kVideoWebM[] = "video/webm";
 static const char kVorbis[] = "vorbis";
 static const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
 
 static const char kAudioMp4[] = "audio/mp4";
@@ skipping 58 matching lines @@
 // Defines bitmask values used to specify supported codecs.
 // Each value represents a codec within a specific container.
 enum SupportedCodecs {
   WEBM_VP8_AND_VORBIS = 1 << 0,
 #if defined(USE_PROPRIETARY_CODECS)
   MP4_AAC = 1 << 1,
   MP4_AVC1 = 1 << 2,
 #endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
+#if defined(OS_ANDROID)
+static const uint8 kWidevineUuid[16] = {
+    0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
+    0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
+#endif
+
 static void AddWidevineWithCodecs(
     SupportedCodecs supported_codecs,
     std::vector<KeySystemInfo>* concrete_key_systems) {
   static const char kWidevineParentKeySystem[] = "com.widevine";
-#if defined(OS_ANDROID)
-  static const uint8 kWidevineUuid[16] = {
-      0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
-      0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
-#endif
 
   KeySystemInfo info(kWidevineKeySystem);
 
   if (supported_codecs & WEBM_VP8_AND_VORBIS) {
     info.supported_types.push_back(std::make_pair(kAudioWebM, kVorbis));
     info.supported_types.push_back(std::make_pair(kVideoWebM, kVorbisVP8));
   }
 
 #if defined(USE_PROPRIETARY_CODECS)
   if (supported_codecs & MP4_AAC)
@@ skipping 39 matching lines @@
   supported_codecs = static_cast<SupportedCodecs>(supported_codecs | MP4_AAC);
 #endif
 #if defined(WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE)
   supported_codecs = static_cast<SupportedCodecs>(supported_codecs | MP4_AVC1);
 #endif
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
   AddWidevineWithCodecs(supported_codecs, concrete_key_systems);
 }
 #elif defined(OS_ANDROID)
+
+#define COMPILE_ASSERT_MATCHING_ENUM(name) \
+  COMPILE_ASSERT(static_cast<int>(name) == \
+                 static_cast<int>(android::name), \
+                 mismatching_enums)
+COMPILE_ASSERT_MATCHING_ENUM(WEBM_VP8_AND_VORBIS);
+COMPILE_ASSERT_MATCHING_ENUM(MP4_AAC);
+COMPILE_ASSERT_MATCHING_ENUM(MP4_AVC1);
+#undef COMPILE_ASSERT_MATCHING_ENUM

[xhwang, 2013/09/18 07:10:57]

So there's no way to only define those enum in one place?

[qinmin, 2013/09/18 17:19:59]

Ya, i agree this is not satisfactory. We have these enums also in GTV code.
May need to reconsider how to move these enums, but that may come with a later
patch though
On 2013/09/18 07:10:57, xhwang wrote:

+
 static void AddAndroidWidevine(
     std::vector<KeySystemInfo>* concrete_key_systems) {
+  android::SupportedKeySystemRequest request;
+  android::SupportedKeySystemResponse response;
+
+  request.uuid.insert(request.uuid.begin(), kWidevineUuid,
+                      kWidevineUuid + arraysize(kWidevineUuid));
 #if defined(USE_PROPRIETARY_CODECS)
+  request.requested_codecs =
+      static_cast<android::SupportedCodecs>(
+          android::MP4_AAC | android::MP4_AVC1);
+#endif  // defined(USE_PROPRIETARY_CODECS)
+  content::RenderThread::Get()->Send(
+      new ChromeViewHostMsg_GetSupportedKeySystems(
+          request, &response));

[xhwang, 2013/09/18 07:10:57]

fit in one line?

[qinmin, 2013/09/18 17:19:59]

Done.

+  // TODO(qinmin): Use different key system types for compositing and
+  // non-compositing codecs. Need to ignore the extra bit masks defined in
+  // android if that happens.
   SupportedCodecs supported_codecs =
-      static_cast<SupportedCodecs>(MP4_AAC | MP4_AVC1);
+      static_cast<SupportedCodecs>(
+          response.compositing_codecs | response.non_compositing_codecs);
   AddWidevineWithCodecs(supported_codecs, concrete_key_systems);
-#endif  // defined(USE_PROPRIETARY_CODECS)
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
   AddClearKey(key_systems_info);
 
 #if defined(ENABLE_PEPPER_CDMS)
   AddExternalClearKey(key_systems_info);
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }