Support Android secure codecs in requestMediaKeySystemAccess().

media/base/eme_constants.h

 // 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.
 
 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
 #define MEDIA_BASE_EME_CONSTANTS_H_
 
 #include <stdint.h>
 
 namespace media {
 
 // Defines values that specify registered Initialization Data Types used
 // in Encrypted Media Extensions (EME).
 // http://w3c.github.io/encrypted-media/initdata-format-registry.html#registry
 // The mask values are stored in a InitDataTypeMask.
 enum class EmeInitDataType {
   UNKNOWN,
   WEBM,
   CENC,
   KEYIDS
 };
 
 typedef uint32_t InitDataTypeMask;
 const InitDataTypeMask kInitDataTypeMaskNone = 0;

[ddorwin, 2015/04/30 18:18:04]

We should eventually be consistent in how we define masks (or stop using them).
:)

[sandersd (OOO until July 31), 2015/04/30 19:57:44]

Acknowledged.

 const InitDataTypeMask kInitDataTypeMaskWebM = 1 << 0;
 const InitDataTypeMask kInitDataTypeMaskCenc = 1 << 1;
 const InitDataTypeMask kInitDataTypeMaskKeyIds = 1 << 2;
 
 // Defines bitmask values that specify codecs used in Encrypted Media Extension
 // (EME). Each value represents a codec within a specific container.
 // The mask values are stored in a SupportedCodecs.
 enum EmeCodec {
   // *_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.
@@ skipping 87 matching lines @@
   // The configuration option is supported, but the user experience may be
   // improved if a distinctive identifier is available.
   IDENTIFIER_RECOMMENDED,
   // The configuration option prevents use of persistent state.
   PERSISTENCE_NOT_ALLOWED,
   // The configuration option is supported if persistent state is available.
   PERSISTENCE_REQUIRED,
   // The configuration option is supported if both a distinctive identifier and
   // persistent state are available.
   IDENTIFIER_AND_PERSISTENCE_REQUIRED,
+#if defined(OS_ANDROID)
+  // The configuration option is supported if hardware-secure codecs are not
+  // used.
+  SECURE_CODECS_NOT_ALLOWED,
+  // The configuration option is supported if hardware-secure codecs are used.
+  // In this mode only secure surfaces (hole-punching) will be functional.

[ddorwin, 2015/04/30 18:18:04]

This last sentence only applies to video.

[sandersd (OOO until July 31), 2015/04/30 19:57:44]

Done.

+  SECURE_CODECS_REQUIRED,
+#endif  // defined(OS_ANDROID)
   // The configuration option is supported without conditions.
   SUPPORTED,
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_EME_CONSTANTS_H_