Chromium Code Reviews Chromium Code Reviews
Issue 2640113004:
Introduce Dolby Vision video codec and Demuxer support (Closed)
| OLD | NEW |
|---|---|
| 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" |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 FOURCC_FREE = 0x66726565, | 36 FOURCC_FREE = 0x66726565, |
| 37 FOURCC_FRMA = 0x66726d61, | 37 FOURCC_FRMA = 0x66726d61, |
| 38 FOURCC_FTYP = 0x66747970, | 38 FOURCC_FTYP = 0x66747970, |
| 39 FOURCC_HDLR = 0x68646c72, | 39 FOURCC_HDLR = 0x68646c72, |
| 40 FOURCC_HINT = 0x68696e74, | 40 FOURCC_HINT = 0x68696e74, |
| 41 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 41 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
| 42 FOURCC_HEV1 = 0x68657631, | 42 FOURCC_HEV1 = 0x68657631, |
| 43 FOURCC_HVC1 = 0x68766331, | 43 FOURCC_HVC1 = 0x68766331, |
| 44 FOURCC_HVCC = 0x68766343, | 44 FOURCC_HVCC = 0x68766343, |
| 45 #endif | 45 #endif |
| 46 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) | |
|
wolenetz
2017/01/25 23:42:42
nit: these all begin with "D", so move them betwee
erickung1
2017/02/03 18:18:32
Done.
| |
| 47 FOURCC_DVAV = 0x64766176, | |
| 48 FOURCC_DVCC = 0x64766343, | |
| 49 FOURCC_DVHE = 0x64766865, | |
| 50 #endif | |
| 46 FOURCC_IODS = 0x696f6473, | 51 FOURCC_IODS = 0x696f6473, |
| 47 FOURCC_MDAT = 0x6d646174, | 52 FOURCC_MDAT = 0x6d646174, |
| 48 FOURCC_MDHD = 0x6d646864, | 53 FOURCC_MDHD = 0x6d646864, |
| 49 FOURCC_MDIA = 0x6d646961, | 54 FOURCC_MDIA = 0x6d646961, |
| 50 FOURCC_MECO = 0x6d65636f, | 55 FOURCC_MECO = 0x6d65636f, |
| 51 FOURCC_MEHD = 0x6d656864, | 56 FOURCC_MEHD = 0x6d656864, |
| 52 FOURCC_META = 0x6d657461, | 57 FOURCC_META = 0x6d657461, |
| 53 FOURCC_MFHD = 0x6d666864, | 58 FOURCC_MFHD = 0x6d666864, |
| 54 FOURCC_MFRA = 0x6d667261, | 59 FOURCC_MFRA = 0x6d667261, |
| 55 FOURCC_MINF = 0x6d696e66, | 60 FOURCC_MINF = 0x6d696e66, |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 } | 129 } |
| 125 } | 130 } |
| 126 | 131 |
| 127 return std::string(buf); | 132 return std::string(buf); |
| 128 } | 133 } |
| 129 | 134 |
| 130 } // namespace mp4 | 135 } // namespace mp4 |
| 131 } // namespace media | 136 } // namespace media |
| 132 | 137 |
| 133 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_ | 138 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_ |
| OLD | NEW |
