Skip to content

F
ffmpeg
Commit cbe5a60c authored by Luca Barbato's avatar Luca Barbato
Browse files
Options

pixdesc: add PIX_FMT_ALPHA flag

parent b353321c
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 24 deletions
libavutil/pixdesc.c
View file @ cbe5a60c
...@@ -435,7 +435,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -435,7 +435,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 3, 3, 0, 7 }, /* G */ { 0, 3, 3, 0, 7 }, /* G */
{ 0, 3, 4, 0, 7 }, /* B */ { 0, 3, 4, 0, 7 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_RGBA] = { [AV_PIX_FMT_RGBA] = {
.name = "rgba", .name = "rgba",
...@@ -448,7 +448,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -448,7 +448,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 3, 3, 0, 7 }, /* B */ { 0, 3, 3, 0, 7 }, /* B */
{ 0, 3, 4, 0, 7 }, /* A */ { 0, 3, 4, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_ABGR] = { [AV_PIX_FMT_ABGR] = {
.name = "abgr", .name = "abgr",
...@@ -461,7 +461,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -461,7 +461,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 3, 3, 0, 7 }, /* G */ { 0, 3, 3, 0, 7 }, /* G */
{ 0, 3, 4, 0, 7 }, /* R */ { 0, 3, 4, 0, 7 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_BGRA] = { [AV_PIX_FMT_BGRA] = {
.name = "bgra", .name = "bgra",
...@@ -474,7 +474,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -474,7 +474,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 3, 3, 0, 7 }, /* R */ { 0, 3, 3, 0, 7 }, /* R */
{ 0, 3, 4, 0, 7 }, /* A */ { 0, 3, 4, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_GRAY16BE] = { [AV_PIX_FMT_GRAY16BE] = {
.name = "gray16be", .name = "gray16be",
...@@ -530,7 +530,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -530,7 +530,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 0, 1, 0, 7 }, /* V */ { 2, 0, 1, 0, 7 }, /* V */
{ 3, 0, 1, 0, 7 }, /* A */ { 3, 0, 1, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P] = { [AV_PIX_FMT_YUVA422P] = {
.name = "yuva422p", .name = "yuva422p",
...@@ -543,7 +543,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -543,7 +543,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 0, 1, 0, 7 }, /* V */ { 2, 0, 1, 0, 7 }, /* V */
{ 3, 0, 1, 0, 7 }, /* A */ { 3, 0, 1, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P] = { [AV_PIX_FMT_YUVA444P] = {
.name = "yuva444p", .name = "yuva444p",
...@@ -556,7 +556,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -556,7 +556,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 0, 1, 0, 7 }, /* V */ { 2, 0, 1, 0, 7 }, /* V */
{ 3, 0, 1, 0, 7 }, /* A */ { 3, 0, 1, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA420P9BE] = { [AV_PIX_FMT_YUVA420P9BE] = {
.name = "yuva420p9be", .name = "yuva420p9be",
...@@ -582,7 +582,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -582,7 +582,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 8 }, /* V */ { 2, 1, 1, 0, 8 }, /* V */
{ 3, 1, 1, 0, 8 }, /* A */ { 3, 1, 1, 0, 8 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P9BE] = { [AV_PIX_FMT_YUVA422P9BE] = {
.name = "yuva422p9be", .name = "yuva422p9be",
...@@ -595,7 +595,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -595,7 +595,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 8 }, /* V */ { 2, 1, 1, 0, 8 }, /* V */
{ 3, 1, 1, 0, 8 }, /* A */ { 3, 1, 1, 0, 8 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P9LE] = { [AV_PIX_FMT_YUVA422P9LE] = {
.name = "yuva422p9le", .name = "yuva422p9le",
...@@ -608,7 +608,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -608,7 +608,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 8 }, /* V */ { 2, 1, 1, 0, 8 }, /* V */
{ 3, 1, 1, 0, 8 }, /* A */ { 3, 1, 1, 0, 8 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P9BE] = { [AV_PIX_FMT_YUVA444P9BE] = {
.name = "yuva444p9be", .name = "yuva444p9be",
...@@ -621,7 +621,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -621,7 +621,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 8 }, /* V */ { 2, 1, 1, 0, 8 }, /* V */
{ 3, 1, 1, 0, 8 }, /* A */ { 3, 1, 1, 0, 8 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P9LE] = { [AV_PIX_FMT_YUVA444P9LE] = {
.name = "yuva444p9le", .name = "yuva444p9le",
...@@ -634,7 +634,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -634,7 +634,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 8 }, /* V */ { 2, 1, 1, 0, 8 }, /* V */
{ 3, 1, 1, 0, 8 }, /* A */ { 3, 1, 1, 0, 8 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA420P10BE] = { [AV_PIX_FMT_YUVA420P10BE] = {
.name = "yuva420p10be", .name = "yuva420p10be",
...@@ -647,7 +647,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -647,7 +647,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 9 }, /* V */ { 2, 1, 1, 0, 9 }, /* V */
{ 3, 1, 1, 0, 9 }, /* A */ { 3, 1, 1, 0, 9 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA420P10LE] = { [AV_PIX_FMT_YUVA420P10LE] = {
.name = "yuva420p10le", .name = "yuva420p10le",
...@@ -660,7 +660,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -660,7 +660,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P10BE] = { [AV_PIX_FMT_YUVA422P10BE] = {
.name = "yuva422p10be", .name = "yuva422p10be",
...@@ -673,7 +673,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -673,7 +673,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P10LE] = { [AV_PIX_FMT_YUVA422P10LE] = {
.name = "yuva422p10le", .name = "yuva422p10le",
...@@ -686,7 +686,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -686,7 +686,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P10BE] = { [AV_PIX_FMT_YUVA444P10BE] = {
.name = "yuva444p10be", .name = "yuva444p10be",
...@@ -699,7 +699,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -699,7 +699,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P10LE] = { [AV_PIX_FMT_YUVA444P10LE] = {
.name = "yuva444p10le", .name = "yuva444p10le",
...@@ -712,7 +712,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -712,7 +712,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA420P16BE] = { [AV_PIX_FMT_YUVA420P16BE] = {
.name = "yuva420p16be", .name = "yuva420p16be",
...@@ -725,7 +725,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -725,7 +725,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA420P16LE] = { [AV_PIX_FMT_YUVA420P16LE] = {
.name = "yuva420p16le", .name = "yuva420p16le",
...@@ -738,7 +738,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -738,7 +738,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P16BE] = { [AV_PIX_FMT_YUVA422P16BE] = {
.name = "yuva422p16be", .name = "yuva422p16be",
...@@ -751,7 +751,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -751,7 +751,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA422P16LE] = { [AV_PIX_FMT_YUVA422P16LE] = {
.name = "yuva422p16le", .name = "yuva422p16le",
...@@ -764,7 +764,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -764,7 +764,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P16BE] = { [AV_PIX_FMT_YUVA444P16BE] = {
.name = "yuva444p16be", .name = "yuva444p16be",
...@@ -777,7 +777,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -777,7 +777,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_YUVA444P16LE] = { [AV_PIX_FMT_YUVA444P16LE] = {
.name = "yuva444p16le", .name = "yuva444p16le",
...@@ -790,7 +790,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -790,7 +790,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 2, 1, 1, 0, 15 }, /* V */ { 2, 1, 1, 0, 15 }, /* V */
{ 3, 1, 1, 0, 15 }, /* A */ { 3, 1, 1, 0, 15 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_VDPAU_H264] = { [AV_PIX_FMT_VDPAU_H264] = {
.name = "vdpau_h264", .name = "vdpau_h264",
...@@ -1273,6 +1273,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -1273,6 +1273,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 1, 1, 0, 7 }, /* Y */ { 0, 1, 1, 0, 7 }, /* Y */
{ 0, 1, 2, 0, 7 }, /* A */ { 0, 1, 2, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_ALPHA,
}, },
[AV_PIX_FMT_GBRP] = { [AV_PIX_FMT_GBRP] = {
.name = "gbrp", .name = "gbrp",
......
libavutil/pixdesc.h
View file @ cbe5a60c
...@@ -96,6 +96,9 @@ typedef struct AVPixFmtDescriptor{ ...@@ -96,6 +96,9 @@ typedef struct AVPixFmtDescriptor{
*/ */
#define PIX_FMT_PSEUDOPAL 64 #define PIX_FMT_PSEUDOPAL 64
#define PIX_FMT_ALPHA 128 ///< The pixel format has an alpha channel
#if FF_API_PIX_FMT_DESC #if FF_API_PIX_FMT_DESC
/** /**
* The array of all the pixel format descriptors. * The array of all the pixel format descriptors.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment