Chromium Code Reviews| 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..68eaeff80019b0a6b7c12e574505d12113dc5b20 100644 |
| --- a/components/cdm/renderer/widevine_key_systems.cc |
| +++ b/components/cdm/renderer/widevine_key_systems.cc |
| @@ -60,6 +60,27 @@ void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type, |
| info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; |
| #endif // defined(USE_PROPRIETARY_CODECS) |
| +#if defined(OS_ANDROID) |
| + info.persistent_state_requirement = media::EME_REQUIREMENT_NOT_ALLOWED; |
| + info.distinctive_identifier_requirement = media::EME_REQUIREMENT_REQUIRED; |
| + info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY; |
| +#elif defined(OS_CHROMEOS) |
| + info.persistent_state_requirement = media::EME_REQUIREMENT_OPTIONAL; |
| + // A distinctive identifier will be available if remote attestation succeeds. |
| + // TODO(sandersd): Change to optional once CDM8 adds the ability to block |
|
ddorwin
2015/02/17 20:56:47
Add a bug reference.
Also, it may be helpful to e
sandersd (OOO until July 31)
2015/02/18 23:41:17
Done.
|
| + // access to the distinctive identifier based on the configuration (not just |
| + // based on the permission). |
| + info.distinctive_identifier_requirement = media::EME_REQUIREMENT_REQUIRED; |
| + // Persistent licenses will be available if remote attestation succeeds. |
| + // TODO(sandersd): Add PERSISTENT_LICENSE once there is logic to predict if |
|
ddorwin
2015/02/17 20:56:47
Would it help to have PERSISTENT_LICENSE_WITH_AUTH
sandersd (OOO until July 31)
2015/02/18 23:41:17
Done.
This isn't a perfect definition, since what
|
| + // remote attestation will succeed. |
| + info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY; |
| +#else |
|
ddorwin
2015/02/17 20:56:46
This is Windows, Mac, Linux desktop, Cast, and eve
sandersd (OOO until July 31)
2015/02/18 23:41:17
Done.
|
| + info.persistent_state_requirement = media::EME_REQUIREMENT_OPTIONAL; |
| + info.distinctive_identifier_requirement = media::EME_REQUIREMENT_NOT_ALLOWED; |
| + info.supported_session_types = media::EME_SESSION_TYPE_TEMPORARY; |
| +#endif |
| + |
| #if defined(ENABLE_PEPPER_CDMS) |
| info.pepper_type = kWidevineCdmPluginMimeType; |
| #endif // defined(ENABLE_PEPPER_CDMS) |