The branch, master has been updated via ca20d42cd79b12b1f39cc80c758e5492337f2f25 (commit) from 9b8b78a8153f9ca94b7eb9cba87442954787912a (commit) - Log ----------------------------------------------------------------- commit ca20d42cd79b12b1f39cc80c758e5492337f2f25 Author: Michael Niedermayer <michael@niedermayer.cc> AuthorDate: Mon Aug 18 16:31:05 2025 +0200 Commit: michaelni <michael@niedermayer.cc> CommitDate: Mon Aug 18 19:12:46 2025 +0000 swscale/swscale_internal: Use more precisse gamma Avoids failure of xyz12 fate tests on mingw and linux x86-32 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 32428c56fb..5dd65a8d71 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -545,8 +545,8 @@ struct SwsInternal { int use_mmx_vfilter; /* pre defined color-spaces gamma */ -#define XYZ_GAMMA (2.6f) -#define RGB_GAMMA (2.2f) +#define XYZ_GAMMA (2.6) +#define RGB_GAMMA (2.2) uint16_t *xyzgamma; uint16_t *rgbgamma; uint16_t *xyzgammainv; diff --git a/tests/ref/fate/filter-pixdesc-xyz12be b/tests/ref/fate/filter-pixdesc-xyz12be index 6610444e76..3cef4083c7 100644 --- a/tests/ref/fate/filter-pixdesc-xyz12be +++ b/tests/ref/fate/filter-pixdesc-xyz12be @@ -1 +1 @@ -pixdesc-xyz12be 1508a33dea936c45d9ee13f7743af00d +pixdesc-xyz12be 198f43f452bc55f4ca1e0e0171de5c4c diff --git a/tests/ref/fate/filter-pixdesc-xyz12le b/tests/ref/fate/filter-pixdesc-xyz12le index 41b4907923..6193c3193a 100644 --- a/tests/ref/fate/filter-pixdesc-xyz12le +++ b/tests/ref/fate/filter-pixdesc-xyz12le @@ -1 +1 @@ -pixdesc-xyz12le da2d1326fa5747a7f6ce5ac1e1494aea +pixdesc-xyz12le 5ca7d9ab5e01cc1bdc906520926721eb diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 84a407c8fa..d42e2f6b33 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -117,8 +117,8 @@ xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 xv48be ce34993b4b4411bba1d852b9b86aa39e xv48le df913a7e61b162aa98303e5393e60c63 -xyz12be f257f86373207af8aed0a1a05171df3b -xyz12le 7922f99edc44a2c26a25becbea9914cc +xyz12be d4562ab725e3ab7e5573dd03218bb03c +xyz12le ce17d867c3fea4c42324e40353b72de4 y210le 04e9487b6cce38e7531437e946cdd586 y212le 825768be8fe92708ae80be84855066ed y216le 0e99aeddfee304e72d525d72998d9e9b diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 05bb5b1b19..a86113c631 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -114,8 +114,8 @@ xv36be 23b6f253fcb375e4145cfcb562268c5f xv36le 778286003497f92b84d0bd8258d6b85d xv48be c90889b2cf54cc78bd58e8c47d4eb791 xv48le 2c15c1254449ec5f9135ae61bdf4e1d5 -xyz12be e2f9f6a1ec205ab675a5a1c9521dfa6c -xyz12le fea1da11c07736303b139bc52b7d4759 +xyz12be 05d6fc3fbe70403160ff4e1b8a4aa969 +xyz12le 3c7328a2f8497f0b4635b84df381a2b8 ya16be 071add03126a11dc6a06209e9b409f8d ya16le b723211dc0647c944768c6e45e066b36 ya8 51a8dd297e35d40b06d3ebe8f4717895 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index d8a0d5234a..c05dba55f6 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -117,8 +117,8 @@ xv36be bcc7bda2d0a5d43db4464af6a4cb5d65 xv36le ba99f258370f2a56993e8760e6b30194 xv48be 2abcd986a34789ba4310be3969020d0d xv48le f6f2e33f260f48334197538f3331f7bc -xyz12be 3b6eb75517263b9e54b9bfa869de394f -xyz12le 27d1d6a488cbc5d53e8d12fa0e162ddb +xyz12be a17930e991ca4ff86de5c2dc3b1e9b51 +xyz12le b134b258a9593bc2019f0493f079f3a1 y210le 4c2fba1dc40322584977d15dd07c9146 y212le ac2a47c45187dd54d0f55293cbffd954 y216le e65b5bfae1b40edbbed2012e9cd45e31 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index df48d3af34..4c8cffca08 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -106,8 +106,8 @@ xv36be 962386c88268f4382004c3a7a82c5eb8 xv36le bcceffc985aaa8414c4b8072aa0889bd xv48be 4d6e4004b03767f12df8bb4e76c98ddf xv48le 9e94d82461a2131063157ac0dbe9467b -xyz12be ba6928f85c202cd77e216934f6bf0698 -xyz12le 964680cd3f3db8a7ef5510f90196961a +xyz12be 65fe8da4ad44c83855360144eba41853 +xyz12le f13851b3ba4e511ab1436786ec0727bd y210le 22b1a02a39c4b325726bf8793bf1e8f2 y212le 2f08fb195b948056c844acb1eee8d649 y216le 360cb98ac80b13d3a8ec61c9f1ff3bac diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index cd5dda5ccf..b47087d1f6 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -114,8 +114,8 @@ xv36be 98f578df965eed369f46cb135e2d1345 xv36le e478b4b54698beb3ce1b9a2dd691d544 xv48be e030a2c7b1b600cfacb691b6e90c2e3d xv48le fbd7f8c65cd6fc9f9108dc9a1f977dc3 -xyz12be 3c50a51a3c486a0c6853e4bbbcf3f244 -xyz12le e020897d826ea20ded16f30ea1eb018d +xyz12be c678c7f19c610063f352a0253121441f +xyz12le 2320702cb1c8ccaad27d7004d4f3a195 ya16be 70fa41c32ecaf3370edc38add6096db2 ya16le 3b2c20f9e80717628ced6c6468507f63 ya8 4ad5920716de3d2fbbc49f95adb60345 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 768bf8c06c..490995bbf0 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -116,8 +116,8 @@ xv36be 3bbb949278ea55cc947ee03bd9c27c2d xv36le 102c0e817d375ddd6b2cfbb4262dec95 xv48be 4d7376651fb7b3e84d00abad6c785aad xv48le a1a8ff16d9a864568e5e557734bf3d6d -xyz12be b7d50e283360bf69fd661369110b26ef -xyz12le d5b1d45c3a136bb3d04f70a619c86c8d +xyz12be 3d9ae42c65eb645bb8e99dc708716f2d +xyz12le b27ec91dcff02d2b94b17c136be55001 y210le d4cf9b53cd7ff22f087743d483e88480 y212le d5a2b4677ddb4a3bc3e5cd5cbb20f426 y216le 9e44c6d76b09bcbe71738423b4b3d67a diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 84a407c8fa..d42e2f6b33 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -117,8 +117,8 @@ xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 xv36le e08dcbde02f1c28a3554f372ad1278e2 xv48be ce34993b4b4411bba1d852b9b86aa39e xv48le df913a7e61b162aa98303e5393e60c63 -xyz12be f257f86373207af8aed0a1a05171df3b -xyz12le 7922f99edc44a2c26a25becbea9914cc +xyz12be d4562ab725e3ab7e5573dd03218bb03c +xyz12le ce17d867c3fea4c42324e40353b72de4 y210le 04e9487b6cce38e7531437e946cdd586 y212le 825768be8fe92708ae80be84855066ed y216le 0e99aeddfee304e72d525d72998d9e9b diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index e4ab07104c..66d22e0484 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -117,8 +117,8 @@ xv36be 4d084adca0228d7750d1e2e877e0d79b xv36le de9c74e94dc19c828e1572aa283d8aca xv48be 9e58d1a045df100b0dec116e13be5b4e xv48le fd873d53609b2fbdfe99470f515a234c -xyz12be f1905012d9b845306d9bef68d0fc81d5 -xyz12le cfe1a3bbe391d83d381f590a00e1a16d +xyz12be 94ed06895d7030b97c36ccb9aae3722a +xyz12le fcb73d6b6192ab64ca9ff668fe6562f6 y210le 7c2aef142d88ab343ec01acd45f38466 y212le 39a3c0c843041ad4501b3107dd91ef17 y216le 17be2999e97d36b8ed903f07ef428c09 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 64b45945c7..80b05dbb05 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -104,8 +104,8 @@ xv36be 2261a0e3db5ee607d37f68d19704ae15 xv36le 9202133de91bf64c76ca27d5cd0c816a xv48be 14373b7fe123225689e76fe2ce43fb93 xv48le 319df9724a067c7b5efa215f9f54d127 -xyz12be 69737aceb508a73365664d04c340dd3b -xyz12le 70dd5fab9d8383b0d2e772b3b6569df4 +xyz12be 38ce311e8734b535484c2e2ba70626d0 +xyz12le 24a0e779fce6eaed687cb2c416a61eb9 ya16be 6098f7d2ede0aab6b2d93d2b4f4d915a ya16le 1fae63e3e320ba9e6c12c29a48c44eff ya8 d4b7a62f80681fa44c977ff3a64f4ce4 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 590717399d..6b8c888b9a 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -117,8 +117,8 @@ xv36be c0272372d3e1a59adb3931ee433a5d5b xv36le ffe6ab75ebc09134c3451f8f6ef0d501 xv48be bdfc3217ae456b370dbdcf4d52606a3f xv48le 53dbebab73a66539c04644ef56dc6bbb -xyz12be 1bffa153a4a3ae61fd18e370f95161d9 -xyz12le a0e93443826621a9d6c48354d949898a +xyz12be b9b83d36d58f4ad129894207888b3b3c +xyz12le b9764e43bacbbfc410e4b6558486115f y210le f8847bedd3ae6e1c0cf84a823f275e31 y212le c801725ae31e3b8f5be269359d49f191 y216le 985db498aedf3fb1c547ad07442b7258 diff --git a/tests/ref/pixfmt/xyz12le b/tests/ref/pixfmt/xyz12le index 870d5ce683..312bc9ed57 100644 --- a/tests/ref/pixfmt/xyz12le +++ b/tests/ref/pixfmt/xyz12le @@ -1,2 +1,2 @@ -47b890678bb9195107c2f7afb2344bbf *tests/data/pixfmt/xyz12le.yuv +f14b14a12c864408a0115f55eaef9934 *tests/data/pixfmt/xyz12le.yuv 304128 tests/data/pixfmt/xyz12le.yuv ----------------------------------------------------------------------- Summary of changes: libswscale/swscale_internal.h | 4 ++-- tests/ref/fate/filter-pixdesc-xyz12be | 2 +- tests/ref/fate/filter-pixdesc-xyz12le | 2 +- tests/ref/fate/filter-pixfmts-copy | 4 ++-- tests/ref/fate/filter-pixfmts-crop | 4 ++-- tests/ref/fate/filter-pixfmts-field | 4 ++-- tests/ref/fate/filter-pixfmts-fieldorder | 4 ++-- tests/ref/fate/filter-pixfmts-hflip | 4 ++-- tests/ref/fate/filter-pixfmts-il | 4 ++-- tests/ref/fate/filter-pixfmts-null | 4 ++-- tests/ref/fate/filter-pixfmts-scale | 4 ++-- tests/ref/fate/filter-pixfmts-transpose | 4 ++-- tests/ref/fate/filter-pixfmts-vflip | 4 ++-- tests/ref/pixfmt/xyz12le | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) hooks/post-receive --