Several updates to canPlayType() results for EME

webkit/media/crypto/key_systems.cc

 // Copyright (c) 2012 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 <map>
 
 #include "webkit/media/crypto/key_systems.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
   const char* mime_type;
   const char* codecs_list;
   const char* key_system;
 };
 
 struct KeySystemPluginTypePair {
   const char* key_system;
   const char* plugin_type;
 };
 
+// TODO(xhwang): Remove this and ifdefs after fixing http://crbug.com/123421.
+#define DECRYPT_ONLY_AUDIO_NOT_SUPPORTED
+
 // Specifies the container and codec combinations supported by individual
 // key systems. Each line is a container-codecs combination and the key system
 // that supports it. Multiple codecs can be listed. A trailing commas in
 // the |codecs_list| allows the container to be specified without a codec.
 // This list is converted at runtime into individual container-codec-key system
 // entries in KeySystems::key_system_map_.
 static const MediaFormatAndKeySystem
 supported_format_key_system_combinations[] = {
   // Clear Key.
+#if defined(DECRYPT_ONLY_AUDIO_NOT_SUPPORTED)
+  { "video/webm", "vp8,vp8.0,", kClearKeyKeySystem },
+#else
   { "video/webm", "vorbis,vp8,vp8.0,", kClearKeyKeySystem },
   { "audio/webm", "vorbis,", kClearKeyKeySystem },
+#endif
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+#if defined(DECRYPT_ONLY_AUDIO_NOT_SUPPORTED)
+  { "video/mp4", "avc1,", kClearKeyKeySystem },
+#else
   { "video/mp4", "avc1,mp4a,", kClearKeyKeySystem },
   { "audio/mp4", "mp4a,", kClearKeyKeySystem },
 #endif
+#endif
 
   // External Clear Key (used for testing).
   { "video/webm", "vorbis,vp8,vp8.0,", kExternalClearKeyKeySystem },
   { "audio/webm", "vorbis,", kExternalClearKeyKeySystem },
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
   { "video/mp4", "avc1,mp4a,", kExternalClearKeyKeySystem },
   { "audio/mp4", "mp4a,", kExternalClearKeyKeySystem },
 #endif
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   // Widevine.
   { "video/webm", "vorbis,vp8,vp8.0,", kWidevineKeySystem },
   { "audio/webm", "vorbis,", kWidevineKeySystem },
+  // TODO(ddorwin): Eliminate Base entries: http://crbug.com/164303.
+  { "video/webm", "vorbis,vp8,vp8.0,", kWidevineBaseKeySystem },
+  { "audio/webm", "vorbis,", kWidevineBaseKeySystem },
+#if defined(WIDEVINE_CDM_CENC_SUPPORT_AVAILABLE)
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
+  { "video/mp4", "avc1,mp4a,", kWidevineKeySystem },
+  { "audio/mp4", "mp4a,", kWidevineKeySystem },
+  // TODO(ddorwin): Eliminate Base entries: http://crbug.com/164303.
+  { "video/mp4", "avc1,mp4a,", kWidevineBaseKeySystem },
+  { "audio/mp4", "mp4a,", kWidevineBaseKeySystem },
+#endif
+#endif
 #endif  // WIDEVINE_CDM_AVAILABLE
 };
 
 static const KeySystemPluginTypePair key_system_to_plugin_type_mapping[] = {
   // TODO(xhwang): Update this with the real plugin name.
   { kExternalClearKeyKeySystem, "application/x-ppapi-clearkey-cdm" },
 #if defined(WIDEVINE_CDM_AVAILABLE)
   { kWidevineKeySystem, kWidevineCdmPluginMimeType }
 #endif  // WIDEVINE_CDM_AVAILABLE
 };
@@ skipping 55 matching lines @@
       DCHECK(mime_types_map.find(combination.mime_type) ==
              mime_types_map.end());
       mime_types_map[combination.mime_type] = codecs;
     }
   }
 }
 
 bool KeySystems::IsSupportedKeySystem(const std::string& key_system) {
   bool is_supported = key_system_map_.find(key_system) != key_system_map_.end();
 
-  DCHECK_EQ(is_supported,
-            (CanUseAesDecryptor(key_system) ||
-             !GetPluginType(key_system).empty()))
-      << "key_system_map_ & key_system_to_plugin_type_mapping are inconsistent";
   return is_supported;
 }
 
 bool KeySystems::IsSupportedKeySystemWithContainerAndCodec(
     const std::string& mime_type,
     const std::string& codec,
     const std::string& key_system) {
 
   KeySystemMappings::const_iterator key_system_iter =
       key_system_map_.find(key_system);
@@ skipping 63 matching lines @@
 std::string GetPluginType(const std::string& key_system) {
   for (size_t i = 0; i < arraysize(key_system_to_plugin_type_mapping); ++i) {
     if (key_system_to_plugin_type_mapping[i].key_system == key_system)
       return key_system_to_plugin_type_mapping[i].plugin_type;
   }
 
   return std::string();
 }
 
 }  // namespace webkit_media