From 6ab8a9d375ca922b2a94cd7160a4e3c5abe6339c Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sat, 23 Jul 2022 11:11:59 -0700 Subject: lavu/pixfmt: Add packed 4:4:4 format The "AYUV" format is defined by Microsoft as their preferred format for 4:4:4 content, and so it is the format used by Intel VAAPI and QSV. As Microsoft like to define their byte ordering in little-endian fashion, the memory order is reversed, and so our pix_fmt, which follows memory order, has a reversed name (VUYA). --- doc/APIchanges | 3 +++ libavutil/pixdesc.c | 13 +++++++++++++ libavutil/pixfmt.h | 2 ++ libavutil/version.h | 2 +- tests/ref/fate/imgutils | 1 + tests/ref/fate/sws-pixdesc-query | 4 ++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 0e9ea4d7c5..0bf2b3cd77 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-08-03 - xxxxxxxxxx - lavu 57.32.100 - pixfmt.h + Add AV_PIX_FMT_VUYA. + 2022-08-xx - xxxxxxxxxx - lavc 59.41.100 - avcodec.h codec.h Add AV_CODEC_FLAG_RECON_FRAME and AV_CODEC_CAP_ENCODER_RECON_FRAME. avcodec_receive_frame() may now be used on encoders when diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 6e57a82cb6..e078fd5320 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2491,6 +2491,19 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, + [AV_PIX_FMT_VUYA] = { + .name = "vuya", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 2, 0, 8 }, /* Y */ + { 0, 4, 1, 0, 8 }, /* U */ + { 0, 4, 0, 0, 8 }, /* V */ + { 0, 4, 3, 0, 8 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, }; static const char * const color_range_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 2d3927cc3f..9d1fdaf82d 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -367,6 +367,8 @@ enum AVPixelFormat { AV_PIX_FMT_P416BE, ///< interleaved chroma YUV 4:4:4, 48bpp, big-endian AV_PIX_FMT_P416LE, ///< interleaved chroma YUV 4:4:4, 48bpp, little-endian + AV_PIX_FMT_VUYA, ///< packed VUYA 4:4:4, 32bpp, VUYAVUYA... + 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 }; diff --git a/libavutil/version.h b/libavutil/version.h index e9eefcdb2c..5095743fed 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 31 +#define LIBAVUTIL_VERSION_MINOR 32 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index b23d1b4c39..4ec66febb8 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -246,3 +246,4 @@ p216be planes: 2, linesizes: 128 128 0 0, plane_sizes: 6144 6144 p216le planes: 2, linesizes: 128 128 0 0, plane_sizes: 6144 6144 0 0, plane_offsets: 6144 0 0, total_size: 12288 p416be planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 p416le planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 +vuya planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index 76104bc5a6..bd0f1fcb82 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -215,6 +215,7 @@ isYUV: p416le uyvy422 uyyvyy411 + vuya xyz12be xyz12le y210be @@ -654,6 +655,7 @@ ALPHA: rgb32_1 rgba64be rgba64le + vuya ya16be ya16le ya8 @@ -739,6 +741,7 @@ Packed: rgba64le uyvy422 uyyvyy411 + vuya x2bgr10be x2bgr10le x2rgb10be @@ -967,5 +970,6 @@ DataInHighBits: SwappedChroma: nv21 nv42 + vuya yvyu422 -- cgit v1.2.3