Closed Bug 1793238 Opened 3 years ago Closed 3 years ago

Update libjxl to new version f7c10956d80a6cf5dca6223a449ae0cf305a023e from 2022-09-30 14:29:08

Categories

(Core :: Graphics: ImageLib, enhancement)

Product:
Core
Component:
Graphics: ImageLib
Type:
enhancement

Tracking

()

Status:
RESOLVED FIXED
Milestone:
107 Branch
Tracking Flags:
Tracking Status
firefox107 --- fixed

People

(Reporter: update-bot, Assigned: saschanaz)

Details

(Whiteboard: [3pl-filed][task_id: ayBaFzM3TMi0bkNr72RJEQ])

Attachments

(1 file, 1 obsolete file)

Bug 1793238 - Update libjxl r=tnikkel
48 bytes, text/x-phabricator-request
Details

This update covers 32 commits:

f7c10956d80a6cf5dca6223a449ae0cf305a023e by Sami Boukortt

https://github.com/libjxl/libjxl/commit/f7c10956d80a6cf5dca6223a449ae0cf305a023e
Authored: 2022-09-30 15:57:27 +0200
Committed: 2022-09-30 16:29:08 +0200

Write the output of tone mapping with the sRGB TRC instead of BT.709

Files Modified:

  • tools/hdr/render_hlg.cc
  • tools/hdr/tone_map.cc

86e70690ce8108f9802503b10030f6dcac10cace by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/86e70690ce8108f9802503b10030f6dcac10cace
Authored: 2022-09-30 14:18:39 +0200
Committed: 2022-09-30 15:45:58 +0200

Adjust roundtrip test expectations.

Files Modified:

  • lib/jxl/decode_test.cc
  • lib/jxl/encode_test.cc
  • lib/jxl/jxl_test.cc

ec1c19d32340efb83046f79bf40f6de99605bdef by Sami Boukortt

https://github.com/libjxl/libjxl/commit/ec1c19d32340efb83046f79bf40f6de99605bdef
Authored: 2022-09-21 16:38:18 +0200
Committed: 2022-09-30 14:46:55 +0200

Tone mapping: fix handling of very dark values

Files Modified:

  • lib/jxl/dec_tone_mapping-inl.h

538c77b59ca708a46e9a8045d6673108507e65e1 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/538c77b59ca708a46e9a8045d6673108507e65e1
Authored: 2022-09-29 11:55:06 +0200
Committed: 2022-09-30 08:35:16 +0200

Add a jpeg decoding function that is based on libjxl internals.

This is now equivalent to the lossless-jpeg roundtrip version,
but is faster because we do not create the actual jxl bitstream.

Files Added:

  • lib/extras/decode_jpeg.cc
  • lib/extras/decode_jpeg.h

Files Modified:

  • lib/jxl/enc_quant_weights.cc
  • lib/jxl/enc_quant_weights.h
  • lib/jxl_extras.cmake
  • lib/lib.gni
  • tools/benchmark/benchmark_codec_jpeg.cc

2741d7b9b33d9bc709522bf10e782f1939d0ad70 by Jon Sneyers

https://github.com/libjxl/libjxl/commit/2741d7b9b33d9bc709522bf10e782f1939d0ad70
Authored: 2022-09-29 13:48:30 +0200
Committed: 2022-09-29 13:48:30 +0200

