Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / cdm / renderer / android_key_systems.cc

diff --git a/src/components/cdm/renderer/android_key_systems.cc b/src/components/cdm/renderer/android_key_systems.cc
index 99bc2bb..83a0d04 100644 (file)
--- a/src/components/cdm/renderer/android_key_systems.cc
+++ b/src/components/cdm/renderer/android_key_systems.cc
@@ -11,11 +11,12 @@
 #include "components/cdm/common/cdm_messages_android.h"
 #include "components/cdm/renderer/widevine_key_systems.h"
 #include "content/public/renderer/render_thread.h"
+#include "media/base/eme_constants.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
-using content::KeySystemInfo;
-using content::SupportedCodecs;
+using media::KeySystemInfo;
+using media::SupportedCodecs;
 
 namespace cdm {
 
@@ -25,12 +26,12 @@ static SupportedKeySystemResponse QueryKeySystemSupport(
   SupportedKeySystemResponse response;
 
   request.key_system = key_system;
-  request.codecs = content::EME_CODEC_ALL;
+  request.codecs = media::EME_CODEC_ALL;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_QueryKeySystemSupport(request, &response));
-  DCHECK(!(response.compositing_codecs & ~content::EME_CODEC_ALL))
+  DCHECK(!(response.compositing_codecs & ~media::EME_CODEC_ALL))
       << "unrecognized codec";
-  DCHECK(!(response.non_compositing_codecs & ~content::EME_CODEC_ALL))
+  DCHECK(!(response.non_compositing_codecs & ~media::EME_CODEC_ALL))
       << "unrecognized codec";
   return response;
 }
@@ -38,14 +39,14 @@ static SupportedKeySystemResponse QueryKeySystemSupport(
 void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemResponse response = QueryKeySystemSupport(
       kWidevineKeySystem);
-  if (response.compositing_codecs != content::EME_CODEC_NONE) {
+  if (response.compositing_codecs != media::EME_CODEC_NONE) {
     AddWidevineWithCodecs(
         WIDEVINE,
         static_cast<SupportedCodecs>(response.compositing_codecs),
         concrete_key_systems);
   }
 
-  if (response.non_compositing_codecs != content::EME_CODEC_NONE) {
+  if (response.non_compositing_codecs != media::EME_CODEC_NONE) {
     AddWidevineWithCodecs(
         WIDEVINE_HR_NON_COMPOSITING,
         static_cast<SupportedCodecs>(response.non_compositing_codecs),
@@ -62,9 +63,18 @@ void AddAndroidPlatformKeySystems(
   for (std::vector<std::string>::const_iterator it = key_system_names.begin();
        it != key_system_names.end(); ++it) {
     SupportedKeySystemResponse response = QueryKeySystemSupport(*it);
-    if (response.compositing_codecs != content::EME_CODEC_NONE) {
+    if (response.compositing_codecs != media::EME_CODEC_NONE) {
       KeySystemInfo info(*it);
       info.supported_codecs = response.compositing_codecs;
+      // Here we assume that support for a container implies support for the
+      // associated initialization data type. KeySystems handles validating
+      // |init_data_type| x |container| pairings.
+      if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL)
+        info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM;
+#if defined(USE_PROPRIETARY_CODECS)
+      if (response.compositing_codecs & media::EME_CODEC_MP4_ALL)
+        info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
+#endif  // defined(USE_PROPRIETARY_CODECS)
       concrete_key_systems->push_back(info);
     }
   }