virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Revert "lavu/pixfmt: add grayscale 10 and 12-bit MSB padded variants"

Browse Source 
This reverts commit ed5b694ebe.
This commit is contained in:
Lynne
2025-11-06 18:52:17 +01:00
parent 26236a47b2
commit 9a7174bc9a
4 changed files with 0 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libavutil/pixdesc.c
View File

@@ -734,27 +734,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.alias = "y10le",
},
[AV_PIX_FMT_GRAY10MSBBE] = {
.name = "gray10msbbe",
.nb_components = 1,
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
{ 0, 2, 0, 6, 10 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y10msbbe",
},
[AV_PIX_FMT_GRAY10MSBLE] = {
.name = "gray10msble",
.nb_components = 1,
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
{ 0, 2, 0, 6, 10 }, /* Y */
},
.alias = "y10msble",
},
[AV_PIX_FMT_GRAY12BE] = {
.name = "gray12be",
.nb_components = 1,
@@ -776,27 +755,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.alias = "y12le",
},
[AV_PIX_FMT_GRAY12MSBBE] = {
.name = "gray12msbbe",
.nb_components = 1,
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
{ 0, 2, 0, 4, 12 }, /* Y */
},
.flags = AV_PIX_FMT_FLAG_BE,
.alias = "y12msbbe",
},
[AV_PIX_FMT_GRAY12MSBLE] = {
.name = "gray12msble",
.nb_components = 1,
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
{ 0, 2, 0, 4, 12 }, /* Y */
},
.alias = "y12msble",
},
[AV_PIX_FMT_GRAY14BE] = {
.name = "gray14be",
.nb_components = 1,

7
libavutil/pixfmt.h
View File

@@ -499,11 +499,6 @@ enum AVPixelFormat {
AV_PIX_FMT_OHCODEC, /// hardware decoding through openharmony
AV_PIX_FMT_GRAY10MSBBE, ///< Y , 10bpp, lowest bits zero, big-endian
AV_PIX_FMT_GRAY10MSBLE, ///< Y , 10bpp, lowest bits zero, little-endian
AV_PIX_FMT_GRAY12MSBBE, ///< Y , 12bpp, lowest bits zero, big-endian
AV_PIX_FMT_GRAY12MSBLE, ///< Y , 12bpp, lowest bits zero, little-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
};
@@ -556,8 +551,6 @@ enum AVPixelFormat {
#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
#define AV_PIX_FMT_GRAY10MSB AV_PIX_FMT_NE(GRAY10MSBBE, GRAY10MSBLE)
#define AV_PIX_FMT_GRAY12MSB AV_PIX_FMT_NE(GRAY12MSBBE, GRAY12MSBLE)
#define AV_PIX_FMT_YUV444P10MSB AV_PIX_FMT_NE(YUV444P10MSBBE, YUV444P10MSBLE)
#define AV_PIX_FMT_YUV444P12MSB AV_PIX_FMT_NE(YUV444P12MSBBE, YUV444P12MSBLE)

8
tests/ref/fate/imgutils
View File

@@ -306,10 +306,6 @@ gbrp10msbbe planes: 3, linesizes: 128 128 128 0, plane_sizes: 6144 6144
gbrp10msble planes: 3, linesizes: 128 128 128 0, plane_sizes: 6144 6144 6144 0, plane_offsets: 6144 6144 0, total_size: 18432
gbrp12msbbe planes: 3, linesizes: 128 128 128 0, plane_sizes: 6144 6144 6144 0, plane_offsets: 6144 6144 0, total_size: 18432
gbrp12msble planes: 3, linesizes: 128 128 128 0, plane_sizes: 6144 6144 6144 0, plane_offsets: 6144 6144 0, total_size: 18432
gray10msbbe planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144
gray10msble planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144
gray12msbbe planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144
gray12msble planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144
image_fill_black tests
yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af
@@ -563,7 +559,3 @@ gbrp10msbbe total_size: 18432, black_unknown_crc: 0x00000000, black_tv_cr
gbrp10msble total_size: 18432, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000
gbrp12msbbe total_size: 18432, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000
gbrp12msble total_size: 18432, black_unknown_crc: 0x00000000, black_tv_crc: 0x00000000, black_pc_crc: 0x00000000
gray10msbbe total_size: 6144, black_unknown_crc: 0x02d4a26f, black_tv_crc: 0x02d4a26f, black_pc_crc: 0x00000000
gray10msble total_size: 6144, black_unknown_crc: 0xb93165c3, black_tv_crc: 0xb93165c3, black_pc_crc: 0x00000000
gray12msbbe total_size: 6144, black_unknown_crc: 0x02d4a26f, black_tv_crc: 0x02d4a26f, black_pc_crc: 0x00000000
gray12msble total_size: 6144, black_unknown_crc: 0xb93165c3, black_tv_crc: 0xb93165c3, black_pc_crc: 0x00000000

14
tests/ref/fate/sws-pixdesc-query
View File

@@ -73,12 +73,8 @@ isNBPS:
gbrp9le
gray10be
gray10le
gray10msbbe
gray10msble
gray12be
gray12le
gray12msbbe
gray12msble
gray14be
gray14le
gray9be
@@ -190,9 +186,7 @@ isBE:
gbrpf16be
gbrpf32be
gray10be
gray10msbbe
gray12be
gray12msbbe
gray14be
gray16be
gray32be
@@ -631,12 +625,8 @@ Gray:
gray
gray10be
gray10le
gray10msbbe
gray10msble
gray12be
gray12le
gray12msbbe
gray12msble
gray14be
gray14le
gray16be
@@ -1235,10 +1225,6 @@ DataInHighBits:
gbrp10msble
gbrp12msbbe
gbrp12msble
gray10msbbe
gray10msble
gray12msbbe
gray12msble
p010be
p010le
p012be