| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/cpu.h" | 8 #include "base/cpu.h" |
| 9 #include "base/debug/crash_logging.h" | 9 #include "base/debug/crash_logging.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING; | 272 widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING; |
| 273 content::WebPluginMimeType widevine_cdm_mime_type( | 273 content::WebPluginMimeType widevine_cdm_mime_type( |
| 274 kWidevineCdmPluginMimeType, | 274 kWidevineCdmPluginMimeType, |
| 275 kWidevineCdmPluginExtension, | 275 kWidevineCdmPluginExtension, |
| 276 kWidevineCdmPluginMimeTypeDescription); | 276 kWidevineCdmPluginMimeTypeDescription); |
| 277 | 277 |
| 278 // Add the supported codecs as if they came from the component manifest. | 278 // Add the supported codecs as if they came from the component manifest. |
| 279 std::vector<std::string> codecs; | 279 std::vector<std::string> codecs; |
| 280 codecs.push_back(kCdmSupportedCodecVorbis); | 280 codecs.push_back(kCdmSupportedCodecVorbis); |
| 281 codecs.push_back(kCdmSupportedCodecVp8); | 281 codecs.push_back(kCdmSupportedCodecVp8); |
| 282 // TODO(xhwang): Add VP9 when it's supported by Widevine CDM. | 282 codecs.push_back(kCdmSupportedCodecVp9); |
| 283 // See http://crbug.com/361318 | |
| 284 #if defined(USE_PROPRIETARY_CODECS) | 283 #if defined(USE_PROPRIETARY_CODECS) |
| 285 // TODO(ddorwin): Rename these macros to reflect their real meaning: whether the | 284 // TODO(ddorwin): Rename these macros to reflect their real meaning: whether the |
| 286 // CDM Chrome was built [and shipped] with support these types. | 285 // CDM Chrome was built [and shipped] with support these types. |
| 287 #if defined(WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE) | 286 #if defined(WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE) |
| 288 codecs.push_back(kCdmSupportedCodecAac); | 287 codecs.push_back(kCdmSupportedCodecAac); |
| 289 #endif | 288 #endif |
| 290 #if defined(WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE) | 289 #if defined(WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE) |
| 291 codecs.push_back(kCdmSupportedCodecAvc1); | 290 codecs.push_back(kCdmSupportedCodecAvc1); |
| 292 #endif | 291 #endif |
| 293 #endif // defined(USE_PROPRIETARY_CODECS) | 292 #endif // defined(USE_PROPRIETARY_CODECS) |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; | 541 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; |
| 543 return true; | 542 return true; |
| 544 } | 543 } |
| 545 return false; | 544 return false; |
| 546 } | 545 } |
| 547 | 546 |
| 548 std::string ChromeContentClient::GetCarbonInterposePath() const { | 547 std::string ChromeContentClient::GetCarbonInterposePath() const { |
| 549 return std::string(kInterposeLibraryPath); | 548 return std::string(kInterposeLibraryPath); |
| 550 } | 549 } |
| 551 #endif | 550 #endif |
| OLD | NEW |