Imported Upstream version 0.7.0upstream/0.7.0

Change-Id: Ice1364b8cdf314cd19cc443865a3c02b7b0c1d5c

1 files changed, 105 insertions, 39 deletions

diff --git a/lib/lib.gni b/lib/lib.gni
index e4da742..2914de9 100644
--- a/lib/lib.gni
+++ b/lib/lib.gni
@@ -8,13 +8,14 @@
 # Library version macros
 libjxl_version_defines = [
     "JPEGXL_MAJOR_VERSION=0",
-    "JPEGXL_MINOR_VERSION=6",
-    "JPEGXL_PATCH_VERSION=1",
+    "JPEGXL_MINOR_VERSION=7",
+    "JPEGXL_PATCH_VERSION=0",
 ]
 
 libjxl_public_headers = [
     "include/jxl/butteraugli.h",
     "include/jxl/butteraugli_cxx.h",
+    "include/jxl/cms_interface.h",
     "include/jxl/codestream_header.h",
     "include/jxl/color_encoding.h",
     "include/jxl/decode.h",
@@ -46,22 +47,25 @@ libjxl_dec_sources = [
     "jxl/base/compiler_specific.h",
     "jxl/base/data_parallel.cc",
     "jxl/base/data_parallel.h",
-    "jxl/base/descriptive_statistics.cc",
-    "jxl/base/descriptive_statistics.h",
     "jxl/base/file_io.h",
     "jxl/base/iaca.h",
     "jxl/base/os_macros.h",
     "jxl/base/override.h",
     "jxl/base/padded_bytes.cc",
     "jxl/base/padded_bytes.h",
+    "jxl/base/printf_macros.h",
     "jxl/base/profiler.h",
-    "jxl/base/robust_statistics.h",
+    "jxl/base/random.cc",
+    "jxl/base/random.h",
+    "jxl/base/sanitizer_definitions.h",
+    "jxl/base/scope_guard.h",
     "jxl/base/span.h",
-    "jxl/base/status.cc",
     "jxl/base/status.h",
     "jxl/base/thread_pool_internal.h",
     "jxl/blending.cc",
     "jxl/blending.h",
+    "jxl/box_content_decoder.cc",
+    "jxl/box_content_decoder.h",
     "jxl/chroma_from_luma.cc",
     "jxl/chroma_from_luma.h",
     "jxl/codec_in_out.h",
@@ -76,8 +80,12 @@ libjxl_dec_sources = [
     "jxl/compressed_dc.cc",
     "jxl/compressed_dc.h",
     "jxl/convolve-inl.h",
-    "jxl/convolve.cc",
     "jxl/convolve.h",
+    "jxl/convolve_separable5.cc",
+    "jxl/convolve_separable7.cc",
+    "jxl/convolve_slow.cc",
+    "jxl/convolve_symmetric3.cc",
+    "jxl/convolve_symmetric5.cc",
     "jxl/dct-inl.h",
     "jxl/dct_block-inl.h",
     "jxl/dct_scales.cc",
@@ -104,15 +112,10 @@ libjxl_dec_sources = [
     "jxl/dec_modular.h",
     "jxl/dec_noise.cc",
     "jxl/dec_noise.h",
-    "jxl/dec_params.h",
     "jxl/dec_patch_dictionary.cc",
     "jxl/dec_patch_dictionary.h",
-    "jxl/dec_reconstruct.cc",
-    "jxl/dec_reconstruct.h",
-    "jxl/dec_render_pipeline.h",
+    "jxl/dec_tone_mapping-inl.h",
     "jxl/dec_transforms-inl.h",
-    "jxl/dec_upsample.cc",
-    "jxl/dec_upsample.h",
     "jxl/dec_xyb-inl.h",
     "jxl/dec_xyb.cc",
     "jxl/dec_xyb.h",
@@ -125,13 +128,20 @@ libjxl_dec_sources = [
     "jxl/entropy_coder.h",
     "jxl/epf.cc",
     "jxl/epf.h",
+    "jxl/exif.h",
+    "jxl/fast_dct-inl.h",
+    "jxl/fast_dct.cc",
+    "jxl/fast_dct.h",
+    "jxl/fast_dct128-inl.h",
+    "jxl/fast_dct16-inl.h",
+    "jxl/fast_dct256-inl.h",
+    "jxl/fast_dct32-inl.h",
+    "jxl/fast_dct64-inl.h",
+    "jxl/fast_dct8-inl.h",
     "jxl/fast_math-inl.h",
     "jxl/field_encodings.h",
     "jxl/fields.cc",
     "jxl/fields.h",
-    "jxl/filters.cc",
-    "jxl/filters.h",
-    "jxl/filters_internal.h",
     "jxl/frame_header.cc",
     "jxl/frame_header.h",
     "jxl/gauss_blur.cc",
@@ -178,13 +188,13 @@ libjxl_dec_sources = [
     "jxl/modular/modular_image.h",
     "jxl/modular/options.h",
     "jxl/modular/transform/palette.h",
+    "jxl/modular/transform/rct.cc",
     "jxl/modular/transform/rct.h",
     "jxl/modular/transform/squeeze.cc",
     "jxl/modular/transform/squeeze.h",
     "jxl/modular/transform/transform.cc",
     "jxl/modular/transform/transform.h",
     "jxl/noise.h",
-    "jxl/noise_distributions.h",
     "jxl/opsin_params.cc",
     "jxl/opsin_params.h",
     "jxl/passes_state.cc",
@@ -196,7 +206,47 @@ libjxl_dec_sources = [
     "jxl/quantizer.cc",
     "jxl/quantizer.h",
     "jxl/rational_polynomial-inl.h",
+    "jxl/render_pipeline/low_memory_render_pipeline.cc",
+    "jxl/render_pipeline/low_memory_render_pipeline.h",
+    "jxl/render_pipeline/render_pipeline.cc",
+    "jxl/render_pipeline/render_pipeline.h",
+    "jxl/render_pipeline/render_pipeline_stage.h",
+    "jxl/render_pipeline/simple_render_pipeline.cc",
+    "jxl/render_pipeline/simple_render_pipeline.h",
+    "jxl/render_pipeline/stage_blending.cc",
+    "jxl/render_pipeline/stage_blending.h",
+    "jxl/render_pipeline/stage_chroma_upsampling.cc",
+    "jxl/render_pipeline/stage_chroma_upsampling.h",
+    "jxl/render_pipeline/stage_epf.cc",
+    "jxl/render_pipeline/stage_epf.h",
+    "jxl/render_pipeline/stage_from_linear.cc",
+    "jxl/render_pipeline/stage_from_linear.h",
+    "jxl/render_pipeline/stage_gaborish.cc",
+    "jxl/render_pipeline/stage_gaborish.h",
+    "jxl/render_pipeline/stage_noise.cc",
+    "jxl/render_pipeline/stage_noise.h",
+    "jxl/render_pipeline/stage_patches.cc",
+    "jxl/render_pipeline/stage_patches.h",
+    "jxl/render_pipeline/stage_splines.cc",
+    "jxl/render_pipeline/stage_splines.h",
+    "jxl/render_pipeline/stage_spot.cc",
+    "jxl/render_pipeline/stage_spot.h",
+    "jxl/render_pipeline/stage_to_linear.cc",
+    "jxl/render_pipeline/stage_to_linear.h",
+    "jxl/render_pipeline/stage_tone_mapping.cc",
+    "jxl/render_pipeline/stage_tone_mapping.h",
+    "jxl/render_pipeline/stage_upsampling.cc",
+    "jxl/render_pipeline/stage_upsampling.h",
+    "jxl/render_pipeline/stage_write.cc",
+    "jxl/render_pipeline/stage_write.h",
+    "jxl/render_pipeline/stage_xyb.cc",
+    "jxl/render_pipeline/stage_xyb.h",
+    "jxl/render_pipeline/stage_ycbcr.cc",
+    "jxl/render_pipeline/stage_ycbcr.h",
+    "jxl/render_pipeline/test_render_pipeline_stages.h",
     "jxl/sanitizers.h",
+    "jxl/simd_util-inl.h",
+    "jxl/size_constraints.h",
     "jxl/splines.cc",
     "jxl/splines.h",
     "jxl/toc.cc",
@@ -210,8 +260,6 @@ libjxl_enc_sources = [
     "jxl/butteraugli/butteraugli.cc",
     "jxl/butteraugli/butteraugli.h",
     "jxl/butteraugli_wrapper.cc",
-    "jxl/dec_file.cc",
-    "jxl/dec_file.h",
     "jxl/enc_ac_strategy.cc",
     "jxl/enc_ac_strategy.h",
     "jxl/enc_adaptive_quantization.cc",
@@ -247,7 +295,6 @@ libjxl_enc_sources = [
     "jxl/enc_entropy_coder.h",
     "jxl/enc_external_image.cc",
     "jxl/enc_external_image.h",
-    "jxl/enc_fast_heuristics.cc",
     "jxl/enc_file.cc",
     "jxl/enc_file.h",
     "jxl/enc_frame.cc",
@@ -297,6 +344,8 @@ libjxl_enc_sources = [
     "jxl/jpeg/enc_jpeg_huffman_decode.cc",
     "jxl/jpeg/enc_jpeg_huffman_decode.h",
     "jxl/linalg.cc",
+    "jxl/modular/encoding/enc_debug_tree.cc",
+    "jxl/modular/encoding/enc_debug_tree.h",
     "jxl/modular/encoding/enc_encoding.cc",
     "jxl/modular/encoding/enc_encoding.h",
     "jxl/modular/encoding/enc_ma.cc",
@@ -319,13 +368,13 @@ libjxl_gbench_sources = [
     "extras/tone_mapping_gbench.cc",
     "jxl/dec_external_image_gbench.cc",
     "jxl/enc_external_image_gbench.cc",
+    "jxl/gauss_blur_gbench.cc",
     "jxl/splines_gbench.cc",
     "jxl/tf_gbench.cc",
 ]
 
 libjxl_tests_sources = [
     "jxl/ac_strategy_test.cc",
-    "jxl/adaptive_reconstruction_test.cc",
     "jxl/alpha_test.cc",
     "jxl/ans_common_test.cc",
     "jxl/ans_test.cc",
@@ -337,19 +386,17 @@ libjxl_tests_sources = [
     "jxl/coeff_order_test.cc",
     "jxl/color_encoding_internal_test.cc",
     "jxl/color_management_test.cc",
-    "jxl/compressed_image_test.cc",
     "jxl/convolve_test.cc",
     "jxl/data_parallel_test.cc",
     "jxl/dct_test.cc",
     "jxl/decode_test.cc",
-    "jxl/descriptive_statistics_test.cc",
     "jxl/enc_external_image_test.cc",
     "jxl/enc_photon_noise_test.cc",
     "jxl/encode_test.cc",
     "jxl/entropy_coder_test.cc",
+    "jxl/fast_dct_test.cc",
     "jxl/fast_math_test.cc",
     "jxl/fields_test.cc",
-    "jxl/filters_internal_test.cc",
     "jxl/gaborish_test.cc",
     "jxl/gamma_correct_test.cc",
     "jxl/gauss_blur_test.cc",
@@ -372,8 +419,9 @@ libjxl_tests_sources = [
     "jxl/quant_weights_test.cc",
     "jxl/quantizer_test.cc",
     "jxl/rational_polynomial_test.cc",
-    "jxl/robust_statistics_test.cc",
+    "jxl/render_pipeline/render_pipeline_test.cc",
     "jxl/roundtrip_test.cc",
+    "jxl/simd_util_test.cc",
     "jxl/speed_tier_test.cc",
     "jxl/splines_test.cc",
     "jxl/toc_test.cc",
@@ -382,11 +430,14 @@ libjxl_tests_sources = [
 
 # Test-only library code.
 libjxl_testlib_sources = [
+    "jxl/codec_y4m_testonly.cc",
+    "jxl/codec_y4m_testonly.h",
     "jxl/dct_for_test.h",
     "jxl/dec_transforms_testonly.cc",
     "jxl/dec_transforms_testonly.h",
     "jxl/fake_parallel_runner_testonly.h",
     "jxl/image_test_utils.h",
+    "jxl/test_image.h",
     "jxl/test_utils.h",
     "jxl/testdata.h",
 ]
@@ -394,20 +445,35 @@ libjxl_testlib_sources = [
 libjxl_extras_sources = [
     "extras/codec.cc",
     "extras/codec.h",
-    "extras/codec_jpg.cc",
-    "extras/codec_jpg.h",
-    "extras/codec_pgx.cc",
-    "extras/codec_pgx.h",
-    "extras/codec_png.cc",
-    "extras/codec_png.h",
-    "extras/codec_pnm.cc",
-    "extras/codec_pnm.h",
-    "extras/codec_psd.cc",
-    "extras/codec_psd.h",
-    "extras/color_description.cc",
-    "extras/color_description.h",
-    "extras/color_hints.cc",
-    "extras/color_hints.h",
+    "extras/dec/color_description.cc",
+    "extras/dec/color_description.h",
+    "extras/dec/color_hints.cc",
+    "extras/dec/color_hints.h",
+    "extras/dec/decode.cc",
+    "extras/dec/decode.h",
+    "extras/dec/jxl.cc",
+    "extras/dec/jxl.h",
+    "extras/dec/pgx.cc",
+    "extras/dec/pgx.h",
+    "extras/dec/pnm.cc",
+    "extras/dec/pnm.h",
+    "extras/enc/encode.cc",
+    "extras/enc/encode.h",
+    "extras/enc/npy.cc",
+    "extras/enc/npy.h",
+    "extras/enc/pgx.cc",
+    "extras/enc/pgx.h",
+    "extras/enc/pnm.cc",
+    "extras/enc/pnm.h",
+    "extras/exif.cc",
+    "extras/exif.h",
+    "extras/hlg.cc",
+    "extras/hlg.h",
+    "extras/packed_image.h",
+    "extras/packed_image_convert.cc",
+    "extras/packed_image_convert.h",
+    "extras/render_hdr.cc",
+    "extras/render_hdr.h",
     "extras/time.cc",
     "extras/time.h",
     "extras/tone_mapping.cc",