Adding colorspace flags to AVPixFmtDescriptor will allow many similar
collections of attributes spread around the codebase to be removed.
---
libavutil/pixdesc.c | 55 +++++++++++++++++++++++++++++++++-----------------
libavutil/pixdesc.h | 9 ++++++++
2 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index efc7c7e..e90a5c3 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -148,6 +148,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,2,2,0,7}, /* G */
{0,2,3,0,7}, /* B */
},
+ .flags = PIX_FMT_RGB,
},
[PIX_FMT_BGR24] = {
.name = "bgr24",
@@ -159,6 +160,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,2,2,0,7}, /* G */
{0,2,3,0,7}, /* R */
},
+ .flags = PIX_FMT_BGR,
},
[PIX_FMT_YUV422P] = {
.name = "yuv422p",
@@ -212,7 +214,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = {
{0,0,1,0,7}, /* Y */
},
- .flags = PIX_FMT_PAL,
+ .flags = PIX_FMT_PAL | PIX_FMT_GRAY,
},
[PIX_FMT_MONOWHITE] = {
.name = "monow",
@@ -222,7 +224,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = {
{0,0,1,0,0}, /* Y */
},
- .flags = PIX_FMT_BITSTREAM,
+ .flags = PIX_FMT_BITSTREAM | PIX_FMT_GRAY,
},
[PIX_FMT_MONOBLACK] = {
.name = "monob",
@@ -232,7 +234,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = {
{0,0,1,7,0}, /* Y */
},
- .flags = PIX_FMT_BITSTREAM,
+ .flags = PIX_FMT_BITSTREAM | PIX_FMT_GRAY,
},
[PIX_FMT_PAL8] = {
.name = "pal8",
@@ -242,7 +244,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = {
{0,0,1,0,7},
},
- .flags = PIX_FMT_PAL,
+ .flags = PIX_FMT_PAL | PIX_FMT_RGB,
},
[PIX_FMT_YUVJ420P] = {
.name = "yuvj420p",
@@ -317,7 +319,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,0,1,3,2}, /* G */
{0,0,1,0,2}, /* R */
},
- .flags = PIX_FMT_PAL,
+ .flags = PIX_FMT_PAL | PIX_FMT_BGR,
},
[PIX_FMT_BGR4] = {
.name = "bgr4",
@@ -329,7 +331,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,3,2,0,1}, /* G */
{0,3,4,0,0}, /* R */
},
- .flags = PIX_FMT_BITSTREAM,
+ .flags = PIX_FMT_BITSTREAM | PIX_FMT_BGR,
},
[PIX_FMT_BGR4_BYTE] = {
.name = "bgr4_byte",
@@ -341,7 +343,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,0,1,1,1}, /* G */
{0,0,1,0,0}, /* R */
},
- .flags = PIX_FMT_PAL,
+ .flags = PIX_FMT_PAL | PIX_FMT_BGR,
},
[PIX_FMT_RGB8] = {
.name = "rgb8",
@@ -353,7 +355,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,0,1,3,2}, /* G */
{0,0,1,0,2}, /* B */
},
- .flags = PIX_FMT_PAL,
+ .flags = PIX_FMT_PAL | PIX_FMT_RGB,
},
[PIX_FMT_RGB4] = {
.name = "rgb4",
@@ -365,7 +367,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,3,2,0,1}, /* G */
{0,3,4,0,0}, /* B */
},
- .flags = PIX_FMT_BITSTREAM,
+ .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB,
},
[PIX_FMT_RGB4_BYTE] = {
.name = "rgb4_byte",
@@ -377,7 +379,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,0,1,1,1}, /* G */
{0,0,1,0,0}, /* B */
},
- .flags = PIX_FMT_PAL,
+ .flags = PIX_FMT_PAL | PIX_FMT_RGB,
},
[PIX_FMT_NV12] = {
.name = "nv12",
@@ -412,6 +414,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,3,3,0,7}, /* G */
{0,3,4,0,7}, /* B */
},
+ .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
},
[PIX_FMT_RGBA] = {
.name = "rgba",
@@ -424,6 +427,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,3,3,0,7}, /* B */
{0,3,4,0,7}, /* A */
},
+ .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
},
[PIX_FMT_ABGR] = {
.name = "abgr",
@@ -436,6 +440,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,3,3,0,7}, /* G */
{0,3,4,0,7}, /* R */
},
+ .flags = PIX_FMT_BGR | PIX_FMT_ALPHA,
},
[PIX_FMT_BGRA] = {
.name = "bgra",
@@ -448,6 +453,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,3,3,0,7}, /* R */
{0,3,4,0,7}, /* A */
},
+ .flags = PIX_FMT_BGR | PIX_FMT_ALPHA,
},
[PIX_FMT_GRAY16BE] = {
.name = "gray16be",
@@ -457,7 +463,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = {
{0,1,1,0,15}, /* Y */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_GRAY,
},
[PIX_FMT_GRAY16LE] = {
.name = "gray16le",
@@ -467,6 +473,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
.comp = {
{0,1,1,0,15}, /* Y */
},
+ .flags = PIX_FMT_GRAY,
},
[PIX_FMT_YUV440P] = {
.name = "yuv440p",
@@ -501,6 +508,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{2,0,1,0,7}, /* V */
{3,0,1,0,7}, /* A */
},
+ .flags = PIX_FMT_ALPHA,
},
[PIX_FMT_VDPAU_H264] = {
.name = "vdpau_h264",
@@ -548,7 +556,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_RGB,
},
[PIX_FMT_RGB48LE] = {
.name = "rgb48le",
@@ -560,6 +568,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* B */
},
+ .flags = PIX_FMT_RGB,
},
[PIX_FMT_RGB565BE] = {
.name = "rgb565be",
@@ -571,7 +580,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* B */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_RGB,
},
[PIX_FMT_RGB565LE] = {
.name = "rgb565le",
@@ -583,6 +592,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* B */
},
+ .flags = PIX_FMT_RGB,
},
[PIX_FMT_RGB555BE] = {
.name = "rgb555be",
@@ -594,7 +604,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,4}, /* G */
{0,1,1,0,4}, /* B */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_RGB,
},
[PIX_FMT_RGB555LE] = {
.name = "rgb555le",
@@ -606,6 +616,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,4}, /* G */
{0,1,1,0,4}, /* B */
},
+ .flags = PIX_FMT_RGB,
},
[PIX_FMT_RGB444BE] = {
.name = "rgb444be",
@@ -617,7 +628,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,4,3}, /* G */
{0,1,1,0,3}, /* B */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_RGB,
},
[PIX_FMT_RGB444LE] = {
.name = "rgb444le",
@@ -629,6 +640,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,4,3}, /* G */
{0,1,1,0,3}, /* B */
},
+ .flags = PIX_FMT_RGB,
},
[PIX_FMT_BGR48BE] = {
.name = "bgr48be",
@@ -640,7 +652,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* R */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_BGR,
},
[PIX_FMT_BGR48LE] = {
.name = "bgr48le",
@@ -652,6 +664,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,5,3,0,15}, /* G */
{0,5,5,0,15}, /* R */
},
+ .flags = PIX_FMT_BGR,
},
[PIX_FMT_BGR565BE] = {
.name = "bgr565be",
@@ -663,7 +676,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* R */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_BGR,
},
[PIX_FMT_BGR565LE] = {
.name = "bgr565le",
@@ -675,6 +688,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,5}, /* G */
{0,1,1,0,4}, /* R */
},
+ .flags = PIX_FMT_BGR,
},
[PIX_FMT_BGR555BE] = {
.name = "bgr555be",
@@ -686,7 +700,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,4}, /* G */
{0,1,1,0,4}, /* R */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_BGR,
},
[PIX_FMT_BGR555LE] = {
.name = "bgr555le",
@@ -698,6 +712,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,5,4}, /* G */
{0,1,1,0,4}, /* R */
},
+ .flags = PIX_FMT_BGR,
},
[PIX_FMT_BGR444BE] = {
.name = "bgr444be",
@@ -709,7 +724,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,4,3}, /* G */
{0,1,1,0,3}, /* R */
},
- .flags = PIX_FMT_BE,
+ .flags = PIX_FMT_BE | PIX_FMT_BGR,
},
[PIX_FMT_BGR444LE] = {
.name = "bgr444le",
@@ -721,6 +736,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,4,3}, /* G */
{0,1,1,0,3}, /* R */
},
+ .flags = PIX_FMT_BGR,
},
[PIX_FMT_VAAPI_MOCO] = {
.name = "vaapi_moco",
@@ -937,6 +953,7 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[PIX_FMT_NB] = {
{0,1,1,0,7}, /* Y */
{0,1,2,0,7}, /* A */
},
+ .flags = PIX_FMT_GRAY | PIX_FMT_ALPHA,
},
};
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index 979a235..a1195ea 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -87,6 +87,15 @@ typedef struct AVPixFmtDescriptor{
#define PIX_FMT_PAL 2 ///< Pixel format has a palette in
data[1], values are indexes in this palette.
#define PIX_FMT_BITSTREAM 4 ///< All values of a component are
bit-wise packed end to end.
#define PIX_FMT_HWACCEL 8 ///< Pixel format is an HW accelerated format.
+#define PIX_FMT_ALPHA 0x10 ///< Pixel format has an alpha channel.
+
+#define PIX_FMT_YUV 0x00
+#define PIX_FMT_GRAY 0x20
+#define PIX_FMT_RGB 0x40
+#define PIX_FMT_BGR 0x60
+
+#define PIX_FMT_RGB_BIT 0x40 ///< Bit mask to check for RGB.
+#define PIX_FMT_CS_BITS 0x60 ///< Bit mask for the colorspace information.
/**
* The array of all the pixel format descriptors.
--
1.7.4.msysgit.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
