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

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

Issue 1690353002: media: Remove Vorbis from secure decoder list for Widevine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 4 years, 10 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
« no previous file with comments | « no previous file | third_party/widevine/cdm/widevine_cdm_common.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/crash_logging.h" 10 #include "base/debug/crash_logging.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 widevine_cdm.description = kWidevineCdmDescription + 165 widevine_cdm.description = kWidevineCdmDescription +
166 std::string(" (version: ") + 166 std::string(" (version: ") +
167 WIDEVINE_CDM_VERSION_STRING + ")"; 167 WIDEVINE_CDM_VERSION_STRING + ")";
168 widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING; 168 widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
169 content::WebPluginMimeType widevine_cdm_mime_type( 169 content::WebPluginMimeType widevine_cdm_mime_type(
170 kWidevineCdmPluginMimeType, 170 kWidevineCdmPluginMimeType,
171 kWidevineCdmPluginExtension, 171 kWidevineCdmPluginExtension,
172 kWidevineCdmPluginMimeTypeDescription); 172 kWidevineCdmPluginMimeTypeDescription);
173 173
174 // Add the supported codecs as if they came from the component manifest. 174 // Add the supported codecs as if they came from the component manifest.
175 // This list must match the CDM that is being bundled with Chrome.
Lei Zhang 2016/02/12 21:34:17 Is there any way to test and assert this is true?
xhwang 2016/02/12 21:39:15 We can bundle the manifest file with the CDM. Then
ddorwin 2016/02/12 21:43:32 This should be part of a larger effort to unify th
xhwang 2016/02/12 21:53:16 Agreed. I filed a bug to track this work: https://
175 std::vector<std::string> codecs; 176 std::vector<std::string> codecs;
176 codecs.push_back(kCdmSupportedCodecVorbis);
177 codecs.push_back(kCdmSupportedCodecVp8); 177 codecs.push_back(kCdmSupportedCodecVp8);
178 codecs.push_back(kCdmSupportedCodecVp9); 178 codecs.push_back(kCdmSupportedCodecVp9);
179 #if defined(USE_PROPRIETARY_CODECS) 179 #if defined(USE_PROPRIETARY_CODECS)
180 codecs.push_back(kCdmSupportedCodecAac); 180 codecs.push_back(kCdmSupportedCodecAac);
181 codecs.push_back(kCdmSupportedCodecAvc1); 181 codecs.push_back(kCdmSupportedCodecAvc1);
182 #endif // defined(USE_PROPRIETARY_CODECS) 182 #endif // defined(USE_PROPRIETARY_CODECS)
183 std::string codec_string = base::JoinString( 183 std::string codec_string = base::JoinString(
184 codecs, std::string(1, kCdmSupportedCodecsValueDelimiter)); 184 codecs, std::string(1, kCdmSupportedCodecsValueDelimiter));
185 widevine_cdm_mime_type.additional_param_names.push_back( 185 widevine_cdm_mime_type.additional_param_names.push_back(
186 base::ASCIIToUTF16(kCdmSupportedCodecsParamName)); 186 base::ASCIIToUTF16(kCdmSupportedCodecsParamName));
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 #endif 630 #endif
631 } 631 }
632 632
633 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { 633 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
634 #if defined(ENABLE_EXTENSIONS) 634 #if defined(ENABLE_EXTENSIONS)
635 return extensions::IsIsolateExtensionsEnabled(); 635 return extensions::IsIsolateExtensionsEnabled();
636 #else 636 #else
637 return false; 637 return false;
638 #endif 638 #endif
639 } 639 }
OLDNEW
« no previous file with comments | « no previous file | third_party/widevine/cdm/widevine_cdm_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698