Cherry-picking #73
Merged
Cherry-picking #73
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixes #3829 (cherry picked from commit b0947a8035ae716a1552fe5278ab8ef2a6de4792)
Floating-point overloads of std::abs come from <cmath>. Also use non-deprecated C++ forms of the other headers. (cherry picked from commit 9e6f9d4621c10e794f6bb7731fe9c84e6b7e80f4)
(cherry picked from commit a9a6d4257a9ce45c6d9dd936cb85102ba3d054a8)
* detect broken ICC when encoding jpg * Update lib/jxl/encode.cc Co-authored-by: Jon Sneyers <[email protected]> * fix format --------- Co-authored-by: Jon Sneyers <[email protected]> (cherry picked from commit 635eb589f15792794b31cbeeb1edd5c9720daa1f)
* No work without expert * Add benchmark_xl expert param (cherry picked from commit eb122fcd010ff27e6a5ea312f26dca807b6cfce0)
Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.9.1 to 2.10.1. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](step-security/harden-runner@5c7944e...91182cc) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4a150d114b1a36505d82f22827836ab4b0520f28)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.6 to 3.26.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@4dd1613...8214744) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c1835de4e57d5131e2fe10844f6005d90224d42b)
* Fix jpg.cc for MinGW-w64
Fix the following error when building with MinGW-w64:
```raw
lib/extras/enc/jpg.cc:277:34: error: cannot convert 'long unsigned int*' to 'size_t*' {aka 'long long
unsigned int*'}
277 | jpeg_mem_dest(&cinfo, &buffer, &size);
| ^~~~~
| |
| long unsigned int*
```
* Update jpg.cc
Use LIBJPEG_TURBO_VERSION to detect if libjpeg-turbo is used
* format
---------
Co-authored-by: Moritz Firsching <[email protected]>
(cherry picked from commit 0266f4ddad834e0df45878cf95ae89021b113b4e)
(cherry picked from commit 7bb34af01b008daa3175e86bd2eed602e90bcafb)
Co-authored-by: Sami Boukortt <[email protected]> (cherry picked from commit 8f22cb1fb98ed27ceee59887bd291ef4d277c89d)
Co-authored-by: Sami Boukortt <[email protected]> (cherry picked from commit 55fc72b408bf34b3ced628f17d2a387dca5de8c5)
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@1e60f62...0a44ba7) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 087fc9e05d61b847de4ffab80c5370031dc00f33)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.7 to 3.26.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@8214744...294a9d9) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4dd60a7aab610cf0f9d8e4696191b1b227129f95)
Fixes #3834. (cherry picked from commit 9f2402dbd883a85c77a77b97011ea929ebef0c68)
* lint: included header cmath is not used directly * put it in cc (cherry picked from commit 4b9dbde293f7f282b6952a02340300abfca2b184)
Fix a simple typo in the documentation for the downsampling argument. Signed-off-by: Leo Izen <[email protected]> (cherry picked from commit 6bce9e53a8a8dccdd5f2516220d52df31b2b9830)
* remove CodecInOut from JPEGFrameTest * removed unused CodecInOut in TestJPEGReconstruction * partially remove CodecInOut from RoundtripLossless * format (cherry picked from commit 6455966882f6e82a0ddf2c81f8d7474241001cdf)
* remove CodecInOut from GrayscaleModular * format * move Get[Color]?Image to test_utils * format * also remove in GrayscaleVarDCT * review comments * Update lib/jxl/patch_dictionary_test.cc * check num_channels (cherry picked from commit 7e178a51b0a59fcc8e58c78ce88058a9b97abf5b)
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@692973e...d632683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 331043d479aa1c9dc38854f9cfbb7a1bab4cc5e4)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.8 to 3.26.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@294a9d9...e2b3eaf) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 733b92645d2fff6461b55ff3e502f3a9d5fe3adc)
…r HDR input (#3870) (cherry picked from commit 42422b4a12aeaa095bb5d71d7bc330a519cbe1f2)
See also: https://www.youtube.com/watch?v=_ACCK0AUQ8Q&t=696s (cherry picked from commit 9cc451b91b74ba470fd72bd48c121e9f33d24c99)
(cherry picked from commit 84459fa0e8252502414cc5da3a7bc235e06efdbd)
…3872) This uses 760 entries in the 2-level Huffman lookup table, which is the maximum found so far. (cherry picked from commit 57dd9253b9bc0d1875584666b3c151636925e338)
imlib2 supports JPEG XL without a plugin. (cherry picked from commit b1582656b8687acd9a1d29bfee89b2a7dea5d778)
Also fix the detection of the primary encoding. (cherry picked from commit 0306df328640e3138e6b34408df8f5c98b2ed15e)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.10 to 3.26.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@e2b3eaf...6db8d63) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Moritz Firsching <[email protected]> (cherry picked from commit 7f0588033f0723e08799a315bf62741ffc83db11)
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@e28ff12...b9fd7d1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Moritz Firsching <[email protected]> (cherry picked from commit 84cb53067cd404630d534eec1a78bbe045291499)
Bumps [actions/cache](https://github.com/actions/cache) from 4.0.2 to 4.1.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@0c45773...2cdf405) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Moritz Firsching <[email protected]> (cherry picked from commit 6f30560255ecd4ba74851b8538d6614e13bc13df)
Previously, the Butteraugli loop would use an intensity of 80 even for
HDR content, thereby lowering quality at efforts 8 and above.
butteraugli_main also did not handle the reference and actual images
having different intensity_targets, meaning that it was not possible to
compare a PQ PNG (which would automatically have an intensity_target of
10000) with a compressed JXL version using a lower intensity_target
(reflecting the fact that the image doesn’t actually get that bright).
ClassE_LasVegasStore, before:
e1: 1.709 bpp, Butteraugli 1.9095990658, 3-norm 0.763096
e2: 1.709 bpp, Butteraugli 1.9095990658, 3-norm 0.763096
e3: 1.616 bpp, Butteraugli 1.9095990658, 3-norm 0.763096
e4: 1.631 bpp, Butteraugli 1.9226754904, 3-norm 0.761637
e5: 1.519 bpp, Butteraugli 2.5887553692, 3-norm 0.801795
e6: 1.507 bpp, Butteraugli 2.4450392723, 3-norm 0.777965
e7: 1.681 bpp, Butteraugli 1.4998193979, 3-norm 0.617420
e8: 1.415 bpp, Butteraugli 1.9081192017, 3-norm 0.770197
e9: 1.413 bpp, Butteraugli 1.9081192017, 3-norm 0.770197
e10: 1.409 bpp, Butteraugli 1.9175151587, 3-norm 0.770864
After:
e1: 1.709 bpp, Butteraugli 1.9095990658, 3-norm 0.763096
e2: 1.709 bpp, Butteraugli 1.9095990658, 3-norm 0.763096
e3: 1.616 bpp, Butteraugli 1.9095990658, 3-norm 0.763096
e4: 1.631 bpp, Butteraugli 1.9226754904, 3-norm 0.761637
e5: 1.519 bpp, Butteraugli 2.5887553692, 3-norm 0.801795
e6: 1.507 bpp, Butteraugli 2.4450392723, 3-norm 0.777965
e7: 1.681 bpp, Butteraugli 1.4998193979, 3-norm 0.617420
e8: 1.721 bpp, Butteraugli 1.4964444637, 3-norm 0.590536
e9: 1.727 bpp, Butteraugli 1.2693173885, 3-norm 0.585146
e10: 1.719 bpp, Butteraugli 1.3858509064, 3-norm 0.589227
(cherry picked from commit 095f259b07e81c0fda25f56686e49984d852b530)
(cherry picked from commit 6fc95ba855bb3f8a66dd25c3af88389742e17413)
(cherry picked from commit 538c140df1e5390ce51b90a81058c53ca5af5aad)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.3 to 3.27.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@396bb3e...ea9e4e3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit fc3456cb3b104f27df6000e90c0c02ac4fe1ee1c)
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.6.0 to 5.0.2. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@b9fd7d1...5c47607) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 7421fc18a74f8d3ca207aba04d05573ae25d21d5)
…ll (#3941) (cherry picked from commit d28c7a24b71ca531bb5ed680374a8ee9e86eb537)
(cherry picked from commit 46b4883c998498e2fb5bccd9c50c77d502a7ef12)
Also rewrite the implementation to use iterative checking instead of recursive checking of tree property values, to ensure stack usage is low. Before, it was possible for appropriately-crafted files to use a significant amount of stack (in the order of hundreds of MB). (cherry picked from commit bf4781a2eed2eef664790170977d1d3d8347efb9)
``` 2000 x 3008, geomean: 123.866 MP/s [108.75, 129.53], , 100 reps, 1 threads. 3072 x 2048, geomean: 211.124 MP/s [188.20, 221.33], , 100 reps, 1 threads. -> 2000 x 3008, geomean: 132.063 MP/s [111.09, 137.27], , 100 reps, 1 threads. 3072 x 2048, geomean: 225.402 MP/s [183.71, 236.48], , 100 reps, 1 threads. ``` (cherry picked from commit 8a39b30133c880c873ca7e2bd0911f5c8dcda49f)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.4 to 3.27.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@ea9e4e3...f09c1c0) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 419d6ee4aea7fb5f186a660cd5fd7051ece571aa)
Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.10.1 to 2.10.2. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](step-security/harden-runner@91182cc...0080882) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 706f78ae58304b58de6345a90d89c171bde889b9)
(cherry picked from commit 5ea4ea13e55d2bd750f50eb0e2a497245c842e87)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](actions/dependency-review-action@4081bf9...3b139cf) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c4db78b3ae978f3721d56a8723dda6b9705863e4)
(cherry picked from commit e9d562199cbfd4d228faf00f693179a672ac9b9b)
(cherry picked from commit 93f869853df3edbc8686bd028bfe8b8af94a6832)
…sabled) (#3967) (cherry picked from commit b9e1c0897e75390f07f0a103fe0cc79ee0789f41)
(cherry picked from commit 6f57ce403783b7ebfe011a9b1c93c16724b69a15)
* smol fix e10 should now have 4 iterations just like e9 * Refactor butteraugli iteration count selection (google#1) * Refactor butteraugli iteration count selection * Update enc_adaptive_quantization.cc * Update AUTHORS (again) --------- Co-authored-by: CrushedAsian255 <[email protected]> (cherry picked from commit 613e6036104c6fbb1a20695c41aede85cc567b3d)
https://w3c.github.io/png/#cLLI-chunk Reading remains to be updated. (We might want to read both?) (cherry picked from commit 705d198f8260aba31e408790a204466b4e0330d5)
(cherry picked from commit 30b8e2453a175b9ca6dd36199bf31796f786c0fa)
* add `make uninstall` fixes #3851 * correct comment * also remove directories if empty (cherry picked from commit 7af4dcc482bbd56e968c24a4113de89d85797e06)
(cherry picked from commit 231706a8fbb3384830ed2651fb9767de7cd0066b)
(cherry picked from commit 58b0c86c3e80ecec7d8f16843ba3b7043b1a3a67)
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.0.2 to 5.0.7. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@5c47607...015f24e) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit d66258837ab1c66d60cb296446ff3e2756f3ff2d)
This PR is pre-work for removing convolve out of decoder sources (cherry picked from commit 2368781aa66182108b74bdee5a74028f8a3f8920)
(cherry picked from commit fcab7df75647bb96da3469e3b20e8ce47b622203)
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
mo271
approved these changes
Dec 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Picked: b9effd2 .. 008f671
That makes jpegli repo in sync with libjxl.
In next PR will take care of failing pipelines.