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

Side by Side Diff: media/base/eme_constants.h

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Merge Created 4 years 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 | « media/base/demuxer_perftest.cc ('k') | media/base/key_systems.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MEDIA_BASE_EME_CONSTANTS_H_ 5 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
6 #define MEDIA_BASE_EME_CONSTANTS_H_ 6 #define MEDIA_BASE_EME_CONSTANTS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "media/media_features.h" 10 #include "media/media_features.h"
(...skipping 12 matching lines...) Expand all
23 // *_ALL values should only be used for masking, do not use them to specify 23 // *_ALL values should only be used for masking, do not use them to specify
24 // codec support because they may be extended to include more codecs. 24 // codec support because they may be extended to include more codecs.
25 EME_CODEC_NONE = 0, 25 EME_CODEC_NONE = 0,
26 EME_CODEC_WEBM_OPUS = 1 << 0, 26 EME_CODEC_WEBM_OPUS = 1 << 0,
27 EME_CODEC_WEBM_VORBIS = 1 << 1, 27 EME_CODEC_WEBM_VORBIS = 1 << 1,
28 EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS, 28 EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
29 EME_CODEC_WEBM_VP8 = 1 << 2, 29 EME_CODEC_WEBM_VP8 = 1 << 2,
30 EME_CODEC_WEBM_VP9 = 1 << 3, 30 EME_CODEC_WEBM_VP9 = 1 << 3,
31 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9), 31 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
32 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL), 32 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
33 #if defined(USE_PROPRIETARY_CODECS) 33 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
34 EME_CODEC_MP4_AAC = 1 << 4, 34 EME_CODEC_MP4_AAC = 1 << 4,
35 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC, 35 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
36 EME_CODEC_MP4_AVC1 = 1 << 5, 36 EME_CODEC_MP4_AVC1 = 1 << 5,
37 EME_CODEC_MP4_VP9 = 1 << 6, 37 EME_CODEC_MP4_VP9 = 1 << 6,
38 #if !BUILDFLAG(ENABLE_HEVC_DEMUXING) 38 #if !BUILDFLAG(ENABLE_HEVC_DEMUXING)
39 EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9), 39 EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9),
40 #else 40 #else
41 EME_CODEC_MP4_HEVC = 1 << 7, 41 EME_CODEC_MP4_HEVC = 1 << 7,
42 EME_CODEC_MP4_VIDEO_ALL = 42 EME_CODEC_MP4_VIDEO_ALL =
43 (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9 | EME_CODEC_MP4_HEVC), 43 (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9 | EME_CODEC_MP4_HEVC),
44 #endif 44 #endif
45 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL), 45 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
46 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL), 46 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL),
47 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL), 47 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL),
48 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL), 48 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
49 #else 49 #else
50 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL, 50 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL,
51 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL, 51 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL,
52 EME_CODEC_ALL = EME_CODEC_WEBM_ALL, 52 EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
53 #endif // defined(USE_PROPRIETARY_CODECS) 53 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
54 }; 54 };
55 55
56 typedef uint32_t SupportedCodecs; 56 typedef uint32_t SupportedCodecs;
57 57
58 enum class EmeSessionTypeSupport { 58 enum class EmeSessionTypeSupport {
59 // Invalid default value. 59 // Invalid default value.
60 INVALID, 60 INVALID,
61 // The session type is not supported. 61 // The session type is not supported.
62 NOT_SUPPORTED, 62 NOT_SUPPORTED,
63 // The session type is supported if a distinctive identifier is available. 63 // The session type is supported if a distinctive identifier is available.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // This rule only has meaning on platforms that distinguish hardware-secure 121 // This rule only has meaning on platforms that distinguish hardware-secure
122 // codecs (ie. Android). 122 // codecs (ie. Android).
123 HW_SECURE_CODECS_REQUIRED, 123 HW_SECURE_CODECS_REQUIRED,
124 // The configuration option is supported without conditions. 124 // The configuration option is supported without conditions.
125 SUPPORTED, 125 SUPPORTED,
126 }; 126 };
127 127
128 } // namespace media 128 } // namespace media
129 129
130 #endif // MEDIA_BASE_EME_CONSTANTS_H_ 130 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW
« no previous file with comments | « media/base/demuxer_perftest.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698