The branch, master has been updated
via dd80ecb666f03d07cc8bca115bd5074cd63f59ed (commit)
via 6720f71247edb4bff4b2806bfa0b1597873406b4 (commit)
via 9a7174bc9af4c0f67c55ce4ff97abc76abd40323 (commit)
via 26236a47b26942b470b9e33b27335d7befe2543c (commit)
via b982b2a2a3c2a0fa6ba7f47407a7423e5370421d (commit)
via 72a19a1c4a623bbc792f0139cf4449ab05d1e162 (commit)
via 22cc958c58488827115d1fce7c8ec6abf13bf498 (commit)
via 2c7732a67688dbf0cface4def22aa3312fd80949 (commit)
via 38df9ba71b0bb047b9d1c9200e8e31c5f097111b (commit)
via 15e82dc45221a2e368474751a351fe28d700936b (commit)
via deaece6e56e2bc9ad01092df68c09012e3384d49 (commit)
from 4bee01084475169fe26e859446b3833ad2804a52 (commit)
- Log -----------------------------------------------------------------
commit dd80ecb666f03d07cc8bca115bd5074cd63f59ed
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 21:47:08 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:47:08 2025 +0100
doc/APIchanges: bump lavu minor and remove reverted pixfmts
diff --git a/doc/APIchanges b/doc/APIchanges
index d1e535d6e8..9d128ae77b 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -17,11 +17,6 @@ API changes, most recent first:
Add AVCOL_TRC_EXT_BASE, AVCOL_TRC_V_LOG,
AVCOL_PRI_EXT_BASE and AVCOL_PRI_V_GAMUT.
-2025-10-xx - xxxxxxxxxx - lavu 60.15.100 - pixfmt.h
- Add AV_PIX_FMT_GRAY10MSB, AV_PIX_FMT_GRAY12MSB,
- AV_PIX_FMT_YUV420P10MSB, AV_PIX_FMT_YUV420P12MSB,
- AV_PIX_FMT_YUV422P10MSB, AV_PIX_FMT_YUV422P12MSB.
-
2025-10-xx - xxxxxxxxxx - lavu 60.14.100 - csp.h
Add av_csp_approximate_eotf_gamma().
diff --git a/libavutil/version.h b/libavutil/version.h
index a9039fe865..b16b88bfca 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 60
-#define LIBAVUTIL_VERSION_MINOR 16
+#define LIBAVUTIL_VERSION_MINOR 17
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
commit 6720f71247edb4bff4b2806bfa0b1597873406b4
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:42:26 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:46:43 2025 +0100
Revert "vulkan/prores: output LSB-padded data"
This reverts commit 909d71322a0694b1158a046d531f2d60c680af4d.
The issue was elsewhere, not in our code.
diff --git a/libavcodec/vulkan/prores_idct.comp
b/libavcodec/vulkan/prores_idct.comp
index 642fcb5bd5..645cb02979 100644
--- a/libavcodec/vulkan/prores_idct.comp
+++ b/libavcodec/vulkan/prores_idct.comp
@@ -110,14 +110,14 @@ void main(void)
idct(block, idx, 9);
float fact = 1.0f / (1 << (12 - depth)), off = 1 << (depth - 1);
- int maxv = (1 << depth) - 1, shift = 16 - depth;
+ int maxv = (1 << depth) - 1;
/* 7.5.1 Color Component Samples. Rescale, clamp and write back to global
memory */
barrier();
if (act) {
[[unroll]] for (uint i = 0; i < 8; ++i) {
float v = blocks[block][i * 9 + idx] * fact + off;
- put_px(comp, ivec2(gid.x, (gid.y << 3) | i), clamp(int(v), 0,
maxv) << shift);
+ put_px(comp, ivec2(gid.x, (gid.y << 3) | i), clamp(int(v), 0,
maxv));
}
}
}
commit 9a7174bc9af4c0f67c55ce4ff97abc76abd40323
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:52:17 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:46:43 2025 +0100
Revert "lavu/pixfmt: add grayscale 10 and 12-bit MSB padded variants"
This reverts commit ed5b694ebeb4af5669f638d9045efe1f138bc538.
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 7bafecdbde..90f9596def 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -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,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 83e80cf21f..2e7b6457e0 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -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)
diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils
index 738ce0289c..ccd1522ef2 100644
--- a/tests/ref/fate/imgutils
+++ b/tests/ref/fate/imgutils
@@ -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
diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
index af421b4eee..a062088d54 100644
--- a/tests/ref/fate/sws-pixdesc-query
+++ b/tests/ref/fate/sws-pixdesc-query
@@ -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
commit 26236a47b26942b470b9e33b27335d7befe2543c
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:51:52 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:46:43 2025 +0100
Revert "lavu/pixfmt: add 420 and 422, 10 and 12-bit MSB padded variants"
This reverts commit e42c7698f5375a5ca53a135b0f1f33c9a338872f.
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 0e00142995..7bafecdbde 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1503,30 +1503,6 @@ static const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
- [AV_PIX_FMT_YUV420P10MSBLE] = {
- .name = "yuv420p10msble",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 1,
- .comp = {
- { 0, 2, 0, 6, 10 }, /* Y */
- { 1, 2, 0, 6, 10 }, /* U */
- { 2, 2, 0, 6, 10 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_PLANAR,
- },
- [AV_PIX_FMT_YUV420P10MSBBE] = {
- .name = "yuv420p10msbbe",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 1,
- .comp = {
- { 0, 2, 0, 6, 10 }, /* Y */
- { 1, 2, 0, 6, 10 }, /* U */
- { 2, 2, 0, 6, 10 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
- },
[AV_PIX_FMT_YUV420P12LE] = {
.name = "yuv420p12le",
.nb_components = 3,
@@ -1551,30 +1527,6 @@ static const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
- [AV_PIX_FMT_YUV420P12MSBLE] = {
- .name = "yuv420p12msble",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 1,
- .comp = {
- { 0, 2, 0, 4, 12 }, /* Y */
- { 1, 2, 0, 4, 12 }, /* U */
- { 2, 2, 0, 4, 12 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_PLANAR,
- },
- [AV_PIX_FMT_YUV420P12MSBBE] = {
- .name = "yuv420p12msbbe",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 1,
- .comp = {
- { 0, 2, 0, 4, 12 }, /* Y */
- { 1, 2, 0, 4, 12 }, /* U */
- { 2, 2, 0, 4, 12 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
- },
[AV_PIX_FMT_YUV420P14LE] = {
.name = "yuv420p14le",
.nb_components = 3,
@@ -1671,30 +1623,6 @@ static const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
- [AV_PIX_FMT_YUV422P10MSBLE] = {
- .name = "yuv422p10msble",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 0,
- .comp = {
- { 0, 2, 0, 6, 10 }, /* Y */
- { 1, 2, 0, 6, 10 }, /* U */
- { 2, 2, 0, 6, 10 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_PLANAR,
- },
- [AV_PIX_FMT_YUV422P10MSBBE] = {
- .name = "yuv422p10msbbe",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 0,
- .comp = {
- { 0, 2, 0, 6, 10 }, /* Y */
- { 1, 2, 0, 6, 10 }, /* U */
- { 2, 2, 0, 6, 10 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
- },
[AV_PIX_FMT_YUV422P12LE] = {
.name = "yuv422p12le",
.nb_components = 3,
@@ -1719,30 +1647,6 @@ static const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
- [AV_PIX_FMT_YUV422P12MSBLE] = {
- .name = "yuv422p12msble",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 0,
- .comp = {
- { 0, 2, 0, 4, 12 }, /* Y */
- { 1, 2, 0, 4, 12 }, /* U */
- { 2, 2, 0, 4, 12 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_PLANAR,
- },
- [AV_PIX_FMT_YUV422P12MSBBE] = {
- .name = "yuv422p12msbbe",
- .nb_components = 3,
- .log2_chroma_w = 1,
- .log2_chroma_h = 0,
- .comp = {
- { 0, 2, 0, 4, 12 }, /* Y */
- { 1, 2, 0, 4, 12 }, /* U */
- { 2, 2, 0, 4, 12 }, /* V */
- },
- .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
- },
[AV_PIX_FMT_YUV422P14LE] = {
.name = "yuv422p14le",
.nb_components = 3,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 27e0b2d7a7..83e80cf21f 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -503,14 +503,6 @@ enum AVPixelFormat {
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_YUV420P10MSBBE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample
per 2x2 Y samples), lowest bits zero, big-endian
- AV_PIX_FMT_YUV420P10MSBLE, ///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample
per 2x2 Y samples), lowest bits zero, little-endian
- AV_PIX_FMT_YUV420P12MSBBE, ///< planar YUV 4:2:0, 18bpp, (1 Cr & Cb sample
per 2x2 Y samples), lowest bits zero, big-endian
- AV_PIX_FMT_YUV420P12MSBLE, ///< planar YUV 4:2:0, 18bpp, (1 Cr & Cb sample
per 2x2 Y samples), lowest bits zero, little-endian
- AV_PIX_FMT_YUV422P10MSBBE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample
per 2x1 Y samples), lowest bits zero, big-endian
- AV_PIX_FMT_YUV422P10MSBLE, ///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample
per 2x1 Y samples), lowest bits zero, little-endian
- AV_PIX_FMT_YUV422P12MSBBE, ///< planar YUV 4:2:2, 24bpp, (1 Cr & Cb sample
per 2x1 Y samples), lowest bits zero, big-endian
- AV_PIX_FMT_YUV422P12MSBLE, ///< planar YUV 4:2:2, 24bpp, (1 Cr & Cb sample
per 2x1 Y samples), 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
};
@@ -566,10 +558,6 @@ enum AVPixelFormat {
#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_YUV420P10MSB AV_PIX_FMT_NE(YUV420P10MSBBE, YUV420P10MSBLE)
-#define AV_PIX_FMT_YUV420P12MSB AV_PIX_FMT_NE(YUV420P12MSBBE, YUV420P12MSBLE)
-#define AV_PIX_FMT_YUV422P10MSB AV_PIX_FMT_NE(YUV422P10MSBBE, YUV422P10MSBLE)
-#define AV_PIX_FMT_YUV422P12MSB AV_PIX_FMT_NE(YUV422P12MSBBE, YUV422P12MSBLE)
#define AV_PIX_FMT_YUV444P10MSB AV_PIX_FMT_NE(YUV444P10MSBBE, YUV444P10MSBLE)
#define AV_PIX_FMT_YUV444P12MSB AV_PIX_FMT_NE(YUV444P12MSBBE, YUV444P12MSBLE)
diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils
index c4ad705b3d..738ce0289c 100644
--- a/tests/ref/fate/imgutils
+++ b/tests/ref/fate/imgutils
@@ -310,14 +310,6 @@ gray10msbbe planes: 1, linesizes: 128 0 0 0,
plane_sizes: 6144 0
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
-yuv420p10msbbe planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
1536 1536 0, plane_offsets: 6144 1536 0, total_size: 9216
-yuv420p10msble planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
1536 1536 0, plane_offsets: 6144 1536 0, total_size: 9216
-yuv420p12msbbe planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
1536 1536 0, plane_offsets: 6144 1536 0, total_size: 9216
-yuv420p12msble planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
1536 1536 0, plane_offsets: 6144 1536 0, total_size: 9216
-yuv422p10msbbe planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
3072 3072 0, plane_offsets: 6144 3072 0, total_size: 12288
-yuv422p10msble planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
3072 3072 0, plane_offsets: 6144 3072 0, total_size: 12288
-yuv422p12msbbe planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
3072 3072 0, plane_offsets: 6144 3072 0, total_size: 12288
-yuv422p12msble planes: 3, linesizes: 128 64 64 0, plane_sizes: 6144
3072 3072 0, plane_offsets: 6144 3072 0, total_size: 12288
image_fill_black tests
yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6,
black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af
@@ -575,11 +567,3 @@ gray10msbbe total_size: 6144, black_unknown_crc:
0x02d4a26f, black_tv_cr
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
-yuv420p10msbbe total_size: 9216, black_unknown_crc: 0x4d4d9903,
black_tv_crc: 0x4d4d9903, black_pc_crc: 0x69c6fe01
-yuv420p10msble total_size: 9216, black_unknown_crc: 0xfff85b60,
black_tv_crc: 0xfff85b60, black_pc_crc: 0xc03cff93
-yuv420p12msbbe total_size: 9216, black_unknown_crc: 0x4d4d9903,
black_tv_crc: 0x4d4d9903, black_pc_crc: 0x69c6fe01
-yuv420p12msble total_size: 9216, black_unknown_crc: 0xfff85b60,
black_tv_crc: 0xfff85b60, black_pc_crc: 0xc03cff93
-yuv422p10msbbe total_size: 12288, black_unknown_crc: 0x0bbe5df7,
black_tv_crc: 0x0bbe5df7, black_pc_crc: 0x16a51378
-yuv422p10msble total_size: 12288, black_unknown_crc: 0x6582d6cf,
black_tv_crc: 0x6582d6cf, black_pc_crc: 0xc9dc3ddf
-yuv422p12msbbe total_size: 12288, black_unknown_crc: 0x0bbe5df7,
black_tv_crc: 0x0bbe5df7, black_pc_crc: 0x16a51378
-yuv422p12msble total_size: 12288, black_unknown_crc: 0x6582d6cf,
black_tv_crc: 0x6582d6cf, black_pc_crc: 0xc9dc3ddf
diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
index bee2c65b9d..af421b4eee 100644
--- a/tests/ref/fate/sws-pixdesc-query
+++ b/tests/ref/fate/sws-pixdesc-query
@@ -115,24 +115,16 @@ isNBPS:
y212le
yuv420p10be
yuv420p10le
- yuv420p10msbbe
- yuv420p10msble
yuv420p12be
yuv420p12le
- yuv420p12msbbe
- yuv420p12msble
yuv420p14be
yuv420p14le
yuv420p9be
yuv420p9le
yuv422p10be
yuv422p10le
- yuv422p10msbbe
- yuv422p10msble
yuv422p12be
yuv422p12le
- yuv422p12msbbe
- yuv422p12msble
yuv422p14be
yuv422p14le
yuv422p9be
@@ -242,16 +234,12 @@ isBE:
yaf16be
yaf32be
yuv420p10be
- yuv420p10msbbe
yuv420p12be
- yuv420p12msbbe
yuv420p14be
yuv420p16be
yuv420p9be
yuv422p10be
- yuv422p10msbbe
yuv422p12be
- yuv422p12msbbe
yuv422p14be
yuv422p16be
yuv422p9be
@@ -339,12 +327,8 @@ isYUV:
yuv420p
yuv420p10be
yuv420p10le
- yuv420p10msbbe
- yuv420p10msble
yuv420p12be
yuv420p12le
- yuv420p12msbbe
- yuv420p12msble
yuv420p14be
yuv420p14le
yuv420p16be
@@ -354,12 +338,8 @@ isYUV:
yuv422p
yuv422p10be
yuv422p10le
- yuv422p10msbbe
- yuv422p10msble
yuv422p12be
yuv422p12le
- yuv422p12msbbe
- yuv422p12msble
yuv422p14be
yuv422p14le
yuv422p16be
@@ -450,12 +430,8 @@ isPlanarYUV:
yuv420p
yuv420p10be
yuv420p10le
- yuv420p10msbbe
- yuv420p10msble
yuv420p12be
yuv420p12le
- yuv420p12msbbe
- yuv420p12msble
yuv420p14be
yuv420p14le
yuv420p16be
@@ -465,12 +441,8 @@ isPlanarYUV:
yuv422p
yuv422p10be
yuv422p10le
- yuv422p10msbbe
- yuv422p10msble
yuv422p12be
yuv422p12le
- yuv422p12msbbe
- yuv422p12msble
yuv422p14be
yuv422p14le
yuv422p16be
@@ -1078,12 +1050,8 @@ Planar:
yuv420p
yuv420p10be
yuv420p10le
- yuv420p10msbbe
- yuv420p10msble
yuv420p12be
yuv420p12le
- yuv420p12msbbe
- yuv420p12msble
yuv420p14be
yuv420p14le
yuv420p16be
@@ -1093,12 +1061,8 @@ Planar:
yuv422p
yuv422p10be
yuv422p10le
- yuv422p10msbbe
- yuv422p10msble
yuv422p12be
yuv422p12le
- yuv422p12msbbe
- yuv422p12msble
yuv422p14be
yuv422p14le
yuv422p16be
@@ -1295,14 +1259,6 @@ DataInHighBits:
y210le
y212be
y212le
- yuv420p10msbbe
- yuv420p10msble
- yuv420p12msbbe
- yuv420p12msble
- yuv422p10msbbe
- yuv422p10msble
- yuv422p12msbbe
- yuv422p12msble
yuv444p10msbbe
yuv444p10msble
yuv444p12msbbe
commit b982b2a2a3c2a0fa6ba7f47407a7423e5370421d
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:51:40 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:46:41 2025 +0100
Revert "swscale: add support for 10/12-bit grayscale MSB pixfmts"
This reverts commit a5be0ecbfdab24632a10c8a6714844530f76d368.
diff --git a/libswscale/format.c b/libswscale/format.c
index d70c86493e..6aec0132be 100644
--- a/libswscale/format.c
+++ b/libswscale/format.c
@@ -91,10 +91,6 @@ static const LegacyFormatEntry legacy_format_entries[] = {
[AV_PIX_FMT_GRAY14LE] = { 1, 1 },
[AV_PIX_FMT_GRAY16BE] = { 1, 1 },
[AV_PIX_FMT_GRAY16LE] = { 1, 1 },
- [AV_PIX_FMT_GRAY10MSBBE] = { 1, 1 },
- [AV_PIX_FMT_GRAY10MSBLE] = { 1, 1 },
- [AV_PIX_FMT_GRAY12MSBBE] = { 1, 1 },
- [AV_PIX_FMT_GRAY12MSBLE] = { 1, 1 },
[AV_PIX_FMT_YUV440P] = { 1, 1 },
[AV_PIX_FMT_YUVJ440P] = { 1, 1 },
[AV_PIX_FMT_YUV440P10LE] = { 1, 1 },
@@ -983,10 +979,6 @@ static int fmt_read_write(enum AVPixelFormat fmt,
SwsReadWriteOp *rw_op,
case AV_PIX_FMT_GRAY14LE:
case AV_PIX_FMT_GRAY16BE:
case AV_PIX_FMT_GRAY16LE:
- case AV_PIX_FMT_GRAY10MSBBE:
- case AV_PIX_FMT_GRAY10MSBLE:
- case AV_PIX_FMT_GRAY12MSBBE:
- case AV_PIX_FMT_GRAY12MSBLE:
//case AV_PIX_FMT_GRAYF16BE: TODO
//case AV_PIX_FMT_GRAYF16LE:
//case AV_PIX_FMT_YAF16BE:
diff --git a/libswscale/input.c b/libswscale/input.c
index fd19d1a257..eb4eb3101e 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -2469,19 +2469,15 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c,
*alpToYV12 = bswap16Y_c;
break;
#endif
- case AV_PIX_FMT_GRAY10MSBLE:
case AV_PIX_FMT_YUV444P10MSBLE:
*lumToYV12 = shf16_10LEToY_c;
break;
- case AV_PIX_FMT_GRAY12MSBLE:
case AV_PIX_FMT_YUV444P12MSBLE:
*lumToYV12 = shf16_12LEToY_c;
break;
- case AV_PIX_FMT_GRAY10MSBBE:
case AV_PIX_FMT_YUV444P10MSBBE:
*lumToYV12 = shf16_10BEToY_c;
break;
- case AV_PIX_FMT_GRAY12MSBBE:
case AV_PIX_FMT_YUV444P12MSBBE:
*lumToYV12 = shf16_12BEToY_c;
break;
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 3f9a83dd60..2c791e89fe 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -2560,8 +2560,6 @@ void ff_get_unscaled_swscale(SwsInternal *c)
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY12) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY14) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY16) ||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY10MSB) ||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY12MSB) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YA16) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_AYUV64) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP9) ||
diff --git a/tests/ref/fate/filter-pixfmts-copy
b/tests/ref/fate/filter-pixfmts-copy
index ec53fd4dab..1b6e658fe8 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -51,12 +51,8 @@ gbrpf32le f3aff67024db002d8d985c775ec8c235
gray 188590b1231afd231ea910815aef2b25
gray10be d1e230a5db36c30976f12ccf28b3d7be
gray10le 5e4076d5bdda71c1d74e1222670331e0
-gray10msbbe b8c4e2d8974cc23225492ed86578e54b
-gray10msble e2ac6ef9d9208fb6f2155f8edebe4843
gray12be 34ea6210910b1d3414695294e617a9f8
gray12le 4ee1038208d2b5ae494202b47cfd4021
-gray12msbbe dcade24ef97d6aa3ccfd84c1f2c695da
-gray12msble 68f0acd3bf5186d5be78577e8321835b
gray14be 0068a1290677c7677f3ca749bacd16a2
gray14le 4b4396bd90d24da3f04e9c91da8969eb
gray16be 5b71eb9a890a3c52210512b9622231eb
diff --git a/tests/ref/fate/filter-pixfmts-crop
b/tests/ref/fate/filter-pixfmts-crop
index 1d49e7788b..aac5fe298b 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -51,12 +51,8 @@ gbrpf32le b930a6185e3ffb23785d57ab1f519bc3
gray 0d70b54b4b888ec4dbd89713620ac1ee
gray10be 56cbcb86115a4c7d4f886932f94bfa7c
gray10le af872a90b3aedb0f198f4e3b285a48f1
-gray10msbbe 788022a5fabf4b5c5cda268c80241a0a
-gray10msble fca1ad5e5925b6f92983320ec0f8dd62
gray12be ec85a2c57c28f1e4079565fe5e52bd47
gray12le 638d9bf13af39cac1ba5f858637bbdb6
-gray12msbbe 9ec25ece600477a37e44d3f5745958aa
-gray12msble 3df35b13df6d03cd636e3df97dee6395
gray14be 10f8231ccb0cdef0f882d14b8216ca5d
gray14le 3a45cabac3757629737024fb4bd263e4
gray16be 9a87fd9facebf9858b61e2996a701a75
diff --git a/tests/ref/fate/filter-pixfmts-field
b/tests/ref/fate/filter-pixfmts-field
index 35227f162d..603bc22615 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -51,12 +51,8 @@ gbrpf32le 64722b723252d359858136cb00079636
gray 57fd8e6e00f6be8752726005974cce1b
gray10be 711bc331a8ed5c48e2e8872d3df7f890
gray10le 61591241c1f83d3076e0fa6b801adb99
-gray10msbbe 2257c72ca7d6bd683a83a07ac454e2ed
-gray10msble cd87525d365d1a12cb1661c3619cc929
gray12be 718af16226ee969af743ae8ccbbf0613
gray12le b655b51e52c39ee9deedbd7b2a1fa2cc
-gray12msbbe 89910422cd91527d3b76f67eb41505e6
-gray12msble f21838de4af768110ed67f9646d542f4
gray14be 6a3661d546ab53c2c0a891128c809f1f
gray14le cfccfc0c493ea01c07e6b8571dc4ca29
gray16be 3f9a4ee6683542a840a8767c4da2158a
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder
b/tests/ref/fate/filter-pixfmts-fieldorder
index ee3d1a4c89..2e9ab58d58 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -51,12 +51,8 @@ gbrpf32le 070140993c538b996890b983c0a010be
gray d96e0f1c73d3f0b9506d691b5cd36c73
gray10be d061419a367cd373f24a2d6c1ee7d053
gray10le d3a497d617afc0571e70498e2fb83c06
-gray10msbbe cdc524ab9bd8aa4638e9f857987ff530
-gray10msble 120becb549110b6b3342f45ce22a70a4
gray12be c39a152c43cef4d09582de0242b81533
gray12le 3481771752aff19c7c795fa1ff62b7af
-gray12msbbe 5ca1f415f9022e1301803bde7e1b5845
-gray12msble 1f9158e7ec1ca9af30ea0d43138fa385
gray14be 226c4dfe178445f5990472158f917ae9
gray14le de4b3f0166df4136b2a03e3d9b8f8831
gray16be 507d141b00748b23457ae5c61c4ca548
diff --git a/tests/ref/fate/filter-pixfmts-hflip
b/tests/ref/fate/filter-pixfmts-hflip
index aaf5e30d08..5889c6caa4 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -51,12 +51,8 @@ gbrpf32le cbb650b78c412b10a1070840fefd6d59
gray 8bd4ece1dbf89b20ee785e0515356e07
gray10be 19b71135e06a5cdfc3017f7dae521a57
gray10le 7f5d5b393b7f6e9c80688176b0013431
-gray10msbbe 432f1150da3f66aa621e5f0fabfe126b
-gray10msble 3432c95ef5a451c794167bde7bc8a3a7
gray12be f61a9efed17ab6b1bd8aca4fe7e56c48
gray12le f88166d4b2b5d7e359ecb90fc1dacbf5
-gray12msbbe 2fe8069aac440db1a8e72e6b9f7ebd9d
-gray12msble ba02d3c7c237850e9e88b20a0064ae0a
gray14be 97b6af07da7729354b9d93f16d18dde5
gray14le 929da55e235b5db19e517c513dde03d3
gray16be 20fc0cc0894d2fca3d86dcdea47acc90
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index d0c3fb999b..03ff9c9224 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -51,12 +51,8 @@ gbrpf32le 6514fcf1804c375f4d560d4f08dbacb7
gray 52ae18648161ac43144f5c9cd2127786
gray10be 4f7f78b4b750ac9b83e69e7458b73c53
gray10le 10125cdc121dcb2ff3a5a2129fc08f36
-gray10msbbe 2ae123f391817e05be555979b9e4619e
-gray10msble 134c6a4a41a62469220e9a479e36a14e
gray12be f1c6ad114535afb096011a9b42250718
gray12le b5ae2633cbe2f25945c900bcda44ae1c
-gray12msbbe ce1a8481fed767461bf306960cedd038
-gray12msble ab80323986bb21be87f484c5f4199166
gray14be 0707988393273db1a30d0efe809596fc
gray14le e38626064a48ca2cfef6fccbd7c3588d
gray16be 06703c79bc5f2a19649ffd5920898174
diff --git a/tests/ref/fate/filter-pixfmts-null
b/tests/ref/fate/filter-pixfmts-null
index ec53fd4dab..1b6e658fe8 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -51,12 +51,8 @@ gbrpf32le f3aff67024db002d8d985c775ec8c235
gray 188590b1231afd231ea910815aef2b25
gray10be d1e230a5db36c30976f12ccf28b3d7be
gray10le 5e4076d5bdda71c1d74e1222670331e0
-gray10msbbe b8c4e2d8974cc23225492ed86578e54b
-gray10msble e2ac6ef9d9208fb6f2155f8edebe4843
gray12be 34ea6210910b1d3414695294e617a9f8
gray12le 4ee1038208d2b5ae494202b47cfd4021
-gray12msbbe dcade24ef97d6aa3ccfd84c1f2c695da
-gray12msble 68f0acd3bf5186d5be78577e8321835b
gray14be 0068a1290677c7677f3ca749bacd16a2
gray14le 4b4396bd90d24da3f04e9c91da8969eb
gray16be 5b71eb9a890a3c52210512b9622231eb
diff --git a/tests/ref/fate/filter-pixfmts-pad
b/tests/ref/fate/filter-pixfmts-pad
index 6613d1281f..8298a466de 100644
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@@ -22,9 +22,7 @@ gbrp16le a6156d1a37e05ee621b2a343fb158bd6
gbrp9le 9e827f438e081d334a6cae7e282698b0
gray 2b9652a8b136316fada371d03ee252bc
gray10le 665518a5ce3ee47e9d8a39d4f8feb67f
-gray10msble 5ca3086c4f79beb380a6f9eb021633cf
gray12le b2a1c83f662e1b95a0d4eaadeb0df0d4
-gray12msble 87b99c0b189fb294948e8d4f2ced5549
gray14le 8706512fff02d8f42d5af7d9141d8a80
gray16le 06dbf4ce429ab564f6d127d97da5d7ca
gray9le 99f825e62d5786901dba9abc88878ffb
diff --git a/tests/ref/fate/filter-pixfmts-scale
b/tests/ref/fate/filter-pixfmts-scale
index 406716c283..a6520f25ed 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -51,12 +51,8 @@ gbrpf32le f6fcfa78926bc1acdf40675e015491fd
gray 221201cc7cfc4964eacd8b3e426fd276
gray10be a7fe8332b527f59cc7574612b105c7f1
gray10le 599b53339cf293adbbc8af194fd03e85
-gray10msbbe b084eb9113ddeba7576d2587cf322751
-gray10msble 934e8b257827009695da47195cc8b570
gray12be 70b4f7920ce24a2080a298bfcf67161b
gray12le 2c1f1537e0cdd496ad46abe9068b4737
-gray12msbbe 5763340914688449b5c86eebab1f8667
-gray12msble 107014134c7d1ec84daf84088c0d404f
gray14be 8fc7a3c7886b7234385a64e3b2e56592
gray14le ec9bd85a99a3340d4857e650da5bd79d
gray16be 4be62cba0e89e8121fcfe257b8fd270f
diff --git a/tests/ref/fate/filter-pixfmts-transpose
b/tests/ref/fate/filter-pixfmts-transpose
index 17321e8f74..ebb70d15ed 100644
--- a/tests/ref/fate/filter-pixfmts-transpose
+++ b/tests/ref/fate/filter-pixfmts-transpose
@@ -51,12 +51,8 @@ gbrpf32le 3daead396f5bbd6dc3e9d729f6dd7e4a
gray c5f8bc6636fd15dbc57deb4bba1e7379
gray10be 344fc885d496d6ea693f8a5596eb8e0e
gray10le 007e717a42c8c068c66b9dbe4b6f37a3
-gray10msbbe be4f8a002b012f4c4c82083d130d71dd
-gray10msble ef2e1c00590f51c85f4550909f540f2e
gray12be 11cc17637a7ac183a5c6b5d6e9a8b0f6
gray12le 8764460a5bc967fa1070aa779deb3c8b
-gray12msbbe e1d86645955f81d3a073449e2d884b55
-gray12msble 98fa1e001979b7f711fa68478caebe68
gray14be 199e0f9a21f6b318d90b1be2ad2e3221
gray14le ceedc38b97f87d0367d97e5ca289dbe1
gray16be 570c9f15778f767cd5cca8fb7908f119
diff --git a/tests/ref/fate/filter-pixfmts-vflip
b/tests/ref/fate/filter-pixfmts-vflip
index 119d616010..e86e9d84e5 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -51,12 +51,8 @@ gbrpf32le a60eadee900a27d4e1fb5d7ac0b0e901
gray 41811422d5819ed69389357294384c10
gray10be 75e8a7f4f88b767119d970541555f380
gray10le 71757f947804ace3ca496750be87e964
-gray10msbbe 8279608cd3df50d0d18c2473e99095ed
-gray10msble c21f895dc1c067aa6cdeb49b7a765188
gray12be cc6d361f5076c57394f763251f040e89
gray12le ead3d2c89954688b696e5056efa30ec9
-gray12msbbe fa9cd18b64c67051119b9408307904bf
-gray12msble 6a2b96483107ae82a3188edc22b26129
gray14be 0b963d4b744250e2cbe8a2a623e9c55d
gray14le 4e7652d8927b4481c6757a25052118c8
gray16be 483c6e570d97fbed9e51a61212910632
commit 72a19a1c4a623bbc792f0139cf4449ab05d1e162
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:51:19 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:44:13 2025 +0100
Revert "swscale: add support for 10/12-bit 422 and 444 MSB pixfmts"
This reverts commit bc0ee8b7cc608e8e500f353db959d94320c8841d.
diff --git a/libswscale/format.c b/libswscale/format.c
index e4b9b264e5..d70c86493e 100644
--- a/libswscale/format.c
+++ b/libswscale/format.c
@@ -159,10 +159,6 @@ static const LegacyFormatEntry legacy_format_entries[] = {
[AV_PIX_FMT_YUV420P12LE] = { 1, 1 },
[AV_PIX_FMT_YUV420P14BE] = { 1, 1 },
[AV_PIX_FMT_YUV420P14LE] = { 1, 1 },
- [AV_PIX_FMT_YUV420P10MSBBE] = { 1, 1 },
- [AV_PIX_FMT_YUV420P10MSBLE] = { 1, 1 },
- [AV_PIX_FMT_YUV420P12MSBBE] = { 1, 1 },
- [AV_PIX_FMT_YUV420P12MSBLE] = { 1, 1 },
[AV_PIX_FMT_YUV422P9BE] = { 1, 1 },
[AV_PIX_FMT_YUV422P9LE] = { 1, 1 },
[AV_PIX_FMT_YUV422P10BE] = { 1, 1 },
@@ -171,10 +167,6 @@ static const LegacyFormatEntry legacy_format_entries[] = {
[AV_PIX_FMT_YUV422P12LE] = { 1, 1 },
[AV_PIX_FMT_YUV422P14BE] = { 1, 1 },
[AV_PIX_FMT_YUV422P14LE] = { 1, 1 },
- [AV_PIX_FMT_YUV422P10MSBBE] = { 1, 1 },
- [AV_PIX_FMT_YUV422P10MSBLE] = { 1, 1 },
- [AV_PIX_FMT_YUV422P12MSBBE] = { 1, 1 },
- [AV_PIX_FMT_YUV422P12MSBLE] = { 1, 1 },
[AV_PIX_FMT_YUV444P9BE] = { 1, 1 },
[AV_PIX_FMT_YUV444P9LE] = { 1, 1 },
[AV_PIX_FMT_YUV444P10BE] = { 1, 1 },
@@ -749,10 +741,6 @@ static int fmt_shift(enum AVPixelFormat fmt)
case AV_PIX_FMT_P210LE:
case AV_PIX_FMT_Y210BE:
case AV_PIX_FMT_Y210LE:
- case AV_PIX_FMT_YUV420P10MSBBE:
- case AV_PIX_FMT_YUV420P10MSBLE:
- case AV_PIX_FMT_YUV422P10MSBBE:
- case AV_PIX_FMT_YUV422P10MSBLE:
case AV_PIX_FMT_YUV444P10MSBBE:
case AV_PIX_FMT_YUV444P10MSBLE:
case AV_PIX_FMT_GBRP10MSBBE:
@@ -768,10 +756,6 @@ static int fmt_shift(enum AVPixelFormat fmt)
case AV_PIX_FMT_XV36LE:
case AV_PIX_FMT_XYZ12BE:
case AV_PIX_FMT_XYZ12LE:
- case AV_PIX_FMT_YUV420P12MSBBE:
- case AV_PIX_FMT_YUV420P12MSBLE:
- case AV_PIX_FMT_YUV422P12MSBBE:
- case AV_PIX_FMT_YUV422P12MSBLE:
case AV_PIX_FMT_YUV444P12MSBBE:
case AV_PIX_FMT_YUV444P12MSBLE:
case AV_PIX_FMT_GBRP12MSBBE:
diff --git a/libswscale/input.c b/libswscale/input.c
index 8efc42b57b..fd19d1a257 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -1992,23 +1992,15 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c,
*chrToYV12 = bswap16UV_c;
break;
#endif
- case AV_PIX_FMT_YUV420P10MSBLE:
- case AV_PIX_FMT_YUV422P10MSBLE:
case AV_PIX_FMT_YUV444P10MSBLE:
*chrToYV12 = shf16_10LEToUV_c;
break;
- case AV_PIX_FMT_YUV420P12MSBLE:
- case AV_PIX_FMT_YUV422P12MSBLE:
case AV_PIX_FMT_YUV444P12MSBLE:
*chrToYV12 = shf16_12LEToUV_c;
break;
- case AV_PIX_FMT_YUV420P10MSBBE:
- case AV_PIX_FMT_YUV422P10MSBBE:
case AV_PIX_FMT_YUV444P10MSBBE:
*chrToYV12 = shf16_10BEToUV_c;
break;
- case AV_PIX_FMT_YUV420P12MSBBE:
- case AV_PIX_FMT_YUV422P12MSBBE:
case AV_PIX_FMT_YUV444P12MSBBE:
*chrToYV12 = shf16_12BEToUV_c;
break;
@@ -2478,26 +2470,18 @@ av_cold void ff_sws_init_input_funcs(SwsInternal *c,
break;
#endif
case AV_PIX_FMT_GRAY10MSBLE:
- case AV_PIX_FMT_YUV420P10MSBLE:
- case AV_PIX_FMT_YUV422P10MSBLE:
case AV_PIX_FMT_YUV444P10MSBLE:
*lumToYV12 = shf16_10LEToY_c;
break;
case AV_PIX_FMT_GRAY12MSBLE:
- case AV_PIX_FMT_YUV420P12MSBLE:
- case AV_PIX_FMT_YUV422P12MSBLE:
case AV_PIX_FMT_YUV444P12MSBLE:
*lumToYV12 = shf16_12LEToY_c;
break;
case AV_PIX_FMT_GRAY10MSBBE:
- case AV_PIX_FMT_YUV420P10MSBBE:
- case AV_PIX_FMT_YUV422P10MSBBE:
case AV_PIX_FMT_YUV444P10MSBBE:
*lumToYV12 = shf16_10BEToY_c;
break;
case AV_PIX_FMT_GRAY12MSBBE:
- case AV_PIX_FMT_YUV420P12MSBBE:
- case AV_PIX_FMT_YUV422P12MSBBE:
case AV_PIX_FMT_YUV444P12MSBBE:
*lumToYV12 = shf16_12BEToY_c;
break;
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index d169a3b498..3f9a83dd60 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -2588,15 +2588,11 @@ void ff_get_unscaled_swscale(SwsInternal *c)
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P12) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P14) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P16) ||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P10MSB)
||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P12MSB)
||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P9) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P10) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P12) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P14) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P16) ||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P10MSB)
||
- IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV422P12MSB)
||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV440P10) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV440P12) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P9) ||
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p10msbbe
b/tests/ref/fate/filter-pixdesc-yuv420p10msbbe
deleted file mode 100644
index d265f604e2..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv420p10msbbe
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv420p10msbbe714c32421334acd21547fdd818c38fc4
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p10msble
b/tests/ref/fate/filter-pixdesc-yuv420p10msble
deleted file mode 100644
index dbca9bf909..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv420p10msble
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv420p10msble018bce154495538cf61ce565c8bcce78
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p12msbbe
b/tests/ref/fate/filter-pixdesc-yuv420p12msbbe
deleted file mode 100644
index 96f2878d22..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv420p12msbbe
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv420p12msbbe714c32421334acd21547fdd818c38fc4
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p12msble
b/tests/ref/fate/filter-pixdesc-yuv420p12msble
deleted file mode 100644
index 24d0c943ff..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv420p12msble
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv420p12msble018bce154495538cf61ce565c8bcce78
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p10msbbe
b/tests/ref/fate/filter-pixdesc-yuv422p10msbbe
deleted file mode 100644
index 3cef106ee0..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv422p10msbbe
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv422p10msbbe2c04d978af86e47cc29cc16d6b97d9aa
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p10msble
b/tests/ref/fate/filter-pixdesc-yuv422p10msble
deleted file mode 100644
index 9ddb4fc2aa..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv422p10msble
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv422p10msble1ebb8eb68a5757b098d6d262e28ff56c
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p12msbbe
b/tests/ref/fate/filter-pixdesc-yuv422p12msbbe
deleted file mode 100644
index 85c667e583..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv422p12msbbe
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv422p12msbbecfa0d2a7711c0b6b4a74ea7a26c155dc
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p12msble
b/tests/ref/fate/filter-pixdesc-yuv422p12msble
deleted file mode 100644
index 509e871a11..0000000000
--- a/tests/ref/fate/filter-pixdesc-yuv422p12msble
+++ /dev/null
@@ -1 +0,0 @@
-pixdesc-yuv422p12msble38043e9e40a19b61bcfff334fbc64422
diff --git a/tests/ref/fate/filter-pixfmts-copy
b/tests/ref/fate/filter-pixfmts-copy
index 2bc857e747..ec53fd4dab 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -134,12 +134,8 @@ yuv411p 7e1300e89f5bc07939e2c4a6acbdf267
yuv420p a014c7eb7a8385d1dd092b7a583f1bff
yuv420p10be f9b154364efaa1af376fa6d8eeae6955
yuv420p10le 15c83294ef560d57f25d16ae6e0fc70c
-yuv420p10msbbe 13a35f032d8b27fbe86be8581f0ec0b3
-yuv420p10msble 01400270da5519f681b48ab8212205c7
yuv420p12be 34da9c4e289124122ba36a9d4fb133fa
yuv420p12le c19a477a07fcf88e37ab37b416d064c0
-yuv420p12msbbe 13a35f032d8b27fbe86be8581f0ec0b3
-yuv420p12msble 01400270da5519f681b48ab8212205c7
yuv420p14be 64779858686946fc0e780baf7c1391b6
yuv420p14le c1d012a4f9d54fbc8b04fea96d85e903
yuv420p16be 268b07358d8dc733ee81d0b87990d5af
@@ -149,12 +145,8 @@ yuv420p9le 83a6d32c91c15a3bc334bb9abf920654
yuv422p 74f8006b4482db104f1986f49807a0af
yuv422p10be 7291903c3c0cf4e5456dd9673a619f1d
yuv422p10le 14cbaa728e888534359b9dddc5430f08
-yuv422p10msbbe 84584da376799390599031f77fbd0aee
-yuv422p10msble 06d4727c5c4d178736445bddcd9b03a0
yuv422p12be e9bc7f2da217fade40feb6960dcd894e
yuv422p12le 8d8184e4d0f1eb50e1834ac0c4af8c33
-yuv422p12msbbe bdf57a55ed1957997671d42535a1156f
-yuv422p12msble fa213f34ebb3042349b3b8b88070f132
yuv422p14be 2617c569ae9659d8fe6a01f96e2c9657
yuv422p14le 7d01363cf090306cf93337c474cd8827
yuv422p16be 86147d8bfb795ab1873c899611e2a361
diff --git a/tests/ref/fate/filter-pixfmts-crop
b/tests/ref/fate/filter-pixfmts-crop
index a883d6f7e0..1d49e7788b 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -128,12 +128,8 @@ yuv411p 693e4afe96998e6dd91734037d75d887
yuv420p 510d36163e4d3710988c23c2240ca6dc
yuv420p10be ce9af476d924b463b0f68579f30a6463
yuv420p10le 65214f2af95e816bbe303fa0649ecc84
-yuv420p10msbbe 1a4692f3d0d38516452fc984f91b7ad7
-yuv420p10msble 45f2034adb4616958f17a83aec581276
yuv420p12be f86f763eb2ae76d12226009e5f9595d7
yuv420p12le 3741f6a4ccd368d0e9d00ecdebdde0c9
-yuv420p12msbbe 1a4692f3d0d38516452fc984f91b7ad7
-yuv420p12msble 45f2034adb4616958f17a83aec581276
yuv420p14be 5544e5fc40e718e608c0bd8c7b1d0812
yuv420p14le 2c763a71c7c4650b91b405634556e21c
yuv420p16be c22f72b460beef22b0bf80806c43b25f
@@ -143,12 +139,8 @@ yuv420p9le fe0215f5683437bd5a10b6255344109e
yuv422p 42ea5e9a22df5913b2ec75512162e533
yuv422p10be 3956017f5023ff5d56b4f814422dd711
yuv422p10le a5fa7cb6a21bcbb60ae3ba4a9f4e60e0
-yuv422p10msbbe d4267abe90750908e7b0cf35a7967770
-yuv422p10msble 478f06c71824c538f0018913753ed21f
yuv422p12be 3a7cdaa7671394aae514d60c529e099d
yuv422p12le 3369b2b6eed18a450ab0a5581335e375
-yuv422p12msbbe 25cdfe8bfdae924f96a350f1bc58633a
-yuv422p12msble 2d8905cbcb9eaf0d1084a59515fd22c7
yuv422p14be 845c42b333e331a556008ef0a16afc85
yuv422p14le abcdaccf8d01a9133daca94383d27db7
yuv422p16be 565299a5d6265c77d00fd1a1d0173834
diff --git a/tests/ref/fate/filter-pixfmts-field
b/tests/ref/fate/filter-pixfmts-field
index dd33b7ab53..35227f162d 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -134,12 +134,8 @@ yuv411p 9106e283d5dbcfba01c611886d58871a
yuv420p 9ea8ed3c22c31c0354b7face540bb280
yuv420p10be c6e76d651b991c0814a3047b2b3a517c
yuv420p10le 3bf226b758c0b53b893729d97e7bc602
-yuv420p10msbbe 1f810646bef6018891f613cd8e33d839
-yuv420p10msble a124c0b77e8b219da307439bcfb090a0
yuv420p12be 8d63ddea0b9a886e859fec778d72a1ef
yuv420p12le f5b6dd8cd8b62fce64deac95aae916ef
-yuv420p12msbbe 1f810646bef6018891f613cd8e33d839
-yuv420p12msble a124c0b77e8b219da307439bcfb090a0
yuv420p14be dda2c5c09b72b41a19943b3832ddd2d5
yuv420p14le e79f827393fb9344190bacacffe9978e
yuv420p16be 62d08d547f857b254c1d31b5c40b20a6
@@ -149,12 +145,8 @@ yuv420p9le e9d061aad8e0d07226d41421797e6cbf
yuv422p 9bd12ab1efe6c3fe6d9f639b97b79c7e
yuv422p10be 6dd930ff81b89b71f6cadf757e0e8b3e
yuv422p10le 5e314f06833b5016cc5cd76c611f7a48
-yuv422p10msbbe 59c40eae138ddd69ac7c9b1479e35a53
-yuv422p10msble bcb5e9da16ce5a910cead2e8bc3aee3e
yuv422p12be 71c75f56a518f07be9946cbdb38b1d45
yuv422p12le 1351d615ca6a97f206d04b9c4bb2d130
-yuv422p12msbbe 4d2de6dedd0edf0c52704acad43758a9
-yuv422p12msble e7e7f4c7a00fc175e9e8a0ade99efa8a
yuv422p14be d3d1d29966b9737dc8bbc31c6d215c9e
yuv422p14le 3ba9d5d2a32dc3e0ec025100621e20f9
yuv422p16be ed49651e67f96c34649762f4678091de
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder
b/tests/ref/fate/filter-pixfmts-fieldorder
index d5635e8d16..ee3d1a4c89 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -122,12 +122,8 @@ yuv411p e4a040e0e786c4dae07d9d3f90a54905
yuv422p 16ce67249c6ce7ef57a433646ad6dfc1
yuv422p10be 62ae323dcc41aabf8ff6ecc53b119ce8
yuv422p10le 60b20ad8c01ad7ea774ce1d74d8932ba
-yuv422p10msbbe 7b79dbcb696575ab55717e2a5d2eb223
-yuv422p10msble b182fe96adaa08f5b1fa55a0efea76fe
yuv422p12be 7bcb3e28323dbf566512b5b8a1d33380
yuv422p12le 5877624df10122dd51c173f814bd5414
-yuv422p12msbbe 478e1a8ef5703e1a1eca438a9387446e
-yuv422p12msble 3000948ea9fe3975f21108b3effef999
yuv422p14be 8bd7bfb0b35d68000ba57af66958ef2d
yuv422p14le 471c7528e3da240d0a40f33548cbfbab
yuv422p16be 8c193a8b6064e2379b2fb211cd2e6e37
diff --git a/tests/ref/fate/filter-pixfmts-hflip
b/tests/ref/fate/filter-pixfmts-hflip
index 437b20bf3a..aaf5e30d08 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -128,12 +128,8 @@ yuv411p c416371077dce13d31bf1dc706111ae7
yuv420p eb8d9f02db98e10400781428c43e9438
yuv420p10be 5cd5c8181248b2dbdc7a8669caca3ed7
yuv420p10le 95a92ee031fdb8812661c019d925fad0
-yuv420p10msbbe 1328786116716a03e66f7a219e79157e
-yuv420p10msble 8a65eaccf8e9be58d29a5c6cdbb85eb6
yuv420p12be 8fe5d344a1576aba7892e855d2790df9
yuv420p12le c0897e2b53c1417fcf0cfbdbf9f54163
-yuv420p12msbbe 1328786116716a03e66f7a219e79157e
-yuv420p12msble 8a65eaccf8e9be58d29a5c6cdbb85eb6
yuv420p14be c5758d8062c61248110485243a75b712
yuv420p14le e283871dec73c853421d3aa098f071a7
yuv420p16be da4f5b6e537edf9cdea48a60defe520e
@@ -143,12 +139,8 @@ yuv420p9le 49eac58088b3e1cac170911382e2bb9d
yuv422p 5aade4d118cd7243800a08d300033748
yuv422p10be a12d0957b703bd54cd569664b821ca3e
yuv422p10le 8b6ac98276b10b7e540a5f689e5453fa
-yuv422p10msbbe 00637422bfaee1098b25568f3445cfd8
-yuv422p10msble 4fb8abce8d4220dc760e9e771ef99b4b
yuv422p12be b5d2142e6ccd9f69dee2c0643b14a741
yuv422p12le da75ea80662636c698986cdeab334669
-yuv422p12msbbe 46fde81861485aff4c0a4b408452f6ee
-yuv422p12msble c388a19ec53170c5d4a4fd6aeb52126c
yuv422p14be 027a593f148a96ff9e37a35e55608818
yuv422p14le 4c1de1ce4f199ab8e94a28bf79ecedb6
yuv422p16be 3d4b525c8056b740a4afa5b86cd79cd3
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index edcb111290..d0c3fb999b 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -133,12 +133,8 @@ yuv411p 8bf73777a5ff43c126be274245aceff1
yuv420p f1f4e7e94a76d5320049464bdeac24ed
yuv420p10be f7839393b65972595bdcb2485c6bf2a1
yuv420p10le cb00b1fc299baff8bc31086d8571fed6
-yuv420p10msbbe b2224a3253b2b1ceacd61579ba56bc5c
-yuv420p10msble 47a88651e0b53d19c76f7276985aea8b
yuv420p12be e5bba4d9f2299e98e69c9347234545c8
yuv420p12le 7110d2862c1da19e0298029383d31dab
-yuv420p12msbbe b2224a3253b2b1ceacd61579ba56bc5c
-yuv420p12msble 47a88651e0b53d19c76f7276985aea8b
yuv420p14be 240357c01079020ccc3d9287b5821a1b
yuv420p14le f7d0f5f5e72455b238897ed87cf67b3c
yuv420p16be 8195046b708c613b3ca521c95db529ab
@@ -148,12 +144,8 @@ yuv420p9le f8a4a93f98743cdd8d0ebadba2f8028a
yuv422p da122be331a53ec389ab6b2064488beb
yuv422p10be 956f3c496807e62a288501e183fafad0
yuv422p10le 43f99eb0d8abd1754572f77e430d4c41
-yuv422p10msbbe 025aa280d71a15d70d7f648a2a9ac534
-yuv422p10msble eb095cbae2c81047b81b6304f1ed5d02
yuv422p12be 9e8e40a95c4c762274e22026d16a4157
yuv422p12le 28a5b358a919297c005bc491c91b2b15
-yuv422p12msbbe 32545dac0863e386726dd252f42f009e
-yuv422p12msble e18a87e59ef68b2b12045b333076efa3
yuv422p14be ccff1e00f5d3adb899f1c266b22c9628
yuv422p14le f8a3bcbf8c55b1f570c078ff2f436b1f
yuv422p16be 7f2363ccb6e69241c70411b6d063a2fe
diff --git a/tests/ref/fate/filter-pixfmts-null
b/tests/ref/fate/filter-pixfmts-null
index 2bc857e747..ec53fd4dab 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -134,12 +134,8 @@ yuv411p 7e1300e89f5bc07939e2c4a6acbdf267
yuv420p a014c7eb7a8385d1dd092b7a583f1bff
yuv420p10be f9b154364efaa1af376fa6d8eeae6955
yuv420p10le 15c83294ef560d57f25d16ae6e0fc70c
-yuv420p10msbbe 13a35f032d8b27fbe86be8581f0ec0b3
-yuv420p10msble 01400270da5519f681b48ab8212205c7
yuv420p12be 34da9c4e289124122ba36a9d4fb133fa
yuv420p12le c19a477a07fcf88e37ab37b416d064c0
-yuv420p12msbbe 13a35f032d8b27fbe86be8581f0ec0b3
-yuv420p12msble 01400270da5519f681b48ab8212205c7
yuv420p14be 64779858686946fc0e780baf7c1391b6
yuv420p14le c1d012a4f9d54fbc8b04fea96d85e903
yuv420p16be 268b07358d8dc733ee81d0b87990d5af
@@ -149,12 +145,8 @@ yuv420p9le 83a6d32c91c15a3bc334bb9abf920654
yuv422p 74f8006b4482db104f1986f49807a0af
yuv422p10be 7291903c3c0cf4e5456dd9673a619f1d
yuv422p10le 14cbaa728e888534359b9dddc5430f08
-yuv422p10msbbe 84584da376799390599031f77fbd0aee
-yuv422p10msble 06d4727c5c4d178736445bddcd9b03a0
yuv422p12be e9bc7f2da217fade40feb6960dcd894e
yuv422p12le 8d8184e4d0f1eb50e1834ac0c4af8c33
-yuv422p12msbbe bdf57a55ed1957997671d42535a1156f
-yuv422p12msble fa213f34ebb3042349b3b8b88070f132
yuv422p14be 2617c569ae9659d8fe6a01f96e2c9657
yuv422p14le 7d01363cf090306cf93337c474cd8827
yuv422p16be 86147d8bfb795ab1873c899611e2a361
diff --git a/tests/ref/fate/filter-pixfmts-pad
b/tests/ref/fate/filter-pixfmts-pad
index 2cd4434282..6613d1281f 100644
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@@ -57,17 +57,13 @@ yuv410p cb871dcc1e84a7ef1d21f9237b88cf6e
yuv411p aec2c1740de9a62db0d41f4dda9121b0
yuv420p 4398e408fc35436ce4b20468946f58b6
yuv420p10le a7d29bbe4e103fc0fb62b465f9540efa
-yuv420p10msble c2811b855eccc728160bd4881708186f
yuv420p12le dafaf94e8d16cd846623dcaba0bc81b3
-yuv420p12msble c2811b855eccc728160bd4881708186f
yuv420p14le ec80062819bc67f8866ba5105d8378ad
yuv420p16le 83e437e3d6b7418c4163c24d41e199fa
yuv420p9le 98a3bede99321386b9abab7926a9f553
yuv422p e43d68568d9f782908ba56bf1e09d5d5
yuv422p10le e3ec30aacff6c8abf6fe035a195ccd26
-yuv422p10msble c5e38f841a7c5e4483f8eec19065574f
yuv422p12le 921b8d532cf5d0eca4ab0fe9c6d4fef5
-yuv422p12msble 4bcd7f0ab997b8300a01d06b31eba0db
yuv422p14le dc41548f336883e9fd9664f329bd2a0c
yuv422p16le 04c87d2fd42cba290a4d4099760e3ee4
yuv422p9le 994a41c11610075c7b0c466f738f49e7
diff --git a/tests/ref/fate/filter-pixfmts-scale
b/tests/ref/fate/filter-pixfmts-scale
index 995ca1cec2..406716c283 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -134,12 +134,8 @@ yuv411p 5af32557c93beb482e26e7af693104c6
yuv420p 5d3ac239c3712143560b1dfbd48a7ddd
yuv420p10be 95256d0cefca26429b2f41aabc9bee04
yuv420p10le 1aae90a2cff18e516f004dae77ac78f7
-yuv420p10msbbe 1bba3bf10a2ececfdcbbf50173667cdd
-yuv420p10msble 8c01be0bf01d17ef0390163c9c2f37d9
yuv420p12be 25a6da0f8045bc7bdeda544e1cf2387b
yuv420p12le c6e40a0851e1237281cd6500bef7a1fa
-yuv420p12msbbe 70ece70c1e117c4666b63e8d44321f13
-yuv420p12msble d216ed2391bc99dcefe2ade54abfac9c
yuv420p14be b202fde5a53d529ddaa35c9467ff0b61
yuv420p14le 36cac5d88b0d566cf835e84da6513e5a
yuv420p16be 6f307c5b1a5941023f9029cb3a616f5c
@@ -149,12 +145,8 @@ yuv420p9le 0e6ade4219bdcbce32eceafc80d995d7
yuv422p 9823e4d6bd1482b0cab3c44dab67f0a7
yuv422p10be 42b9b936392b4a6a678028ace2cdcd20
yuv422p10le 4bdc5e9ab3a16409600887335dbb1a66
-yuv422p10msbbe b3c067b20202c4e892630cd72743d909
-yuv422p10msble d84eb3f8f33e9dc6b753d3b12033771b
yuv422p12be af6ec8146dd7860b510017c22e8d0c80
yuv422p12le d69676f61d2693cfd163b3ce3f79fb56
-yuv422p12msbbe 54b08dcf6c243aee5f50ecd795c80a29
-yuv422p12msble 39ed974d5f1ceb28b56e298b81a08463
yuv422p14be 2a005a86b80b947c953d11ae170551c7
yuv422p14le dcbde0634eb70bed62dde097c80a1643
yuv422p16be a772b46454e415ce454c0999ebb71486
diff --git a/tests/ref/fate/filter-pixfmts-transpose
b/tests/ref/fate/filter-pixfmts-transpose
index b0ddb6239f..17321e8f74 100644
--- a/tests/ref/fate/filter-pixfmts-transpose
+++ b/tests/ref/fate/filter-pixfmts-transpose
@@ -117,12 +117,8 @@ yuv410p 4c0143429edd30aa01493447c90132ea
yuv420p 2fa5b2201c75034206cc20e2c6134aed
yuv420p10be 0931660f930d9be8aea9d0c76b406055
yuv420p10le 9ce12b168c49db871836c979b526c1f1
-yuv420p10msbbe c3ba380ff4a14b651c05d4c863c897c2
-yuv420p10msble 62b90f6ee22bbcb17ee6bb879a292600
yuv420p12be 73d6be4230b6f4e4e269977afab56323
yuv420p12le 6938815c8acd690138506cbb5f005fb8
-yuv420p12msbbe c3ba380ff4a14b651c05d4c863c897c2
-yuv420p12msble 62b90f6ee22bbcb17ee6bb879a292600
yuv420p14be bf76a805b9c2f9808c73492d3b8da268
yuv420p14le 5df47483b89ffe6ef4bbf14058d7d3b3
yuv420p16be 3a64132681656be6db635f4e6a282dc9
diff --git a/tests/ref/fate/filter-pixfmts-vflip
b/tests/ref/fate/filter-pixfmts-vflip
index c0f0a2fbd0..119d616010 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -134,12 +134,8 @@ yuv411p 3fce29db403a25f81be39e01aaf6ff3a
yuv420p d64fae96fac22aefa8fbcf45a09f37c1
yuv420p10be 63f545453139f38883cfa1210f7b6ac5
yuv420p10le 925de8b0bf9519c4b841afab4dd6bb25
-yuv420p10msbbe 04cce3d17a60b419cfb4e914f9b80809
-yuv420p10msble 7ccfb29763104c20a2e391b91a8cc07b
yuv420p12be 619425168c3b8bb9da68e7810bf5eacf
yuv420p12le 403d7d96939fa538b04f7b7b26ac6868
-yuv420p12msbbe 04cce3d17a60b419cfb4e914f9b80809
-yuv420p12msble 7ccfb29763104c20a2e391b91a8cc07b
yuv420p14be 22d2d9fb5883410807ede4066e735426
yuv420p14le 5cace6a24a1ff5d2a41a3c909c4bc41f
yuv420p16be 0a6499a1b22230ad030448d3ac95b5c1
@@ -149,12 +145,8 @@ yuv420p9le c3ec4bffc19c49edafd769a7dfccd9c1
yuv422p 54f608c9d8bc56979aeaa7863820f5d3
yuv422p10be fbd6329d2decbe318be4d89dc8ade3a3
yuv422p10le 7d7bdf4f68d8a7698e92722625c59c53
-yuv422p10msbbe c76f9021a6efd9d354de1ce265d9924d
-yuv422p10msble 6af065da37a04ad1db95d4061f129d41
yuv422p12be d6ca250820312bab977ce88d2ef65c13
yuv422p12le 3185b59dddc7ee67251d9829a977130b
-yuv422p12msbbe 2a31770a165d72be6fc2f6a16337c297
-yuv422p12msble 661b82b6a48938b64c39abb1328b5b13
yuv422p14be 3bc3a72c7cf995981bd8eb45f23705b3
yuv422p14le 5987087bbc03d8cbff4c41bce03451d9
yuv422p16be 97d95a9cfe8f67fb20a4c983c7fdc215
commit 22cc958c58488827115d1fce7c8ec6abf13bf498
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:50:42 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:44:13 2025 +0100
Revert "hwcontext_vulkan: fix grayscale 10 and 12-bit formats using the new
MSB formats"
This reverts commit 471acedec28078307d9f76c0469a2bf5a1f5c0d9.
diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
index c2381155ab..d22ccc21aa 100644
--- a/libavcodec/vulkan_decode.c
+++ b/libavcodec/vulkan_decode.c
@@ -1113,9 +1113,6 @@ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef
*hw_frames_ctx)
hwfc->create_pnext = &prof->profile_list;
} else {
switch (frames_ctx->sw_format) {
- /* Vulkan's formats are all LSB-padded */
- case AV_PIX_FMT_GRAY10: frames_ctx->sw_format = AV_PIX_FMT_GRAY10MSB;
break;
- case AV_PIX_FMT_GRAY12: frames_ctx->sw_format = AV_PIX_FMT_GRAY12MSB;
break;
case AV_PIX_FMT_GBRAP16:
/* This should be more efficient for downloading and using */
frames_ctx->sw_format = AV_PIX_FMT_RGBA64;
diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
index 471cfd5ad5..819940460f 100644
--- a/libavcodec/vulkan_video.c
+++ b/libavcodec/vulkan_video.c
@@ -29,8 +29,6 @@ static const struct FFVkFormatMapEntry {
} vk_format_map[] = {
/* Gray formats */
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_GRAY8, VK_IMAGE_ASPECT_COLOR_BIT },
- { VK_FORMAT_R10X6_UNORM_PACK16, AV_PIX_FMT_GRAY10MSB,
VK_IMAGE_ASPECT_COLOR_BIT },
- { VK_FORMAT_R12X4_UNORM_PACK16, AV_PIX_FMT_GRAY12MSB,
VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY16, VK_IMAGE_ASPECT_COLOR_BIT },
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT },
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 4d2d627d71..d870c38a56 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -372,8 +372,8 @@ static const struct FFVkFormatEntry {
} vk_formats_list[] = {
/* Gray formats */
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_GRAY8, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R8_UNORM } },
- { VK_FORMAT_R10X6_UNORM_PACK16, AV_PIX_FMT_GRAY10MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
- { VK_FORMAT_R12X4_UNORM_PACK16, AV_PIX_FMT_GRAY12MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY10, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY12, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY14, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY16, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R32_UINT, AV_PIX_FMT_GRAY32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_UINT } },
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 8a14f8a6c3..ef755ad6f7 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1672,8 +1672,8 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
};
return rep_tab[rep_fmt];
};
- case AV_PIX_FMT_GRAY10MSB:
- case AV_PIX_FMT_GRAY12MSB:
+ case AV_PIX_FMT_GRAY10:
+ case AV_PIX_FMT_GRAY12:
case AV_PIX_FMT_GRAY14:
case AV_PIX_FMT_GRAY16:
case AV_PIX_FMT_GBRAP10:
commit 2c7732a67688dbf0cface4def22aa3312fd80949
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:50:32 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:44:13 2025 +0100
Revert "hwcontext_vulkan: fix 3-plane 444 10 and 12-bit formats using the
new MSB formats"
This reverts commit 41ecb203c58145a7de06108737e7b85d3f7cc1c7.
diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
index a43f02f21e..c2381155ab 100644
--- a/libavcodec/vulkan_decode.c
+++ b/libavcodec/vulkan_decode.c
@@ -1116,12 +1116,6 @@ int ff_vk_frame_params(AVCodecContext *avctx,
AVBufferRef *hw_frames_ctx)
/* Vulkan's formats are all LSB-padded */
case AV_PIX_FMT_GRAY10: frames_ctx->sw_format = AV_PIX_FMT_GRAY10MSB;
break;
case AV_PIX_FMT_GRAY12: frames_ctx->sw_format = AV_PIX_FMT_GRAY12MSB;
break;
- case AV_PIX_FMT_YUV420P10: frames_ctx->sw_format =
AV_PIX_FMT_YUV420P10MSB; break;
- case AV_PIX_FMT_YUV420P12: frames_ctx->sw_format =
AV_PIX_FMT_YUV420P12MSB; break;
- case AV_PIX_FMT_YUV422P10: frames_ctx->sw_format =
AV_PIX_FMT_YUV422P10MSB; break;
- case AV_PIX_FMT_YUV422P12: frames_ctx->sw_format =
AV_PIX_FMT_YUV422P12MSB; break;
- case AV_PIX_FMT_YUV444P10: frames_ctx->sw_format =
AV_PIX_FMT_YUV444P10MSB; break;
- case AV_PIX_FMT_YUV444P12: frames_ctx->sw_format =
AV_PIX_FMT_YUV444P12MSB; break;
case AV_PIX_FMT_GBRAP16:
/* This should be more efficient for downloading and using */
frames_ctx->sw_format = AV_PIX_FMT_RGBA64;
diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
index 8c86882a55..471cfd5ad5 100644
--- a/libavcodec/vulkan_video.c
+++ b/libavcodec/vulkan_video.c
@@ -73,16 +73,16 @@ static const struct FFVkFormatMapEntry {
/* Three-plane 420, 422, 444 at 8, 10, 12 and 16 bits */
{ VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P,
ASPECT_3PLANE },
- { VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16,
AV_PIX_FMT_YUV420P10MSB, ASPECT_3PLANE },
- { VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16,
AV_PIX_FMT_YUV420P12MSB, ASPECT_3PLANE },
+ { VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P10,
ASPECT_3PLANE },
+ { VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P12,
ASPECT_3PLANE },
{ VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P16,
ASPECT_3PLANE },
{ VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P,
ASPECT_3PLANE },
- { VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16,
AV_PIX_FMT_YUV422P10MSB, ASPECT_3PLANE },
- { VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16,
AV_PIX_FMT_YUV422P12MSB, ASPECT_3PLANE },
+ { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P10,
ASPECT_3PLANE },
+ { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P12,
ASPECT_3PLANE },
{ VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P16,
ASPECT_3PLANE },
{ VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P,
ASPECT_3PLANE },
- { VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16,
AV_PIX_FMT_YUV444P10MSB, ASPECT_3PLANE },
- { VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16,
AV_PIX_FMT_YUV444P12MSB, ASPECT_3PLANE },
+ { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P10,
ASPECT_3PLANE },
+ { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P12,
ASPECT_3PLANE },
{ VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P16,
ASPECT_3PLANE },
/* Single plane 422 at 8, 10, 12 and 16 bits */
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index e3d67cb220..4d2d627d71 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -437,16 +437,16 @@ static const struct FFVkFormatEntry {
/* Three-plane 420, 422, 444 at 8, 10, 12 and 16 bits */
{ VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM } },
- { VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16,
AV_PIX_FMT_YUV420P10MSB, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
- { VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16,
AV_PIX_FMT_YUV420P12MSB, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P10,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P12,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, AV_PIX_FMT_YUV420P16,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM } },
- { VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16,
AV_PIX_FMT_YUV422P10MSB, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
- { VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16,
AV_PIX_FMT_YUV422P12MSB, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P10,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P12,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, AV_PIX_FMT_YUV422P16,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM } },
- { VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16,
AV_PIX_FMT_YUV444P10MSB, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
- { VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16,
AV_PIX_FMT_YUV444P12MSB, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P10,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P12,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P16,
ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
/* Single plane 422 at 8, 10, 12 and 16 bits */
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 7975ed27d2..8a14f8a6c3 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1684,14 +1684,14 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
case AV_PIX_FMT_GBRP12:
case AV_PIX_FMT_GBRP14:
case AV_PIX_FMT_GBRP16:
- case AV_PIX_FMT_YUV420P10MSB:
- case AV_PIX_FMT_YUV420P12MSB:
+ case AV_PIX_FMT_YUV420P10:
+ case AV_PIX_FMT_YUV420P12:
case AV_PIX_FMT_YUV420P16:
- case AV_PIX_FMT_YUV422P10MSB:
- case AV_PIX_FMT_YUV422P12MSB:
+ case AV_PIX_FMT_YUV422P10:
+ case AV_PIX_FMT_YUV422P12:
case AV_PIX_FMT_YUV422P16:
- case AV_PIX_FMT_YUV444P10MSB:
- case AV_PIX_FMT_YUV444P12MSB:
+ case AV_PIX_FMT_YUV444P10:
+ case AV_PIX_FMT_YUV444P12:
case AV_PIX_FMT_YUV444P16:
case AV_PIX_FMT_YUVA420P10:
case AV_PIX_FMT_YUVA420P16:
commit 38df9ba71b0bb047b9d1c9200e8e31c5f097111b
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:50:21 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:44:13 2025 +0100
Revert "hwcontext_vulkan: fix planar 10 and 12-bit RGB formats using the
new MSB formats"
This reverts commit 98ee3f671813bfb704df1626113899d0dba555de.
diff --git a/libavcodec/ffv1enc_vulkan.c b/libavcodec/ffv1enc_vulkan.c
index 526a196ec4..d2908a09a9 100644
--- a/libavcodec/ffv1enc_vulkan.c
+++ b/libavcodec/ffv1enc_vulkan.c
@@ -242,8 +242,8 @@ static int run_rct_search(AVCodecContext *avctx,
FFVkExecContext *exec,
.micro_version = f->micro_version,
};
- if (avctx->sw_pix_fmt == AV_PIX_FMT_GBRP10MSB ||
- avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12MSB ||
+ if (avctx->sw_pix_fmt == AV_PIX_FMT_GBRP10 ||
+ avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12 ||
avctx->sw_pix_fmt == AV_PIX_FMT_GBRP14)
memcpy(pd.fmt_lut, (int [4]) { 2, 1, 0, 3 }, 4*sizeof(int));
else
@@ -503,8 +503,8 @@ static int vulkan_encode_ffv1_submit_frame(AVCodecContext
*avctx,
};
/* For some reason the C FFv1 encoder/decoder treats these differently */
- if (avctx->sw_pix_fmt == AV_PIX_FMT_GBRP10MSB ||
- avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12MSB ||
+ if (avctx->sw_pix_fmt == AV_PIX_FMT_GBRP10 ||
+ avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12 ||
avctx->sw_pix_fmt == AV_PIX_FMT_GBRP14)
memcpy(pd.fmt_lut, (int [4]) { 2, 1, 0, 3 }, 4*sizeof(int));
else
diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
index 8930005ed1..a43f02f21e 100644
--- a/libavcodec/vulkan_decode.c
+++ b/libavcodec/vulkan_decode.c
@@ -1116,7 +1116,6 @@ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef
*hw_frames_ctx)
/* Vulkan's formats are all LSB-padded */
case AV_PIX_FMT_GRAY10: frames_ctx->sw_format = AV_PIX_FMT_GRAY10MSB;
break;
case AV_PIX_FMT_GRAY12: frames_ctx->sw_format = AV_PIX_FMT_GRAY12MSB;
break;
- case AV_PIX_FMT_GBRP12: frames_ctx->sw_format = AV_PIX_FMT_GBRP12MSB;
break;
case AV_PIX_FMT_YUV420P10: frames_ctx->sw_format =
AV_PIX_FMT_YUV420P10MSB; break;
case AV_PIX_FMT_YUV420P12: frames_ctx->sw_format =
AV_PIX_FMT_YUV420P12MSB; break;
case AV_PIX_FMT_YUV422P10: frames_ctx->sw_format =
AV_PIX_FMT_YUV422P10MSB; break;
diff --git a/libavcodec/vulkan_ffv1.c b/libavcodec/vulkan_ffv1.c
index 3eb0484629..b02bc71683 100644
--- a/libavcodec/vulkan_ffv1.c
+++ b/libavcodec/vulkan_ffv1.c
@@ -447,7 +447,7 @@ static int vk_ffv1_end_frame(AVCodecContext *avctx)
/* For some reason the C FFv1 encoder/decoder treats these differently */
- if (sw_format == AV_PIX_FMT_GBRP10MSB || sw_format == AV_PIX_FMT_GBRP12MSB
||
+ if (sw_format == AV_PIX_FMT_GBRP10 || sw_format == AV_PIX_FMT_GBRP12 ||
sw_format == AV_PIX_FMT_GBRP14)
memcpy(pd.fmt_lut, (int [4]) { 2, 1, 0, 3 }, 4*sizeof(int));
else if (sw_format == AV_PIX_FMT_X2BGR10)
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index f207ea8df5..e3d67cb220 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -399,8 +399,8 @@ static const struct FFVkFormatEntry {
/* Planar RGB */
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_GBRP, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
- { VK_FORMAT_R10X6_UNORM_PACK16, AV_PIX_FMT_GBRP10MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 3, 3, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
- { VK_FORMAT_R12X4_UNORM_PACK16, AV_PIX_FMT_GBRP12MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 3, 3, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRP10, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRP12, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRP14, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRP16, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GBRPF32, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT } },
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 3e3a15b5e5..7975ed27d2 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1534,7 +1534,7 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt)
pix_fmt == AV_PIX_FMT_RGBA64 || pix_fmt == AV_PIX_FMT_RGB565 ||
pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_BGR0 ||
pix_fmt == AV_PIX_FMT_0BGR || pix_fmt == AV_PIX_FMT_RGB0 ||
- pix_fmt == AV_PIX_FMT_GBRP10MSB || pix_fmt == AV_PIX_FMT_GBRP12MSB ||
+ pix_fmt == AV_PIX_FMT_GBRP10 || pix_fmt == AV_PIX_FMT_GBRP12 ||
pix_fmt == AV_PIX_FMT_GBRP14 || pix_fmt == AV_PIX_FMT_GBRP16 ||
pix_fmt == AV_PIX_FMT_GBRAP || pix_fmt == AV_PIX_FMT_GBRAP10 ||
pix_fmt == AV_PIX_FMT_GBRAP12 || pix_fmt == AV_PIX_FMT_GBRAP14 ||
@@ -1557,8 +1557,8 @@ void ff_vk_set_perm(enum AVPixelFormat pix_fmt, int
lut[4], int inv)
case AV_PIX_FMT_GBRAP12:
case AV_PIX_FMT_GBRAP14:
case AV_PIX_FMT_GBRAP16:
- case AV_PIX_FMT_GBRP10MSB:
- case AV_PIX_FMT_GBRP12MSB:
+ case AV_PIX_FMT_GBRP10:
+ case AV_PIX_FMT_GBRP12:
case AV_PIX_FMT_GBRP14:
case AV_PIX_FMT_GBRP16:
case AV_PIX_FMT_GBRPF32:
@@ -1680,8 +1680,8 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
case AV_PIX_FMT_GBRAP12:
case AV_PIX_FMT_GBRAP14:
case AV_PIX_FMT_GBRAP16:
- case AV_PIX_FMT_GBRP10MSB:
- case AV_PIX_FMT_GBRP12MSB:
+ case AV_PIX_FMT_GBRP10:
+ case AV_PIX_FMT_GBRP12:
case AV_PIX_FMT_GBRP14:
case AV_PIX_FMT_GBRP16:
case AV_PIX_FMT_YUV420P10MSB:
commit 15e82dc45221a2e368474751a351fe28d700936b
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:47:51 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:44:13 2025 +0100
Revert "hwcontext_vulkan: remove unsupported/broken pixel formats"
This reverts commit 5b388f28384a76acf6e83ba4418863d9a7a2cad2.
diff --git a/libavcodec/ffv1enc_vulkan.c b/libavcodec/ffv1enc_vulkan.c
index 8a624a305d..526a196ec4 100644
--- a/libavcodec/ffv1enc_vulkan.c
+++ b/libavcodec/ffv1enc_vulkan.c
@@ -243,7 +243,8 @@ static int run_rct_search(AVCodecContext *avctx,
FFVkExecContext *exec,
};
if (avctx->sw_pix_fmt == AV_PIX_FMT_GBRP10MSB ||
- avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12MSB)
+ avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12MSB ||
+ avctx->sw_pix_fmt == AV_PIX_FMT_GBRP14)
memcpy(pd.fmt_lut, (int [4]) { 2, 1, 0, 3 }, 4*sizeof(int));
else
ff_vk_set_perm(avctx->sw_pix_fmt, pd.fmt_lut, 1);
@@ -503,7 +504,8 @@ static int vulkan_encode_ffv1_submit_frame(AVCodecContext
*avctx,
/* For some reason the C FFv1 encoder/decoder treats these differently */
if (avctx->sw_pix_fmt == AV_PIX_FMT_GBRP10MSB ||
- avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12MSB)
+ avctx->sw_pix_fmt == AV_PIX_FMT_GBRP12MSB ||
+ avctx->sw_pix_fmt == AV_PIX_FMT_GBRP14)
memcpy(pd.fmt_lut, (int [4]) { 2, 1, 0, 3 }, 4*sizeof(int));
else
ff_vk_set_perm(avctx->sw_pix_fmt, pd.fmt_lut, 1);
diff --git a/libavcodec/vulkan_ffv1.c b/libavcodec/vulkan_ffv1.c
index 4428d65373..3eb0484629 100644
--- a/libavcodec/vulkan_ffv1.c
+++ b/libavcodec/vulkan_ffv1.c
@@ -447,7 +447,8 @@ static int vk_ffv1_end_frame(AVCodecContext *avctx)
/* For some reason the C FFv1 encoder/decoder treats these differently */
- if (sw_format == AV_PIX_FMT_GBRP10MSB || sw_format == AV_PIX_FMT_GBRP12MSB)
+ if (sw_format == AV_PIX_FMT_GBRP10MSB || sw_format == AV_PIX_FMT_GBRP12MSB
||
+ sw_format == AV_PIX_FMT_GBRP14)
memcpy(pd.fmt_lut, (int [4]) { 2, 1, 0, 3 }, 4*sizeof(int));
else if (sw_format == AV_PIX_FMT_X2BGR10)
memcpy(pd.fmt_lut, (int [4]) { 0, 2, 1, 3 }, 4*sizeof(int));
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 85bae53e5a..f207ea8df5 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -374,6 +374,7 @@ static const struct FFVkFormatEntry {
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_GRAY8, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R8_UNORM } },
{ VK_FORMAT_R10X6_UNORM_PACK16, AV_PIX_FMT_GRAY10MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R12X4_UNORM_PACK16, AV_PIX_FMT_GRAY12MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY14, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GRAY16, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R32_UINT, AV_PIX_FMT_GRAY32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_UINT } },
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GRAYF32, VK_IMAGE_ASPECT_COLOR_BIT, 1,
1, 1, { VK_FORMAT_R32_SFLOAT } },
@@ -400,6 +401,7 @@ static const struct FFVkFormatEntry {
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_GBRP, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
{ VK_FORMAT_R10X6_UNORM_PACK16, AV_PIX_FMT_GBRP10MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 3, 3, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R12X4_UNORM_PACK16, AV_PIX_FMT_GBRP12MSB,
VK_IMAGE_ASPECT_COLOR_BIT, 3, 3, 3, { VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRP14, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRP16, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GBRPF32, VK_IMAGE_ASPECT_COLOR_BIT, 3,
3, 3, { VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT } },
@@ -456,14 +458,19 @@ static const struct FFVkFormatEntry {
/* Planar YUVA 420 at 8, 10 and 16 bits */
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_YUVA420P, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA420P10, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA420P16, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
/* Planar YUVA 422 at 8, 10, 12 and 16 bits */
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_YUVA422P, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA422P10, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA422P12, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA422P16, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
/* Planar YUVA 444 at 8, 10, 12 and 16 bits */
{ VK_FORMAT_R8_UNORM, AV_PIX_FMT_YUVA444P, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA444P10, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA444P12, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
{ VK_FORMAT_R16_UNORM, AV_PIX_FMT_YUVA444P16, VK_IMAGE_ASPECT_COLOR_BIT,
4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM,
VK_FORMAT_R16_UNORM } },
/* Single plane 444 at 8, 10, 12 and 16 bits */
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index c7d06238c5..3e3a15b5e5 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1535,7 +1535,7 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt)
pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_BGR0 ||
pix_fmt == AV_PIX_FMT_0BGR || pix_fmt == AV_PIX_FMT_RGB0 ||
pix_fmt == AV_PIX_FMT_GBRP10MSB || pix_fmt == AV_PIX_FMT_GBRP12MSB ||
- pix_fmt == AV_PIX_FMT_GBRP16 ||
+ pix_fmt == AV_PIX_FMT_GBRP14 || pix_fmt == AV_PIX_FMT_GBRP16 ||
pix_fmt == AV_PIX_FMT_GBRAP || pix_fmt == AV_PIX_FMT_GBRAP10 ||
pix_fmt == AV_PIX_FMT_GBRAP12 || pix_fmt == AV_PIX_FMT_GBRAP14 ||
pix_fmt == AV_PIX_FMT_GBRAP16 || pix_fmt == AV_PIX_FMT_GBRAP32 ||
@@ -1559,6 +1559,7 @@ void ff_vk_set_perm(enum AVPixelFormat pix_fmt, int
lut[4], int inv)
case AV_PIX_FMT_GBRAP16:
case AV_PIX_FMT_GBRP10MSB:
case AV_PIX_FMT_GBRP12MSB:
+ case AV_PIX_FMT_GBRP14:
case AV_PIX_FMT_GBRP16:
case AV_PIX_FMT_GBRPF32:
case AV_PIX_FMT_GBRAP32:
@@ -1673,6 +1674,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
};
case AV_PIX_FMT_GRAY10MSB:
case AV_PIX_FMT_GRAY12MSB:
+ case AV_PIX_FMT_GRAY14:
case AV_PIX_FMT_GRAY16:
case AV_PIX_FMT_GBRAP10:
case AV_PIX_FMT_GBRAP12:
@@ -1680,6 +1682,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
case AV_PIX_FMT_GBRAP16:
case AV_PIX_FMT_GBRP10MSB:
case AV_PIX_FMT_GBRP12MSB:
+ case AV_PIX_FMT_GBRP14:
case AV_PIX_FMT_GBRP16:
case AV_PIX_FMT_YUV420P10MSB:
case AV_PIX_FMT_YUV420P12MSB:
@@ -1690,8 +1693,13 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat
pix_fmt,
case AV_PIX_FMT_YUV444P10MSB:
case AV_PIX_FMT_YUV444P12MSB:
case AV_PIX_FMT_YUV444P16:
+ case AV_PIX_FMT_YUVA420P10:
case AV_PIX_FMT_YUVA420P16:
+ case AV_PIX_FMT_YUVA422P10:
+ case AV_PIX_FMT_YUVA422P12:
case AV_PIX_FMT_YUVA422P16:
+ case AV_PIX_FMT_YUVA444P10:
+ case AV_PIX_FMT_YUVA444P12:
case AV_PIX_FMT_YUVA444P16:
case AV_PIX_FMT_BAYER_RGGB16: {
const char *rep_tab[] = {
commit deaece6e56e2bc9ad01092df68c09012e3384d49
Author: Lynne <[email protected]>
AuthorDate: Thu Nov 6 18:43:56 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Thu Nov 6 21:44:13 2025 +0100
Revert "swscale/format: add missing fmt_shift for gray12/12 msb formats"
This reverts commit c9710dae3c6151a22f0fff60f0a9b4514f6a3b97.
diff --git a/libswscale/format.c b/libswscale/format.c
index c4c4142fc6..e4b9b264e5 100644
--- a/libswscale/format.c
+++ b/libswscale/format.c
@@ -757,8 +757,6 @@ static int fmt_shift(enum AVPixelFormat fmt)
case AV_PIX_FMT_YUV444P10MSBLE:
case AV_PIX_FMT_GBRP10MSBBE:
case AV_PIX_FMT_GBRP10MSBLE:
- case AV_PIX_FMT_GRAY10MSBBE:
- case AV_PIX_FMT_GRAY10MSBLE:
return 6;
case AV_PIX_FMT_P012BE:
case AV_PIX_FMT_P012LE:
@@ -778,8 +776,6 @@ static int fmt_shift(enum AVPixelFormat fmt)
case AV_PIX_FMT_YUV444P12MSBLE:
case AV_PIX_FMT_GBRP12MSBBE:
case AV_PIX_FMT_GBRP12MSBLE:
- case AV_PIX_FMT_GRAY12MSBBE:
- case AV_PIX_FMT_GRAY12MSBLE:
return 4;
}
-----------------------------------------------------------------------
Summary of changes:
doc/APIchanges | 5 -
libavcodec/ffv1enc_vulkan.c | 10 +-
libavcodec/vulkan/prores_idct.comp | 4 +-
libavcodec/vulkan_decode.c | 10 --
libavcodec/vulkan_ffv1.c | 3 +-
libavcodec/vulkan_video.c | 14 ++-
libavutil/hwcontext_vulkan.c | 27 ++++--
libavutil/pixdesc.c | 138 ---------------------------
libavutil/pixfmt.h | 19 ----
libavutil/version.h | 2 +-
libavutil/vulkan.c | 36 ++++---
libswscale/format.c | 28 ------
libswscale/input.c | 20 ----
libswscale/swscale_unscaled.c | 6 --
tests/ref/fate/filter-pixdesc-yuv420p10msbbe | 1 -
tests/ref/fate/filter-pixdesc-yuv420p10msble | 1 -
tests/ref/fate/filter-pixdesc-yuv420p12msbbe | 1 -
tests/ref/fate/filter-pixdesc-yuv420p12msble | 1 -
tests/ref/fate/filter-pixdesc-yuv422p10msbbe | 1 -
tests/ref/fate/filter-pixdesc-yuv422p10msble | 1 -
tests/ref/fate/filter-pixdesc-yuv422p12msbbe | 1 -
tests/ref/fate/filter-pixdesc-yuv422p12msble | 1 -
tests/ref/fate/filter-pixfmts-copy | 12 ---
tests/ref/fate/filter-pixfmts-crop | 12 ---
tests/ref/fate/filter-pixfmts-field | 12 ---
tests/ref/fate/filter-pixfmts-fieldorder | 8 --
tests/ref/fate/filter-pixfmts-hflip | 12 ---
tests/ref/fate/filter-pixfmts-il | 12 ---
tests/ref/fate/filter-pixfmts-null | 12 ---
tests/ref/fate/filter-pixfmts-pad | 6 --
tests/ref/fate/filter-pixfmts-scale | 12 ---
tests/ref/fate/filter-pixfmts-transpose | 8 --
tests/ref/fate/filter-pixfmts-vflip | 12 ---
tests/ref/fate/imgutils | 24 -----
tests/ref/fate/sws-pixdesc-query | 58 -----------
35 files changed, 56 insertions(+), 474 deletions(-)
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv420p10msbbe
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv420p10msble
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv420p12msbbe
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv420p12msble
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv422p10msbbe
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv422p10msble
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv422p12msbbe
delete mode 100644 tests/ref/fate/filter-pixdesc-yuv422p12msble
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
