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

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

Issue 1899423002: Revert of Implement support for vp9 in ISO-BMFF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « media/BUILD.gn ('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 namespace media { 10 namespace media {
(...skipping 26 matching lines...) Expand all
37 EME_CODEC_WEBM_VORBIS = 1 << 1, 37 EME_CODEC_WEBM_VORBIS = 1 << 1,
38 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,
39 EME_CODEC_WEBM_VP8 = 1 << 2, 39 EME_CODEC_WEBM_VP8 = 1 << 2,
40 EME_CODEC_WEBM_VP9 = 1 << 3, 40 EME_CODEC_WEBM_VP9 = 1 << 3,
41 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9), 41 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
42 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL), 42 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
43 #if defined(USE_PROPRIETARY_CODECS) 43 #if defined(USE_PROPRIETARY_CODECS)
44 EME_CODEC_MP4_AAC = 1 << 4, 44 EME_CODEC_MP4_AAC = 1 << 4,
45 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC, 45 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
46 EME_CODEC_MP4_AVC1 = 1 << 5, 46 EME_CODEC_MP4_AVC1 = 1 << 5,
47 EME_CODEC_MP4_VP9 = 1 << 6, 47 EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
48 EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9),
49 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL), 48 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
50 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL), 49 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL),
51 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL), 50 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL),
52 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL), 51 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
53 #else 52 #else
54 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL, 53 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL,
55 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL, 54 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL,
56 EME_CODEC_ALL = EME_CODEC_WEBM_ALL, 55 EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
57 #endif // defined(USE_PROPRIETARY_CODECS) 56 #endif // defined(USE_PROPRIETARY_CODECS)
58 }; 57 };
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 // This rule only has meaning on platforms that distinguish hardware-secure 137 // This rule only has meaning on platforms that distinguish hardware-secure
139 // codecs (ie. Android). 138 // codecs (ie. Android).
140 HW_SECURE_CODECS_REQUIRED, 139 HW_SECURE_CODECS_REQUIRED,
141 // The configuration option is supported without conditions. 140 // The configuration option is supported without conditions.
142 SUPPORTED, 141 SUPPORTED,
143 }; 142 };
144 143
145 } // namespace media 144 } // namespace media
146 145
147 #endif // MEDIA_BASE_EME_CONSTANTS_H_ 146 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698