Encrypted Media: Support Audio Decrypt-Only.

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
 // TODO(ddorwin): Automatically support parent systems: http://crbug.com/164303.
 static const char kWidevineBaseKeySystem[] = "com.widevine";
 
 // 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 kSupportedFormatKeySystemCombinations[] = {
   // 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)
@@ skipping 161 matching lines @@
 std::string GetPluginType(const std::string& key_system) {
   for (size_t i = 0; i < arraysize(kKeySystemToPluginTypeMapping); ++i) {
     if (kKeySystemToPluginTypeMapping[i].key_system == key_system)
       return kKeySystemToPluginTypeMapping[i].plugin_type;
   }
 
   return std::string();
 }
 
 }  // namespace webkit_media