Extract supported codecs from CDM component manifest.

chrome/common/chrome_content_client.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 "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/debug/crash_logging.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
@@ skipping 260 matching lines @@
       content::PepperPluginInfo widevine_cdm;
       widevine_cdm.is_out_of_process = true;
       widevine_cdm.path = path;
       widevine_cdm.name = kWidevineCdmDisplayName;
       widevine_cdm.description = kWidevineCdmDescription;
       widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
       content::WebPluginMimeType widevine_cdm_mime_type(
           kWidevineCdmPluginMimeType,
           kWidevineCdmPluginExtension,
           kWidevineCdmPluginMimeTypeDescription);
+
+      // Add the supported codecs as if they came from the component manifest.
+      base::string16 codecs = base::ASCIIToUTF16(kCdmSupportedCodecVorbis) +
+                              base::ASCIIToUTF16(",") +

[xhwang, 2013/10/25 17:33:22]

do we have comments anywhere about the format? e.g. delimited with ","

[ddorwin, 2013/10/25 19:03:40]

Done. Added constant and simplified this.

+                              base::ASCIIToUTF16(kCdmSupportedCodecVp8);
+#if defined(USE_PROPRIETARY_CODECS)
+#if defined(WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE)
+      codecs += (base::ASCIIToUTF16(",") +
+                 base::ASCIIToUTF16(kCdmSupportedCodecAac));
+#endif
+#if defined(WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE)

[xhwang, 2013/10/25 17:33:22]

Per offline discussion, add a TODO about renaming the macros?

[ddorwin, 2013/10/25 19:03:40]

Done.

+      codecs += (base::ASCIIToUTF16(",") +
+                 base::ASCIIToUTF16(kCdmSupportedCodecAvc1));
+#endif
+#endif  // defined(USE_PROPRIETARY_CODECS)
+      widevine_cdm_mime_type.additional_param_names.push_back(
+          base::ASCIIToUTF16(kCdmSupportedCodecsParamName));
+      widevine_cdm_mime_type.additional_param_values.push_back(codecs);
+
       widevine_cdm.mime_types.push_back(widevine_cdm_mime_type);
       widevine_cdm.permissions = kWidevineCdmPluginPermissions;
       plugins->push_back(widevine_cdm);
 
       skip_widevine_cdm_file_check = true;
     }
   }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) &&
         // !defined(WIDEVINE_CDM_IS_COMPONENT)
 
@@ skipping 232 matching lines @@
   }
   return false;
 }
 
 std::string ChromeContentClient::GetCarbonInterposePath() const {
   return std::string(kInterposeLibraryPath);
 }
 #endif
 
 }  // namespace chrome