Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avutil/pixdesc: add AV_PIX_FMT_FLAG_XYZ

Browse source 
There are already several places in the codebase that match desc->name
against "xyz", and many downstream clients replicate this behavior.
I have no idea why this is not just a flag.

Motivated by my desire to add yet another check for XYZ to the codebase,
and I'd rather not keep copy/pasting a string comparison hack.
This commit is contained in:
Niklas Haas 2023-10-31 15:46:07 +01:00
parent 96dfc4481b
commit 57c16323f2
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/APIchanges
View file

@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first: API changes, most recent first:
2023-10-31 - xxxxxxxxxx - lavu 58.31.100 - pixdesc.h
Add AV_PIX_FMT_FLAG_XYZ.
-------- 8< --------- FFmpeg 6.1 was cut here -------- 8< --------- -------- 8< --------- FFmpeg 6.1 was cut here -------- 8< ---------
2023-10-27 - xxxxxxxxxx - lavu 58.28.100 - channel_layout.h 2023-10-27 - xxxxxxxxxx - lavu 58.28.100 - channel_layout.h

6
libavutil/pixdesc.c
View file

@ -1977,8 +1977,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 6, 0, 4, 12 }, /* X */ { 0, 6, 0, 4, 12 }, /* X */
{ 0, 6, 2, 4, 12 }, /* Y */ { 0, 6, 2, 4, 12 }, /* Y */
{ 0, 6, 4, 4, 12 }, /* Z */ { 0, 6, 4, 4, 12 }, /* Z */
}, },
/*.flags = -- not used*/ .flags = AV_PIX_FMT_FLAG_XYZ,
}, },
[AV_PIX_FMT_XYZ12BE] = { [AV_PIX_FMT_XYZ12BE] = {
.name = "xyz12be", .name = "xyz12be",
@ -1990,7 +1990,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
{ 0, 6, 2, 4, 12 }, /* Y */ { 0, 6, 2, 4, 12 }, /* Y */
{ 0, 6, 4, 4, 12 }, /* Z */ { 0, 6, 4, 4, 12 }, /* Z */
}, },
.flags = AV_PIX_FMT_FLAG_BE, .flags = AV_PIX_FMT_FLAG_XYZ | AV_PIX_FMT_FLAG_BE,
}, },
#define BAYER8_DESC_COMMON \ #define BAYER8_DESC_COMMON \

5
libavutil/pixdesc.h
View file

@ -157,6 +157,11 @@ typedef struct AVPixFmtDescriptor {
*/ */
#define AV_PIX_FMT_FLAG_FLOAT (1 << 9) #define AV_PIX_FMT_FLAG_FLOAT (1 << 9)
/**
* The pixel format contains XYZ-like data (as opposed to YUV/RGB/grayscale).
*/
#define AV_PIX_FMT_FLAG_XYZ (1 << 10)
/** /**
* Return the number of bits per pixel used by the pixel format * Return the number of bits per pixel used by the pixel format
* described by pixdesc. Note that this is not the same as the number * described by pixdesc. Note that this is not the same as the number

2
libavutil/version.h
View file

@ -79,7 +79,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 58 #define LIBAVUTIL_VERSION_MAJOR 58
#define LIBAVUTIL_VERSION_MINOR 30 #define LIBAVUTIL_VERSION_MINOR 31
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \