Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-picking #71

Merged
merged 33 commits into from
Dec 6, 2024
Merged

Cherry-picking #71

merged 33 commits into from
Dec 6, 2024

Conversation

eustas
Copy link
Collaborator

@eustas eustas commented Dec 5, 2024

Pick: f73ce71a .. 00d85f91
Next: 878b9bd9 Expose a wrapper function instead of Allotment (#3770)

eustas and others added 30 commits December 5, 2024 14:24
(cherry picked from commit f73ce71a606545eae76144ca34bb4ee593144f6e)
…ack (#3702)

* Fix "typo"

* Use tracking memory manager in fuzzers (remove ancient memory_limit hack)

(cherry picked from commit 626cb8fb363fe69b5da62a367e54e043271e203a)
(cherry picked from commit 38dcd185f1020ab05aef9653e0025fcbc55b843e)
* don't do a funky conversion from uint8 to float

* adjust roundtrip test

* more test fixing

(cherry picked from commit a9fb21683567b976352af3af4511644f9a15044f)
* mention new jpegli repo

* Update  jpegli readme

(cherry picked from commit 5ddb303a1457899d845dc7d385b562e340d2e473)
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@60edb5d...1e60f62)

---
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 5e22aefa6edc9c6338f5e0ca45f5e18714149399)
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.7 to 4.1.8.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@65a9edc...fa0a91b)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  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 a05bf19d9d53ebaf7608e2d995e6c7adee19612a)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](actions/dependency-review-action@72eb03d...5a2ce3f)

---
updated-dependencies:
- dependency-name: actions/dependency-review-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 32aefb664961d9cbae37187a66cdd2dcf98e6064)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@b611370...4fa2a79)

---
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 7b9701eb31aaa93e14e0fb620d58dc595a1e330c)
(cherry picked from commit d5f919c72a242b209db3f498235f3bab9c075ae4)
…721)

* [jpegli] fix buffer overflow when chroma component has refinement

See [issue 14](google#14) for context.

Under certain conditions, num_refinement_bits is computed wrongly causing a heap-buffer-overflow in jpegli's TokenizeACRefinementScan in https://github.com/google/jpegli/blob/main/lib/jpegli/entropy_coding.cc#L255

The problem seems to be function TokenizeJpeg which only has a single 1D array int num_refinement_scans[DCTSIZE2] to keep track of number of refinement passes for each DCT coefficient. This is inadequate when multiple color components have different refinement sequences.

* [jpegli] Fix assertion for refinement bits

The num_refinement_bits is an upper bound for the allocation required.

For luma-only refinement this equality always holds. But when chroma refinement is involved, then some scans may not use up the entire allocation.

---------

Co-authored-by: Haixia Shi <[email protected]>
(cherry picked from commit e046a6eb136250a5bf52cbc664046fe9e78a1ef2)
Fixes #3717.

(cherry picked from commit f7f20ce0f1485d9aab226ec31af5b4adc4fdf972)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@6546280...0b2256b)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  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 3852355d34b78c55858ced2b841772287f748274)
* Allocate enough space for \0 terminator

Frame name requires length+1 bytes.

* Avoid some unnecessary string allocations

* Lint

(cherry picked from commit 8e3df063c69da54043eca577aafdf615d2b57de4)
Several libavif functions require us to check the result. This commit
wraps these calls in the existing JXL_RETURN_IF_AVIF_ERROR macro to
properly check these calls for failure.

Signed-off-by: Leo Izen <[email protected]>
(cherry picked from commit 5df155d975bd8ecf091f2b808d41cdd1f37e09b8)
Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/step-security/harden-runner/releases)
- [Commits](step-security/harden-runner@17d0e2b...0d38121)

---
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>
Co-authored-by: Moritz Firsching <[email protected]>
(cherry picked from commit 51ee942af0359bbe33faa57307062aa1f04fd697)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.12 to 3.25.15.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@4fa2a79...afb54ba)

---
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 846bc12ccb1edcc117acb04274a8fea7ffca24d6)
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](ossf/scorecard-action@dc50aa9...62b2cac)

---
updated-dependencies:
- dependency-name: ossf/scorecard-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 56b6e93075e8eacd21019d0e161e166a631417d5)
* benchmark_utils: use correct environ on macOS

* fix lint

---------

Co-authored-by: Moritz Firsching <[email protected]>
(cherry picked from commit ff03d9e855b52051451d3a81cb82bafacc20d3b7)
(cherry picked from commit 6cad81b378e72deafa580f482df4cdf11a89b0af)
This fixes `benchmark_xl --save_decompressed`.

(cherry picked from commit 91a814ef040c333ab1ae1f410e94c7f19e358343)
(cherry picked from commit 628690aebc2737486e9328053db03433fa4b232d)
* update highway to 1.2.0

* also test 1.2.0

(cherry picked from commit 4ba6e969025fba2b7487c1b7214af1591fb83b25)
* bump version to 0.11.0

* update JPEGXL_SO_MINOR_VERSION

(cherry picked from commit bae8be30f96f97da23b62e392d8449047a5f6cef)
(cherry picked from commit 36cfa82c938a156b30954efce7991b56b0dcddfd)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@0b2256b...89ef406)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  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 03644520ea6525451544e893e54f414cef7dd4f0)
Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/step-security/harden-runner/releases)
- [Commits](step-security/harden-runner@0d38121...5c7944e)

---
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 ba759b4254a574f89cc930043020f99ffb7ca056)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@89ef406...834a144)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  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 0c76b5124b5eb7f90ad255dd39772d368bae1146)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.15 to 3.26.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@afb54ba...429e197)

---
updated-dependencies:
- dependency-name: github/codeql-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 e35252834cdfd47d3a3a1a66bb8de64beb65e4c5)
libjxl/libjxl#414

0.08 % win on BPP * pnorm

small improvement on 'blue eyes' problem, perhaps fixes 15 % of the
issue

```
Before:

104 images
Encoding      kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm  SSIMULACRA2   PSNR        pnorm       BPP*pnorm   QABPP   Bugs
----------------------------------------------------------------------------------------------------------------------------------------
jxl:d0.1        20315 17201092    6.7734912   0.877   9.400   0.27150021  95.71487004  56.45   0.09202106  0.623303827334   6.776      0
jxl:d0.5        20315  7097969    2.7950569   1.055  13.011   0.85951955  91.44716664  46.43   0.34549147  0.965668308615   2.933      0
jxl:d0.8        20315  5369188    2.1142929   0.956  11.795   1.10998495  88.84518826  44.43   0.46523179  0.983636297558   2.467      0
jxl:d1          20315  4609354    1.8150835   0.957  11.755   1.32312207  87.02710112  43.19   0.55369287  1.004998801648   2.498      0
jxl:d1.5        20315  3497308    1.3771791   0.973  12.325   1.85060044  82.81802614  41.06   0.75584793  1.040937996647   2.642      0
jxl:d2.0        20315  2843267    1.1196291   1.005  13.102   2.40395119  78.77733614  39.54   0.94515107  1.058218683138   2.837      0
jxl:d2.5        20315  2394141    0.9427711   0.991  12.787   2.84155832  74.93859331  38.34   1.12102822  1.056873038553   2.818      0
jxl:d3          20315  2085469    0.8212215   0.958  12.823   3.25793791  71.56263100  37.51   1.27936547  1.050642375921   2.805      0
jxl:d5          20315  1396755    0.5500179   0.971   8.710   4.59055175  60.06439983  35.22   1.80800716  0.994436210208   2.620      0
jxl:d10         20315   843717    0.3322411   0.961   9.378   7.66272179  38.38418527  32.45   2.92733228  0.972580081795   2.532      0
Aggregate:      20315  3347697    1.3182647   0.969  11.387   1.86034228  76.95794978  41.00   0.73239975  0.965496754517   2.939      0

After:

104 images
Encoding      kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm  SSIMULACRA2   PSNR        pnorm       BPP*pnorm   QABPP   Bugs
----------------------------------------------------------------------------------------------------------------------------------------
jxl:d0.1        20315 17234055    6.7864714   0.910   9.788   0.26921220  95.72922587  56.47   0.09149990  0.620961464563   6.786      0
jxl:d0.5        20315  7112515    2.8007848   1.071  13.558   0.85998310  91.46395356  46.44   0.34487223  0.965912919133   2.941      0
jxl:d0.8        20315  5380024    2.1185600   0.980  12.654   1.10730124  88.87286260  44.43   0.46413467  0.983297134681   2.471      0
jxl:d1          20315  4616590    1.8179329   0.999  12.761   1.32266768  87.04284922  43.20   0.55278192  1.004920452626   2.499      0
jxl:d1.5        20315  3501542    1.3788464   1.002  12.879   1.84924045  82.85156040  41.07   0.75456129  1.040424113923   2.644      0
jxl:d2.0        20315  2846638    1.1209566   1.014  13.333   2.40151432  78.80988790  39.56   0.94325779  1.057351028760   2.835      0
jxl:d2.5        20315  2396802    0.9438190   1.026  12.919   2.82912128  74.97206547  38.37   1.11707140  1.054313198037   2.814      0
jxl:d3          20315  2085594    0.8212707   0.978  13.233   3.25567966  71.58518909  37.51   1.27852510  1.050015177507   2.801      0
jxl:d5          20315  1398149    0.5505668   0.990   9.120   4.58800935  60.07606195  35.23   1.80660922  0.994659027562   2.622      0
jxl:d10         20315   843981    0.3323451   0.982   9.968   7.68431602  38.42064210  32.46   2.92598859  0.972437834700   2.534      0
Aggregate:      20315  3351858    1.3199034   0.994  11.905   1.85750610  76.98242982  41.01   0.73089142  0.964706041010   2.941      0
```

(cherry picked from commit 18726bbad839c057107877e3654461dcb9759e2d)
mo271 and others added 3 commits December 5, 2024 15:03
(cherry picked from commit e4c6fe27e7af3b02a4037dd9f74fab5ee3354edf)
* different initialization only

* remove one of the initializations

(cherry picked from commit 00d85f91151c8399e7bb132055f53b7e31c0faa3)
@eustas eustas merged commit b307d35 into google:main Dec 6, 2024
55 of 69 checks passed
@eustas eustas deleted the cherry7 branch December 6, 2024 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.