[FFmpeg-cvslog] swscale: add P210/P410/P216/P416 output
rcombs
git at videolan.org
Thu Dec 23 02:45:09 EET 2021
ffmpeg | branch: master | rcombs <rcombs at rcombs.me> | Thu Dec 16 18:03:46 2021 -0600| [88d804b7ffa20caab2e8e2809da974c41f7fd8fc] | committer: rcombs
swscale: add P210/P410/P216/P416 output
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88d804b7ffa20caab2e8e2809da974c41f7fd8fc
---
libswscale/output.c | 8 ++++++--
libswscale/utils.c | 16 ++++++++--------
libswscale/version.h | 2 +-
tests/ref/fate/filter-pixdesc-p210be | 1 +
tests/ref/fate/filter-pixdesc-p210le | 1 +
tests/ref/fate/filter-pixdesc-p216be | 1 +
tests/ref/fate/filter-pixdesc-p216le | 1 +
tests/ref/fate/filter-pixdesc-p410be | 1 +
tests/ref/fate/filter-pixdesc-p410le | 1 +
tests/ref/fate/filter-pixdesc-p416be | 1 +
tests/ref/fate/filter-pixdesc-p416le | 1 +
tests/ref/fate/filter-pixfmts-copy | 8 ++++++++
tests/ref/fate/filter-pixfmts-crop | 8 ++++++++
tests/ref/fate/filter-pixfmts-field | 8 ++++++++
tests/ref/fate/filter-pixfmts-fieldorder | 8 ++++++++
tests/ref/fate/filter-pixfmts-hflip | 8 ++++++++
tests/ref/fate/filter-pixfmts-il | 8 ++++++++
tests/ref/fate/filter-pixfmts-null | 8 ++++++++
tests/ref/fate/filter-pixfmts-pad | 4 ++++
tests/ref/fate/filter-pixfmts-scale | 8 ++++++++
tests/ref/fate/filter-pixfmts-transpose | 4 ++++
tests/ref/fate/filter-pixfmts-vflip | 8 ++++++++
22 files changed, 103 insertions(+), 11 deletions(-)
diff --git a/libswscale/output.c b/libswscale/output.c
index 58b10f85a5..4b4b186be9 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -2563,14 +2563,18 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
enum AVPixelFormat dstFormat = c->dstFormat;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);
- if (dstFormat == AV_PIX_FMT_P010LE || dstFormat == AV_PIX_FMT_P010BE) {
+ if (dstFormat == AV_PIX_FMT_P010LE || dstFormat == AV_PIX_FMT_P010BE ||
+ dstFormat == AV_PIX_FMT_P210LE || dstFormat == AV_PIX_FMT_P210BE ||
+ dstFormat == AV_PIX_FMT_P410LE || dstFormat == AV_PIX_FMT_P410BE) {
*yuv2plane1 = isBE(dstFormat) ? yuv2p010l1_BE_c : yuv2p010l1_LE_c;
*yuv2planeX = isBE(dstFormat) ? yuv2p010lX_BE_c : yuv2p010lX_LE_c;
*yuv2nv12cX = yuv2p010cX_c;
} else if (is16BPS(dstFormat)) {
*yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c;
*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c;
- if (dstFormat == AV_PIX_FMT_P016LE || dstFormat == AV_PIX_FMT_P016BE) {
+ if (dstFormat == AV_PIX_FMT_P016LE || dstFormat == AV_PIX_FMT_P016BE ||
+ dstFormat == AV_PIX_FMT_P216LE || dstFormat == AV_PIX_FMT_P216BE ||
+ dstFormat == AV_PIX_FMT_P416LE || dstFormat == AV_PIX_FMT_P416BE) {
*yuv2nv12cX = yuv2p016cX_c;
}
} else if (isNBPS(dstFormat)) {
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 7158384f0b..c5ea8853d5 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -268,14 +268,14 @@ static const FormatEntry format_entries[] = {
[AV_PIX_FMT_Y210LE] = { 1, 0 },
[AV_PIX_FMT_X2RGB10LE] = { 1, 1 },
[AV_PIX_FMT_X2BGR10LE] = { 1, 1 },
- [AV_PIX_FMT_P210BE] = { 1, 0 },
- [AV_PIX_FMT_P210LE] = { 1, 0 },
- [AV_PIX_FMT_P410BE] = { 1, 0 },
- [AV_PIX_FMT_P410LE] = { 1, 0 },
- [AV_PIX_FMT_P216BE] = { 1, 0 },
- [AV_PIX_FMT_P216LE] = { 1, 0 },
- [AV_PIX_FMT_P416BE] = { 1, 0 },
- [AV_PIX_FMT_P416LE] = { 1, 0 },
+ [AV_PIX_FMT_P210BE] = { 1, 1 },
+ [AV_PIX_FMT_P210LE] = { 1, 1 },
+ [AV_PIX_FMT_P410BE] = { 1, 1 },
+ [AV_PIX_FMT_P410LE] = { 1, 1 },
+ [AV_PIX_FMT_P216BE] = { 1, 1 },
+ [AV_PIX_FMT_P216LE] = { 1, 1 },
+ [AV_PIX_FMT_P416BE] = { 1, 1 },
+ [AV_PIX_FMT_P416LE] = { 1, 1 },
};
void ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, int filterSize, int16_t *filter, int dstW){
diff --git a/libswscale/version.h b/libswscale/version.h
index 15ad54319c..8f7b56df9a 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@
#define LIBSWSCALE_VERSION_MAJOR 6
#define LIBSWSCALE_VERSION_MINOR 1
-#define LIBSWSCALE_VERSION_MICRO 101
+#define LIBSWSCALE_VERSION_MICRO 102
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
LIBSWSCALE_VERSION_MINOR, \
diff --git a/tests/ref/fate/filter-pixdesc-p210be b/tests/ref/fate/filter-pixdesc-p210be
new file mode 100644
index 0000000000..b7d15ff93d
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p210be
@@ -0,0 +1 @@
+pixdesc-p210be 9f3465e388d91beeb5cb7fe0011c5a67
diff --git a/tests/ref/fate/filter-pixdesc-p210le b/tests/ref/fate/filter-pixdesc-p210le
new file mode 100644
index 0000000000..cdb96e9cf5
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p210le
@@ -0,0 +1 @@
+pixdesc-p210le 9994fb3da38c83d3b5fd4994993ad0ae
diff --git a/tests/ref/fate/filter-pixdesc-p216be b/tests/ref/fate/filter-pixdesc-p216be
new file mode 100644
index 0000000000..657136996a
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p216be
@@ -0,0 +1 @@
+pixdesc-p216be db5cabe6e5f1814a6d20e8398aec4785
diff --git a/tests/ref/fate/filter-pixdesc-p216le b/tests/ref/fate/filter-pixdesc-p216le
new file mode 100644
index 0000000000..5ade1ee75f
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p216le
@@ -0,0 +1 @@
+pixdesc-p216le 79d711ee3dac99e37c013d2073d90a2c
diff --git a/tests/ref/fate/filter-pixdesc-p410be b/tests/ref/fate/filter-pixdesc-p410be
new file mode 100644
index 0000000000..26ff981622
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p410be
@@ -0,0 +1 @@
+pixdesc-p410be 85671676fa52d0350c918f45417f3c64
diff --git a/tests/ref/fate/filter-pixdesc-p410le b/tests/ref/fate/filter-pixdesc-p410le
new file mode 100644
index 0000000000..826d98ea5e
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p410le
@@ -0,0 +1 @@
+pixdesc-p410le 0b90a10af76240042876793a1dafa862
diff --git a/tests/ref/fate/filter-pixdesc-p416be b/tests/ref/fate/filter-pixdesc-p416be
new file mode 100644
index 0000000000..5a23be5d72
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p416be
@@ -0,0 +1 @@
+pixdesc-p416be a7d8a859ce47c3860e0fee31539a84b0
diff --git a/tests/ref/fate/filter-pixdesc-p416le b/tests/ref/fate/filter-pixdesc-p416le
new file mode 100644
index 0000000000..25e733b69d
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p416le
@@ -0,0 +1 @@
+pixdesc-p416le e0f93774f62dd3b261fb8637696f3773
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index 790b733112..b090739bd2 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -63,6 +63,14 @@ p010be 7f9842d6015026136bad60d03c035cc3
p010le c453421b9f726bdaf2bacf59a492c43b
p016be 7f9842d6015026136bad60d03c035cc3
p016le c453421b9f726bdaf2bacf59a492c43b
+p210be 6df2a72ee297e53f9ac7f96acf0ef5d5
+p210le c06e4b76cf504e908128081f92b60ce2
+p216be 01d10b0d17c9f575b512dff36623a85b
+p216le 2f634e1a3cd5c9c122e0f2ebadb3503d
+p410be d9af5b8126ea7457edaf0c90ad0cb2b7
+p410le 527761e1f4381007044679710a352ecc
+p416be fc5c1c45567de4a6bc9dbc8eef30116d
+p416le 983064bfd506be1e26cd57bafc14ae50
pal8 ff5929f5b42075793b2c34cb441bede5
rgb0 0de71e5a1f97f81fb51397a0435bfa72
rgb24 f4438057d046e6d98ade4e45294b21be
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 3c410cbd6b..93353ad16a 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -61,6 +61,14 @@ p010be 8b2de2eb6b099bbf355bfc55a0694ddc
p010le 373b50c766dfd0a8e79c9a73246d803a
p016be 8b2de2eb6b099bbf355bfc55a0694ddc
p016le 373b50c766dfd0a8e79c9a73246d803a
+p210be b75f0e53a245e49af955fe210fc31bb8
+p210le 74fcd5a32eee687eebe002c884103963
+p216be 89cb3a4bd44ba624c1395e7ea6998dde
+p216le e56f5e5b0d4460d56f27a5df8a4a1462
+p410be 37e56737c2421aa59a33c57423d58616
+p410le 75f910c7282d8065d97f502ba974c481
+p416be 13b2dc247bdb0ab7e5532f75048f5a2c
+p416le ecb78b327ea5cfe1fff82945c1fca310
pal8 1f2cdc8e718f95c875dbc1034a688bfb
rgb0 736646b70dd9a0be22b8da8041e35035
rgb24 c5fbbf816bb2000f4d2914e335698ef5
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 37718d81d0..bcd1a0a45b 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -63,6 +63,14 @@ p010be a0311a09bba7383553267d2b3b9c075e
p010le ee09a18aefa3ebe97715b3a7312cb8ff
p016be a0311a09bba7383553267d2b3b9c075e
p016le ee09a18aefa3ebe97715b3a7312cb8ff
+p210be 341db7c98afd2767d48cdd72e224df2f
+p210le 8d68f7655a3d76f2f8436bd25beb3973
+p216be 0dde930860e940dced179884c359f720
+p216le b573c0473a1368813d077487cc9bce0e
+p410be 9e9a812b74854226271c5f7dc18c37b7
+p410le c981188c7fd9f32988a9f4732303f82b
+p416be 203203e6788a80b52d2ca6ba629beb9c
+p416le 1039b97bbe42ef0af1bc46d2c0fc819e
pal8 0658c18dcd8d052d59dfbe23f5b368d9
rgb0 ca3fa6e865b91b3511c7f2bf62830059
rgb24 25ab271e26a5785be169578d99da5dd0
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index 88780c05a7..761ef422b5 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -55,6 +55,14 @@ grayf32be 1aa7960131f880c54fe3c77f13448674
grayf32le 4029ac9d197f255794c1b9e416520fc7
nv24 4fdbef26042c77f012df114e666efdb2
nv42 59608290fece913e6b7d61edf581a529
+p210be 82958903f553e9d2d91549bd44559a5a
+p210le 755363012d8801b96ead2e8b1b4d2ab8
+p216be 7159f11beb9138932f8d60b95efe96dc
+p216le c0c888ab7bde56638732344076b3b2ba
+p410be 411f89fadbee1ca43d2918eba583bea5
+p410le 2771dd3ae54a439921f51c29e79b6799
+p416be de6b84bd524e8fcfc251634cae416069
+p416le 2e73af44eb933580da59981176848dcc
rgb0 2e3d8c91c7a83d451593dfd06607ff39
rgb24 b82577f8215d3dc2681be60f1da247af
rgb444be 1c3afc3a0c53c51139c76504f59bb1f4
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index 69c7b42b6e..1fc26b9fb5 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -61,6 +61,14 @@ p010be 744b13e44d39e1ff7588983fa03e0101
p010le a50b160346ab94f55a425065b57006f0
p016be 744b13e44d39e1ff7588983fa03e0101
p016le a50b160346ab94f55a425065b57006f0
+p210be 174cdf99f18658724e269bf38d2b653b
+p210le b6982912b2376371edea4fccf99fe40c
+p216be c58f03c6668ab0fbc3ee1a2da051e28c
+p216le 1f5213bebf4c99634f57290f5ad99c0d
+p410be aa40aa32be7aa353252bac70b5edc175
+p410le 1143c811c383e4461b1192dca0c74246
+p416be 8863e9156ee7edcb6b9e6ac01a2e338c
+p416le a42b88cabc4395aa0bf1bcbbc876f48f
pal8 5b7c77d99817b4f52339742a47de7797
rgb0 0092452f37d73da20193265ace0b7d57
rgb24 21571104e6091a689feabb7867e513dd
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index 09fe072314..7e7f057afa 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -63,6 +63,14 @@ p010be 3df51286ef66b53e3e283dbbab582263
p010le eadcd8241e97e35b2b47d5eb2eaea6cd
p016be 3df51286ef66b53e3e283dbbab582263
p016le eadcd8241e97e35b2b47d5eb2eaea6cd
+p210be 4992fe87c600dfb177b1e2e6aa0f922c
+p210le c695064fb9f2cc4e35957d4d649cc281
+p216be 98b73479f0ea9843768c162c449c3ac5
+p216le 77757390da383a90981e461d128d8789
+p410be a7183a01888b47a4d9f3672073c7ea7d
+p410le 6cf3a3e199b327f4f013e0346410d7a8
+p416be 4dc4aebf18e09e8f8b49db90ae5ec127
+p416le 4990b51ff889d9ee23e68997f81c09f1
rgb0 cfaf68671e43248267d8cd50cae8c13f
rgb24 88894f608cf33ba310f21996748d77a7
rgb444be 99d36d814988fb388aacdef575dacfcf
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index 790b733112..b090739bd2 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -63,6 +63,14 @@ p010be 7f9842d6015026136bad60d03c035cc3
p010le c453421b9f726bdaf2bacf59a492c43b
p016be 7f9842d6015026136bad60d03c035cc3
p016le c453421b9f726bdaf2bacf59a492c43b
+p210be 6df2a72ee297e53f9ac7f96acf0ef5d5
+p210le c06e4b76cf504e908128081f92b60ce2
+p216be 01d10b0d17c9f575b512dff36623a85b
+p216le 2f634e1a3cd5c9c122e0f2ebadb3503d
+p410be d9af5b8126ea7457edaf0c90ad0cb2b7
+p410le 527761e1f4381007044679710a352ecc
+p416be fc5c1c45567de4a6bc9dbc8eef30116d
+p416le 983064bfd506be1e26cd57bafc14ae50
pal8 ff5929f5b42075793b2c34cb441bede5
rgb0 0de71e5a1f97f81fb51397a0435bfa72
rgb24 f4438057d046e6d98ade4e45294b21be
diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad
index 57fa817cf5..1362d198b4 100644
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@@ -25,6 +25,10 @@ nv12 381574979cb04be10c9168540310afad
nv21 0fdeb2cdd56cf5a7147dc273456fa217
nv24 193b9eadcc06ad5081609f76249b3e47
nv42 1738ad3c31c6c16e17679f5b09ce4677
+p210le 10b53de63b086de93c076d1d40f9da42
+p216le 0bbf778e1b6101a3f650ce0454a357f2
+p410le fcab6381bde9cd84b813925ff29be4d2
+p416le 6db094f8d7d27d7299bf9496ad66e2e0
rgb0 78d500c8361ab6423a4826a00268c908
rgb24 17f9e2e0c609009acaf2175c42d4a2a5
rgba b157c90191463d34fb3ce77b36c96386
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 1623e5c939..a5a4ac4cba 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -63,6 +63,14 @@ p010be 1d6726d94bf1385996a9a9840dd0e878
p010le 4b316f2b9e18972299beb73511278fa8
p016be 31e204018cbb53f8988c4e1174ea8ce9
p016le d5afe557f492a09317e525d7cb782f5b
+p210be 42be1e97427247317444afa836969667
+p210le 04efb8f14a9d98417af40954a06aa187
+p216be caa0268d0f6779343a4432b6bc832c5b
+p216le c8f65811f717a12706a598561c6df46d
+p410be f580b8dcf5a826c94258eeba837fd874
+p410le 90fdd95ec4482c127d98307550a885c6
+p416be a1242f80d32705a757f4d3553542ae1f
+p416le d91a0858ea8d2cf1ed29f179c9ad9666
pal8 29e10892009b2cfe431815ec3052ed3b
rgb0 fbd27e98154efb7535826afed41e9bb0
rgb24 e022e741451e81f2ecce1c7240b93e87
diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose
index 5117bcf763..dc3a0628ee 100644
--- a/tests/ref/fate/filter-pixfmts-transpose
+++ b/tests/ref/fate/filter-pixfmts-transpose
@@ -61,6 +61,10 @@ p010be ad0de2cc9bff81688b182a870fcf7000
p010le e7ff5143595021246733ce6bd0a769e8
p016be ad0de2cc9bff81688b182a870fcf7000
p016le e7ff5143595021246733ce6bd0a769e8
+p410be 171453dc34dd3c77659914e2202c5aa6
+p410le 4e5f78dfccda9a6387e81354a56a033a
+p416be ff09601f127101a8ce8997b9ae0fd6bf
+p416le 7bb46e2aec65669a27502ec452941237
rgb0 31ea5da7fe779c6ea0a33f1d28aad918
rgb24 47654cabaaad79170b90afd5a02161dd
rgb444be 3cac1f0c43a74d2a95eb02e187070845
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 34c1a9c64f..7736e372ad 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -63,6 +63,14 @@ p010be 06e9354b6e0e38ba41736352cedc0bd5
p010le fd18d322bffbf5816902c13102872e22
p016be 06e9354b6e0e38ba41736352cedc0bd5
p016le fd18d322bffbf5816902c13102872e22
+p210be 328b09bb0c70571617901322b4194023
+p210le d71c2d4e483030ffd87fa6a68c83fce0
+p216be e4ab026532db1dfee38cedef384e605b
+p216le 2c0a660762527706799c4705ca50a9c5
+p410be 637fb064c2ce173de5cf431aa9267914
+p410le 849308a1cdf41e055019cf311d1b2201
+p416be 8e9cf1b695c0a33b6094dd6c7b3722d9
+p416le 0991d7fff4e2caf36be219ecdd9619d4
pal8 450b0155d0f2d5628bf95a442db5f817
rgb0 56a7ea69541bcd27bef6a5615784722b
rgb24 195e6dae1c3a488b9d3ceb7560d25d85
More information about the ffmpeg-cvslog
mailing list