Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

chromecast/renderer/key_systems_cast.cc

Index: chromecast/renderer/key_systems_cast.cc
diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc
index 919ebbe802889ccc3e1006fa18f81aeaf12eb94c..6ffb99f7cad80f6310437bb87665f127491f9c44 100644
--- a/chromecast/renderer/key_systems_cast.cc
+++ b/chromecast/renderer/key_systems_cast.cc
@@ -17,25 +17,31 @@
 namespace chromecast {
 namespace shell {
 
-void AddKeySystemWithCodecs(
-    const std::string& key_system_name,
-    std::vector< ::media::KeySystemInfo>* concrete_key_systems) {
-  ::media::KeySystemInfo info(key_system_name);
-  info.supported_codecs = ::media::EME_CODEC_MP4_ALL;
-  concrete_key_systems->push_back(info);
-}
-
 void AddChromecastKeySystems(
-    std::vector< ::media::KeySystemInfo>* key_systems_info) {
+    std::vector<::media::KeySystemInfo>* key_systems_info) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
-  AddWidevineWithCodecs(cdm::WIDEVINE,
-                        ::media::EME_CODEC_MP4_ALL,
-                        key_systems_info);
+  AddWidevineWithCodecs(
+      cdm::WIDEVINE,
+      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1,
+      ::media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent license.
+      ::media::EME_SESSION_TYPE_NOT_SUPPORTED,  // Persistent release message.
+      ::media::EME_FEATURE_NOT_SUPPORTED,       // Persistent state.
+      ::media::EME_FEATURE_ALWAYS_ENABLED,      // Distinctive identifier.
+      key_systems_info);
 #endif
 
 #if defined(PLAYREADY_CDM_AVAILABLE)
-  AddKeySystemWithCodecs(media::kChromecastPlayreadyKeySystem,
-                         key_systems_info);
+  ::media::KeySystemInfo info;
+  info.key_system = ::media::kChromecastPlayreadyKeySystem;
+  info.supported_codecs =
+      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
+  info.supported_init_data_types = ::media::EME_INIT_DATA_TYPE_NONE;

[ddorwin, 2015/02/19 23:03:57]

CENC

[sandersd (OOO until July 31), 2015/02/20 00:17:12]

Done.

+  info.persistent_license_support = ::media::EME_SESSION_TYPE_NOT_SUPPORTED;
+  info.persistent_release_message_support =
+      ::media::EME_SESSION_TYPE_NOT_SUPPORTED;
+  info.persistent_state_support = ::media::EME_FEATURE_NOT_SUPPORTED;

[ddorwin, 2015/02/19 23:03:57]

I don't know what the correct answer. We should probably use "worst case" like
we do for Android platform. Thus, ALWAYS_ENABLED, right?

[sandersd (OOO until July 31), 2015/02/20 00:17:12]

Done.

I was hoping lcwu@ would comment on this.

[ddorwin, 2015/02/20 00:49:07]

Since we don't control the implementation, I don't think we'll ever have
confidence. Perhaps we need a "can't be sure" value that causes us to reject
anything other than "optional". Perhaps in a follow-on CL.

[sandersd (OOO until July 31), 2015/02/20 01:25:35]

Acknowledged.

+  info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED;
+  key_systems_info->push_back(info);
 #endif
 }