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 <string>
 
 #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 61 matching lines @@
   WEBM_VP8_AND_VORBIS = 1 << 0,
 #if defined(USE_PROPRIETARY_CODECS)
   MP4_AAC = 1 << 1,
   MP4_AVC1 = 1 << 2,
 #endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
 enum WidevineCdmType {
   WIDEVINE,
   WIDEVINE_HR,
+  WIDEVINE_HRSURFACE,
 };
 
+#if !defined(OS_ANDROID)
 static bool IsWidevineHrSupported() {
   // TODO(jrummell): Need to call CheckPlatformState() but it is
   // asynchronous, and needs to be done in the browser.
   return false;
 }
+#endif
 
 // Return |name|'s parent key system.
 static std::string GetDirectParentName(std::string name) {
   int last_period = name.find_last_of('.');
   DCHECK_GT(last_period, 0);
   return name.substr(0, last_period);
 }
 
+#if defined(OS_ANDROID)

[ddorwin, 2013/09/18 23:48:07]

These should be up with the enum after the rebase. Maybe move the CdmType enum
to be first then put these before 110. You can also make 110 #else.

[qinmin, 2013/09/19 00:02:55]

Done.

+#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
+
+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(
     WidevineCdmType widevine_cdm_type,
     SupportedCodecs supported_codecs,
     std::vector<KeySystemInfo>* concrete_key_systems) {
 
   KeySystemInfo info(kWidevineKeySystem);
 
   switch (widevine_cdm_type) {
     case WIDEVINE:
       // For standard Widevine, add parent name.
       info.parent_key_system = GetDirectParentName(kWidevineKeySystem);
       break;
     case WIDEVINE_HR:
       info.key_system.append(".hr");
       break;
+    case WIDEVINE_HRSURFACE:
+      info.key_system.append(".hrsurface");
+      break;
     default:
       NOTREACHED();
   }
 
   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)
     info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a));
 
   if (supported_codecs & MP4_AVC1) {
     const char* video_codecs = (supported_codecs & MP4_AAC) ? kMp4aAvc1 : kAvc1;
     info.supported_types.push_back(std::make_pair(kVideoMp4, video_codecs));
   }
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)
   info.pepper_type = kWidevineCdmPluginMimeType;
 #elif defined(OS_ANDROID)
-  static const uint8 kWidevineUuid[16] = {
-      0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
-      0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
   info.uuid.assign(kWidevineUuid, kWidevineUuid + arraysize(kWidevineUuid));
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
   concrete_key_systems->push_back(info);
 }
 
 #if defined(ENABLE_PEPPER_CDMS)
 // Supported types are determined at compile time.
 static void AddPepperBasedWidevine(
     std::vector<KeySystemInfo>* concrete_key_systems) {
@@ skipping 21 matching lines @@
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
   AddWidevineWithCodecs(WIDEVINE, supported_codecs, concrete_key_systems);
 
   if (IsWidevineHrSupported())
     AddWidevineWithCodecs(WIDEVINE_HR, supported_codecs, concrete_key_systems);
 }
 #elif defined(OS_ANDROID)
 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)
-  SupportedCodecs supported_codecs =
-      static_cast<SupportedCodecs>(MP4_AAC | MP4_AVC1);
-  AddWidevineWithCodecs(WIDEVINE, supported_codecs, concrete_key_systems);
+  request.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));
+  DCHECK_EQ(response.compositing_codecs >> 3, 0) << "unrecognized codec";
+  DCHECK_EQ(response.non_compositing_codecs >> 3, 0) << "unrecognized codec";
+  AddWidevineWithCodecs(

[ddorwin, 2013/09/18 23:48:07]

might not matter in practice, but we should only add if the codec lists are
non-empty.

[qinmin, 2013/09/19 00:02:55]

Added a if statement here to check if the returned list is empty.

On 2013/09/18 23:48:07, ddorwin wrote:

+      WIDEVINE,
+      static_cast<SupportedCodecs>(response.compositing_codecs),
+      concrete_key_systems);
 
-  if (IsWidevineHrSupported())
-    AddWidevineWithCodecs(WIDEVINE_HR, supported_codecs, concrete_key_systems);
-#endif  // defined(USE_PROPRIETARY_CODECS)
+  AddWidevineWithCodecs(
+      WIDEVINE_HRSURFACE,
+      static_cast<SupportedCodecs>(response.non_compositing_codecs),
+      concrete_key_systems);
 }
 #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
 }