@@ -205,6 +205,68 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */
},
},
+ [AV_PIX_FMT_Y210LE] = {
+ .name = "y210le",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 4, 0, 6, 10, 3, 9, 1 }, /* Y */
+ { 0, 8, 2, 6, 10, 7, 9, 3 }, /* U */
+ { 0, 8, 6, 6, 10, 7, 9, 7 }, /* V */
+ },
+ },
+ [AV_PIX_FMT_Y210BE] = {
+ .name = "y210be",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 4, 0, 6, 10, 3, 9, 1 }, /* Y */
+ { 0, 8, 2, 6, 10, 7, 9, 3 }, /* U */
+ { 0, 8, 6, 6, 10, 7, 9, 7 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_BE,
+ },
+ [AV_PIX_FMT_AYUV] = {
+ .name = "ayuv",
+ .nb_components = 4,
+ .log2_chroma_w = 0,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */
+ { 0, 4, 2, 0, 8, 3, 7, 3 }, /* U */
+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */
+ { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
+ },
+ .flags = AV_PIX_FMT_FLAG_ALPHA,
+ },
+ [AV_PIX_FMT_Y410LE] = {
+ .name = "y410le",
+ .nb_components = 4,
+ .log2_chroma_w = 0,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 32, 10, 0, 10, 31, 9, 11 }, /* Y */
+ { 0, 32, 0, 0, 10, 31, 9, 1 }, /* U */
+ { 0, 32, 20, 0, 10, 31, 9, 21 }, /* V */
+ { 0, 32, 30, 0, 2, 31, 1, 31 }, /* A */
+ },
+ .flags = AV_PIX_FMT_FLAG_ALPHA | AV_PIX_FMT_FLAG_BITSTREAM,
+ },
+ [AV_PIX_FMT_Y410BE] = {
+ .name = "y410be",
+ .nb_components = 4,
+ .log2_chroma_w = 0,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 32, 10, 0, 10, 31, 9, 11 }, /* Y */
+ { 0, 32, 0, 0, 10, 31, 9, 1 }, /* U */
+ { 0, 32, 20, 0, 10, 31, 9, 21 }, /* V */
+ { 0, 32, 30, 0, 2, 31, 1, 31 }, /* A */
+ },
+ .flags = AV_PIX_FMT_FLAG_ALPHA | AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_BE,
+ },
[AV_PIX_FMT_RGB24] = {
.name = "rgb24",
.nb_components = 3,
@@ -348,6 +348,12 @@ enum AVPixelFormat {
AV_PIX_FMT_NV24, ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
AV_PIX_FMT_NV42, ///< as above, but U and V bytes are swapped
+ AV_PIX_FMT_Y210BE, ///< packed YUV 4:2:2, 32bpp, Y0 Cb Y1 Cr, big-endian
+ AV_PIX_FMT_Y210LE, ///< packed YUV 4:2:2, 32bpp, Y0 Cb Y1 Cr, little-endian
+ AV_PIX_FMT_AYUV, ///< packed YUV 4:4:4, 32bpp, A Y Cb Cr,
+ AV_PIX_FMT_Y410LE, ///< packed YUV 4:4:4, 32bpp, Cr Y Cb A, little-endian
+ AV_PIX_FMT_Y410BE, ///< packed YUV 4:4:4, 32bpp, Cr Y Cb A, big-endian
+
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
};
@@ -436,6 +442,9 @@ enum AVPixelFormat {
#define AV_PIX_FMT_P010 AV_PIX_FMT_NE(P010BE, P010LE)
#define AV_PIX_FMT_P016 AV_PIX_FMT_NE(P016BE, P016LE)
+#define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE)
+#define AV_PIX_FMT_Y410 AV_PIX_FMT_NE(Y410BE, Y410LE)
+
/**
* Chromaticity coordinates of the source primaries.
* These values match the ones defined by ISO/IEC 23001-8_2013 ยง 7.1.
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 56
-#define LIBAVUTIL_VERSION_MINOR 35
+#define LIBAVUTIL_VERSION_MINOR 36
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -59,6 +59,10 @@ isNBPS:
p010le
xyz12be
xyz12le
+ y210be
+ y210le
+ y410be
+ y410le
yuv420p10be
yuv420p10le
yuv420p12be
@@ -140,6 +144,8 @@ isBE:
rgb565be
rgba64be
xyz12be
+ y210be
+ y410be
ya16be
yuv420p10be
yuv420p12be
@@ -171,6 +177,7 @@ isBE:
yuva444p9be
isYUV:
+ ayuv
ayuv64be
ayuv64le
nv12
@@ -188,6 +195,10 @@ isYUV:
uyyvyy411
xyz12be
xyz12le
+ y210be
+ y210le
+ y410be
+ y410le
ya16be
ya16le
ya8
@@ -579,6 +590,7 @@ AnyRGB:
rgba64le
ALPHA:
+ ayuv
ayuv64be
ayuv64le
bgr32
@@ -599,6 +611,8 @@ ALPHA:
rgb32_1
rgba64be
rgba64le
+ y410be
+ y410le
ya16be
ya16le
ya8
@@ -631,6 +645,7 @@ ALPHA:
Packed:
0bgr
0rgb
+ ayuv
ayuv64be
ayuv64le
bayer_bggr16be
@@ -686,6 +701,10 @@ Packed:
uyyvyy411
xyz12be
xyz12le
+ y210be
+ y210le
+ y410be
+ y410le
ya16be
ya16le
ya8
Previously, media driver provided planar format(like 420 8 bit), but for HEVC Range Extension (422/444 8/10 bit), the decoded image is produced in packed format because Windows expects it. Add some packed pixel formats for hardware decode support in VAAPI and QSV: 4:2:2 10 bit: Y210 4:4:4 8 bit: AYUV 4:4:4 10 bit: Y410 Add query support in fate. Signed-off-by: Linjie Fu <linjie.fu@intel.com> --- libavutil/pixdesc.c | 62 ++++++++++++++++++++++++++++++++++++++++ libavutil/pixfmt.h | 9 ++++++ libavutil/version.h | 2 +- tests/ref/fate/sws-pixdesc-query | 19 ++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-)