Componentize EncryptedMediaMessageFilter and rename it CdmMessageFilter.

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 <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.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"
+#include "components/cdm/renderer/widevine_key_systems.h"
 #endif
 
 using content::KeySystemInfo;
 using content::SupportedCodecs;
 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmRegistered(
     const std::string& pepper_type,
     std::vector<base::string16>* additional_param_names,
     std::vector<base::string16>* additional_param_values) {
@@ skipping 54 matching lines @@
   // A key system that Chrome thinks is supported by ClearKeyCdm, but actually
   // will be refused by ClearKeyCdm. This is to test the CDM initialization
   // failure case.
   info.key_system = kExternalClearKeyInitializeFailKeySystem;
   concrete_key_systems->push_back(info);
 
   // A key system that triggers a crash in ClearKeyCdm.
   info.key_system = kExternalClearKeyCrashKeySystem;
   concrete_key_systems->push_back(info);
 }
-#endif  // defined(ENABLE_PEPPER_CDMS)
-
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
-enum WidevineCdmType {
-  WIDEVINE,
-  WIDEVINE_HR,
-#if defined(OS_ANDROID)
-  WIDEVINE_HR_NON_COMPOSITING,
-#endif
-};
-
-#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);
 }
 
 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;
-#if defined(OS_ANDROID)
-    case WIDEVINE_HR_NON_COMPOSITING:
-      info.key_system.append(".hrnoncompositing");
-      break;
-#endif
-    default:
-      NOTREACHED();
-  }
+  // For standard Widevine, add parent name.
+  info.parent_key_system = GetDirectParentName(kWidevineKeySystem);
 
   // TODO(xhwang): A container or an initDataType may be supported even though
   // there are no codecs supported in that container. Fix this when we support
   // initDataType.
   info.supported_codecs = supported_codecs;
 
-#if defined(ENABLE_PEPPER_CDMS)
   info.pepper_type = kWidevineCdmPluginMimeType;
-#endif  // defined(ENABLE_PEPPER_CDMS)
 
   concrete_key_systems->push_back(info);
 }
 
-#if defined(ENABLE_PEPPER_CDMS)
 // When the adapter is registered, a name-value pair is inserted in
 // additional_param_* that lists the supported codecs. The name is "codecs" and
 // the value is a comma-delimited list of codecs.
 // This function finds "codecs" and parses the value into the vector |codecs|.
 // Converts the codec strings to UTF-8 since we only expect ASCII strings and
 // this simplifies the rest of the code in this file.
 void GetSupportedCodecs(

[ddorwin, 2014/05/02 17:58:55]

Improvement: We should rename this to GetSupportedCodecsForPepperBasedCdm() or
something like that so it's clear what it does.

[ycheo (away), 2014/05/05 10:15:08]

Done.
Renamed it to GetSupportedCodecsForPepperCdm()

     const std::vector<base::string16>& additional_param_names,
     const std::vector<base::string16>& additional_param_values,
     std::vector<std::string>* codecs) {
   DCHECK(codecs->empty());
   DCHECK_EQ(additional_param_names.size(), additional_param_values.size());
   for (size_t i = 0; i < additional_param_names.size(); ++i) {
     if (additional_param_names[i] ==
         base::ASCIIToUTF16(kCdmSupportedCodecsParamName)) {
       const base::string16& codecs_string16 = additional_param_values[i];
       std::string codecs_string;
@@ skipping 42 matching lines @@
       supported_codecs |= content::EME_CODEC_WEBM_VP9;
 #if defined(USE_PROPRIETARY_CODECS)
     if (codecs[i] == kCdmSupportedCodecAac)
       supported_codecs |= content::EME_CODEC_MP4_AAC;
     if (codecs[i] == kCdmSupportedCodecAvc1)
       supported_codecs |= content::EME_CODEC_MP4_AVC1;
 #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) {
-  SupportedKeySystemRequest request;
-  SupportedKeySystemResponse response;
-
-  request.key_system = kWidevineKeySystem;
-  request.codecs = content::EME_CODEC_WEBM_ALL | content::EME_CODEC_MP4_ALL;
-  content::RenderThread::Get()->Send(
-      new ChromeViewHostMsg_GetSupportedKeySystems(request, &response));
-  DCHECK(response.compositing_codecs & content::EME_CODEC_ALL)
-      << "unrecognized codec";
-  DCHECK(response.non_compositing_codecs & content::EME_CODEC_ALL)
-      << "unrecognized codec";
-  if (response.compositing_codecs != content::EME_CODEC_NONE) {
-    AddWidevineWithCodecs(
-        WIDEVINE,
-        static_cast<SupportedCodecs>(response.compositing_codecs),
-        concrete_key_systems);
-  }
-
-  if (response.non_compositing_codecs != content::EME_CODEC_NONE) {
-    AddWidevineWithCodecs(
-        WIDEVINE_HR_NON_COMPOSITING,
-        static_cast<SupportedCodecs>(response.non_compositing_codecs),
-        concrete_key_systems);
-  }
-}
+#endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
-#endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
 #if defined(ENABLE_PEPPER_CDMS)

[ddorwin, 2014/05/02 17:58:55]

I wonder if we should move the ifdef logic to the individual functions. Then
this function would just be:

  AddExternalClearKey(key_systems_info);

#if defined(WIDEVINE_CDM_AVAILABLE)
  AddWidevine(key_systems_info);
#endif

[ycheo (away), 2014/05/05 10:15:08]

Done.

   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);
+  cdm::AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }