Rename FOURCC -> CRICKET_FOURCC.
This macro collides with a libjingle macro with the same name. Bug: webrtc:8589 Change-Id: Icdae45c3550d09a591ee02eaf37e11a44d4230d5 Reviewed-on: https://webrtc-review.googlesource.com/27982 Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21029}
This commit is contained in:
Patrik Höglund
Commit Bot
parent
29dd6d7367
commit
4e76ebb372
@ -39,7 +39,7 @@ const uint32_t kDummyVideoSsrc = 0xFFFFFFFF;
|
||||
// Convert four characters to a FourCC code.
|
||||
// Needs to be a macro otherwise the OS X compiler complains when the kFormat*
|
||||
// constants are used in a switch.
|
||||
#define FOURCC(a, b, c, d) \
|
||||
#define CRICKET_FOURCC(a, b, c, d) \
|
||||
((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \
|
||||
(static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24))
|
||||
// Some pages discussing FourCC codes:
|
||||
@ -55,67 +55,69 @@ const uint32_t kDummyVideoSsrc = 0xFFFFFFFF;
|
||||
// Auxilliary formats call primary converters.
|
||||
enum FourCC {
|
||||
// 9 Primary YUV formats: 5 planar, 2 biplanar, 2 packed.
|
||||
FOURCC_I420 = FOURCC('I', '4', '2', '0'),
|
||||
FOURCC_I422 = FOURCC('I', '4', '2', '2'),
|
||||
FOURCC_I444 = FOURCC('I', '4', '4', '4'),
|
||||
FOURCC_I411 = FOURCC('I', '4', '1', '1'),
|
||||
FOURCC_I400 = FOURCC('I', '4', '0', '0'),
|
||||
FOURCC_NV21 = FOURCC('N', 'V', '2', '1'),
|
||||
FOURCC_NV12 = FOURCC('N', 'V', '1', '2'),
|
||||
FOURCC_YUY2 = FOURCC('Y', 'U', 'Y', '2'),
|
||||
FOURCC_UYVY = FOURCC('U', 'Y', 'V', 'Y'),
|
||||
FOURCC_I420 = CRICKET_FOURCC('I', '4', '2', '0'),
|
||||
FOURCC_I422 = CRICKET_FOURCC('I', '4', '2', '2'),
|
||||
FOURCC_I444 = CRICKET_FOURCC('I', '4', '4', '4'),
|
||||
FOURCC_I411 = CRICKET_FOURCC('I', '4', '1', '1'),
|
||||
FOURCC_I400 = CRICKET_FOURCC('I', '4', '0', '0'),
|
||||
FOURCC_NV21 = CRICKET_FOURCC('N', 'V', '2', '1'),
|
||||
FOURCC_NV12 = CRICKET_FOURCC('N', 'V', '1', '2'),
|
||||
FOURCC_YUY2 = CRICKET_FOURCC('Y', 'U', 'Y', '2'),
|
||||
FOURCC_UYVY = CRICKET_FOURCC('U', 'Y', 'V', 'Y'),
|
||||
|
||||
// 2 Secondary YUV formats: row biplanar.
|
||||
FOURCC_M420 = FOURCC('M', '4', '2', '0'),
|
||||
FOURCC_M420 = CRICKET_FOURCC('M', '4', '2', '0'),
|
||||
|
||||
// 9 Primary RGB formats: 4 32 bpp, 2 24 bpp, 3 16 bpp.
|
||||
FOURCC_ARGB = FOURCC('A', 'R', 'G', 'B'),
|
||||
FOURCC_BGRA = FOURCC('B', 'G', 'R', 'A'),
|
||||
FOURCC_ABGR = FOURCC('A', 'B', 'G', 'R'),
|
||||
FOURCC_24BG = FOURCC('2', '4', 'B', 'G'),
|
||||
FOURCC_RAW = FOURCC('r', 'a', 'w', ' '),
|
||||
FOURCC_RGBA = FOURCC('R', 'G', 'B', 'A'),
|
||||
FOURCC_RGBP = FOURCC('R', 'G', 'B', 'P'), // bgr565.
|
||||
FOURCC_RGBO = FOURCC('R', 'G', 'B', 'O'), // abgr1555.
|
||||
FOURCC_R444 = FOURCC('R', '4', '4', '4'), // argb4444.
|
||||
FOURCC_ARGB = CRICKET_FOURCC('A', 'R', 'G', 'B'),
|
||||
FOURCC_BGRA = CRICKET_FOURCC('B', 'G', 'R', 'A'),
|
||||
FOURCC_ABGR = CRICKET_FOURCC('A', 'B', 'G', 'R'),
|
||||
FOURCC_24BG = CRICKET_FOURCC('2', '4', 'B', 'G'),
|
||||
FOURCC_RAW = CRICKET_FOURCC('r', 'a', 'w', ' '),
|
||||
FOURCC_RGBA = CRICKET_FOURCC('R', 'G', 'B', 'A'),
|
||||
FOURCC_RGBP = CRICKET_FOURCC('R', 'G', 'B', 'P'), // bgr565.
|
||||
FOURCC_RGBO = CRICKET_FOURCC('R', 'G', 'B', 'O'), // abgr1555.
|
||||
FOURCC_R444 = CRICKET_FOURCC('R', '4', '4', '4'), // argb4444.
|
||||
|
||||
// 4 Secondary RGB formats: 4 Bayer Patterns.
|
||||
FOURCC_RGGB = FOURCC('R', 'G', 'G', 'B'),
|
||||
FOURCC_BGGR = FOURCC('B', 'G', 'G', 'R'),
|
||||
FOURCC_GRBG = FOURCC('G', 'R', 'B', 'G'),
|
||||
FOURCC_GBRG = FOURCC('G', 'B', 'R', 'G'),
|
||||
FOURCC_RGGB = CRICKET_FOURCC('R', 'G', 'G', 'B'),
|
||||
FOURCC_BGGR = CRICKET_FOURCC('B', 'G', 'G', 'R'),
|
||||
FOURCC_GRBG = CRICKET_FOURCC('G', 'R', 'B', 'G'),
|
||||
FOURCC_GBRG = CRICKET_FOURCC('G', 'B', 'R', 'G'),
|
||||
|
||||
// 1 Primary Compressed YUV format.
|
||||
FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'),
|
||||
FOURCC_MJPG = CRICKET_FOURCC('M', 'J', 'P', 'G'),
|
||||
|
||||
// 5 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias.
|
||||
FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'),
|
||||
FOURCC_YV16 = FOURCC('Y', 'V', '1', '6'),
|
||||
FOURCC_YV24 = FOURCC('Y', 'V', '2', '4'),
|
||||
FOURCC_YU12 = FOURCC('Y', 'U', '1', '2'), // Linux version of I420.
|
||||
FOURCC_J420 = FOURCC('J', '4', '2', '0'),
|
||||
FOURCC_J400 = FOURCC('J', '4', '0', '0'),
|
||||
FOURCC_YV12 = CRICKET_FOURCC('Y', 'V', '1', '2'),
|
||||
FOURCC_YV16 = CRICKET_FOURCC('Y', 'V', '1', '6'),
|
||||
FOURCC_YV24 = CRICKET_FOURCC('Y', 'V', '2', '4'),
|
||||
FOURCC_YU12 = CRICKET_FOURCC('Y', 'U', '1', '2'), // Linux version of I420.
|
||||
FOURCC_J420 = CRICKET_FOURCC('J', '4', '2', '0'),
|
||||
FOURCC_J400 = CRICKET_FOURCC('J', '4', '0', '0'),
|
||||
|
||||
// 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical fourcc.
|
||||
FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420.
|
||||
FOURCC_YU16 = FOURCC('Y', 'U', '1', '6'), // Alias for I422.
|
||||
FOURCC_YU24 = FOURCC('Y', 'U', '2', '4'), // Alias for I444.
|
||||
FOURCC_YUYV = FOURCC('Y', 'U', 'Y', 'V'), // Alias for YUY2.
|
||||
FOURCC_YUVS = FOURCC('y', 'u', 'v', 's'), // Alias for YUY2 on Mac.
|
||||
FOURCC_HDYC = FOURCC('H', 'D', 'Y', 'C'), // Alias for UYVY.
|
||||
FOURCC_2VUY = FOURCC('2', 'v', 'u', 'y'), // Alias for UYVY on Mac.
|
||||
FOURCC_JPEG = FOURCC('J', 'P', 'E', 'G'), // Alias for MJPG.
|
||||
FOURCC_DMB1 = FOURCC('d', 'm', 'b', '1'), // Alias for MJPG on Mac.
|
||||
FOURCC_BA81 = FOURCC('B', 'A', '8', '1'), // Alias for BGGR.
|
||||
FOURCC_RGB3 = FOURCC('R', 'G', 'B', '3'), // Alias for RAW.
|
||||
FOURCC_BGR3 = FOURCC('B', 'G', 'R', '3'), // Alias for 24BG.
|
||||
FOURCC_CM32 = FOURCC(0, 0, 0, 32), // Alias for BGRA kCMPixelFormat_32ARGB
|
||||
FOURCC_CM24 = FOURCC(0, 0, 0, 24), // Alias for RAW kCMPixelFormat_24RGB
|
||||
// 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical FOURCC.
|
||||
FOURCC_IYUV = CRICKET_FOURCC('I', 'Y', 'U', 'V'), // Alias for I420.
|
||||
FOURCC_YU16 = CRICKET_FOURCC('Y', 'U', '1', '6'), // Alias for I422.
|
||||
FOURCC_YU24 = CRICKET_FOURCC('Y', 'U', '2', '4'), // Alias for I444.
|
||||
FOURCC_YUYV = CRICKET_FOURCC('Y', 'U', 'Y', 'V'), // Alias for YUY2.
|
||||
FOURCC_YUVS = CRICKET_FOURCC('y', 'u', 'v', 's'), // Alias for YUY2 on Mac.
|
||||
FOURCC_HDYC = CRICKET_FOURCC('H', 'D', 'Y', 'C'), // Alias for UYVY.
|
||||
FOURCC_2VUY = CRICKET_FOURCC('2', 'v', 'u', 'y'), // Alias for UYVY on Mac.
|
||||
FOURCC_JPEG = CRICKET_FOURCC('J', 'P', 'E', 'G'), // Alias for MJPG.
|
||||
FOURCC_DMB1 = CRICKET_FOURCC('d', 'm', 'b', '1'), // Alias for MJPG on Mac.
|
||||
FOURCC_BA81 = CRICKET_FOURCC('B', 'A', '8', '1'), // Alias for BGGR.
|
||||
FOURCC_RGB3 = CRICKET_FOURCC('R', 'G', 'B', '3'), // Alias for RAW.
|
||||
FOURCC_BGR3 = CRICKET_FOURCC('B', 'G', 'R', '3'), // Alias for 24BG.
|
||||
FOURCC_CM32 = CRICKET_FOURCC(0, 0, 0, 32), // BGRA kCMPixelFormat_32ARGB
|
||||
FOURCC_CM24 = CRICKET_FOURCC(0, 0, 0, 24), // RAW kCMPixelFormat_24RGB
|
||||
|
||||
// 1 Auxiliary compressed YUV format set aside for capturer.
|
||||
FOURCC_H264 = FOURCC('H', '2', '6', '4'),
|
||||
FOURCC_H264 = CRICKET_FOURCC('H', '2', '6', '4'),
|
||||
};
|
||||
|
||||
#undef CRICKET_FOURCC
|
||||
|
||||
// Match any fourcc.
|
||||
|
||||
// We move this out of the enum because using it in many places caused
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user