Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 252513005: Encrypted Media: Add VP9 support to IsTypeSupported(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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.
283 // See http://crbug.com/361318
282 #if defined(USE_PROPRIETARY_CODECS) 284 #if defined(USE_PROPRIETARY_CODECS)
283 // TODO(ddorwin): Rename these macros to reflect their real meaning: whether the 285 // TODO(ddorwin): Rename these macros to reflect their real meaning: whether the
284 // CDM Chrome was built [and shipped] with support these types. 286 // CDM Chrome was built [and shipped] with support these types.
285 #if defined(WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE) 287 #if defined(WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE)
286 codecs.push_back(kCdmSupportedCodecAac); 288 codecs.push_back(kCdmSupportedCodecAac);
287 #endif 289 #endif
288 #if defined(WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE) 290 #if defined(WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE)
289 codecs.push_back(kCdmSupportedCodecAvc1); 291 codecs.push_back(kCdmSupportedCodecAvc1);
290 #endif 292 #endif
291 #endif // defined(USE_PROPRIETARY_CODECS) 293 #endif // defined(USE_PROPRIETARY_CODECS)
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 550 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
549 return true; 551 return true;
550 } 552 }
551 return false; 553 return false;
552 } 554 }
553 555
554 std::string ChromeContentClient::GetCarbonInterposePath() const { 556 std::string ChromeContentClient::GetCarbonInterposePath() const {
555 return std::string(kInterposeLibraryPath); 557 return std::string(kInterposeLibraryPath);
556 } 558 }
557 #endif 559 #endif
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_message_filter_android.cc ('k') | chrome/renderer/media/chrome_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698