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

Side by Side Diff: third_party/widevine/cdm/widevine_cdm_common.h

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
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 #ifndef WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ 5 #ifndef WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
6 #define WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ 6 #define WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
7 7
8 // This file defines constants common to all Widevine CDM versions. 8 // This file defines constants common to all Widevine CDM versions.
9 9
10 // Widevine CDM version contains 4 components, e.g. 1.4.0.195. 10 // Widevine CDM version contains 4 components, e.g. 1.4.0.195.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #elif defined(OS_WIN) 44 #elif defined(OS_WIN)
45 "widevinecdmadapter.dll"; 45 "widevinecdmadapter.dll";
46 #else // OS_LINUX, etc. 46 #else // OS_LINUX, etc.
47 "libwidevinecdmadapter.so"; 47 "libwidevinecdmadapter.so";
48 #endif 48 #endif
49 49
50 // The following strings are used to communicate supported codecs (from the 50 // The following strings are used to communicate supported codecs (from the
51 // component manifest) via WebPluginInfo::WebPluginMimeType's additional params. 51 // component manifest) via WebPluginInfo::WebPluginMimeType's additional params.
52 const char kCdmSupportedCodecsParamName[] = "codecs"; 52 const char kCdmSupportedCodecsParamName[] = "codecs";
53 const char kCdmSupportedCodecsValueDelimiter = ','; 53 const char kCdmSupportedCodecsValueDelimiter = ',';
54 const char kCdmSupportedCodecVorbis[] = "vorbis";
55 const char kCdmSupportedCodecVp8[] = "vp8"; 54 const char kCdmSupportedCodecVp8[] = "vp8";
56 const char kCdmSupportedCodecVp9[] = "vp9.0"; 55 const char kCdmSupportedCodecVp9[] = "vp9.0";
57 #if defined(USE_PROPRIETARY_CODECS) 56 #if defined(USE_PROPRIETARY_CODECS)
58 const char kCdmSupportedCodecAac[] = "aac"; 57 const char kCdmSupportedCodecAac[] = "aac";
59 const char kCdmSupportedCodecAvc1[] = "avc1"; 58 const char kCdmSupportedCodecAvc1[] = "avc1";
60 #endif // defined(USE_PROPRIETARY_CODECS) 59 #endif // defined(USE_PROPRIETARY_CODECS)
61 60
62 #if defined(OS_MACOSX) || defined(OS_WIN) 61 #if defined(OS_MACOSX) || defined(OS_WIN)
63 // CDM is installed by the component installer instead of the Chrome installer. 62 // CDM is installed by the component installer instead of the Chrome installer.
64 #define WIDEVINE_CDM_IS_COMPONENT 63 #define WIDEVINE_CDM_IS_COMPONENT
65 #endif // defined(OS_MACOSX) || defined(OS_WIN) 64 #endif // defined(OS_MACOSX) || defined(OS_WIN)
66 #endif // defined(ENABLE_PEPPER_CDMS) 65 #endif // defined(ENABLE_PEPPER_CDMS)
67 66
68 #endif // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ 67 #endif // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
OLDNEW
« chrome/common/chrome_content_client.cc ('K') | « chrome/common/chrome_content_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698