remove discontinuity in DC approach at d2 (#1762)

Files Modified:

  • lib/jxl/decode_test.cc
  • lib/jxl/enc_adaptive_quantization.cc
  • lib/jxl/enc_cache.cc
  • lib/jxl/encode_test.cc
  • lib/jxl/jxl_test.cc

e746ce02c0e1fc1f8840d5aa04b6fa4a6e49a539 by Jon Sneyers

https://github.com/libjxl/libjxl/commit/e746ce02c0e1fc1f8840d5aa04b6fa4a6e49a539
Authored: 2022-09-29 13:44:27 +0200
Committed: 2022-09-29 13:44:27 +0200

remove detailed error codes from jpeg data reader; remove max size limit (#1417)

Files Modified:

  • lib/jxl/jpeg/enc_jpeg_data_reader.cc
  • lib/jxl/jpeg/jpeg_data.cc
  • lib/jxl/jpeg/jpeg_data.h

ef1a91c97602c00230ba337c9613de4817591d2b by Sami Boukortt

https://github.com/libjxl/libjxl/commit/ef1a91c97602c00230ba337c9613de4817591d2b
Authored: 2022-09-16 14:51:56 +0200
Committed: 2022-09-28 13:59:28 +0200

ICC: generate cicp tag when appropriate

Co-authored-by: Luca Versari <veluca@google.com>

Files Modified:

  • .github/workflows/conformance.yml
  • lib/jxl/color_management.cc

1eb5c0c8fabe24c0ffe772344696d370486530cb by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/1eb5c0c8fabe24c0ffe772344696d370486530cb
Authored: 2022-09-28 11:52:10 +0200
Committed: 2022-09-28 13:17:46 +0200

Don't use chroma-from-luma for jxl-roundtrip jpeg decoding.

Benchmark before:

Encoding           kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm        pnorm       BPP*pnorm   Bugs
-----------------------------------------------------------------------------------------------------------------
jpeg:q95:djxl8       13270  7112433    4.2876819  17.679   2.856   1.62978482   0.45445552  1.948560710939      0
jpeg:q95:djxl16      13270  7112433    4.2876819  16.533   2.858   1.62876725   0.44648875  1.914401746589      0

Benchmark after:

Encoding           kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm        pnorm       BPP*pnorm   Bugs
-----------------------------------------------------------------------------------------------------------------
jpeg:q95:djxl8       13270  7112433    4.2876819  18.117   3.494   1.63743067   0.44661786  1.914955293952      0
jpeg:q95:djxl16      13270  7112433    4.2876819  16.691   3.185   1.61143291   0.43850905  1.880187337450      0

Files Modified:

  • tools/benchmark/benchmark_codec_jpeg.cc

f9cc7f9a15880ca08018a729a19a81553c09b695 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/f9cc7f9a15880ca08018a729a19a81553c09b695
Authored: 2022-09-27 18:13:36 +0200
Committed: 2022-09-28 10:31:24 +0200

Convert more tests to use ppf input.

The y4m test was removed because it is not possible to set
chroma subsampling through the API (other than for jpeg recompression).

Files Deleted:

  • lib/jxl/codec_y4m_testonly.cc
  • lib/jxl/codec_y4m_testonly.h

Files Modified:

  • lib/extras/packed_image.h
  • lib/jxl/jxl_test.cc
  • lib/jxl/test_image.h
  • lib/jxl/test_utils.h
  • lib/jxl_tests.cmake
  • lib/lib.gni

872c3b388f1148302913823caf908ce23bd1d25f by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/872c3b388f1148302913823caf908ce23bd1d25f
Authored: 2022-09-27 11:14:22 +0200
Committed: 2022-09-28 10:31:16 +0200

Add jxl-roundtrip based jpeg decoder to benchmark.

The hf_assymetry of the butteraugli_main tool was changed to
match that of benchmark_xl.

Benchmark results:

Encoding           kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm        pnorm       BPP*pnorm   Bugs
-----------------------------------------------------------------------------------------------------------------
jpeg:q95             13270  7112433    4.2876819  18.423  45.517   1.72006321   0.48375988  2.074208483263      0
jpeg:q95:djxl8       13270  7112433    4.2876819  17.420   2.787   1.62978482   0.45445552  1.948560710939      0
jpeg:q95:djxl16      13270  7112433    4.2876819  14.434   2.842   1.62876725   0.44648875  1.914401746589      0

Files Modified:

  • tools/benchmark/benchmark_codec_jpeg.cc
  • tools/butteraugli_main.cc

d7e18a998e8c28051fe6c95b4d10cae86186cc55 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/d7e18a998e8c28051fe6c95b4d10cae86186cc55
Authored: 2022-09-26 20:59:11 +0200
Committed: 2022-09-27 08:19:00 +0200

Convert more tests to use ppf input + alpha bit depth bugfix.

The new test framework detected a bug in cjxl where we would
ignore the 16-bit alpha bit-depth and fall back to 8 bit precision.

Files Modified:

  • lib/extras/enc/jxl.cc
  • lib/jxl/jxl_test.cc
  • lib/jxl/test_image.h
  • lib/jxl/test_utils.h

6ec00f569b6c43a5c3e293b4be82fe8b8a958501 by Moritz Firsching

https://github.com/libjxl/libjxl/commit/6ec00f569b6c43a5c3e293b4be82fe8b8a958501
Authored: 2022-09-26 16:34:08 +0200
Committed: 2022-09-26 14:34:08 +0000

jxlinfo: simplify info about channels (#1785)

Files Modified:

  • tools/jxlinfo.c

39032b8c45551289b3eed7259fb0fd8c12148a0a by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/39032b8c45551289b3eed7259fb0fd8c12148a0a
Authored: 2022-09-23 17:02:18 +0200
Committed: 2022-09-26 14:46:54 +0200

Relax some of the expectations on compressed file sizes.

Files Modified:

  • lib/extras/dec/jxl.cc
  • lib/jxl/jxl_test.cc
  • lib/jxl/test_image.h
  • lib/jxl/testdata.h

2ee9886a7c3b31564f7431812bb6c6a4a03927b2 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/2ee9886a7c3b31564f7431812bb6c6a4a03927b2
Authored: 2022-09-22 18:21:10 +0200
Committed: 2022-09-23 14:20:05 +0200

Add a ppf based roundtrip test framework.

Start replacing CodecInOut based roundtrip tests in jxl_test.cc

Files Modified:

  • lib/extras/enc/jxl.cc
  • lib/extras/enc/jxl.h
  • lib/jxl/jxl_test.cc
  • lib/jxl/test_image.h
  • lib/jxl/test_utils.h

b303a2441cf3df155ecd808200f0d580a1b0bdc0 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/b303a2441cf3df155ecd808200f0d580a1b0bdc0
Authored: 2022-09-23 09:15:50 +0200
Committed: 2022-09-23 10:23:09 +0200

Use less magic constants in XYB ICC profile generator.

Files Modified:

  • lib/jxl/color_management.cc
  • lib/jxl/color_management_test.cc

16770a0bc83c35f88fa15cd108d4f9685c34ee03 by Moritz Firsching

https://github.com/libjxl/libjxl/commit/16770a0bc83c35f88fa15cd108d4f9685c34ee03
Authored: 2022-09-22 12:25:50 +0200
Committed: 2022-09-22 12:25:50 +0200

tests: Make sure libjxl0.7 can still be found (#1749)

In some cases user may set CMAKE_SKIP_RPATH:BOOL=ON in which case we
must indicate explicitly where to find libjxl dynamic library.

Co-authored-by: Mathieu Malaterre <mathieu.malaterre@gmail.com>

Files Modified:

  • tools/CMakeLists.txt

7f3cbb6c493fd51cd92a252b3883cb11b787eded by Daniel Novomeský

https://github.com/libjxl/libjxl/commit/7f3cbb6c493fd51cd92a252b3883cb11b787eded
Authored: 2022-09-21 20:21:32 +0200
Committed: 2022-09-22 09:29:07 +0200

build pixbufloader-jxl as module

Files Modified:

  • plugins/gdk-pixbuf/CMakeLists.txt

66b998a20da1fda6c782430a45ea94fd238b20e6 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/66b998a20da1fda6c782430a45ea94fd238b20e6
Authored: 2022-09-21 09:30:26 +0200
Committed: 2022-09-21 14:30:57 +0200

Split cjxl implementation into flag parsing and encoder API calls.

The encoder API calls are moved to extras/enc/jxl.cc so that they
can be reused in tests.

Files Added:

  • lib/extras/enc/jxl.cc
  • lib/extras/enc/jxl.h

Files Modified:

  • lib/jxl_extras.cmake
  • lib/lib.gni
  • tools/cjxl_main.cc

9572c699a9f03749978f9e79f352e2aa5634c70f by Moritz Firsching

https://github.com/libjxl/libjxl/commit/9572c699a9f03749978f9e79f352e2aa5634c70f
Authored: 2022-09-21 12:47:52 +0200
Committed: 2022-09-21 10:47:52 +0000

explain tags for branch-off points (#1673)

Files Modified:

  • doc/release.md

6954892ccdb215215d07fc92833a792e64df0df8 by Moritz Firsching

https://github.com/libjxl/libjxl/commit/6954892ccdb215215d07fc92833a792e64df0df8
Authored: 2022-09-21 12:30:15 +0200
Committed: 2022-09-21 10:30:15 +0000

always inclue patch in bump_version script (#1766)

Files Modified:

  • ci.sh

a357d20ba8ebb2b6596d92c527cfebef57231291 by Sami Boukortt

https://github.com/libjxl/libjxl/commit/a357d20ba8ebb2b6596d92c527cfebef57231291
Authored: 2022-09-20 14:10:16 +0200
Committed: 2022-09-20 14:30:46 +0200

Fix tone-mapping following #1597

Files Modified:

  • lib/jxl/dec_tone_mapping-inl.h

137f53ef1a6f39e5f733edb6cc457625abb3b3c9 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/137f53ef1a6f39e5f733edb6cc457625abb3b3c9
Authored: 2022-09-19 09:34:49 +0200
Committed: 2022-09-19 11:22:20 +0200

Update conformance test version.

Files Modified:

  • .github/workflows/conformance.yml

4d4502b4c047d3ec3930a5328db098391670b4d3 by Moritz Firsching

https://github.com/libjxl/libjxl/commit/4d4502b4c047d3ec3930a5328db098391670b4d3
Authored: 2022-09-19 10:53:28 +0200
Committed: 2022-09-19 10:53:28 +0200

cjxl: fix check for resampling flag (#1760)

Fixes #1755 both for --resampling and --ec_resampling.

Files Modified:

  • tools/cjxl_main.cc

da5d05e35a1d9f9564cb3af0d8389e7b9c1eb564 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/da5d05e35a1d9f9564cb3af0d8389e7b9c1eb564
Authored: 2022-09-16 12:50:02 +0200
Committed: 2022-09-19 08:34:28 +0200

Improve PNM codec output and ppf bit depth handling for djxl.

DecodeImageJXL will now set all bit depth info in the ppf (main,
alpha, extra channels) to match what the decoder produced, which
currently only depends on the output data type.

Setting the ppf bit depth based on command line flag is removed,
because it was never implemented in either the decoder or the
output codecs.

All encoders in extras will check that the pixel format that they
get is actually in the list of AcceptedFormats() and that the ppf
bit depth is compatible with the pixel data type (this is needed
because PPM/PGM/PAM derive the data type from the provided bit depth).

The PAM decoder and encoder can now read/write all extra channels
interleaved, since this seems to be the main purpose of the PAM
format (Portable Arbitrary Map).

EncodeImagePNM and EncodeHeader are broken up into separate
implementations for the PPM/PGM, PFM and PAM encoders.

Files Modified:

  • lib/extras/codec_test.cc
  • lib/extras/dec/jxl.cc
  • lib/extras/dec/pnm.cc
  • lib/extras/enc/apng.cc
  • lib/extras/enc/encode.cc
  • lib/extras/enc/encode.h
  • lib/extras/enc/pnm.cc
  • lib/extras/packed_image.h
  • lib/extras/packed_image_convert.cc
  • lib/jxl/jxl_test.cc
  • tools/djxl_main.cc

7c0ce231165db47a6a065e01afd7d5083e8605a6 by Sami Boukortt

https://github.com/libjxl/libjxl/commit/7c0ce231165db47a6a065e01afd7d5083e8605a6
Authored: 2022-09-14 16:36:18 +0200
Committed: 2022-09-15 13:47:31 +0200

More compact XYB ICC profile

The profile is now 628 bytes instead of 920.

Co-authored-by: Luca Versari <veluca@google.com>

Files Modified:

  • lib/jxl/color_management.cc

f484ee2f0201d256eedc7be634bf8048115477cb by Thomas Bonfort

https://github.com/libjxl/libjxl/commit/f484ee2f0201d256eedc7be634bf8048115477cb
Authored: 2022-09-15 09:13:10 +0200
Committed: 2022-09-15 09:13:10 +0200

export version information in headers (#834)

export version information in headers

Co-authored-by: Moritz Firsching <firsching@google.com>

Files Added:

  • lib/jxl/version.h.in

Files Modified:

  • AUTHORS
  • CHANGELOG.md
  • lib/include/jxl/decode.h
  • lib/jxl.cmake

f84cbb6e3071121d15caeaba94107cc592088229 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/f84cbb6e3071121d15caeaba94107cc592088229
Authored: 2022-09-13 14:45:24 +0200
Committed: 2022-09-15 08:26:33 +0200

Handle extra channels in WriteToOutputStage.

Files Modified:

  • lib/jxl/dec_cache.cc
  • lib/jxl/dec_cache.h
  • lib/jxl/dec_frame.h
  • lib/jxl/decode.cc
  • lib/jxl/decode_test.cc
  • lib/jxl/render_pipeline/stage_write.cc
  • lib/jxl/render_pipeline/stage_write.h

ea5fa8074d0146ec0f4388f52990d428ea3b67c3 by Moritz Firsching

https://github.com/libjxl/libjxl/commit/ea5fa8074d0146ec0f4388f52990d428ea3b67c3
Authored: 2022-09-14 11:08:44 +0200
Committed: 2022-09-14 09:08:44 +0000

cjxl: improve quality to distance calculation (#1743)

We change a detail in the calculation going from quality to distance:
now it is continous near the value 30, corresponding to distance 6.4.

Files Modified:

  • tools/cjxl_main.cc

bf37681607694e7883ce4845806c96fba6a88dfc by Sami Boukortt

https://github.com/libjxl/libjxl/commit/bf37681607694e7883ce4845806c96fba6a88dfc
Authored: 2022-09-13 17:36:16 +0200
Committed: 2022-09-13 22:09:05 +0200

Clarify (hopefully) the documentation about color management and HDR

Files Modified:

  • lib/include/jxl/decode.h

12902774295fea02aaa19ff41a1ec9941e9b882b by szabadka

https://github.com/libjxl/libjxl/commit/12902774295fea02aaa19ff41a1ec9941e9b882b
Authored: 2022-09-12 17:06:38 +0200
Committed: 2022-09-12 17:06:38 +0200

Subsample the blue channel in XYB jpegs. (#1739)

Benchmark before:

Encoding                   kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm        pnorm       BPP*pnorm   Bugs
-------------------------------------------------------------------------------------------------------------------------
jpeg:libjxl:d1.0:nr:q80      13270  3185856    1.9205716   0.836  31.438   2.05721784   0.71286332  1.369105080770      0

Images:
https://storage.googleapis.com/jxl-quality/eval/61297ec/index.jpeg_libjxl_d1.0_nr_q80.html

Benchmark after:

Encoding                   kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm        pnorm       BPP*pnorm   Bugs
-------------------------------------------------------------------------------------------------------------------------
jpeg:libjxl:d1.0:nr:q80      13270  3185255    1.9202093   1.195  51.755   2.06744123   0.70402018  1.351866109571      0

Images:
https://storage.googleapis.com/jxl-quality/eval/1e41328/index.jpeg_libjxl_d1.0_nr_q80.html

Files Modified:

  • lib/extras/encode_jpeg.cc
  • lib/jxl/image.cc
  • lib/jxl/image_ops.h

387e10fb95860e6c3395ee16fb314f50f5b35fd3 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/387e10fb95860e6c3395ee16fb314f50f5b35fd3
Authored: 2022-09-12 10:49:46 +0200
Committed: 2022-09-12 14:35:52 +0200

Fix uninitialized value in jpeg benchmark.

Files Modified:

  • tools/benchmark/benchmark_codec_jpeg.cc

1bcb3ca101ac9979d9091ad321720ff291192098 by Zoltan Szabadka

https://github.com/libjxl/libjxl/commit/1bcb3ca101ac9979d9091ad321720ff291192098
Authored: 2022-09-09 11:22:10 +0200
Committed: 2022-09-12 09:31:55 +0200

Add target-bitrate mode to the xyb-jpeg encoder.

Benchmark results:

Encoding                   kPixels    Bytes          BPP  E MP/s  D MP/s     Max norm        pnorm       BPP*pnorm   Bugs
-------------------------------------------------------------------------------------------------------------------------
jpeg:q80                     13270  3185957    1.9206325  46.057 124.259   3.88049626   0.98219334  1.886432478371      0
jpeg:libjxl:d1.0:nr:q80      13270  3185856    1.9205716   1.553  55.073   2.05721784   0.71286332  1.369105080770      0

Images can be viewed at the following links:
https://storage.googleapis.com/jxl-quality/eval/61297ec/index.jpeg_q80.html
https://storage.googleapis.com/jxl-quality/eval/61297ec/index.jpeg_libjxl_d1.0_nr_q80.html

Files Modified:

  • lib/extras/encode_jpeg.cc
  • lib/extras/encode_jpeg.h
  • tools/benchmark/benchmark_args.cc
  • tools/benchmark/benchmark_args.h
  • tools/benchmark/benchmark_codec_jpeg.cc
  • tools/benchmark/benchmark_xl.cc

./mach vendor media/libjxl/moz.yaml reported an error editing moz.build files:

Latest commit is f7c10956d80a6cf5dca6223a449ae0cf305a023e from 2022-09-30T14:29:08Z
Fetching code archive from https://github.com/libjxl/libjxl/archive/f7c10956d80a6cf5dca6223a449ae0cf305a023e.tar.gz
Retaining wanted in-tree files.
Cleaning third_party/jpeg-xl to import changes.
Unpacking upstream files for third_party/jpeg-xl.
Retaining wanted files from upstream changes.
Removing excluded files from upstream changes.
Removing: ['/tmp/tmpc3g_ync0/doc/tables/num_nonzeros_base.md', '/tmp/tmpc3g_ync0/tools/reference_zip.sh', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_avif.cc', '/tmp/tmpc3g_ync0/tools/fuzzer_stub.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_custom.h', '/tmp/tmpc3g_ync0/tools/viewer/load_jxl.h', '/tmp/tmpc3g_ync0/doc/tables/all_tables.sh', '/tmp/tmpc3g_ync0/tools/djxl_fuzzer.cc', '/tmp/tmpc3g_ync0/doc/format_overview.md', '/tmp/tmpc3g_ync0/tools/icc_detect/icc_detect_x11.cc', '/tmp/tmpc3g_ync0/doc/tables/dct_gen.md', '/tmp/tmpc3g_ync0/tools/file_io.h', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/msssim-y.sh', '/tmp/tmpc3g_ync0/tools/flicker_test/test_window.cc', '/tmp/tmpc3g_ync0/tools/comparison_viewer/compare_images.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_utils.h', '/tmp/tmpc3g_ync0/tools/ssimulacra_main.cc', '/tmp/tmpc3g_ync0/doc/sphinx/requirements.txt', '/tmp/tmpc3g_ync0/doc/benchmarking.md', '/tmp/tmpc3g_ync0/tools/butteraugli_main.cc', '/tmp/tmpc3g_ync0/tools/color_encoding_fuzzer.cc', '/tmp/tmpc3g_ync0/tools/comparison_viewer/split_image_view.ui', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/vmaf.sh', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_stats.h', '/tmp/tmpc3g_ync0/tools/git_version.cmake', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/dists-rgb.sh', '/tmp/tmpc3g_ync0/doc/tables/app0.md', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/Status.java', '/tmp/tmpc3g_ync0/tools/box/box.h', '/tmp/tmpc3g_ync0/tools/djxl_main.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_webp.cc', '/tmp/tmpc3g_ync0/doc/color_management.md', '/tmp/tmpc3g_ync0/doc/vuln_playbook.md', '/tmp/tmpc3g_ync0/tools/benchmark/hm/README.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/sdr_plots.sh', '/tmp/tmpc3g_ync0/tools/hdr/generate_lut_template.cc', '/tmp/tmpc3g_ync0/tools/args.h', '/tmp/tmpc3g_ync0/doc/software_support.md', '/tmp/tmpc3g_ync0/tools/hdr/README.md', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_stats.cc', '/tmp/tmpc3g_ync0/tools/upscaling_coefficients/generate_upscaling_coefficients.py', '/tmp/tmpc3g_ync0/tools/example_tree.txt', '/tmp/tmpc3g_ync0/doc/developing_in_debian.md', '/tmp/tmpc3g_ync0/doc/tables/symbol_order.md', '/tmp/tmpc3g_ync0/tools/box/box.cc', '/tmp/tmpc3g_ync0/tools/comparison_viewer/settings.cc', '/tmp/tmpc3g_ync0/doc/building_wasm.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/run_all_hdr_metrics.sh', '/tmp/tmpc3g_ync0/tools/xyb_range.cc', '/tmp/tmpc3g_ync0/tools/viewer/load_jxl.cc', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/PixelFormat.java', '/tmp/tmpc3g_ync0/tools/comparison_viewer/split_image_renderer.cc', '/tmp/tmpc3g_ync0/doc/xl_overview.md', '/tmp/tmpc3g_ync0/doc/tables/quant.md', '/tmp/tmpc3g_ync0/doc/sphinx/api_common.rst', '/tmp/tmpc3g_ync0/tools/icc_detect/icc_detect_empty.cc', '/tmp/tmpc3g_ync0/doc/tables/num_nonzero_context.md', '/tmp/tmpc3g_ync0/doc/sphinx/api_threads.rst', '/tmp/tmpc3g_ync0/tools/viewer/viewer_window.cc', '/tmp/tmpc3g_ync0/tools/libjxl_test.c', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/DecoderJni.java', '/tmp/tmpc3g_ync0/tools/jxl_emcc.cc', '/tmp/tmpc3g_ync0/tools/flicker_test/test_window.ui', '/tmp/tmpc3g_ync0/tools/box/CMakeLists.txt', '/tmp/tmpc3g_ync0/doc/sphinx/index.rst', '/tmp/tmpc3g_ync0/doc/building_and_testing.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/prepare_metrics.sh', '/tmp/tmpc3g_ync0/tools/jxl_from_tree.cc', '/tmp/tmpc3g_ync0/tools/tool_version.h', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_jxl.h', '/tmp/tmpc3g_ync0/tools/cjpeg_hdr.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_webp.h', '/tmp/tmpc3g_ync0/tools/viewer/CMakeLists.txt', '/tmp/tmpc3g_ync0/tools/flicker_test/parameters.h', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_png.cc', '/tmp/tmpc3g_ync0/doc/jxl.svg', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/ImageData.java', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/compute-hdrvdp.m', '/tmp/tmpc3g_ync0/tools/comparison_viewer/settings.ui', '/tmp/tmpc3g_ync0/tools/viewer/main.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_jxl.cc', '/tmp/tmpc3g_ync0/tools/djxl_fuzzer_test.cc', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/plots.py', '/tmp/tmpc3g_ync0/.gitmodules', '/tmp/tmpc3g_ync0/tools/comparison_viewer/codec_comparison_window.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_jpeg.cc', '/tmp/tmpc3g_ync0/tools/comparison_viewer/image_loading.cc', '/tmp/tmpc3g_ync0/tools/codec_config.h', '/tmp/tmpc3g_ync0/doc/tables/is_zero_base.md', '/tmp/tmpc3g_ync0/tools/demo_progressive_saliency_encoding.py', '/tmp/tmpc3g_ync0/tools/codec_config.cc', '/tmp/tmpc3g_ync0/tools/viewer/viewer_window.ui', '/tmp/tmpc3g_ync0/tools/hdr/render_hlg.cc', '/tmp/tmpc3g_ync0/doc/tables/nonzero_buckets.md', '/tmp/tmpc3g_ync0/doc/tables/markdown-pdf.css', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/hdrvdp-fixes.patch', '/tmp/tmpc3g_ync0/tools/flicker_test/split_view.h', '/tmp/tmpc3g_ync0/tools/progressive_sizes.sh', '/tmp/tmpc3g_ync0/doc/tables/ducky.md', '/tmp/tmpc3g_ync0/tools/ssimulacra2.h', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_file_io.cc', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/gmsd-rgb.sh', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/run_all_sdr_metrics.sh', '/tmp/tmpc3g_ync0/doc/tables/stock_counts.md', '/tmp/tmpc3g_ync0/tools/flicker_test/test_window.h', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/msssim-rgb.sh', '/tmp/tmpc3g_ync0/tools/decode_basic_info_fuzzer.cc', '/tmp/tmpc3g_ync0/tools/jxlinfo.c', '/tmp/tmpc3g_ync0/tools/upscaling_coefficients/upscaler_demo.py', '/tmp/tmpc3g_ync0/tools/file_io.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_args.h', '/tmp/tmpc3g_ync0/doc/man/cjxl.txt', '/tmp/tmpc3g_ync0/tools/CMakeLists.txt', '/tmp/tmpc3g_ync0/doc/developing_in_github.md', '/tmp/tmpc3g_ync0/doc/tables/freq_context.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/lpips-rgb.sh', '/tmp/tmpc3g_ync0/tools/cjxl_bisect_bpp', '/tmp/tmpc3g_ync0/tools/comparison_viewer/settings.h', '/tmp/tmpc3g_ync0/tools/flicker_test/setup.cc', '/tmp/tmpc3g_ync0/doc/tables/all_tables.pdf', '/tmp/tmpc3g_ync0/tools/benchmark/hm/encode.sh', '/tmp/tmpc3g_ync0/tools/cjxl_bisect_size', '/tmp/tmpc3g_ync0/doc/tables/context_modes.md', '/tmp/tmpc3g_ync0/doc/sphinx/api.rst', '/tmp/tmpc3g_ync0/tools/ssimulacra.cc', '/tmp/tmpc3g_ync0/tools/comparison_viewer/split_image_renderer.h', '/tmp/tmpc3g_ync0/tools/tool_version.cc', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/decoder_jni.h', '/tmp/tmpc3g_ync0/tools/ssimulacra.txt', '/tmp/tmpc3g_ync0/doc/tables/brn_proto.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/iqa_wrapper.sh', '/tmp/tmpc3g_ync0/tools/build_stats.py', '/tmp/tmpc3g_ync0/doc/tables/adobe.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/fsim-y.sh', '/tmp/tmpc3g_ync0/doc/developing_in_windows_msys.md', '/tmp/tmpc3g_ync0/doc/tables/stock_quant.md', '/tmp/tmpc3g_ync0/tools/fuzzer_corpus.cc', '/tmp/tmpc3g_ync0/tools/flicker_test/split_view.cc', '/tmp/tmpc3g_ync0/doc/tables/icc.md', '/tmp/tmpc3g_ync0/tools/build_cleaner.py', '/tmp/tmpc3g_ync0/tools/comparison_viewer/image_loading.h', '/tmp/tmpc3g_ync0/doc/fuzzing.md', '/tmp/tmpc3g_ync0/tools/cmdline.cc', '/tmp/tmpc3g_ync0/tools/cjxl_fuzzer.cc', '/tmp/tmpc3g_ync0/tools/conformance/lcms2.py', '/tmp/tmpc3g_ync0/tools/conformance/tooling_test.sh', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/vif-rgb.sh', '/tmp/tmpc3g_ync0/doc/release.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/hdrvdp.sh', '/tmp/tmpc3g_ync0/tools/bisector', '/tmp/tmpc3g_ync0/tools/comparison_viewer/codec_comparison_window.h', '/tmp/tmpc3g_ync0/doc/sphinx/conf.py', '/tmp/tmpc3g_ync0/tools/ossfuzz-build.sh', '/tmp/tmpc3g_ync0/tools/ssimulacra.h', '/tmp/tmpc3g_ync0/doc/developing_with_crossroad.md', '/tmp/tmpc3g_ync0/tools/flicker_test/setup.h', '/tmp/tmpc3g_ync0/tools/comparison_viewer/split_image_view.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_png.h', '/tmp/tmpc3g_ync0/tools/conformance/CMakeLists.txt', '/tmp/tmpc3g_ync0/doc/developing_in_windows_vcpkg.md', '/tmp/tmpc3g_ync0/doc/sphinx/api_decoder.rst', '/tmp/tmpc3g_ync0/tools/comparison_viewer/codec_comparison_window.ui', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/nlpd-y.sh', '/tmp/tmpc3g_ync0/tools/progressive_saliency.conf', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/ssimulacra.sh', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/decoder_jni_onload.cc', '/tmp/tmpc3g_ync0/tools/cmdline.h', '/tmp/tmpc3g_ync0/tools/hdr/exr_to_pq.cc', '/tmp/tmpc3g_ync0/tools/roundtrip_test.sh', '/tmp/tmpc3g_ync0/doc/sphinx/api_butteraugli.rst', '/tmp/tmpc3g_ync0/doc/api.txt', '/tmp/tmpc3g_ync0/tools/speed_stats.h', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/ssim-rgb.sh', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_custom.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_avif.h', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/mrse.sh', '/tmp/tmpc3g_ync0/tools/box/box_test.cc', '/tmp/tmpc3g_ync0/.gitignore', '/tmp/tmpc3g_ync0/tools/set_from_bytes_fuzzer.cc', '/tmp/tmpc3g_ync0/tools/hdr/texture_to_cube.cc', '/tmp/tmpc3g_ync0/doc/developing_in_docker.md', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/iqa.py', '/tmp/tmpc3g_ync0/tools/box/box_list_main.cc', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/hdr_plots.sh', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/StreamInfo.java', '/tmp/tmpc3g_ync0/tools/cjxl_main.cc', '/tmp/tmpc3g_ync0/tools/flicker_test/setup.ui', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec.h', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/compute-pumetrics.m', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/pupsnr.sh', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec_jpeg.h', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_xl.cc', '/tmp/tmpc3g_ync0/tools/benchmark/hm/decode.sh', '/tmp/tmpc3g_ync0/tools/hdr/tone_map.cc', '/tmp/tmpc3g_ync0/tools/conformance/conformance.py', '/tmp/tmpc3g_ync0/tools/optimizer/simplex_fork.py', '/tmp/tmpc3g_ync0/tools/fields_fuzzer.cc', '/tmp/tmpc3g_ync0/tools/flicker_test/parameters.cc', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_codec.cc', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/ssim-y.sh', '/tmp/tmpc3g_ync0/tools/comparison_viewer/CMakeLists.txt', '/tmp/tmpc3g_ync0/tools/comparison_viewer/compare_codecs.cc', '/tmp/tmpc3g_ync0/tools/speed_stats.cc', '/tmp/tmpc3g_ync0/tools/icc_codec_fuzzer.cc', '/tmp/tmpc3g_ync0/tools/icc_detect/icc_detect.h', '/tmp/tmpc3g_ync0/tools/viewer/viewer_window.h', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_utils.cc', '/tmp/tmpc3g_ync0/tools/decode_and_encode.cc', '/tmp/tmpc3g_ync0/tools/hdr/display_to_hlg.cc', '/tmp/tmpc3g_ync0/doc/man/djxl.txt', '/tmp/tmpc3g_ync0/tools/transforms_fuzzer.cc', '/tmp/tmpc3g_ync0/doc/sphinx/api_encoder.rst', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_file_io.h', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/pussim.sh', '/tmp/tmpc3g_ync0/tools/conformance/generator.py', '/tmp/tmpc3g_ync0/tools/check_author.py', '/tmp/tmpc3g_ync0/tools/hdr/pq_to_hlg.cc', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/decoder_jni.cc', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/compute_octave_metric.sh', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/fsim-rgb.sh', '/tmp/tmpc3g_ync0/tools/flicker_test/main.cc', '/tmp/tmpc3g_ync0/tools/flicker_test/CMakeLists.txt', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/DecoderTest.java', '/tmp/tmpc3g_ync0/tools/icc_detect/icc_detect_win32.cc', '/tmp/tmpc3g_ync0/tools/ssimulacra2.cc', '/tmp/tmpc3g_ync0/tools/jni/org/jpeg/jpegxl/wrapper/Decoder.java', '/tmp/tmpc3g_ync0/doc/tables/stock_values.md', '/tmp/tmpc3g_ync0/tools/README.cjpeg_hdr.md', '/tmp/tmpc3g_ync0/tools/comparison_viewer/split_image_view.h', '/tmp/tmpc3g_ync0/tools/demo_vardct_select.sh', '/tmp/tmpc3g_ync0/tools/benchmark/benchmark_args.cc', '/tmp/tmpc3g_ync0/tools/benchmark/metrics/vsi-rgb.sh', '/tmp/tmpc3g_ync0/tools/ssimulacra2_main.cc', '/tmp/tmpc3g_ync0/tools/rans_fuzzer.cc']
Copying to third_party/jpeg-xl.
Updating files
Registering changes with version control.
Checking for a spurious update.
Version 'f7c10956d80a6cf5dca6223a449ae0cf305a023e' has changed 52 files.
Updating moz.yaml.
Found release: 3e0b08d4ee53a08f9b58739e088c5bdecebae74d (2022-09-09T11:59:45Z).

Found revision: 3e0b08d4ee53a08f9b58739e088c5bdecebae74d

Updating moz.build files
Found 2 files added and 2 files removed.
Could not add third_party/jpeg-xl/lib/extras/decode_jpeg.cc to the appropriate moz.build file
Could not add third_party/jpeg-xl/lib/extras/enc/jxl.cc to the appropriate moz.build file
Could not remove third_party/jpeg-xl/lib/jxl/codec_y4m_testonly.cc from the appropriate moz.build file
Could not remove third_party/jpeg-xl/lib/jxl/codec_y4m_testonly.h from the appropriate moz.build file
This is a deficiency in ./mach vendor . Please review the affected files before committing.

We're going to continue processing the update; but we may fail because we couldn't handle these files. If we do succeed, you may want to add these files to the 'exclude' key in the moz.yaml file, so they are excluded from the source tree and ignored in the future.

I've submitted a try run for this commit: https://treeherder.mozilla.org/jobs?repo=try&revision=7968f04debd38983ec172ecf6d7fa1d506066905

It looks like we experienced one or more build failures when trying to apply this
update. You will need to apply this update manually; you can replicate the patch
locally with ./mach vendor media/libjxl/moz.yaml. I'm going to abandon the Phabricator patch and
let you submit a new one.

If the build failure wasn't caused by a library change, and was instead caused by
something structural in the build system please let my maintainers know in
Slack:#secinf.

I do my best to automatically add new files to the build, but some moz.build files
are complicated and you may need to fix them manually.

Flags: needinfo?(krosylight)
Attachment #9296818 - Attachment is obsolete: true
Assignee: nobody → krosylight
Status: NEW → ASSIGNED
Flags: needinfo?(krosylight)

https://hg.mozilla.org/mozilla-central/rev/0d9df3ff17b8

Status: ASSIGNED → RESOLVED
Closed: 3 years ago
status-firefox107: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → 107 Branch
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: