diff --git a/Android.mk b/Android.mk index 492ae0b2..a5c61817 100644 --- a/Android.mk +++ b/Android.mk @@ -22,16 +22,16 @@ else endif dec_srcs := \ - src/dec/alpha.c \ - src/dec/buffer.c \ - src/dec/frame.c \ - src/dec/idec.c \ - src/dec/io.c \ - src/dec/quant.c \ - src/dec/tree.c \ - src/dec/vp8.c \ - src/dec/vp8l.c \ - src/dec/webp.c \ + src/dec/alpha_dec.c \ + src/dec/buffer_dec.c \ + src/dec/frame_dec.c \ + src/dec/idec_dec.c \ + src/dec/io_dec.c \ + src/dec/quant_dec.c \ + src/dec/tree_dec.c \ + src/dec/vp8_dec.c \ + src/dec/vp8l_dec.c \ + src/dec/webp_dec.c \ demux_srcs := \ src/demux/anim_decode.c \ @@ -103,29 +103,29 @@ dsp_enc_srcs := \ src/dsp/lossless_enc_sse41.c \ enc_srcs := \ - src/enc/alpha.c \ - src/enc/analysis.c \ - src/enc/backward_references.c \ - src/enc/config.c \ - src/enc/cost.c \ - src/enc/delta_palettization.c \ - src/enc/filter.c \ - src/enc/frame.c \ - src/enc/histogram.c \ - src/enc/iterator.c \ - src/enc/near_lossless.c \ - src/enc/picture.c \ - src/enc/picture_csp.c \ - src/enc/picture_psnr.c \ - src/enc/picture_rescale.c \ - src/enc/picture_tools.c \ - src/enc/predictor.c \ - src/enc/quant.c \ - src/enc/syntax.c \ - src/enc/token.c \ - src/enc/tree.c \ - src/enc/vp8l.c \ - src/enc/webpenc.c \ + src/enc/alpha_enc.c \ + src/enc/analysis_enc.c \ + src/enc/backward_references_enc.c \ + src/enc/config_enc.c \ + src/enc/cost_enc.c \ + src/enc/delta_palettization_enc.c \ + src/enc/filter_enc.c \ + src/enc/frame_enc.c \ + src/enc/histogram_enc.c \ + src/enc/iterator_enc.c \ + src/enc/near_lossless_enc.c \ + src/enc/picture_enc.c \ + src/enc/picture_csp_enc.c \ + src/enc/picture_psnr_enc.c \ + src/enc/picture_rescale_enc.c \ + src/enc/picture_tools_enc.c \ + src/enc/predictor_enc.c \ + src/enc/quant_enc.c \ + src/enc/syntax_enc.c \ + src/enc/token_enc.c \ + src/enc/tree_enc.c \ + src/enc/vp8l_enc.c \ + src/enc/webp_enc.c \ mux_srcs := \ src/mux/anim_encode.c \ @@ -134,20 +134,20 @@ mux_srcs := \ src/mux/muxread.c \ utils_dec_srcs := \ - src/utils/bit_reader.c \ - src/utils/color_cache.c \ - src/utils/filters.c \ - src/utils/huffman.c \ - src/utils/quant_levels_dec.c \ - src/utils/random.c \ - src/utils/rescaler.c \ - src/utils/thread.c \ + src/utils/bit_reader_utils.c \ + src/utils/color_cache_utils.c \ + src/utils/filters_utils.c \ + src/utils/huffman_utils.c \ + src/utils/quant_levels_dec_utils.c \ + src/utils/random_utils.c \ + src/utils/rescaler_utils.c \ + src/utils/thread_utils.c \ src/utils/utils.c \ utils_enc_srcs := \ - src/utils/bit_writer.c \ - src/utils/huffman_encode.c \ - src/utils/quant_levels.c \ + src/utils/bit_writer_utils.c \ + src/utils/huffman_encode_utils.c \ + src/utils/quant_levels_utils.c \ ################################################################################ # libwebpdecoder diff --git a/Makefile.vc b/Makefile.vc index 79e99504..7401b441 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -171,16 +171,16 @@ CFGSET = TRUE # DEC_OBJS = \ - $(DIROBJ)\dec\alpha.obj \ - $(DIROBJ)\dec\buffer.obj \ - $(DIROBJ)\dec\frame.obj \ - $(DIROBJ)\dec\idec.obj \ - $(DIROBJ)\dec\io.obj \ - $(DIROBJ)\dec\quant.obj \ - $(DIROBJ)\dec\tree.obj \ - $(DIROBJ)\dec\vp8.obj \ - $(DIROBJ)\dec\vp8l.obj \ - $(DIROBJ)\dec\webp.obj \ + $(DIROBJ)\dec\alpha_dec.obj \ + $(DIROBJ)\dec\buffer_dec.obj \ + $(DIROBJ)\dec\frame_dec.obj \ + $(DIROBJ)\dec\idec_dec.obj \ + $(DIROBJ)\dec\io_dec.obj \ + $(DIROBJ)\dec\quant_dec.obj \ + $(DIROBJ)\dec\tree_dec.obj \ + $(DIROBJ)\dec\vp8_dec.obj \ + $(DIROBJ)\dec\vp8l_dec.obj \ + $(DIROBJ)\dec\webp_dec.obj \ DEMUX_OBJS = \ $(DIROBJ)\demux\anim_decode.obj \ @@ -273,29 +273,29 @@ EX_UTIL_OBJS = \ $(DIROBJ)\examples\example_util.obj \ ENC_OBJS = \ - $(DIROBJ)\enc\alpha.obj \ - $(DIROBJ)\enc\analysis.obj \ - $(DIROBJ)\enc\backward_references.obj \ - $(DIROBJ)\enc\config.obj \ - $(DIROBJ)\enc\cost.obj \ - $(DIROBJ)\enc\delta_palettization.obj \ - $(DIROBJ)\enc\filter.obj \ - $(DIROBJ)\enc\frame.obj \ - $(DIROBJ)\enc\histogram.obj \ - $(DIROBJ)\enc\iterator.obj \ - $(DIROBJ)\enc\near_lossless.obj \ - $(DIROBJ)\enc\picture.obj \ - $(DIROBJ)\enc\picture_csp.obj \ - $(DIROBJ)\enc\picture_psnr.obj \ - $(DIROBJ)\enc\picture_rescale.obj \ - $(DIROBJ)\enc\picture_tools.obj \ - $(DIROBJ)\enc\predictor.obj \ - $(DIROBJ)\enc\quant.obj \ - $(DIROBJ)\enc\syntax.obj \ - $(DIROBJ)\enc\token.obj \ - $(DIROBJ)\enc\tree.obj \ - $(DIROBJ)\enc\vp8l.obj \ - $(DIROBJ)\enc\webpenc.obj \ + $(DIROBJ)\enc\alpha_enc.obj \ + $(DIROBJ)\enc\analysis_enc.obj \ + $(DIROBJ)\enc\backward_references_enc.obj \ + $(DIROBJ)\enc\config_enc.obj \ + $(DIROBJ)\enc\cost_enc.obj \ + $(DIROBJ)\enc\delta_palettization_enc.obj \ + $(DIROBJ)\enc\filter_enc.obj \ + $(DIROBJ)\enc\frame_enc.obj \ + $(DIROBJ)\enc\histogram_enc.obj \ + $(DIROBJ)\enc\iterator_enc.obj \ + $(DIROBJ)\enc\near_lossless_enc.obj \ + $(DIROBJ)\enc\picture_enc.obj \ + $(DIROBJ)\enc\picture_csp_enc.obj \ + $(DIROBJ)\enc\picture_psnr_enc.obj \ + $(DIROBJ)\enc\picture_rescale_enc.obj \ + $(DIROBJ)\enc\picture_tools_enc.obj \ + $(DIROBJ)\enc\predictor_enc.obj \ + $(DIROBJ)\enc\quant_enc.obj \ + $(DIROBJ)\enc\syntax_enc.obj \ + $(DIROBJ)\enc\token_enc.obj \ + $(DIROBJ)\enc\tree_enc.obj \ + $(DIROBJ)\enc\vp8l_enc.obj \ + $(DIROBJ)\enc\webp_enc.obj \ EXTRAS_OBJS = \ $(DIROBJ)\extras\extras.obj \ @@ -311,20 +311,20 @@ MUX_OBJS = \ $(DIROBJ)\mux\muxread.obj \ UTILS_DEC_OBJS = \ - $(DIROBJ)\utils\bit_reader.obj \ - $(DIROBJ)\utils\color_cache.obj \ - $(DIROBJ)\utils\filters.obj \ - $(DIROBJ)\utils\huffman.obj \ - $(DIROBJ)\utils\quant_levels_dec.obj \ - $(DIROBJ)\utils\rescaler.obj \ - $(DIROBJ)\utils\random.obj \ - $(DIROBJ)\utils\thread.obj \ + $(DIROBJ)\utils\bit_reader_utils.obj \ + $(DIROBJ)\utils\color_cache_utils.obj \ + $(DIROBJ)\utils\filters_utils.obj \ + $(DIROBJ)\utils\huffman_utils.obj \ + $(DIROBJ)\utils\quant_levels_dec_utils.obj \ + $(DIROBJ)\utils\rescaler_utils.obj \ + $(DIROBJ)\utils\random_utils.obj \ + $(DIROBJ)\utils\thread_utils.obj \ $(DIROBJ)\utils\utils.obj \ UTILS_ENC_OBJS = \ - $(DIROBJ)\utils\bit_writer.obj \ - $(DIROBJ)\utils\huffman_encode.obj \ - $(DIROBJ)\utils\quant_levels.obj \ + $(DIROBJ)\utils\bit_writer_utils.obj \ + $(DIROBJ)\utils\huffman_encode_utils.obj \ + $(DIROBJ)\utils\quant_levels_utils.obj \ LIBWEBPDECODER_OBJS = $(DEC_OBJS) $(DSP_DEC_OBJS) $(UTILS_DEC_OBJS) LIBWEBP_OBJS = $(LIBWEBPDECODER_OBJS) $(ENC_OBJS) $(DSP_ENC_OBJS) \ diff --git a/build.gradle b/build.gradle index 3cfa871d..f05575d4 100644 --- a/build.gradle +++ b/build.gradle @@ -96,16 +96,16 @@ model { c { source { srcDir "src/dec" - include "alpha.c" - include "buffer.c" - include "frame.c" - include "idec.c" - include "io.c" - include "quant.c" - include "tree.c" - include "vp8.c" - include "vp8l.c" - include "webp.c" + include "alpha_dec.c" + include "buffer_dec.c" + include "frame_dec.c" + include "idec_dec.c" + include "io_dec.c" + include "quant_dec.c" + include "tree_dec.c" + include "vp8_dec.c" + include "vp8l_dec.c" + include "webp_dec.c" srcDir "src/dsp" include "alpha_processing.c" include "alpha_processing_mips_dsp_r2.c" @@ -150,15 +150,14 @@ model { include "yuv_mips_dsp_r2.c" include "yuv_sse2.c" srcDir "src/utils" - include "ans.c" - include "bit_reader.c" - include "color_cache.c" - include "filters.c" - include "huffman.c" - include "quant_levels_dec.c" - include "random.c" - include "rescaler.c" - include "thread.c" + include "bit_reader_utils.c" + include "color_cache_utils.c" + include "filters_utils.c" + include "huffman_utils.c" + include "quant_levels_dec_utils.c" + include "random_utils.c" + include "rescaler_utils.c" + include "thread_utils.c" include "utils.c" srcDir "src/dsp" include "cost.c" @@ -181,33 +180,33 @@ model { include "lossless_enc_sse2.c" include "lossless_enc_sse41.c" srcDir "src/enc" - include "alpha.c" - include "analysis.c" - include "backward_references.c" - include "config.c" - include "cost.c" - include "delta_palettization.c" - include "filter.c" - include "frame.c" - include "histogram.c" - include "iterator.c" - include "near_lossless.c" - include "picture.c" - include "picture_csp.c" - include "picture_psnr.c" - include "picture_rescale.c" - include "picture_tools.c" - include "predictor.c" - include "quant.c" - include "syntax.c" - include "token.c" - include "tree.c" - include "vp8l.c" - include "webpenc.c" + include "alpha_enc.c" + include "analysis_enc.c" + include "backward_references_enc.c" + include "config_enc.c" + include "cost_enc.c" + include "delta_palettization_enc.c" + include "filter_enc.c" + include "frame_enc.c" + include "histogram_enc.c" + include "iterator_enc.c" + include "near_lossless_enc.c" + include "picture_enc.c" + include "picture_csp_enc.c" + include "picture_psnr_enc.c" + include "picture_rescale_enc.c" + include "picture_tools_enc.c" + include "predictor_enc.c" + include "quant_enc.c" + include "syntax_enc.c" + include "token_enc.c" + include "tree_enc.c" + include "vp8l_enc.c" + include "webp_enc.c" srcDir "src/utils" - include "bit_writer.c" - include "huffman_encode.c" - include "quant_levels.c" + include "bit_writer_utils.c" + include "huffman_encode_utils.c" + include "quant_levels_utils.c" } exportedHeaders { srcDir "src" diff --git a/makefile.unix b/makefile.unix index 4fb3143d..47b8c65f 100644 --- a/makefile.unix +++ b/makefile.unix @@ -113,16 +113,16 @@ ANIM_UTIL_OBJS = \ examples/anim_util.o \ DEC_OBJS = \ - src/dec/alpha.o \ - src/dec/buffer.o \ - src/dec/frame.o \ - src/dec/idec.o \ - src/dec/io.o \ - src/dec/quant.o \ - src/dec/tree.o \ - src/dec/vp8.o \ - src/dec/vp8l.o \ - src/dec/webp.o \ + src/dec/alpha_dec.o \ + src/dec/buffer_dec.o \ + src/dec/frame_dec.o \ + src/dec/idec_dec.o \ + src/dec/io_dec.o \ + src/dec/quant_dec.o \ + src/dec/tree_dec.o \ + src/dec/vp8_dec.o \ + src/dec/vp8l_dec.o \ + src/dec/webp_dec.o \ DEMUX_OBJS = \ src/demux/anim_decode.o \ @@ -194,29 +194,29 @@ DSP_ENC_OBJS = \ src/dsp/lossless_enc_sse41.o \ ENC_OBJS = \ - src/enc/alpha.o \ - src/enc/analysis.o \ - src/enc/backward_references.o \ - src/enc/config.o \ - src/enc/cost.o \ - src/enc/delta_palettization.o \ - src/enc/filter.o \ - src/enc/frame.o \ - src/enc/histogram.o \ - src/enc/iterator.o \ - src/enc/near_lossless.o \ - src/enc/picture.o \ - src/enc/picture_csp.o \ - src/enc/picture_psnr.o \ - src/enc/picture_rescale.o \ - src/enc/picture_tools.o \ - src/enc/predictor.o \ - src/enc/quant.o \ - src/enc/syntax.o \ - src/enc/token.o \ - src/enc/tree.o \ - src/enc/vp8l.o \ - src/enc/webpenc.o \ + src/enc/alpha_enc.o \ + src/enc/analysis_enc.o \ + src/enc/backward_references_enc.o \ + src/enc/config_enc.o \ + src/enc/cost_enc.o \ + src/enc/delta_palettization_enc.o \ + src/enc/filter_enc.o \ + src/enc/frame_enc.o \ + src/enc/histogram_enc.o \ + src/enc/iterator_enc.o \ + src/enc/near_lossless_enc.o \ + src/enc/picture_enc.o \ + src/enc/picture_csp_enc.o \ + src/enc/picture_psnr_enc.o \ + src/enc/picture_rescale_enc.o \ + src/enc/picture_tools_enc.o \ + src/enc/predictor_enc.o \ + src/enc/quant_enc.o \ + src/enc/syntax_enc.o \ + src/enc/token_enc.o \ + src/enc/tree_enc.o \ + src/enc/vp8l_enc.o \ + src/enc/webp_enc.o \ EX_FORMAT_DEC_OBJS = \ imageio/image_dec.o \ @@ -245,20 +245,20 @@ MUX_OBJS = \ src/mux/muxread.o \ UTILS_DEC_OBJS = \ - src/utils/bit_reader.o \ - src/utils/color_cache.o \ - src/utils/filters.o \ - src/utils/huffman.o \ - src/utils/quant_levels_dec.o \ - src/utils/random.o \ - src/utils/rescaler.o \ - src/utils/thread.o \ + src/utils/bit_reader_utils.o \ + src/utils/color_cache_utils.o \ + src/utils/filters_utils.o \ + src/utils/huffman_utils.o \ + src/utils/quant_levels_dec_utils.o \ + src/utils/random_utils.o \ + src/utils/rescaler_utils.o \ + src/utils/thread_utils.o \ src/utils/utils.o \ UTILS_ENC_OBJS = \ - src/utils/bit_writer.o \ - src/utils/huffman_encode.o \ - src/utils/quant_levels.o \ + src/utils/bit_writer_utils.o \ + src/utils/huffman_encode_utils.o \ + src/utils/quant_levels_utils.o \ EXTRA_OBJS = \ extras/extras.o \ @@ -280,12 +280,12 @@ HDRS_INSTALLED = \ src/webp/types.h \ HDRS = \ - src/dec/alphai.h \ - src/dec/common.h \ - src/dec/decode_vp8.h \ - src/dec/vp8i.h \ - src/dec/vp8li.h \ - src/dec/webpi.h \ + src/dec/alphai_dec.h \ + src/dec/common_dec.h \ + src/dec/vp8_dec.h \ + src/dec/vp8i_dec.h \ + src/dec/vp8li_dec.h \ + src/dec/webpi_dec.h \ src/dsp/common_sse2.h \ src/dsp/dsp.h \ src/dsp/lossless.h \ @@ -294,27 +294,27 @@ HDRS = \ src/dsp/msa_macro.h \ src/dsp/neon.h \ src/dsp/yuv.h \ - src/enc/backward_references.h \ - src/enc/cost.h \ - src/enc/delta_palettization.h \ - src/enc/histogram.h \ - src/enc/vp8enci.h \ - src/enc/vp8li.h \ + src/enc/backward_references_enc.h \ + src/enc/cost_enc.h \ + src/enc/delta_palettization_enc.h \ + src/enc/histogram_enc.h \ + src/enc/vp8i_enc.h \ + src/enc/vp8li_enc.h \ src/mux/animi.h \ src/mux/muxi.h \ - src/utils/bit_reader.h \ - src/utils/bit_reader_inl.h \ - src/utils/bit_writer.h \ - src/utils/color_cache.h \ - src/utils/endian_inl.h \ - src/utils/filters.h \ - src/utils/huffman.h \ - src/utils/huffman_encode.h \ - src/utils/quant_levels.h \ - src/utils/quant_levels_dec.h \ - src/utils/random.h \ - src/utils/rescaler.h \ - src/utils/thread.h \ + src/utils/bit_reader_utils.h \ + src/utils/bit_reader_inl_utils.h \ + src/utils/bit_writer_utils.h \ + src/utils/color_cache_utils.h \ + src/utils/endian_inl_utils.h \ + src/utils/filters_utils.h \ + src/utils/huffman_utils.h \ + src/utils/huffman_encode_utils.h \ + src/utils/quant_levels_utils.h \ + src/utils/quant_levels_dec_utils.h \ + src/utils/random_utils.h \ + src/utils/rescaler_utils.h \ + src/utils/thread_utils.h \ src/utils/utils.h \ src/webp/format_constants.h \ $(HDRS_INSTALLED) \ @@ -345,12 +345,15 @@ extras: $(EXTRA_LIB) $(EX_FORMAT_DEC_OBJS): %.o: %.h # special dependencies: -# tree.c/vp8.c/bit_reader.c <-> bit_reader_inl.h, endian_inl.h -# bit_writer.c <-> endian_inl.h -src/dec/tree.o: src/utils/bit_reader_inl.h src/utils/endian_inl.h -src/dec/vp8.o: src/utils/bit_reader_inl.h src/utils/endian_inl.h -src/utils/bit_reader.o: src/utils/bit_reader_inl.h src/utils/endian_inl.h -src/utils/bit_writer.o: src/utils/endian_inl.h +# tree_dec.c/vp8_dec.c/bit_reader_utils.c <-> +# bit_reader_inl_utils.h, endian_inl_utils.h +# bit_writer_utils.c <-> endian_inl_utils.h +src/dec/tree_dec.o: src/utils/bit_reader_inl_utils.h +src/dec/tree_dec.o: src/utils/endian_inl_utils.h +src/dec/vp8_dec.o: src/utils/bit_reader_inl_utils.h src/utils/endian_inl_utils.h +src/utils/bit_reader_utils.o: src/utils/bit_reader_inl_utils.h +src/utils/bit_reader_utils.o: src/utils/endian_inl_utils.h +src/utils/bit_writer_utils.o: src/utils/endian_inl_utils.h %.o: %.c $(HDRS) $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ diff --git a/src/dec/Makefile.am b/src/dec/Makefile.am index 7a0b4e81..8919c42b 100644 --- a/src/dec/Makefile.am +++ b/src/dec/Makefile.am @@ -1,22 +1,22 @@ noinst_LTLIBRARIES = libwebpdecode.la libwebpdecode_la_SOURCES = -libwebpdecode_la_SOURCES += alpha.c -libwebpdecode_la_SOURCES += alphai.h -libwebpdecode_la_SOURCES += buffer.c -libwebpdecode_la_SOURCES += common.h -libwebpdecode_la_SOURCES += decode_vp8.h -libwebpdecode_la_SOURCES += frame.c -libwebpdecode_la_SOURCES += idec.c -libwebpdecode_la_SOURCES += io.c -libwebpdecode_la_SOURCES += quant.c -libwebpdecode_la_SOURCES += tree.c -libwebpdecode_la_SOURCES += vp8.c -libwebpdecode_la_SOURCES += vp8i.h -libwebpdecode_la_SOURCES += vp8l.c -libwebpdecode_la_SOURCES += vp8li.h -libwebpdecode_la_SOURCES += webp.c -libwebpdecode_la_SOURCES += webpi.h +libwebpdecode_la_SOURCES += alpha_dec.c +libwebpdecode_la_SOURCES += alphai_dec.h +libwebpdecode_la_SOURCES += buffer_dec.c +libwebpdecode_la_SOURCES += common_dec.h +libwebpdecode_la_SOURCES += vp8_dec.h +libwebpdecode_la_SOURCES += frame_dec.c +libwebpdecode_la_SOURCES += idec_dec.c +libwebpdecode_la_SOURCES += io_dec.c +libwebpdecode_la_SOURCES += quant_dec.c +libwebpdecode_la_SOURCES += tree_dec.c +libwebpdecode_la_SOURCES += vp8_dec.c +libwebpdecode_la_SOURCES += vp8i_dec.h +libwebpdecode_la_SOURCES += vp8l_dec.c +libwebpdecode_la_SOURCES += vp8li_dec.h +libwebpdecode_la_SOURCES += webp_dec.c +libwebpdecode_la_SOURCES += webpi_dec.h libwebpdecodeinclude_HEADERS = libwebpdecodeinclude_HEADERS += ../webp/decode.h diff --git a/src/dec/alpha.c b/src/dec/alpha_dec.c similarity index 98% rename from src/dec/alpha.c rename to src/dec/alpha_dec.c index d88f01d8..83ffd4b6 100644 --- a/src/dec/alpha.c +++ b/src/dec/alpha_dec.c @@ -12,11 +12,11 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./alphai.h" -#include "./vp8i.h" -#include "./vp8li.h" +#include "./alphai_dec.h" +#include "./vp8i_dec.h" +#include "./vp8li_dec.h" #include "../dsp/dsp.h" -#include "../utils/quant_levels_dec.h" +#include "../utils/quant_levels_dec_utils.h" #include "../utils/utils.h" #include "../webp/format_constants.h" diff --git a/src/dec/alphai.h b/src/dec/alphai_dec.h similarity index 96% rename from src/dec/alphai.h rename to src/dec/alphai_dec.h index 69dd7c0f..561e8151 100644 --- a/src/dec/alphai.h +++ b/src/dec/alphai_dec.h @@ -14,8 +14,8 @@ #ifndef WEBP_DEC_ALPHAI_H_ #define WEBP_DEC_ALPHAI_H_ -#include "./webpi.h" -#include "../utils/filters.h" +#include "./webpi_dec.h" +#include "../utils/filters_utils.h" #ifdef __cplusplus extern "C" { diff --git a/src/dec/buffer.c b/src/dec/buffer_dec.c similarity index 99% rename from src/dec/buffer.c rename to src/dec/buffer_dec.c index 547e69b4..c685fd56 100644 --- a/src/dec/buffer.c +++ b/src/dec/buffer_dec.c @@ -13,8 +13,8 @@ #include -#include "./vp8i.h" -#include "./webpi.h" +#include "./vp8i_dec.h" +#include "./webpi_dec.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dec/common.h b/src/dec/common_dec.h similarity index 100% rename from src/dec/common.h rename to src/dec/common_dec.h diff --git a/src/dec/frame.c b/src/dec/frame_dec.c similarity index 99% rename from src/dec/frame.c rename to src/dec/frame_dec.c index 31cf696e..f91e27f7 100644 --- a/src/dec/frame.c +++ b/src/dec/frame_dec.c @@ -12,7 +12,7 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./vp8i.h" +#include "./vp8i_dec.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dec/idec.c b/src/dec/idec_dec.c similarity index 99% rename from src/dec/idec.c rename to src/dec/idec_dec.c index 8de13191..78fb2e71 100644 --- a/src/dec/idec.c +++ b/src/dec/idec_dec.c @@ -15,9 +15,9 @@ #include #include -#include "./alphai.h" -#include "./webpi.h" -#include "./vp8i.h" +#include "./alphai_dec.h" +#include "./webpi_dec.h" +#include "./vp8i_dec.h" #include "../utils/utils.h" // In append mode, buffer allocations increase as multiples of this value. diff --git a/src/dec/io.c b/src/dec/io_dec.c similarity index 99% rename from src/dec/io.c rename to src/dec/io_dec.c index e0f1a777..8bfab869 100644 --- a/src/dec/io.c +++ b/src/dec/io_dec.c @@ -13,8 +13,8 @@ #include #include -#include "../dec/vp8i.h" -#include "./webpi.h" +#include "../dec/vp8i_dec.h" +#include "./webpi_dec.h" #include "../dsp/dsp.h" #include "../dsp/yuv.h" #include "../utils/utils.h" diff --git a/src/dec/quant.c b/src/dec/quant_dec.c similarity index 99% rename from src/dec/quant.c rename to src/dec/quant_dec.c index 5b648f94..14e31989 100644 --- a/src/dec/quant.c +++ b/src/dec/quant_dec.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./vp8i.h" +#include "./vp8i_dec.h" static WEBP_INLINE int clip(int v, int M) { return v < 0 ? 0 : v > M ? M : v; diff --git a/src/dec/tree.c b/src/dec/tree_dec.c similarity index 99% rename from src/dec/tree.c rename to src/dec/tree_dec.c index 3a69dc8e..9e805f60 100644 --- a/src/dec/tree.c +++ b/src/dec/tree_dec.c @@ -11,8 +11,8 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./vp8i.h" -#include "../utils/bit_reader_inl.h" +#include "./vp8i_dec.h" +#include "../utils/bit_reader_inl_utils.h" #if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__) // using a table is ~1-2% slower on ARM. Prefer the coded-tree approach then. diff --git a/src/dec/vp8.c b/src/dec/vp8_dec.c similarity index 99% rename from src/dec/vp8.c rename to src/dec/vp8_dec.c index 9b54389f..fad8d9cf 100644 --- a/src/dec/vp8.c +++ b/src/dec/vp8_dec.c @@ -13,11 +13,11 @@ #include -#include "./alphai.h" -#include "./vp8i.h" -#include "./vp8li.h" -#include "./webpi.h" -#include "../utils/bit_reader_inl.h" +#include "./alphai_dec.h" +#include "./vp8i_dec.h" +#include "./vp8li_dec.h" +#include "./webpi_dec.h" +#include "../utils/bit_reader_inl_utils.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dec/decode_vp8.h b/src/dec/vp8_dec.h similarity index 100% rename from src/dec/decode_vp8.h rename to src/dec/vp8_dec.h diff --git a/src/dec/vp8i.h b/src/dec/vp8i_dec.h similarity index 98% rename from src/dec/vp8i.h rename to src/dec/vp8i_dec.h index 313d8a7b..299cab34 100644 --- a/src/dec/vp8i.h +++ b/src/dec/vp8i_dec.h @@ -15,11 +15,11 @@ #define WEBP_DEC_VP8I_H_ #include // for memcpy() -#include "./common.h" -#include "./vp8li.h" -#include "../utils/bit_reader.h" -#include "../utils/random.h" -#include "../utils/thread.h" +#include "./common_dec.h" +#include "./vp8li_dec.h" +#include "../utils/bit_reader_utils.h" +#include "../utils/random_utils.h" +#include "../utils/thread_utils.h" #include "../dsp/dsp.h" #ifdef __cplusplus diff --git a/src/dec/vp8l.c b/src/dec/vp8l_dec.c similarity index 99% rename from src/dec/vp8l.c rename to src/dec/vp8l_dec.c index de3711a0..ef359a91 100644 --- a/src/dec/vp8l.c +++ b/src/dec/vp8l_dec.c @@ -14,14 +14,14 @@ #include -#include "./alphai.h" -#include "./vp8li.h" +#include "./alphai_dec.h" +#include "./vp8li_dec.h" #include "../dsp/dsp.h" #include "../dsp/lossless.h" #include "../dsp/lossless_common.h" #include "../dsp/yuv.h" -#include "../utils/endian_inl.h" -#include "../utils/huffman.h" +#include "../utils/endian_inl_utils.h" +#include "../utils/huffman_utils.h" #include "../utils/utils.h" #define NUM_ARGB_CACHE_ROWS 16 diff --git a/src/dec/vp8li.h b/src/dec/vp8li_dec.h similarity index 97% rename from src/dec/vp8li.h rename to src/dec/vp8li_dec.h index 9313bdc0..097a9d05 100644 --- a/src/dec/vp8li.h +++ b/src/dec/vp8li_dec.h @@ -16,10 +16,10 @@ #define WEBP_DEC_VP8LI_H_ #include // for memcpy() -#include "./webpi.h" -#include "../utils/bit_reader.h" -#include "../utils/color_cache.h" -#include "../utils/huffman.h" +#include "./webpi_dec.h" +#include "../utils/bit_reader_utils.h" +#include "../utils/color_cache_utils.h" +#include "../utils/huffman_utils.h" #ifdef __cplusplus extern "C" { diff --git a/src/dec/webp.c b/src/dec/webp_dec.c similarity index 99% rename from src/dec/webp.c rename to src/dec/webp_dec.c index a546ab4b..a8e9c2c5 100644 --- a/src/dec/webp.c +++ b/src/dec/webp_dec.c @@ -13,9 +13,9 @@ #include -#include "./vp8i.h" -#include "./vp8li.h" -#include "./webpi.h" +#include "./vp8i_dec.h" +#include "./vp8li_dec.h" +#include "./webpi_dec.h" #include "../utils/utils.h" #include "../webp/mux_types.h" // ALPHA_FLAG diff --git a/src/dec/webpi.h b/src/dec/webpi_dec.h similarity index 99% rename from src/dec/webpi.h rename to src/dec/webpi_dec.h index 0636c5d6..696abc19 100644 --- a/src/dec/webpi.h +++ b/src/dec/webpi_dec.h @@ -18,8 +18,8 @@ extern "C" { #endif -#include "../utils/rescaler.h" -#include "./decode_vp8.h" +#include "../utils/rescaler_utils.h" +#include "./vp8_dec.h" //------------------------------------------------------------------------------ // WebPDecParams: Decoding output parameters. Transient internal object. diff --git a/src/dsp/Makefile.am b/src/dsp/Makefile.am index dff66c30..33fc1e42 100644 --- a/src/dsp/Makefile.am +++ b/src/dsp/Makefile.am @@ -127,7 +127,7 @@ libwebpdsp_msa_la_LIBADD = libwebpdspdecode_msa.la libwebpdsp_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES) noinst_HEADERS = -noinst_HEADERS += ../dec/decode_vp8.h +noinst_HEADERS += ../dec/vp8_dec.h noinst_HEADERS += ../webp/decode.h libwebpdsp_la_CPPFLAGS = diff --git a/src/dsp/cost.c b/src/dsp/cost.c index fe72d26e..58ddea72 100644 --- a/src/dsp/cost.c +++ b/src/dsp/cost.c @@ -10,7 +10,7 @@ // Author: Skal (pascal.massimino@gmail.com) #include "./dsp.h" -#include "../enc/cost.h" +#include "../enc/cost_enc.h" //------------------------------------------------------------------------------ // Boolean-cost cost table diff --git a/src/dsp/cost_mips32.c b/src/dsp/cost_mips32.c index d1e240e1..3102da87 100644 --- a/src/dsp/cost_mips32.c +++ b/src/dsp/cost_mips32.c @@ -13,7 +13,7 @@ #if defined(WEBP_USE_MIPS32) -#include "../enc/cost.h" +#include "../enc/cost_enc.h" static int GetResidualCost(int ctx0, const VP8Residual* const res) { int temp0, temp1; diff --git a/src/dsp/cost_mips_dsp_r2.c b/src/dsp/cost_mips_dsp_r2.c index ce640677..6ec8aeb6 100644 --- a/src/dsp/cost_mips_dsp_r2.c +++ b/src/dsp/cost_mips_dsp_r2.c @@ -13,7 +13,7 @@ #if defined(WEBP_USE_MIPS_DSP_R2) -#include "../enc/cost.h" +#include "../enc/cost_enc.h" static int GetResidualCost(int ctx0, const VP8Residual* const res) { int temp0, temp1; diff --git a/src/dsp/cost_sse2.c b/src/dsp/cost_sse2.c index 0cb1c1fa..421d51fd 100644 --- a/src/dsp/cost_sse2.c +++ b/src/dsp/cost_sse2.c @@ -16,8 +16,8 @@ #if defined(WEBP_USE_SSE2) #include -#include "../enc/cost.h" -#include "../enc/vp8enci.h" +#include "../enc/cost_enc.h" +#include "../enc/vp8i_enc.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/dec.c b/src/dsp/dec.c index 49bd16d9..007e985d 100644 --- a/src/dsp/dec.c +++ b/src/dsp/dec.c @@ -12,7 +12,7 @@ // Author: Skal (pascal.massimino@gmail.com) #include "./dsp.h" -#include "../dec/vp8i.h" +#include "../dec/vp8i_dec.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/dec_neon.c b/src/dsp/dec_neon.c index 4dfa1b08..34796cf4 100644 --- a/src/dsp/dec_neon.c +++ b/src/dsp/dec_neon.c @@ -17,7 +17,7 @@ #if defined(WEBP_USE_NEON) #include "./neon.h" -#include "../dec/vp8i.h" +#include "../dec/vp8i_dec.h" //------------------------------------------------------------------------------ // NxM Loading functions diff --git a/src/dsp/dec_sse2.c b/src/dsp/dec_sse2.c index c6035da2..411fb027 100644 --- a/src/dsp/dec_sse2.c +++ b/src/dsp/dec_sse2.c @@ -22,7 +22,7 @@ #include #include "./common_sse2.h" -#include "../dec/vp8i.h" +#include "../dec/vp8i_dec.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/dec_sse41.c b/src/dsp/dec_sse41.c index 8d6aed13..4e81ec4d 100644 --- a/src/dsp/dec_sse41.c +++ b/src/dsp/dec_sse41.c @@ -16,7 +16,7 @@ #if defined(WEBP_USE_SSE41) #include -#include "../dec/vp8i.h" +#include "../dec/vp8i_dec.h" #include "../utils/utils.h" static void HE16(uint8_t* dst) { // horizontal diff --git a/src/dsp/enc.c b/src/dsp/enc.c index 0bdb0b79..f31bc6de 100644 --- a/src/dsp/enc.c +++ b/src/dsp/enc.c @@ -15,7 +15,7 @@ #include // for abs() #include "./dsp.h" -#include "../enc/vp8enci.h" +#include "../enc/vp8i_enc.h" static WEBP_INLINE uint8_t clip_8b(int v) { return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255; diff --git a/src/dsp/enc_mips32.c b/src/dsp/enc_mips32.c index fd10143d..752b14da 100644 --- a/src/dsp/enc_mips32.c +++ b/src/dsp/enc_mips32.c @@ -18,8 +18,8 @@ #if defined(WEBP_USE_MIPS32) #include "./mips_macro.h" -#include "../enc/vp8enci.h" -#include "../enc/cost.h" +#include "../enc/vp8i_enc.h" +#include "../enc/cost_enc.h" static const int kC1 = 20091 + (1 << 16); static const int kC2 = 35468; diff --git a/src/dsp/enc_mips_dsp_r2.c b/src/dsp/enc_mips_dsp_r2.c index 7ab96f68..6c8c1c6a 100644 --- a/src/dsp/enc_mips_dsp_r2.c +++ b/src/dsp/enc_mips_dsp_r2.c @@ -17,8 +17,8 @@ #if defined(WEBP_USE_MIPS_DSP_R2) #include "./mips_macro.h" -#include "../enc/cost.h" -#include "../enc/vp8enci.h" +#include "../enc/cost_enc.h" +#include "../enc/vp8i_enc.h" static const int kC1 = 20091 + (1 << 16); static const int kC2 = 35468; diff --git a/src/dsp/enc_msa.c b/src/dsp/enc_msa.c index f263f3eb..909b46d5 100644 --- a/src/dsp/enc_msa.c +++ b/src/dsp/enc_msa.c @@ -17,7 +17,7 @@ #include #include "./msa_macro.h" -#include "../enc/vp8enci.h" +#include "../enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Transforms diff --git a/src/dsp/enc_neon.c b/src/dsp/enc_neon.c index f21b99f1..6a078d63 100644 --- a/src/dsp/enc_neon.c +++ b/src/dsp/enc_neon.c @@ -18,7 +18,7 @@ #include #include "./neon.h" -#include "../enc/vp8enci.h" +#include "../enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Transforms (Paragraph 14.4) diff --git a/src/dsp/enc_sse2.c b/src/dsp/enc_sse2.c index 4deaa8fc..2026a74c 100644 --- a/src/dsp/enc_sse2.c +++ b/src/dsp/enc_sse2.c @@ -19,8 +19,8 @@ #include #include "./common_sse2.h" -#include "../enc/cost.h" -#include "../enc/vp8enci.h" +#include "../enc/cost_enc.h" +#include "../enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Transforms (Paragraph 14.4) diff --git a/src/dsp/enc_sse41.c b/src/dsp/enc_sse41.c index a1783901..e32086d9 100644 --- a/src/dsp/enc_sse41.c +++ b/src/dsp/enc_sse41.c @@ -18,7 +18,7 @@ #include // for abs() #include "./common_sse2.h" -#include "../enc/vp8enci.h" +#include "../enc/vp8i_enc.h" //------------------------------------------------------------------------------ // Compute susceptibility based on DCT-coeff histograms. diff --git a/src/dsp/lossless.c b/src/dsp/lossless.c index 4e8b1eb2..20d18f6e 100644 --- a/src/dsp/lossless.c +++ b/src/dsp/lossless.c @@ -17,8 +17,8 @@ #include #include -#include "../dec/vp8li.h" -#include "../utils/endian_inl.h" +#include "../dec/vp8li_dec.h" +#include "../utils/endian_inl_utils.h" #include "./lossless.h" #include "./lossless_common.h" diff --git a/src/dsp/lossless.h b/src/dsp/lossless.h index 4888fd16..352a54e5 100644 --- a/src/dsp/lossless.h +++ b/src/dsp/lossless.h @@ -18,7 +18,7 @@ #include "../webp/types.h" #include "../webp/decode.h" -#include "../enc/histogram.h" +#include "../enc/histogram_enc.h" #include "../utils/utils.h" #ifdef __cplusplus @@ -26,7 +26,7 @@ extern "C" { #endif #ifdef WEBP_EXPERIMENTAL_FEATURES -#include "../enc/delta_palettization.h" +#include "../enc/delta_palettization_enc.h" #endif // WEBP_EXPERIMENTAL_FEATURES //------------------------------------------------------------------------------ diff --git a/src/dsp/lossless_enc.c b/src/dsp/lossless_enc.c index ff6239dd..4e46fbab 100644 --- a/src/dsp/lossless_enc.c +++ b/src/dsp/lossless_enc.c @@ -17,8 +17,8 @@ #include #include -#include "../dec/vp8li.h" -#include "../utils/endian_inl.h" +#include "../dec/vp8li_dec.h" +#include "../utils/endian_inl_utils.h" #include "./lossless.h" #include "./lossless_common.h" #include "./yuv.h" diff --git a/src/dsp/rescaler.c b/src/dsp/rescaler.c index 6841142c..0f545023 100644 --- a/src/dsp/rescaler.c +++ b/src/dsp/rescaler.c @@ -14,7 +14,7 @@ #include #include "./dsp.h" -#include "../utils/rescaler.h" +#include "../utils/rescaler_utils.h" //------------------------------------------------------------------------------ // Implementations of critical functions ImportRow / ExportRow diff --git a/src/dsp/rescaler_mips32.c b/src/dsp/rescaler_mips32.c index ddaa3913..e09ad5d1 100644 --- a/src/dsp/rescaler_mips32.c +++ b/src/dsp/rescaler_mips32.c @@ -16,7 +16,7 @@ #if defined(WEBP_USE_MIPS32) #include -#include "../utils/rescaler.h" +#include "../utils/rescaler_utils.h" //------------------------------------------------------------------------------ // Row import diff --git a/src/dsp/rescaler_mips_dsp_r2.c b/src/dsp/rescaler_mips_dsp_r2.c index b457d0a3..2308d645 100644 --- a/src/dsp/rescaler_mips_dsp_r2.c +++ b/src/dsp/rescaler_mips_dsp_r2.c @@ -16,7 +16,7 @@ #if defined(WEBP_USE_MIPS_DSP_R2) #include -#include "../utils/rescaler.h" +#include "../utils/rescaler_utils.h" #define ROUNDER (WEBP_RESCALER_ONE >> 1) #define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) diff --git a/src/dsp/rescaler_msa.c b/src/dsp/rescaler_msa.c index 749b6c2c..2c10e55d 100644 --- a/src/dsp/rescaler_msa.c +++ b/src/dsp/rescaler_msa.c @@ -17,7 +17,7 @@ #include -#include "../utils/rescaler.h" +#include "../utils/rescaler_utils.h" #include "./msa_macro.h" #define ROUNDER (WEBP_RESCALER_ONE >> 1) diff --git a/src/dsp/rescaler_neon.c b/src/dsp/rescaler_neon.c index 16fd450e..b2dd8f30 100644 --- a/src/dsp/rescaler_neon.c +++ b/src/dsp/rescaler_neon.c @@ -18,7 +18,7 @@ #include #include #include "./neon.h" -#include "../utils/rescaler.h" +#include "../utils/rescaler_utils.h" #define ROUNDER (WEBP_RESCALER_ONE >> 1) #define MULT_FIX_C(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) diff --git a/src/dsp/rescaler_sse2.c b/src/dsp/rescaler_sse2.c index 5b970281..8271c22e 100644 --- a/src/dsp/rescaler_sse2.c +++ b/src/dsp/rescaler_sse2.c @@ -17,7 +17,7 @@ #include #include -#include "../utils/rescaler.h" +#include "../utils/rescaler_utils.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/dsp/yuv.h b/src/dsp/yuv.h index 01c40fcb..1d33b586 100644 --- a/src/dsp/yuv.h +++ b/src/dsp/yuv.h @@ -36,7 +36,7 @@ #define WEBP_DSP_YUV_H_ #include "./dsp.h" -#include "../dec/decode_vp8.h" +#include "../dec/vp8_dec.h" #if defined(WEBP_EXPERIMENTAL_FEATURES) // Do NOT activate this feature for real compression. This is only experimental! diff --git a/src/enc/Makefile.am b/src/enc/Makefile.am index 2c559169..aead7fec 100644 --- a/src/enc/Makefile.am +++ b/src/enc/Makefile.am @@ -1,35 +1,35 @@ noinst_LTLIBRARIES = libwebpencode.la libwebpencode_la_SOURCES = -libwebpencode_la_SOURCES += alpha.c -libwebpencode_la_SOURCES += analysis.c -libwebpencode_la_SOURCES += backward_references.c -libwebpencode_la_SOURCES += backward_references.h -libwebpencode_la_SOURCES += config.c -libwebpencode_la_SOURCES += cost.c -libwebpencode_la_SOURCES += cost.h -libwebpencode_la_SOURCES += delta_palettization.c -libwebpencode_la_SOURCES += delta_palettization.h -libwebpencode_la_SOURCES += filter.c -libwebpencode_la_SOURCES += frame.c -libwebpencode_la_SOURCES += histogram.c -libwebpencode_la_SOURCES += histogram.h -libwebpencode_la_SOURCES += iterator.c -libwebpencode_la_SOURCES += near_lossless.c -libwebpencode_la_SOURCES += picture.c -libwebpencode_la_SOURCES += picture_csp.c -libwebpencode_la_SOURCES += picture_psnr.c -libwebpencode_la_SOURCES += picture_rescale.c -libwebpencode_la_SOURCES += picture_tools.c -libwebpencode_la_SOURCES += predictor.c -libwebpencode_la_SOURCES += quant.c -libwebpencode_la_SOURCES += syntax.c -libwebpencode_la_SOURCES += token.c -libwebpencode_la_SOURCES += tree.c -libwebpencode_la_SOURCES += vp8enci.h -libwebpencode_la_SOURCES += vp8l.c -libwebpencode_la_SOURCES += vp8li.h -libwebpencode_la_SOURCES += webpenc.c +libwebpencode_la_SOURCES += alpha_enc.c +libwebpencode_la_SOURCES += analysis_enc.c +libwebpencode_la_SOURCES += backward_references_enc.c +libwebpencode_la_SOURCES += backward_references_enc.h +libwebpencode_la_SOURCES += config_enc.c +libwebpencode_la_SOURCES += cost_enc.c +libwebpencode_la_SOURCES += cost_enc.h +libwebpencode_la_SOURCES += delta_palettization_enc.c +libwebpencode_la_SOURCES += delta_palettization_enc.h +libwebpencode_la_SOURCES += filter_enc.c +libwebpencode_la_SOURCES += frame_enc.c +libwebpencode_la_SOURCES += histogram_enc.c +libwebpencode_la_SOURCES += histogram_enc.h +libwebpencode_la_SOURCES += iterator_enc.c +libwebpencode_la_SOURCES += near_lossless_enc.c +libwebpencode_la_SOURCES += picture_enc.c +libwebpencode_la_SOURCES += picture_csp_enc.c +libwebpencode_la_SOURCES += picture_psnr_enc.c +libwebpencode_la_SOURCES += picture_rescale_enc.c +libwebpencode_la_SOURCES += picture_tools_enc.c +libwebpencode_la_SOURCES += predictor_enc.c +libwebpencode_la_SOURCES += quant_enc.c +libwebpencode_la_SOURCES += syntax_enc.c +libwebpencode_la_SOURCES += token_enc.c +libwebpencode_la_SOURCES += tree_enc.c +libwebpencode_la_SOURCES += vp8i_enc.h +libwebpencode_la_SOURCES += vp8l_enc.c +libwebpencode_la_SOURCES += vp8li_enc.h +libwebpencode_la_SOURCES += webp_enc.c libwebpencodeinclude_HEADERS = libwebpencodeinclude_HEADERS += ../webp/encode.h diff --git a/src/enc/alpha.c b/src/enc/alpha_enc.c similarity index 99% rename from src/enc/alpha.c rename to src/enc/alpha_enc.c index 03e3ad07..5a2c931f 100644 --- a/src/enc/alpha.c +++ b/src/enc/alpha_enc.c @@ -14,10 +14,10 @@ #include #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" #include "../dsp/dsp.h" -#include "../utils/filters.h" -#include "../utils/quant_levels.h" +#include "../utils/filters_utils.h" +#include "../utils/quant_levels_utils.h" #include "../utils/utils.h" #include "../webp/format_constants.h" @@ -44,7 +44,7 @@ // invalid quality or method, or // memory allocation for the compressed data fails. -#include "../enc/vp8li.h" +#include "../enc/vp8li_enc.h" static int EncodeLossless(const uint8_t* const data, int width, int height, int effort_level, // in [0..6] range diff --git a/src/enc/analysis.c b/src/enc/analysis_enc.c similarity index 99% rename from src/enc/analysis.c rename to src/enc/analysis_enc.c index 7462098e..dce159b3 100644 --- a/src/enc/analysis.c +++ b/src/enc/analysis_enc.c @@ -15,8 +15,8 @@ #include #include -#include "./vp8enci.h" -#include "./cost.h" +#include "./vp8i_enc.h" +#include "./cost_enc.h" #include "../utils/utils.h" #define MAX_ITERS_K_MEANS 6 diff --git a/src/enc/backward_references.c b/src/enc/backward_references_enc.c similarity index 99% rename from src/enc/backward_references.c rename to src/enc/backward_references_enc.c index 4c480f12..7c0559ff 100644 --- a/src/enc/backward_references.c +++ b/src/enc/backward_references_enc.c @@ -13,12 +13,12 @@ #include #include -#include "./backward_references.h" -#include "./histogram.h" +#include "./backward_references_enc.h" +#include "./histogram_enc.h" #include "../dsp/lossless.h" #include "../dsp/lossless_common.h" #include "../dsp/dsp.h" -#include "../utils/color_cache.h" +#include "../utils/color_cache_utils.h" #include "../utils/utils.h" #define VALUES_IN_BYTE 256 diff --git a/src/enc/backward_references.h b/src/enc/backward_references_enc.h similarity index 100% rename from src/enc/backward_references.h rename to src/enc/backward_references_enc.h diff --git a/src/enc/config.c b/src/enc/config_enc.c similarity index 100% rename from src/enc/config.c rename to src/enc/config_enc.c diff --git a/src/enc/cost.c b/src/enc/cost_enc.c similarity index 99% rename from src/enc/cost.c rename to src/enc/cost_enc.c index 87f89378..c823f5a6 100644 --- a/src/enc/cost.c +++ b/src/enc/cost_enc.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./cost.h" +#include "./cost_enc.h" //------------------------------------------------------------------------------ // Level cost tables diff --git a/src/enc/cost.h b/src/enc/cost_enc.h similarity index 99% rename from src/enc/cost.h rename to src/enc/cost_enc.h index ad7959fe..99e4b37a 100644 --- a/src/enc/cost.h +++ b/src/enc/cost_enc.h @@ -16,7 +16,7 @@ #include #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" #ifdef __cplusplus extern "C" { diff --git a/src/enc/delta_palettization.c b/src/enc/delta_palettization_enc.c similarity index 99% rename from src/enc/delta_palettization.c rename to src/enc/delta_palettization_enc.c index 062e588d..eaf0f050 100644 --- a/src/enc/delta_palettization.c +++ b/src/enc/delta_palettization_enc.c @@ -10,7 +10,7 @@ // Author: Mislav Bradac (mislavm@google.com) // -#include "./delta_palettization.h" +#include "./delta_palettization_enc.h" #ifdef WEBP_EXPERIMENTAL_FEATURES #include "../webp/types.h" diff --git a/src/enc/delta_palettization.h b/src/enc/delta_palettization_enc.h similarity index 97% rename from src/enc/delta_palettization.h rename to src/enc/delta_palettization_enc.h index e41c0c5a..63048ec6 100644 --- a/src/enc/delta_palettization.h +++ b/src/enc/delta_palettization_enc.h @@ -14,7 +14,7 @@ #define WEBP_ENC_DELTA_PALETTIZATION_H_ #include "../webp/encode.h" -#include "../enc/vp8li.h" +#include "../enc/vp8li_enc.h" // Replaces enc->argb_[] input by a palettizable approximation of it, // and generates optimal enc->palette_[]. diff --git a/src/enc/filter.c b/src/enc/filter_enc.c similarity index 99% rename from src/enc/filter.c rename to src/enc/filter_enc.c index bf3e374f..4bc36727 100644 --- a/src/enc/filter.c +++ b/src/enc/filter_enc.c @@ -12,7 +12,7 @@ // Author: somnath@google.com (Somnath Banerjee) #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" #include "../dsp/dsp.h" // This table gives, for a given sharpness, the filtering strength to be diff --git a/src/enc/frame.c b/src/enc/frame_enc.c similarity index 99% rename from src/enc/frame.c rename to src/enc/frame_enc.c index 92e3ea66..abef523b 100644 --- a/src/enc/frame.c +++ b/src/enc/frame_enc.c @@ -14,8 +14,8 @@ #include #include -#include "./cost.h" -#include "./vp8enci.h" +#include "./cost_enc.h" +#include "./vp8i_enc.h" #include "../dsp/dsp.h" #include "../webp/format_constants.h" // RIFF constants diff --git a/src/enc/histogram.c b/src/enc/histogram_enc.c similarity index 99% rename from src/enc/histogram.c rename to src/enc/histogram_enc.c index ea336781..808b6f78 100644 --- a/src/enc/histogram.c +++ b/src/enc/histogram_enc.c @@ -15,8 +15,8 @@ #include -#include "./backward_references.h" -#include "./histogram.h" +#include "./backward_references_enc.h" +#include "./histogram_enc.h" #include "../dsp/lossless.h" #include "../dsp/lossless_common.h" #include "../utils/utils.h" diff --git a/src/enc/histogram.h b/src/enc/histogram_enc.h similarity index 99% rename from src/enc/histogram.h rename to src/enc/histogram_enc.h index d303d1d5..a9d258a1 100644 --- a/src/enc/histogram.h +++ b/src/enc/histogram_enc.h @@ -16,7 +16,7 @@ #include -#include "./backward_references.h" +#include "./backward_references_enc.h" #include "../webp/format_constants.h" #include "../webp/types.h" diff --git a/src/enc/iterator.c b/src/enc/iterator_enc.c similarity index 99% rename from src/enc/iterator.c rename to src/enc/iterator_enc.c index 8a851972..e48d30bd 100644 --- a/src/enc/iterator.c +++ b/src/enc/iterator_enc.c @@ -13,7 +13,7 @@ #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" //------------------------------------------------------------------------------ // VP8Iterator diff --git a/src/enc/near_lossless.c b/src/enc/near_lossless_enc.c similarity index 99% rename from src/enc/near_lossless.c rename to src/enc/near_lossless_enc.c index ea7a055b..2bd03ab2 100644 --- a/src/enc/near_lossless.c +++ b/src/enc/near_lossless_enc.c @@ -19,7 +19,7 @@ #include "../dsp/lossless_common.h" #include "../utils/utils.h" -#include "./vp8enci.h" +#include "./vp8i_enc.h" #define MIN_DIM_FOR_NEAR_LOSSLESS 64 #define MAX_LIMIT_BITS 5 diff --git a/src/enc/picture_csp.c b/src/enc/picture_csp_enc.c similarity index 99% rename from src/enc/picture_csp.c rename to src/enc/picture_csp_enc.c index b5c96e1b..d0303024 100644 --- a/src/enc/picture_csp.c +++ b/src/enc/picture_csp_enc.c @@ -15,8 +15,8 @@ #include #include -#include "./vp8enci.h" -#include "../utils/random.h" +#include "./vp8i_enc.h" +#include "../utils/random_utils.h" #include "../utils/utils.h" #include "../dsp/yuv.h" diff --git a/src/enc/picture.c b/src/enc/picture_enc.c similarity index 99% rename from src/enc/picture.c rename to src/enc/picture_enc.c index 28c56cd6..dfa66510 100644 --- a/src/enc/picture.c +++ b/src/enc/picture_enc.c @@ -14,7 +14,7 @@ #include #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" #include "../dsp/dsp.h" #include "../utils/utils.h" diff --git a/src/enc/picture_psnr.c b/src/enc/picture_psnr_enc.c similarity index 99% rename from src/enc/picture_psnr.c rename to src/enc/picture_psnr_enc.c index c4f488ed..9c0b2295 100644 --- a/src/enc/picture_psnr.c +++ b/src/enc/picture_psnr_enc.c @@ -14,7 +14,7 @@ #include #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" #include "../utils/utils.h" typedef double (*AccumulateFunc)(const uint8_t* src, int src_stride, diff --git a/src/enc/picture_rescale.c b/src/enc/picture_rescale_enc.c similarity index 99% rename from src/enc/picture_rescale.c rename to src/enc/picture_rescale_enc.c index 9f19e8e8..0b7181c0 100644 --- a/src/enc/picture_rescale.c +++ b/src/enc/picture_rescale_enc.c @@ -14,8 +14,8 @@ #include #include -#include "./vp8enci.h" -#include "../utils/rescaler.h" +#include "./vp8i_enc.h" +#include "../utils/rescaler_utils.h" #include "../utils/utils.h" #define HALVE(x) (((x) + 1) >> 1) diff --git a/src/enc/picture_tools.c b/src/enc/picture_tools_enc.c similarity index 99% rename from src/enc/picture_tools.c rename to src/enc/picture_tools_enc.c index bf97af84..895df511 100644 --- a/src/enc/picture_tools.c +++ b/src/enc/picture_tools_enc.c @@ -13,7 +13,7 @@ #include -#include "./vp8enci.h" +#include "./vp8i_enc.h" #include "../dsp/yuv.h" static WEBP_INLINE uint32_t MakeARGB32(int r, int g, int b) { diff --git a/src/enc/predictor.c b/src/enc/predictor_enc.c similarity index 99% rename from src/enc/predictor.c rename to src/enc/predictor_enc.c index daceb9f3..0639b74f 100644 --- a/src/enc/predictor.c +++ b/src/enc/predictor_enc.c @@ -16,7 +16,7 @@ #include "../dsp/lossless.h" #include "../dsp/lossless_common.h" -#include "./vp8li.h" +#include "./vp8li_enc.h" #define MAX_DIFF_COST (1e30f) diff --git a/src/enc/quant.c b/src/enc/quant_enc.c similarity index 99% rename from src/enc/quant.c rename to src/enc/quant_enc.c index 71303d15..b118fb2a 100644 --- a/src/enc/quant.c +++ b/src/enc/quant_enc.c @@ -15,8 +15,8 @@ #include #include // for abs() -#include "./vp8enci.h" -#include "./cost.h" +#include "./vp8i_enc.h" +#include "./cost_enc.h" #define DO_TRELLIS_I4 1 #define DO_TRELLIS_I16 1 // not a huge gain, but ok at low bitrate. diff --git a/src/enc/syntax.c b/src/enc/syntax_enc.c similarity index 99% rename from src/enc/syntax.c rename to src/enc/syntax_enc.c index dbe4d5a5..90665bd7 100644 --- a/src/enc/syntax.c +++ b/src/enc/syntax_enc.c @@ -16,7 +16,7 @@ #include "../utils/utils.h" #include "../webp/format_constants.h" // RIFF constants #include "../webp/mux_types.h" // ALPHA_FLAG -#include "./vp8enci.h" +#include "./vp8i_enc.h" //------------------------------------------------------------------------------ // Helper functions diff --git a/src/enc/token.c b/src/enc/token_enc.c similarity index 99% rename from src/enc/token.c rename to src/enc/token_enc.c index d04e0687..02a0d72c 100644 --- a/src/enc/token.c +++ b/src/enc/token_enc.c @@ -20,8 +20,8 @@ #include #include -#include "./cost.h" -#include "./vp8enci.h" +#include "./cost_enc.h" +#include "./vp8i_enc.h" #include "../utils/utils.h" #if !defined(DISABLE_TOKEN_BUFFER) diff --git a/src/enc/tree.c b/src/enc/tree_enc.c similarity index 99% rename from src/enc/tree.c rename to src/enc/tree_enc.c index f141006d..2c40fe7f 100644 --- a/src/enc/tree.c +++ b/src/enc/tree_enc.c @@ -11,7 +11,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./vp8enci.h" +#include "./vp8i_enc.h" //------------------------------------------------------------------------------ // Default probabilities diff --git a/src/enc/vp8enci.h b/src/enc/vp8i_enc.h similarity index 99% rename from src/enc/vp8enci.h rename to src/enc/vp8i_enc.h index 8a30a2b1..45a86805 100644 --- a/src/enc/vp8enci.h +++ b/src/enc/vp8i_enc.h @@ -15,10 +15,10 @@ #define WEBP_ENC_VP8ENCI_H_ #include // for memcpy() -#include "../dec/common.h" +#include "../dec/common_dec.h" #include "../dsp/dsp.h" -#include "../utils/bit_writer.h" -#include "../utils/thread.h" +#include "../utils/bit_writer_utils.h" +#include "../utils/thread_utils.h" #include "../utils/utils.h" #include "../webp/encode.h" diff --git a/src/enc/vp8l.c b/src/enc/vp8l_enc.c similarity index 99% rename from src/enc/vp8l.c rename to src/enc/vp8l_enc.c index 49cd4389..a7e88af6 100644 --- a/src/enc/vp8l.c +++ b/src/enc/vp8l_enc.c @@ -15,18 +15,18 @@ #include #include -#include "./backward_references.h" -#include "./histogram.h" -#include "./vp8enci.h" -#include "./vp8li.h" +#include "./backward_references_enc.h" +#include "./histogram_enc.h" +#include "./vp8i_enc.h" +#include "./vp8li_enc.h" #include "../dsp/lossless.h" #include "../dsp/lossless_common.h" -#include "../utils/bit_writer.h" -#include "../utils/huffman_encode.h" +#include "../utils/bit_writer_utils.h" +#include "../utils/huffman_encode_utils.h" #include "../utils/utils.h" #include "../webp/format_constants.h" -#include "./delta_palettization.h" +#include "./delta_palettization_enc.h" #define PALETTE_KEY_RIGHT_SHIFT 22 // Key for 1K buffer. // Maximum number of histogram images (sub-blocks). diff --git a/src/enc/vp8li.h b/src/enc/vp8li_enc.h similarity index 97% rename from src/enc/vp8li.h rename to src/enc/vp8li_enc.h index 1b91e7c0..8c5fbcbb 100644 --- a/src/enc/vp8li.h +++ b/src/enc/vp8li_enc.h @@ -14,9 +14,9 @@ #ifndef WEBP_ENC_VP8LI_H_ #define WEBP_ENC_VP8LI_H_ -#include "./backward_references.h" -#include "./histogram.h" -#include "../utils/bit_writer.h" +#include "./backward_references_enc.h" +#include "./histogram_enc.h" +#include "../utils/bit_writer_utils.h" #include "../webp/encode.h" #include "../webp/format_constants.h" diff --git a/src/enc/webpenc.c b/src/enc/webp_enc.c similarity index 99% rename from src/enc/webpenc.c rename to src/enc/webp_enc.c index 2d04822f..71e7c2a7 100644 --- a/src/enc/webpenc.c +++ b/src/enc/webp_enc.c @@ -16,9 +16,9 @@ #include #include -#include "./cost.h" -#include "./vp8enci.h" -#include "./vp8li.h" +#include "./cost_enc.h" +#include "./vp8i_enc.h" +#include "./vp8li_enc.h" #include "../utils/utils.h" // #define PRINT_MEMORY_INFO diff --git a/src/mux/muxi.h b/src/mux/muxi.h index 2628e585..1a86610f 100644 --- a/src/mux/muxi.h +++ b/src/mux/muxi.h @@ -15,8 +15,8 @@ #define WEBP_MUX_MUXI_H_ #include -#include "../dec/vp8i.h" -#include "../dec/vp8li.h" +#include "../dec/vp8i_dec.h" +#include "../dec/vp8li_dec.h" #include "../webp/mux.h" #ifdef __cplusplus diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 128ccfc2..e346c0b4 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -14,34 +14,34 @@ noinst_HEADERS += ../webp/encode.h noinst_HEADERS += ../webp/format_constants.h COMMON_SOURCES = -COMMON_SOURCES += bit_reader.c -COMMON_SOURCES += bit_reader.h -COMMON_SOURCES += bit_reader_inl.h -COMMON_SOURCES += color_cache.c -COMMON_SOURCES += color_cache.h -COMMON_SOURCES += endian_inl.h -COMMON_SOURCES += filters.c -COMMON_SOURCES += filters.h -COMMON_SOURCES += huffman.c -COMMON_SOURCES += huffman.h -COMMON_SOURCES += quant_levels_dec.c -COMMON_SOURCES += quant_levels_dec.h -COMMON_SOURCES += rescaler.c -COMMON_SOURCES += rescaler.h -COMMON_SOURCES += random.c -COMMON_SOURCES += random.h -COMMON_SOURCES += thread.c -COMMON_SOURCES += thread.h +COMMON_SOURCES += bit_reader_utils.c +COMMON_SOURCES += bit_reader_utils.h +COMMON_SOURCES += bit_reader_inl_utils.h +COMMON_SOURCES += color_cache_utils.c +COMMON_SOURCES += color_cache_utils.h +COMMON_SOURCES += endian_inl_utils.h +COMMON_SOURCES += filters_utils.c +COMMON_SOURCES += filters_utils.h +COMMON_SOURCES += huffman_utils.c +COMMON_SOURCES += huffman_utils.h +COMMON_SOURCES += quant_levels_dec_utils.c +COMMON_SOURCES += quant_levels_dec_utils.h +COMMON_SOURCES += rescaler_utils.c +COMMON_SOURCES += rescaler_utils.h +COMMON_SOURCES += random_utils.c +COMMON_SOURCES += random_utils.h +COMMON_SOURCES += thread_utils.c +COMMON_SOURCES += thread_utils.h COMMON_SOURCES += utils.c COMMON_SOURCES += utils.h ENC_SOURCES = -ENC_SOURCES += bit_writer.c -ENC_SOURCES += bit_writer.h -ENC_SOURCES += huffman_encode.c -ENC_SOURCES += huffman_encode.h -ENC_SOURCES += quant_levels.c -ENC_SOURCES += quant_levels.h +ENC_SOURCES += bit_writer_utils.c +ENC_SOURCES += bit_writer_utils.h +ENC_SOURCES += huffman_encode_utils.c +ENC_SOURCES += huffman_encode_utils.h +ENC_SOURCES += quant_levels_utils.c +ENC_SOURCES += quant_levels_utils.h libwebputils_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES) diff --git a/src/utils/bit_reader_inl.h b/src/utils/bit_reader_inl_utils.h similarity index 98% rename from src/utils/bit_reader_inl.h rename to src/utils/bit_reader_inl_utils.h index bb998240..fd7fb044 100644 --- a/src/utils/bit_reader_inl.h +++ b/src/utils/bit_reader_inl_utils.h @@ -23,8 +23,8 @@ #include // for memcpy #include "../dsp/dsp.h" -#include "./bit_reader.h" -#include "./endian_inl.h" +#include "./bit_reader_utils.h" +#include "./endian_inl_utils.h" #include "./utils.h" #ifdef __cplusplus diff --git a/src/utils/bit_reader.c b/src/utils/bit_reader_utils.c similarity index 99% rename from src/utils/bit_reader.c rename to src/utils/bit_reader_utils.c index 50ffb74f..c3157e8f 100644 --- a/src/utils/bit_reader.c +++ b/src/utils/bit_reader_utils.c @@ -15,7 +15,7 @@ #include "../webp/config.h" #endif -#include "./bit_reader_inl.h" +#include "./bit_reader_inl_utils.h" #include "../utils/utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/bit_reader.h b/src/utils/bit_reader_utils.h similarity index 100% rename from src/utils/bit_reader.h rename to src/utils/bit_reader_utils.h diff --git a/src/utils/bit_writer.c b/src/utils/bit_writer_utils.c similarity index 99% rename from src/utils/bit_writer.c rename to src/utils/bit_writer_utils.c index 20b81936..ab0c49dc 100644 --- a/src/utils/bit_writer.c +++ b/src/utils/bit_writer_utils.c @@ -16,8 +16,8 @@ #include // for memcpy() #include -#include "./bit_writer.h" -#include "./endian_inl.h" +#include "./bit_writer_utils.h" +#include "./endian_inl_utils.h" #include "./utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/bit_writer.h b/src/utils/bit_writer_utils.h similarity index 100% rename from src/utils/bit_writer.h rename to src/utils/bit_writer_utils.h diff --git a/src/utils/color_cache.c b/src/utils/color_cache_utils.c similarity index 97% rename from src/utils/color_cache.c rename to src/utils/color_cache_utils.c index c34b2e7f..0172590c 100644 --- a/src/utils/color_cache.c +++ b/src/utils/color_cache_utils.c @@ -14,7 +14,7 @@ #include #include #include -#include "./color_cache.h" +#include "./color_cache_utils.h" #include "./utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/color_cache.h b/src/utils/color_cache_utils.h similarity index 100% rename from src/utils/color_cache.h rename to src/utils/color_cache_utils.h diff --git a/src/utils/endian_inl.h b/src/utils/endian_inl_utils.h similarity index 100% rename from src/utils/endian_inl.h rename to src/utils/endian_inl_utils.h diff --git a/src/utils/filters.c b/src/utils/filters_utils.c similarity index 98% rename from src/utils/filters.c rename to src/utils/filters_utils.c index 15543b12..49c1d18a 100644 --- a/src/utils/filters.c +++ b/src/utils/filters_utils.c @@ -11,7 +11,7 @@ // // Author: Urvang (urvang@google.com) -#include "./filters.h" +#include "./filters_utils.h" #include #include diff --git a/src/utils/filters.h b/src/utils/filters_utils.h similarity index 100% rename from src/utils/filters.h rename to src/utils/filters_utils.h diff --git a/src/utils/huffman_encode.c b/src/utils/huffman_encode_utils.c similarity index 99% rename from src/utils/huffman_encode.c rename to src/utils/huffman_encode_utils.c index 4e5ef6b4..f9504658 100644 --- a/src/utils/huffman_encode.c +++ b/src/utils/huffman_encode_utils.c @@ -14,7 +14,7 @@ #include #include #include -#include "./huffman_encode.h" +#include "./huffman_encode_utils.h" #include "./utils.h" #include "../webp/format_constants.h" diff --git a/src/utils/huffman_encode.h b/src/utils/huffman_encode_utils.h similarity index 100% rename from src/utils/huffman_encode.h rename to src/utils/huffman_encode_utils.h diff --git a/src/utils/huffman.c b/src/utils/huffman_utils.c similarity index 99% rename from src/utils/huffman.c rename to src/utils/huffman_utils.c index 546e99eb..008b5d74 100644 --- a/src/utils/huffman.c +++ b/src/utils/huffman_utils.c @@ -14,7 +14,7 @@ #include #include #include -#include "./huffman.h" +#include "./huffman_utils.h" #include "./utils.h" #include "../webp/format_constants.h" diff --git a/src/utils/huffman.h b/src/utils/huffman_utils.h similarity index 100% rename from src/utils/huffman.h rename to src/utils/huffman_utils.h diff --git a/src/utils/quant_levels_dec.c b/src/utils/quant_levels_dec_utils.c similarity index 99% rename from src/utils/quant_levels_dec.c rename to src/utils/quant_levels_dec_utils.c index ee0a3fe1..d4d23d31 100644 --- a/src/utils/quant_levels_dec.c +++ b/src/utils/quant_levels_dec_utils.c @@ -14,7 +14,7 @@ // // Author: Skal (pascal.massimino@gmail.com) -#include "./quant_levels_dec.h" +#include "./quant_levels_dec_utils.h" #include // for memset diff --git a/src/utils/quant_levels_dec.h b/src/utils/quant_levels_dec_utils.h similarity index 100% rename from src/utils/quant_levels_dec.h rename to src/utils/quant_levels_dec_utils.h diff --git a/src/utils/quant_levels.c b/src/utils/quant_levels_utils.c similarity index 99% rename from src/utils/quant_levels.c rename to src/utils/quant_levels_utils.c index d7c8aab9..73174e8a 100644 --- a/src/utils/quant_levels.c +++ b/src/utils/quant_levels_utils.c @@ -14,7 +14,7 @@ #include -#include "./quant_levels.h" +#include "./quant_levels_utils.h" #define NUM_SYMBOLS 256 diff --git a/src/utils/quant_levels.h b/src/utils/quant_levels_utils.h similarity index 100% rename from src/utils/quant_levels.h rename to src/utils/quant_levels_utils.h diff --git a/src/utils/random.c b/src/utils/random_utils.c similarity index 98% rename from src/utils/random.c rename to src/utils/random_utils.c index 24e96ad6..9f1e4154 100644 --- a/src/utils/random.c +++ b/src/utils/random_utils.c @@ -12,7 +12,7 @@ // Author: Skal (pascal.massimino@gmail.com) #include -#include "./random.h" +#include "./random_utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/random.h b/src/utils/random_utils.h similarity index 100% rename from src/utils/random.h rename to src/utils/random_utils.h diff --git a/src/utils/rescaler.c b/src/utils/rescaler_utils.c similarity index 99% rename from src/utils/rescaler.c rename to src/utils/rescaler_utils.c index d2278a52..0d1f80da 100644 --- a/src/utils/rescaler.c +++ b/src/utils/rescaler_utils.c @@ -15,7 +15,7 @@ #include #include #include "../dsp/dsp.h" -#include "./rescaler.h" +#include "./rescaler_utils.h" //------------------------------------------------------------------------------ diff --git a/src/utils/rescaler.h b/src/utils/rescaler_utils.h similarity index 100% rename from src/utils/rescaler.h rename to src/utils/rescaler_utils.h diff --git a/src/utils/thread.c b/src/utils/thread_utils.c similarity index 99% rename from src/utils/thread.c rename to src/utils/thread_utils.c index b8798f56..1729060c 100644 --- a/src/utils/thread.c +++ b/src/utils/thread_utils.c @@ -13,7 +13,7 @@ #include #include // for memset() -#include "./thread.h" +#include "./thread_utils.h" #include "./utils.h" #ifdef WEBP_USE_THREAD diff --git a/src/utils/thread.h b/src/utils/thread_utils.h similarity index 100% rename from src/utils/thread.h rename to src/utils/thread_utils.h