Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess().

chromecast/renderer/key_systems_cast.cc

 // Copyright 2014 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 "chromecast/renderer/key_systems_cast.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chromecast/media/base/key_systems_common.h"
 #include "components/cdm/renderer/widevine_key_systems.h"
 #include "media/base/eme_constants.h"
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
 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,

[lcwu1, 2015/02/20 02:06:28]

Why not just use ::media::EME_CODEC_MP4_ALL as was done before?

[sandersd (OOO until July 31), 2015/02/20 02:07:49]

As per eme_constants.h:

  // *_ALL values should only be used for masking, do not use them to specify
  // codec support because they may be extended to include more codecs.

+      ::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;

[lcwu1, 2015/02/20 02:06:28]

Ditto.

[sandersd (OOO until July 31), 2015/02/20 02:07:49]

Acknowledged.

+  info.supported_init_data_types = ::media::EME_INIT_DATA_TYPE_CENC;
+  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_ALWAYS_ENABLED;
+  info.distinctive_identifier_support = ::media::EME_FEATURE_ALWAYS_ENABLED;
+  key_systems_info->push_back(info);
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast