diff options
Diffstat (limited to 'lib/jxl/speed_tier_test.cc')
| -rw-r--r-- | lib/jxl/speed_tier_test.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/jxl/speed_tier_test.cc b/lib/jxl/speed_tier_test.cc index 4e7c9f9..9c120fe 100644 --- a/lib/jxl/speed_tier_test.cc +++ b/lib/jxl/speed_tier_test.cc @@ -12,8 +12,6 @@ #include "lib/jxl/base/padded_bytes.h" #include "lib/jxl/base/thread_pool_internal.h" #include "lib/jxl/codec_in_out.h" -#include "lib/jxl/dec_file.h" -#include "lib/jxl/dec_params.h" #include "lib/jxl/enc_butteraugli_comparator.h" #include "lib/jxl/enc_cache.h" #include "lib/jxl/enc_file.h" @@ -85,7 +83,7 @@ JXL_GTEST_INSTANTIATE_TEST_SUITE_P( TEST_P(SpeedTierTest, Roundtrip) { const PaddedBytes orig = - ReadTestData("wesaturate/500px/u76c0g_bliznaca_srgb8.png"); + ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png"); CodecInOut io; ThreadPoolInternal pool(8); ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, &pool)); @@ -98,13 +96,12 @@ TEST_P(SpeedTierTest, Roundtrip) { CompressParams cparams; cparams.speed_tier = params.speed_tier; - DecompressParams dparams; CodecInOut io2; - test::Roundtrip(&io, cparams, dparams, nullptr, &io2); + test::Roundtrip(&io, cparams, {}, nullptr, &io2); // Can be 2.2 in non-hare mode. - EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params, + EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params, GetJxlCms(), /*distmap=*/nullptr, /*pool=*/nullptr), 2.8); } |