diff --git a/media/libjxl/include/jxl/version.h b/media/libjxl/include/jxl/version.h index 9be7a2f5a4..c674b5f48d 100644 --- a/media/libjxl/include/jxl/version.h +++ b/media/libjxl/include/jxl/version.h @@ -14,8 +14,8 @@ #define JXL_VERSION_H_ #define JPEGXL_MAJOR_VERSION 0 ///< JPEG XL Major version -#define JPEGXL_MINOR_VERSION 7 ///< JPEG XL Minor version -#define JPEGXL_PATCH_VERSION 0 ///< JPEG XL Patch version +#define JPEGXL_MINOR_VERSION 11 ///< JPEG XL Minor version +#define JPEGXL_PATCH_VERSION 1 ///< JPEG XL Patch version /** Can be used to conditionally compile code for a specific JXL version * @param[maj] major version diff --git a/media/libjxl/moz.build b/media/libjxl/moz.build index 3c55db02c3..a6f4897dde 100644 --- a/media/libjxl/moz.build +++ b/media/libjxl/moz.build @@ -14,20 +14,12 @@ SOURCES += [ "/media/libjxl/src/lib/jxl/ac_strategy.cc", "/media/libjxl/src/lib/jxl/alpha.cc", "/media/libjxl/src/lib/jxl/ans_common.cc", - "/media/libjxl/src/lib/jxl/aux_out.cc", - "/media/libjxl/src/lib/jxl/base/cache_aligned.cc", - "/media/libjxl/src/lib/jxl/base/data_parallel.cc", - "/media/libjxl/src/lib/jxl/base/padded_bytes.cc", - "/media/libjxl/src/lib/jxl/base/random.cc", "/media/libjxl/src/lib/jxl/blending.cc", - "/media/libjxl/src/lib/jxl/box_content_decoder.cc", "/media/libjxl/src/lib/jxl/chroma_from_luma.cc", "/media/libjxl/src/lib/jxl/coeff_order.cc", "/media/libjxl/src/lib/jxl/color_encoding_internal.cc", - "/media/libjxl/src/lib/jxl/color_management.cc", "/media/libjxl/src/lib/jxl/compressed_dc.cc", "/media/libjxl/src/lib/jxl/convolve_separable5.cc", - "/media/libjxl/src/lib/jxl/convolve_separable7.cc", "/media/libjxl/src/lib/jxl/convolve_slow.cc", "/media/libjxl/src/lib/jxl/convolve_symmetric3.cc", "/media/libjxl/src/lib/jxl/convolve_symmetric5.cc", @@ -45,13 +37,10 @@ SOURCES += [ "/media/libjxl/src/lib/jxl/dec_patch_dictionary.cc", "/media/libjxl/src/lib/jxl/dec_xyb.cc", "/media/libjxl/src/lib/jxl/decode.cc", - "/media/libjxl/src/lib/jxl/enc_bit_writer.cc", "/media/libjxl/src/lib/jxl/entropy_coder.cc", "/media/libjxl/src/lib/jxl/epf.cc", - "/media/libjxl/src/lib/jxl/fast_dct.cc", "/media/libjxl/src/lib/jxl/fields.cc", "/media/libjxl/src/lib/jxl/frame_header.cc", - "/media/libjxl/src/lib/jxl/gauss_blur.cc", "/media/libjxl/src/lib/jxl/headers.cc", "/media/libjxl/src/lib/jxl/huffman_table.cc", "/media/libjxl/src/lib/jxl/icc_codec.cc", @@ -59,15 +48,14 @@ SOURCES += [ "/media/libjxl/src/lib/jxl/image.cc", "/media/libjxl/src/lib/jxl/image_bundle.cc", "/media/libjxl/src/lib/jxl/image_metadata.cc", - "/media/libjxl/src/lib/jxl/jpeg/dec_jpeg_data.cc", - "/media/libjxl/src/lib/jxl/jpeg/dec_jpeg_data_writer.cc", - "/media/libjxl/src/lib/jxl/jpeg/jpeg_data.cc", + "/media/libjxl/src/lib/jxl/image_ops.cc", "/media/libjxl/src/lib/jxl/loop_filter.cc", "/media/libjxl/src/lib/jxl/luminance.cc", "/media/libjxl/src/lib/jxl/memory_manager_internal.cc", "/media/libjxl/src/lib/jxl/modular/encoding/dec_ma.cc", "/media/libjxl/src/lib/jxl/modular/encoding/encoding.cc", "/media/libjxl/src/lib/jxl/modular/modular_image.cc", + "/media/libjxl/src/lib/jxl/modular/transform/palette.cc", "/media/libjxl/src/lib/jxl/modular/transform/rct.cc", "/media/libjxl/src/lib/jxl/modular/transform/squeeze.cc", "/media/libjxl/src/lib/jxl/modular/transform/transform.cc", @@ -80,6 +68,7 @@ SOURCES += [ "/media/libjxl/src/lib/jxl/render_pipeline/simple_render_pipeline.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_blending.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_chroma_upsampling.cc", + "/media/libjxl/src/lib/jxl/render_pipeline/stage_cms.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_epf.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_from_linear.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_gaborish.cc", @@ -93,7 +82,9 @@ SOURCES += [ "/media/libjxl/src/lib/jxl/render_pipeline/stage_write.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_xyb.cc", "/media/libjxl/src/lib/jxl/render_pipeline/stage_ycbcr.cc", + "/media/libjxl/src/lib/jxl/simd_util.cc", "/media/libjxl/src/lib/jxl/splines.cc", + "/media/libjxl/src/lib/jxl/test_memory_manager.cc", "/media/libjxl/src/lib/jxl/toc.cc", ] @@ -106,8 +97,6 @@ EXPORTS.jxl += [ "./include/jxl/jxl_export.h", "./include/jxl/jxl_threads_export.h", "./include/jxl/version.h", - "/media/libjxl/src/lib/include/jxl/butteraugli.h", - "/media/libjxl/src/lib/include/jxl/butteraugli_cxx.h", "/media/libjxl/src/lib/include/jxl/cms_interface.h", "/media/libjxl/src/lib/include/jxl/codestream_header.h", "/media/libjxl/src/lib/include/jxl/color_encoding.h",