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

Side by Side Diff: media/formats/mp4/fourccs.h

Issue 1998333002: MP4 support for Common Encryption 'cbcs' scheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix a problem in hasty change before upload Created 4 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
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_FORMATS_MP4_FOURCCS_H_ 5 #ifndef MEDIA_FORMATS_MP4_FOURCCS_H_
6 #define MEDIA_FORMATS_MP4_FOURCCS_H_ 6 #define MEDIA_FORMATS_MP4_FOURCCS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "media/media_features.h" 10 #include "media/media_features.h"
11 11
12 namespace media { 12 namespace media {
13 namespace mp4 { 13 namespace mp4 {
14 14
15 enum FourCC { 15 enum FourCC {
16 FOURCC_NULL = 0, 16 FOURCC_NULL = 0,
17 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) 17 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
18 FOURCC_AC3 = 0x61632d33, // "ac-3" 18 FOURCC_AC3 = 0x61632d33, // "ac-3"
19 FOURCC_EAC3 = 0x65632d33, // "ec-3" 19 FOURCC_EAC3 = 0x65632d33, // "ec-3"
20 #endif 20 #endif
21 FOURCC_AVC1 = 0x61766331, 21 FOURCC_AVC1 = 0x61766331,
22 FOURCC_AVC3 = 0x61766333, 22 FOURCC_AVC3 = 0x61766333,
23 FOURCC_AVCC = 0x61766343, 23 FOURCC_AVCC = 0x61766343,
24 FOURCC_BLOC = 0x626C6F63, 24 FOURCC_BLOC = 0x626C6F63,
25 FOURCC_CBC1 = 0x63626331,
26 FOURCC_CBCS = 0x63626373,
25 FOURCC_CENC = 0x63656e63, 27 FOURCC_CENC = 0x63656e63,
28 FOURCC_CENS = 0x63656e73,
26 FOURCC_CO64 = 0x636f3634, 29 FOURCC_CO64 = 0x636f3634,
27 FOURCC_CTTS = 0x63747473, 30 FOURCC_CTTS = 0x63747473,
28 FOURCC_DINF = 0x64696e66, 31 FOURCC_DINF = 0x64696e66,
29 FOURCC_EDTS = 0x65647473, 32 FOURCC_EDTS = 0x65647473,
30 FOURCC_EMSG = 0x656d7367, 33 FOURCC_EMSG = 0x656d7367,
31 FOURCC_ELST = 0x656c7374, 34 FOURCC_ELST = 0x656c7374,
32 FOURCC_ENCA = 0x656e6361, 35 FOURCC_ENCA = 0x656e6361,
33 FOURCC_ENCV = 0x656e6376, 36 FOURCC_ENCV = 0x656e6376,
34 FOURCC_ESDS = 0x65736473, 37 FOURCC_ESDS = 0x65736473,
35 FOURCC_FREE = 0x66726565, 38 FOURCC_FREE = 0x66726565,
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 125 }
123 } 126 }
124 127
125 return std::string(buf); 128 return std::string(buf);
126 } 129 }
127 130
128 } // namespace mp4 131 } // namespace mp4
129 } // namespace media 132 } // namespace media
130 133
131 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_ 134 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698