Implement robustness strings in requestMediaKeySystemAccess().

components/cdm/renderer/android_key_systems.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 "components/cdm/renderer/android_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 21 matching lines @@
   DCHECK(!(response.compositing_codecs & ~media::EME_CODEC_ALL))
       << "unrecognized codec";
   DCHECK(!(response.non_compositing_codecs & ~media::EME_CODEC_ALL))
       << "unrecognized codec";
   return response;
 }
 
 void AddAndroidWidevine(std::vector<KeySystemInfo>* concrete_key_systems) {
   SupportedKeySystemResponse response = QueryKeySystemSupport(
       kWidevineKeySystem);
-  if (response.compositing_codecs != media::EME_CODEC_NONE) {
+
+  // When creating the WIDEVINE key system, BrowserCdmFactoryAndroid configures
+  // the CDM's security level based on the --mediadrm-enable-non-compositing
+  // flag (L1 if the flag is enabled, L3 otherwise). Therefore the supported
+  // codec/robustenss combinations depend on that flag.
+  // TODO(sandersd): For unprefixed, set the security level based on the
+  // requested robustness instead of the flag. http://crbug.com/459400

[ddorwin, 2015/03/16 23:25:08]

That's probably not exactly this bug.

[sandersd (OOO until July 31), 2015/03/17 22:10:38]

Done.

+  SupportedCodecs codecs = response.compositing_codecs;
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[ddorwin, 2015/03/16 23:25:08]

My point was that we might want to use
if (response.non_compositing_codecs != media::EME_CODEC_NONE)
instead so that the switch only controls one location and everything else is
based on the results.

[sandersd (OOO until July 31), 2015/03/17 22:10:38]

Unfortunately the com.widevine.alpha key system may operate in L1 mode (based on
the flag), and the flag does not affect the list of supported codecs. The
implementation I have matches what a user will actually get if they request the
named key systems.

[ddorwin, 2015/03/18 01:08:04]

Oh. :( Thanks.

+          switches::kMediaDrmEnableNonCompositing)) {
+    codecs = response.non_compositing_codecs;
+  }
+  if (codecs != media::EME_CODEC_NONE) {
     AddWidevineWithCodecs(
         WIDEVINE,
-        static_cast<SupportedCodecs>(response.compositing_codecs),
+        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.
         concrete_key_systems);
   }
 
+  // For compatibility with the prefixed API, register a separate L1 key system.
+  // When creating the WIDEVINE_HR_NON_COMPOSITING key system,
+  // BrowserCdmFactoryAndroid does not configure the CDM's security level (that
+  // is, leaves it as L1); therefore only secure codecs are supported.
+  // TODO(ddorwin): Remove with unprefixed. http://crbug.com/249976
   if (response.non_compositing_codecs != media::EME_CODEC_NONE) {
-    // TODO(ddorwin): Remove with unprefixed. http://crbug.com/249976
     AddWidevineWithCodecs(
         WIDEVINE_HR_NON_COMPOSITING,
-        static_cast<SupportedCodecs>(response.non_compositing_codecs),
+        response.non_compositing_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.
         concrete_key_systems);
   }
 }
 
 void AddAndroidPlatformKeySystems(
     std::vector<KeySystemInfo>* concrete_key_systems) {
@@ skipping 22 matching lines @@
       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;
       concrete_key_systems->push_back(info);
     }
   }
 }
 
 }  // namespace cdm