| Index: components/cdm/renderer/widevine_key_systems.cc
|
| diff --git a/components/cdm/renderer/widevine_key_systems.cc b/components/cdm/renderer/widevine_key_systems.cc
|
| index f803e8e3fefffaa3b3715e2c7665b1df08dfc86f..037df1b50c3a6baf3f90a19706fde2d3b0538b74 100644
|
| --- a/components/cdm/renderer/widevine_key_systems.cc
|
| +++ b/components/cdm/renderer/widevine_key_systems.cc
|
| @@ -26,10 +26,16 @@ static std::string GetDirectParentName(std::string name) {
|
| return name.substr(0u, last_period);
|
| }
|
|
|
| -void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type,
|
| - SupportedCodecs supported_codecs,
|
| - std::vector<KeySystemInfo>* concrete_key_systems) {
|
| - KeySystemInfo info(kWidevineKeySystem);
|
| +void AddWidevineWithCodecs(
|
| + WidevineCdmType widevine_cdm_type,
|
| + SupportedCodecs supported_codecs,
|
| + media::EmeSessionTypeSupport persistent_license_support,
|
| + media::EmeSessionTypeSupport persistent_release_message_support,
|
| + media::EmeFeatureSupport persistent_state_support,
|
| + media::EmeFeatureSupport distinctive_identifier_support,
|
| + std::vector<KeySystemInfo>* concrete_key_systems) {
|
| + KeySystemInfo info;
|
| + info.key_system = kWidevineKeySystem;
|
|
|
| switch (widevine_cdm_type) {
|
| case WIDEVINE:
|
| @@ -60,6 +66,11 @@ void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type,
|
| info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
|
| #endif // defined(USE_PROPRIETARY_CODECS)
|
|
|
| + info.persistent_license_support = persistent_license_support;
|
| + info.persistent_release_message_support = persistent_release_message_support;
|
| + info.persistent_state_support = persistent_state_support;
|
| + info.distinctive_identifier_support = distinctive_identifier_support;
|
| +
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| info.pepper_type = kWidevineCdmPluginMimeType;
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|