From 7c70ff7a3b81fbdac7ee138836743b2802e247d4 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Tue, 25 Mar 2025 12:38:00 +0100 Subject: [PATCH] Clean dsp/lossless includes Change-Id: I47a405a9c402095b440404fe57ac08b5293ea71b --- src/dsp/lossless.c | 14 ++++++++++---- src/dsp/lossless_enc.c | 13 ++++++++----- src/dsp/lossless_enc_sse2.c | 6 +++++- src/dsp/lossless_enc_sse41.c | 4 ++++ src/dsp/lossless_sse2.c | 5 ++++- src/dsp/lossless_sse41.c | 5 +++-- 6 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/dsp/lossless.c b/src/dsp/lossless.c index a02443f1..f3d36c1e 100644 --- a/src/dsp/lossless.c +++ b/src/dsp/lossless.c @@ -13,15 +13,21 @@ // Jyrki Alakuijala (jyrki@google.com) // Urvang Joshi (urvang@google.com) -#include "src/dsp/dsp.h" +#include "src/dsp/lossless.h" #include -#include #include +#include + #include "src/dec/vp8li_dec.h" -#include "src/utils/endian_inl_utils.h" -#include "src/dsp/lossless.h" +#include "src/dsp/cpu.h" +#include "src/dsp/dsp.h" #include "src/dsp/lossless_common.h" +#include "src/utils/endian_inl_utils.h" +#include "src/utils/utils.h" +#include "src/webp/decode.h" +#include "src/webp/format_constants.h" +#include "src/webp/types.h" //------------------------------------------------------------------------------ // Image transforms. diff --git a/src/dsp/lossless_enc.c b/src/dsp/lossless_enc.c index 7e621a71..3d63da3e 100644 --- a/src/dsp/lossless_enc.c +++ b/src/dsp/lossless_enc.c @@ -13,16 +13,19 @@ // Jyrki Alakuijala (jyrki@google.com) // Urvang Joshi (urvang@google.com) -#include "src/dsp/dsp.h" - #include #include #include -#include "src/dec/vp8li_dec.h" -#include "src/utils/endian_inl_utils.h" +#include + +#include "src/dsp/cpu.h" +#include "src/dsp/dsp.h" #include "src/dsp/lossless.h" #include "src/dsp/lossless_common.h" -#include "src/dsp/yuv.h" +#include "src/enc/histogram_enc.h" +#include "src/utils/utils.h" +#include "src/webp/format_constants.h" +#include "src/webp/types.h" // lookup table for small values of log2(int) * (1 << LOG_2_PRECISION_BITS). // Obtained in Python with: diff --git a/src/dsp/lossless_enc_sse2.c b/src/dsp/lossless_enc_sse2.c index 614eabd5..be1fc850 100644 --- a/src/dsp/lossless_enc_sse2.c +++ b/src/dsp/lossless_enc_sse2.c @@ -14,11 +14,15 @@ #include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE2) + #include #include + +#include "src/dsp/cpu.h" #include "src/dsp/lossless.h" -#include "src/dsp/common_sse2.h" #include "src/dsp/lossless_common.h" +#include "src/utils/utils.h" +#include "src/webp/types.h" // For sign-extended multiplying constants, pre-shifted by 5: #define CST_5b(X) (((int16_t)((uint16_t)(X) << 8)) >> 5) diff --git a/src/dsp/lossless_enc_sse41.c b/src/dsp/lossless_enc_sse41.c index 87ed056f..3b3747c2 100644 --- a/src/dsp/lossless_enc_sse41.c +++ b/src/dsp/lossless_enc_sse41.c @@ -14,9 +14,13 @@ #include "src/dsp/dsp.h" #if defined(WEBP_USE_SSE41) + #include #include + +#include "src/dsp/cpu.h" #include "src/dsp/lossless.h" +#include "src/webp/types.h" //------------------------------------------------------------------------------ // Cost operations. diff --git a/src/dsp/lossless_sse2.c b/src/dsp/lossless_sse2.c index 5b68d1cf..ee8f228a 100644 --- a/src/dsp/lossless_sse2.c +++ b/src/dsp/lossless_sse2.c @@ -15,10 +15,13 @@ #if defined(WEBP_USE_SSE2) +#include + #include "src/dsp/common_sse2.h" +#include "src/dsp/cpu.h" #include "src/dsp/lossless.h" #include "src/dsp/lossless_common.h" -#include +#include "src/webp/types.h" //------------------------------------------------------------------------------ // Predictor Transform diff --git a/src/dsp/lossless_sse41.c b/src/dsp/lossless_sse41.c index a2d19144..eb10181b 100644 --- a/src/dsp/lossless_sse41.c +++ b/src/dsp/lossless_sse41.c @@ -13,9 +13,10 @@ #if defined(WEBP_USE_SSE41) -#include "src/dsp/common_sse41.h" +#include + +#include "src/dsp/cpu.h" #include "src/dsp/lossless.h" -#include "src/dsp/lossless_common.h" //------------------------------------------------------------------------------ // Color-space conversion functions