Browse Source
avutil/pixfmt: remove duplicate AVPixelFormat values
Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>tags/n3.0
James Almer
10 years ago
1 changed files with 9 additions and 58 deletions
Split View
Diff Options
-
+9 -58libavutil/pixfmt.h
+ 9
- 58
libavutil/pixfmt.h
View File
| @@ -178,13 +178,6 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian | |||
| AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian | |||
| AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA | |||
| #ifdef AV_PIX_FMT_ABI_GIT_MASTER | |||
| AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| #endif | |||
| AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp | |||
| AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian | |||
| AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian | |||
| @@ -192,15 +185,8 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian | |||
| AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian | |||
| AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian | |||
| /** | |||
| * duplicated pixel formats for compatibility with libav. | |||
| * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55) | |||
| * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85) | |||
| */ | |||
| AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) | |||
| AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) | |||
| AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) | |||
| AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) | |||
| AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian | |||
| AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian | |||
| AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian | |||
| @@ -228,16 +214,10 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian | |||
| AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian | |||
| /** | |||
| * duplicated pixel formats for compatibility with libav. | |||
| * FFmpeg supports these formats since Sat Sep 24 06:01:45 2011 +0200 (commits 9569a3c9f41387a8c7d1ce97d8693520477a66c3) | |||
| * also see Fri Nov 25 01:38:21 2011 +0100 92afb431621c79155fcb7171d26f137eb1bee028 | |||
| * Libav added them Sun Mar 16 23:05:47 2014 +0100 with incompatible values (commit 1481d24c3a0abf81e1d7a514547bd5305232be30) | |||
| */ | |||
| AV_PIX_FMT_RGBA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_RGBA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| AV_PIX_FMT_BGRA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_BGRA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb | |||
| @@ -246,14 +226,9 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) | |||
| AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) | |||
| /** | |||
| * duplicated pixel formats for compatibility with libav. | |||
| * FFmpeg supports these formats since May 3 2013 (commit e6d4e687558d08187e7a415a7725e4b1a416f782) | |||
| * Libav added them Jan 14 2015 with incompatible values (commit 0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a) | |||
| */ | |||
| AV_PIX_FMT_GBRAP_LIBAV, ///< planar GBRA 4:4:4:4 32bpp | |||
| AV_PIX_FMT_GBRAP16BE_LIBAV, ///< planar GBRA 4:4:4:4 64bpp, big-endian | |||
| AV_PIX_FMT_GBRAP16LE_LIBAV, ///< planar GBRA 4:4:4:4 64bpp, little-endian | |||
| AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp | |||
| AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian | |||
| AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian | |||
| /** | |||
| * HW acceleration through QSV, data[3] contains a pointer to the | |||
| * mfxFrameSurface1 structure. | |||
| @@ -267,18 +242,10 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer | |||
| #ifndef AV_PIX_FMT_ABI_GIT_MASTER | |||
| AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian | |||
| AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian | |||
| #endif | |||
| AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined | |||
| AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined | |||
| AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined | |||
| AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined | |||
| AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) | |||
| AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) | |||
| AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian | |||
| AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian | |||
| @@ -296,9 +263,6 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian | |||
| AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian | |||
| AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian | |||
| AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp | |||
| AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian | |||
| AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian | |||
| AV_PIX_FMT_YUVJ411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV411P and setting color_range | |||
| AV_PIX_FMT_BAYER_BGGR8, ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */ | |||
| @@ -328,19 +292,6 @@ enum AVPixelFormat { | |||
| AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions | |||
| }; | |||
| #if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |||
| #define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV | |||
| #define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV | |||
| #define AV_PIX_FMT_RGBA64BE AV_PIX_FMT_RGBA64BE_LIBAV | |||
| #define AV_PIX_FMT_RGBA64LE AV_PIX_FMT_RGBA64LE_LIBAV | |||
| #define AV_PIX_FMT_BGRA64BE AV_PIX_FMT_BGRA64BE_LIBAV | |||
| #define AV_PIX_FMT_BGRA64LE AV_PIX_FMT_BGRA64LE_LIBAV | |||
| #define AV_PIX_FMT_GBRAP AV_PIX_FMT_GBRAP_LIBAV | |||
| #define AV_PIX_FMT_GBRAP16BE AV_PIX_FMT_GBRAP16BE_LIBAV | |||
| #define AV_PIX_FMT_GBRAP16LE AV_PIX_FMT_GBRAP16LE_LIBAV | |||
| #endif | |||
| #define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A | |||
| #define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP | |||