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

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

Issue 2853123003: EME contentType checks for AC3/EAC3 (Closed)
Patch Set: int32 Created 3 years, 7 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 | « components/cdm/browser/cdm_message_filter_android.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 15 matching lines...) Expand all
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_VP8 = 1 << 2, 28 EME_CODEC_WEBM_VP8 = 1 << 2,
29 EME_CODEC_WEBM_VP9 = 1 << 3, 29 EME_CODEC_WEBM_VP9 = 1 << 3,
30 EME_CODEC_MP4_AAC = 1 << 4, 30 EME_CODEC_MP4_AAC = 1 << 4,
31 EME_CODEC_MP4_AVC1 = 1 << 5, 31 EME_CODEC_MP4_AVC1 = 1 << 5,
32 EME_CODEC_COMMON_VP9 = 1 << 6, 32 EME_CODEC_COMMON_VP9 = 1 << 6,
33 EME_CODEC_MP4_HEVC = 1 << 7, 33 EME_CODEC_MP4_HEVC = 1 << 7,
34 EME_CODEC_MP4_DV_AVC = 1 << 8, 34 EME_CODEC_MP4_DV_AVC = 1 << 8,
35 EME_CODEC_MP4_DV_HEVC = 1 << 9, 35 EME_CODEC_MP4_DV_HEVC = 1 << 9,
36 EME_CODEC_MP4_AC3 = 1 << 10,
37 EME_CODEC_MP4_EAC3 = 1 << 11,
36 EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS, 38 EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
37 EME_CODEC_WEBM_VIDEO_ALL = 39 EME_CODEC_WEBM_VIDEO_ALL =
38 (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9 | EME_CODEC_COMMON_VP9), 40 (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9 | EME_CODEC_COMMON_VP9),
39 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL), 41 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
40 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 42 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
41 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC, 43 EME_CODEC_MP4_AUDIO_ALL = (EME_CODEC_MP4_AAC
44 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
45 |
46 EME_CODEC_MP4_AC3 |
47 EME_CODEC_MP4_EAC3
48 #endif // BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
49 ),
42 EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9 50 EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9
43 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 51 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
44 | 52 |
45 EME_CODEC_MP4_HEVC 53 EME_CODEC_MP4_HEVC
46 #endif // BUILDFLAG(ENABLE_HEVC_DEMUXING) 54 #endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
47 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) 55 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
48 | 56 |
49 EME_CODEC_MP4_DV_AVC 57 EME_CODEC_MP4_DV_AVC
50 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 58 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
51 | 59 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // This rule only has meaning on platforms that distinguish hardware-secure 140 // This rule only has meaning on platforms that distinguish hardware-secure
133 // codecs (ie. Android). 141 // codecs (ie. Android).
134 HW_SECURE_CODECS_REQUIRED, 142 HW_SECURE_CODECS_REQUIRED,
135 // The configuration option is supported without conditions. 143 // The configuration option is supported without conditions.
136 SUPPORTED, 144 SUPPORTED,
137 }; 145 };
138 146
139 } // namespace media 147 } // namespace media
140 148
141 #endif // MEDIA_BASE_EME_CONSTANTS_H_ 149 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW
« no previous file with comments | « components/cdm/browser/cdm_message_filter_android.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698