#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 "components/cdm/renderer/widevine_key_systems.h"
#include "content/public/renderer/render_thread.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
#include "base/version.h"
#endif
-#if defined(OS_ANDROID)
-#include "chrome/common/encrypted_media_messages_android.h"
-#endif
-
using content::KeySystemInfo;
-
-const char kAudioWebM[] = "audio/webm";
-const char kVideoWebM[] = "video/webm";
-const char kVorbis[] = "vorbis";
-const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
-
-#if defined(USE_PROPRIETARY_CODECS)
-const char kAudioMp4[] = "audio/mp4";
-const char kVideoMp4[] = "video/mp4";
-const char kMp4a[] = "mp4a";
-#if defined(WIDEVINE_CDM_AVAILABLE)
-const char kAvc1Avc3[] = "avc1,avc3";
-#endif // WIDEVINE_CDM_AVAILABLE
-const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3";
-#endif // defined(USE_PROPRIETARY_CODECS)
+using content::SupportedCodecs;
#if defined(ENABLE_PEPPER_CDMS)
static bool IsPepperCdmRegistered(
KeySystemInfo info(kExternalClearKeyKeySystem);
- info.supported_types.push_back(std::make_pair(kAudioWebM, kVorbis));
- info.supported_types.push_back(std::make_pair(kVideoWebM, kVorbisVP8));
+ info.supported_codecs = content::EME_CODEC_WEBM_ALL;
#if defined(USE_PROPRIETARY_CODECS)
- info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a));
- info.supported_types.push_back(std::make_pair(kVideoMp4, kMp4aAvc1Avc3));
+ info.supported_codecs |= content::EME_CODEC_MP4_ALL;
#endif // defined(USE_PROPRIETARY_CODECS)
+
info.pepper_type = kExternalClearKeyPepperType;
concrete_key_systems->push_back(info);
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
-};
-
-// Defines bitmask values used to specify supported codecs.
-// Each value represents a codec within a specific container.
-// The mask values are stored in a SupportedCodecs.
-typedef uint32 SupportedCodecs;
-enum SupportedCodecMasks {
- NO_CODECS = 0,
- WEBM_VP8_AND_VORBIS = 1 << 0,
-#if defined(USE_PROPRIETARY_CODECS)
- MP4_AAC = 1 << 1,
- MP4_AVC1 = 1 << 2,
- MP4_CODECS = (MP4_AAC | MP4_AVC1),
-#endif // defined(USE_PROPRIETARY_CODECS)
-};
-
-#if 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
-#else
-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();
- }
-
- 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_CODECS) {
- // MP4 container is supported for audio and video if any codec is supported.
- bool is_aac_supported = (supported_codecs & MP4_AAC) != NO_CODECS;
- bool is_avc1_supported = (supported_codecs & MP4_AVC1) != NO_CODECS;
- const char* video_codecs = is_avc1_supported ?
- (is_aac_supported ? kMp4aAvc1Avc3 : kAvc1Avc3) :
- "";
- const char* audio_codecs = is_aac_supported ? kMp4a : "";
-
- info.supported_types.push_back(std::make_pair(kAudioMp4, audio_codecs));
- 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;
-#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(
+void GetSupportedCodecsForPepperCdm(
const std::vector<base::string16>& additional_param_names,
const std::vector<base::string16>& additional_param_values,
std::vector<std::string>* codecs) {
}
std::vector<std::string> codecs;
- GetSupportedCodecs(additional_param_names, additional_param_values, &codecs);
+ GetSupportedCodecsForPepperCdm(additional_param_names,
+ additional_param_values,
+ &codecs);
- SupportedCodecs supported_codecs = NO_CODECS;
+ SupportedCodecs supported_codecs = content::EME_CODEC_NONE;
for (size_t i = 0; i < codecs.size(); ++i) {
- // TODO(ddorwin): Break up VP8 and Vorbis. For now, "vp8" implies both.
+ if (codecs[i] == kCdmSupportedCodecVorbis)
+ supported_codecs |= content::EME_CODEC_WEBM_VORBIS;
if (codecs[i] == kCdmSupportedCodecVp8)
- supported_codecs |= WEBM_VP8_AND_VORBIS;
+ supported_codecs |= content::EME_CODEC_WEBM_VP8;
+ if (codecs[i] == kCdmSupportedCodecVp9)
+ supported_codecs |= content::EME_CODEC_WEBM_VP9;
#if defined(USE_PROPRIETARY_CODECS)
if (codecs[i] == kCdmSupportedCodecAac)
- supported_codecs |= MP4_AAC;
+ supported_codecs |= content::EME_CODEC_MP4_AAC;
if (codecs[i] == kCdmSupportedCodecAvc1)
- supported_codecs |= MP4_AVC1;
+ 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);
+ cdm::AddWidevineWithCodecs(cdm::WIDEVINE,
+ 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;
-#if defined(USE_PROPRIETARY_CODECS)
- 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";
- if (response.compositing_codecs != android::NO_SUPPORTED_CODECS) {
- AddWidevineWithCodecs(
- WIDEVINE,
- static_cast<SupportedCodecs>(response.compositing_codecs),
- concrete_key_systems);
- }
-
- if (response.non_compositing_codecs != android::NO_SUPPORTED_CODECS) {
- AddWidevineWithCodecs(
- WIDEVINE_HR_NON_COMPOSITING,
- static_cast<SupportedCodecs>(response.non_compositing_codecs),
- concrete_key_systems);
- }
-}
-#endif // defined(ENABLE_PEPPER_CDMS)
#endif // defined(WIDEVINE_CDM_AVAILABLE)
+#endif // defined(ENABLE_PEPPER_CDMS)
void AddChromeKeySystems(std::vector<KeySystemInfo>* 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
+#endif // defined(WIDEVINE_CDM_AVAILABLE)
+#endif // defined(ENABLE_PEPPER_CDMS)
+
+#if defined(OS_ANDROID)
+ cdm::AddAndroidWidevine(key_systems_info);
+#endif // defined(OS_ANDROID)
}
projects / platform / framework / web / crosswalk.git / blobdiff