generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

src/{dec,enc,utils}: give filenames a unique suffix

Browse Source 
this avoids duplicates between these trees and dsp/, e.g., enc/tree.c,
dec/tree.c, making pulling the whole library source tree into one target
possible

BUG=webp:279

Change-Id: I060a614833c7c24ddd37bf641702ae6a5eef1775
This commit is contained in:
James Zern 2017-01-19 00:21:40 -08:00
parent 0e6b7f33ab
commit 668e1dd44f
103 changed files with 419 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Android.mk
View File

@ -22,16 +22,16 @@ else
endif endif
dec_srcs := \ dec_srcs := \
src/dec/alpha.c \ src/dec/alpha_dec.c \
src/dec/buffer.c \ src/dec/buffer_dec.c \
src/dec/frame.c \ src/dec/frame_dec.c \
src/dec/idec.c \ src/dec/idec_dec.c \
src/dec/io.c \ src/dec/io_dec.c \
src/dec/quant.c \ src/dec/quant_dec.c \
src/dec/tree.c \ src/dec/tree_dec.c \
src/dec/vp8.c \ src/dec/vp8_dec.c \
src/dec/vp8l.c \ src/dec/vp8l_dec.c \
src/dec/webp.c \ src/dec/webp_dec.c \
demux_srcs := \ demux_srcs := \
src/demux/anim_decode.c \ src/demux/anim_decode.c \
@ -103,29 +103,29 @@ dsp_enc_srcs := \
src/dsp/lossless_enc_sse41.c \ src/dsp/lossless_enc_sse41.c \
enc_srcs := \ enc_srcs := \
src/enc/alpha.c \ src/enc/alpha_enc.c \
src/enc/analysis.c \ src/enc/analysis_enc.c \
src/enc/backward_references.c \ src/enc/backward_references_enc.c \
src/enc/config.c \ src/enc/config_enc.c \
src/enc/cost.c \ src/enc/cost_enc.c \
src/enc/delta_palettization.c \ src/enc/delta_palettization_enc.c \
src/enc/filter.c \ src/enc/filter_enc.c \
src/enc/frame.c \ src/enc/frame_enc.c \
src/enc/histogram.c \ src/enc/histogram_enc.c \
src/enc/iterator.c \ src/enc/iterator_enc.c \
src/enc/near_lossless.c \ src/enc/near_lossless_enc.c \
src/enc/picture.c \ src/enc/picture_enc.c \
src/enc/picture_csp.c \ src/enc/picture_csp_enc.c \
src/enc/picture_psnr.c \ src/enc/picture_psnr_enc.c \
src/enc/picture_rescale.c \ src/enc/picture_rescale_enc.c \
src/enc/picture_tools.c \ src/enc/picture_tools_enc.c \
src/enc/predictor.c \ src/enc/predictor_enc.c \
src/enc/quant.c \ src/enc/quant_enc.c \
src/enc/syntax.c \ src/enc/syntax_enc.c \
src/enc/token.c \ src/enc/token_enc.c \
src/enc/tree.c \ src/enc/tree_enc.c \
src/enc/vp8l.c \ src/enc/vp8l_enc.c \
src/enc/webpenc.c \ src/enc/webp_enc.c \
mux_srcs := \ mux_srcs := \
src/mux/anim_encode.c \ src/mux/anim_encode.c \
@ -134,20 +134,20 @@ mux_srcs := \
src/mux/muxread.c \ src/mux/muxread.c \
utils_dec_srcs := \ utils_dec_srcs := \
src/utils/bit_reader.c \ src/utils/bit_reader_utils.c \
src/utils/color_cache.c \ src/utils/color_cache_utils.c \
src/utils/filters.c \ src/utils/filters_utils.c \
src/utils/huffman.c \ src/utils/huffman_utils.c \
src/utils/quant_levels_dec.c \ src/utils/quant_levels_dec_utils.c \
src/utils/random.c \ src/utils/random_utils.c \
src/utils/rescaler.c \ src/utils/rescaler_utils.c \
src/utils/thread.c \ src/utils/thread_utils.c \
src/utils/utils.c \ src/utils/utils.c \
utils_enc_srcs := \ utils_enc_srcs := \
src/utils/bit_writer.c \ src/utils/bit_writer_utils.c \
src/utils/huffman_encode.c \ src/utils/huffman_encode_utils.c \
src/utils/quant_levels.c \ src/utils/quant_levels_utils.c \
################################################################################ ################################################################################
# libwebpdecoder # libwebpdecoder

88
Makefile.vc
View File

@ -171,16 +171,16 @@ CFGSET = TRUE
# #
DEC_OBJS = \ DEC_OBJS = \
$(DIROBJ)\dec\alpha.obj \ $(DIROBJ)\dec\alpha_dec.obj \
$(DIROBJ)\dec\buffer.obj \ $(DIROBJ)\dec\buffer_dec.obj \
$(DIROBJ)\dec\frame.obj \ $(DIROBJ)\dec\frame_dec.obj \
$(DIROBJ)\dec\idec.obj \ $(DIROBJ)\dec\idec_dec.obj \
$(DIROBJ)\dec\io.obj \ $(DIROBJ)\dec\io_dec.obj \
$(DIROBJ)\dec\quant.obj \ $(DIROBJ)\dec\quant_dec.obj \
$(DIROBJ)\dec\tree.obj \ $(DIROBJ)\dec\tree_dec.obj \
$(DIROBJ)\dec\vp8.obj \ $(DIROBJ)\dec\vp8_dec.obj \
$(DIROBJ)\dec\vp8l.obj \ $(DIROBJ)\dec\vp8l_dec.obj \
$(DIROBJ)\dec\webp.obj \ $(DIROBJ)\dec\webp_dec.obj \
DEMUX_OBJS = \ DEMUX_OBJS = \
$(DIROBJ)\demux\anim_decode.obj \ $(DIROBJ)\demux\anim_decode.obj \
@ -273,29 +273,29 @@ EX_UTIL_OBJS = \
$(DIROBJ)\examples\example_util.obj \ $(DIROBJ)\examples\example_util.obj \
ENC_OBJS = \ ENC_OBJS = \
$(DIROBJ)\enc\alpha.obj \ $(DIROBJ)\enc\alpha_enc.obj \
$(DIROBJ)\enc\analysis.obj \ $(DIROBJ)\enc\analysis_enc.obj \
$(DIROBJ)\enc\backward_references.obj \ $(DIROBJ)\enc\backward_references_enc.obj \
$(DIROBJ)\enc\config.obj \ $(DIROBJ)\enc\config_enc.obj \
$(DIROBJ)\enc\cost.obj \ $(DIROBJ)\enc\cost_enc.obj \
$(DIROBJ)\enc\delta_palettization.obj \ $(DIROBJ)\enc\delta_palettization_enc.obj \
$(DIROBJ)\enc\filter.obj \ $(DIROBJ)\enc\filter_enc.obj \
$(DIROBJ)\enc\frame.obj \ $(DIROBJ)\enc\frame_enc.obj \
$(DIROBJ)\enc\histogram.obj \ $(DIROBJ)\enc\histogram_enc.obj \
$(DIROBJ)\enc\iterator.obj \ $(DIROBJ)\enc\iterator_enc.obj \
$(DIROBJ)\enc\near_lossless.obj \ $(DIROBJ)\enc\near_lossless_enc.obj \
$(DIROBJ)\enc\picture.obj \ $(DIROBJ)\enc\picture_enc.obj \
$(DIROBJ)\enc\picture_csp.obj \ $(DIROBJ)\enc\picture_csp_enc.obj \
$(DIROBJ)\enc\picture_psnr.obj \ $(DIROBJ)\enc\picture_psnr_enc.obj \
$(DIROBJ)\enc\picture_rescale.obj \ $(DIROBJ)\enc\picture_rescale_enc.obj \
$(DIROBJ)\enc\picture_tools.obj \ $(DIROBJ)\enc\picture_tools_enc.obj \
$(DIROBJ)\enc\predictor.obj \ $(DIROBJ)\enc\predictor_enc.obj \
$(DIROBJ)\enc\quant.obj \ $(DIROBJ)\enc\quant_enc.obj \
$(DIROBJ)\enc\syntax.obj \ $(DIROBJ)\enc\syntax_enc.obj \
$(DIROBJ)\enc\token.obj \ $(DIROBJ)\enc\token_enc.obj \
$(DIROBJ)\enc\tree.obj \ $(DIROBJ)\enc\tree_enc.obj \
$(DIROBJ)\enc\vp8l.obj \ $(DIROBJ)\enc\vp8l_enc.obj \
$(DIROBJ)\enc\webpenc.obj \ $(DIROBJ)\enc\webp_enc.obj \
EXTRAS_OBJS = \ EXTRAS_OBJS = \
$(DIROBJ)\extras\extras.obj \ $(DIROBJ)\extras\extras.obj \
@ -311,20 +311,20 @@ MUX_OBJS = \
$(DIROBJ)\mux\muxread.obj \ $(DIROBJ)\mux\muxread.obj \
UTILS_DEC_OBJS = \ UTILS_DEC_OBJS = \
$(DIROBJ)\utils\bit_reader.obj \ $(DIROBJ)\utils\bit_reader_utils.obj \
$(DIROBJ)\utils\color_cache.obj \ $(DIROBJ)\utils\color_cache_utils.obj \
$(DIROBJ)\utils\filters.obj \ $(DIROBJ)\utils\filters_utils.obj \
$(DIROBJ)\utils\huffman.obj \ $(DIROBJ)\utils\huffman_utils.obj \
$(DIROBJ)\utils\quant_levels_dec.obj \ $(DIROBJ)\utils\quant_levels_dec_utils.obj \
$(DIROBJ)\utils\rescaler.obj \ $(DIROBJ)\utils\rescaler_utils.obj \
$(DIROBJ)\utils\random.obj \ $(DIROBJ)\utils\random_utils.obj \
$(DIROBJ)\utils\thread.obj \ $(DIROBJ)\utils\thread_utils.obj \
$(DIROBJ)\utils\utils.obj \ $(DIROBJ)\utils\utils.obj \
UTILS_ENC_OBJS = \ UTILS_ENC_OBJS = \
$(DIROBJ)\utils\bit_writer.obj \ $(DIROBJ)\utils\bit_writer_utils.obj \
$(DIROBJ)\utils\huffman_encode.obj \ $(DIROBJ)\utils\huffman_encode_utils.obj \
$(DIROBJ)\utils\quant_levels.obj \ $(DIROBJ)\utils\quant_levels_utils.obj \
LIBWEBPDECODER_OBJS = $(DEC_OBJS) $(DSP_DEC_OBJS) $(UTILS_DEC_OBJS) LIBWEBPDECODER_OBJS = $(DEC_OBJS) $(DSP_DEC_OBJS) $(UTILS_DEC_OBJS)
LIBWEBP_OBJS = $(LIBWEBPDECODER_OBJS) $(ENC_OBJS) $(DSP_ENC_OBJS) \ LIBWEBP_OBJS = $(LIBWEBPDECODER_OBJS) $(ENC_OBJS) $(DSP_ENC_OBJS) \

89
build.gradle
View File

@ -96,16 +96,16 @@ model {
c { c {
source { source {
srcDir "src/dec" srcDir "src/dec"
include "alpha.c" include "alpha_dec.c"
include "buffer.c" include "buffer_dec.c"
include "frame.c" include "frame_dec.c"
include "idec.c" include "idec_dec.c"
include "io.c" include "io_dec.c"
include "quant.c" include "quant_dec.c"
include "tree.c" include "tree_dec.c"
include "vp8.c" include "vp8_dec.c"
include "vp8l.c" include "vp8l_dec.c"
include "webp.c" include "webp_dec.c"
srcDir "src/dsp" srcDir "src/dsp"
include "alpha_processing.c" include "alpha_processing.c"
include "alpha_processing_mips_dsp_r2.c" include "alpha_processing_mips_dsp_r2.c"
@ -150,15 +150,14 @@ model {
include "yuv_mips_dsp_r2.c" include "yuv_mips_dsp_r2.c"
include "yuv_sse2.c" include "yuv_sse2.c"
srcDir "src/utils" srcDir "src/utils"
include "ans.c" include "bit_reader_utils.c"
include "bit_reader.c" include "color_cache_utils.c"
include "color_cache.c" include "filters_utils.c"
include "filters.c" include "huffman_utils.c"
include "huffman.c" include "quant_levels_dec_utils.c"
include "quant_levels_dec.c" include "random_utils.c"
include "random.c" include "rescaler_utils.c"
include "rescaler.c" include "thread_utils.c"
include "thread.c"
include "utils.c" include "utils.c"
srcDir "src/dsp" srcDir "src/dsp"
include "cost.c" include "cost.c"
@ -181,33 +180,33 @@ model {
include "lossless_enc_sse2.c" include "lossless_enc_sse2.c"
include "lossless_enc_sse41.c" include "lossless_enc_sse41.c"
srcDir "src/enc" srcDir "src/enc"
include "alpha.c" include "alpha_enc.c"
include "analysis.c" include "analysis_enc.c"
include "backward_references.c" include "backward_references_enc.c"
include "config.c" include "config_enc.c"
include "cost.c" include "cost_enc.c"
include "delta_palettization.c" include "delta_palettization_enc.c"
include "filter.c" include "filter_enc.c"
include "frame.c" include "frame_enc.c"
include "histogram.c" include "histogram_enc.c"
include "iterator.c" include "iterator_enc.c"
include "near_lossless.c" include "near_lossless_enc.c"
include "picture.c" include "picture_enc.c"
include "picture_csp.c" include "picture_csp_enc.c"
include "picture_psnr.c" include "picture_psnr_enc.c"
include "picture_rescale.c" include "picture_rescale_enc.c"
include "picture_tools.c" include "picture_tools_enc.c"
include "predictor.c" include "predictor_enc.c"
include "quant.c" include "quant_enc.c"
include "syntax.c" include "syntax_enc.c"
include "token.c" include "token_enc.c"
include "tree.c" include "tree_enc.c"
include "vp8l.c" include "vp8l_enc.c"
include "webpenc.c" include "webp_enc.c"
srcDir "src/utils" srcDir "src/utils"
include "bit_writer.c" include "bit_writer_utils.c"
include "huffman_encode.c" include "huffman_encode_utils.c"
include "quant_levels.c" include "quant_levels_utils.c"
} }
exportedHeaders { exportedHeaders {
srcDir "src" srcDir "src"

153
makefile.unix
View File

@ -113,16 +113,16 @@ ANIM_UTIL_OBJS = \
examples/anim_util.o \ examples/anim_util.o \
DEC_OBJS = \ DEC_OBJS = \
src/dec/alpha.o \ src/dec/alpha_dec.o \
src/dec/buffer.o \ src/dec/buffer_dec.o \
src/dec/frame.o \ src/dec/frame_dec.o \
src/dec/idec.o \ src/dec/idec_dec.o \
src/dec/io.o \ src/dec/io_dec.o \
src/dec/quant.o \ src/dec/quant_dec.o \
src/dec/tree.o \ src/dec/tree_dec.o \
src/dec/vp8.o \ src/dec/vp8_dec.o \
src/dec/vp8l.o \ src/dec/vp8l_dec.o \
src/dec/webp.o \ src/dec/webp_dec.o \
DEMUX_OBJS = \ DEMUX_OBJS = \
src/demux/anim_decode.o \ src/demux/anim_decode.o \
@ -194,29 +194,29 @@ DSP_ENC_OBJS = \
src/dsp/lossless_enc_sse41.o \ src/dsp/lossless_enc_sse41.o \
ENC_OBJS = \ ENC_OBJS = \
src/enc/alpha.o \ src/enc/alpha_enc.o \
src/enc/analysis.o \ src/enc/analysis_enc.o \
src/enc/backward_references.o \ src/enc/backward_references_enc.o \
src/enc/config.o \ src/enc/config_enc.o \
src/enc/cost.o \ src/enc/cost_enc.o \
src/enc/delta_palettization.o \ src/enc/delta_palettization_enc.o \
src/enc/filter.o \ src/enc/filter_enc.o \
src/enc/frame.o \ src/enc/frame_enc.o \
src/enc/histogram.o \ src/enc/histogram_enc.o \
src/enc/iterator.o \ src/enc/iterator_enc.o \
src/enc/near_lossless.o \ src/enc/near_lossless_enc.o \
src/enc/picture.o \ src/enc/picture_enc.o \
src/enc/picture_csp.o \ src/enc/picture_csp_enc.o \
src/enc/picture_psnr.o \ src/enc/picture_psnr_enc.o \
src/enc/picture_rescale.o \ src/enc/picture_rescale_enc.o \
src/enc/picture_tools.o \ src/enc/picture_tools_enc.o \
src/enc/predictor.o \ src/enc/predictor_enc.o \
src/enc/quant.o \ src/enc/quant_enc.o \
src/enc/syntax.o \ src/enc/syntax_enc.o \
src/enc/token.o \ src/enc/token_enc.o \
src/enc/tree.o \ src/enc/tree_enc.o \
src/enc/vp8l.o \ src/enc/vp8l_enc.o \
src/enc/webpenc.o \ src/enc/webp_enc.o \
EX_FORMAT_DEC_OBJS = \ EX_FORMAT_DEC_OBJS = \
imageio/image_dec.o \ imageio/image_dec.o \
@ -245,20 +245,20 @@ MUX_OBJS = \
src/mux/muxread.o \ src/mux/muxread.o \
UTILS_DEC_OBJS = \ UTILS_DEC_OBJS = \
src/utils/bit_reader.o \ src/utils/bit_reader_utils.o \
src/utils/color_cache.o \ src/utils/color_cache_utils.o \
src/utils/filters.o \ src/utils/filters_utils.o \
src/utils/huffman.o \ src/utils/huffman_utils.o \
src/utils/quant_levels_dec.o \ src/utils/quant_levels_dec_utils.o \
src/utils/random.o \ src/utils/random_utils.o \
src/utils/rescaler.o \ src/utils/rescaler_utils.o \
src/utils/thread.o \ src/utils/thread_utils.o \
src/utils/utils.o \ src/utils/utils.o \
UTILS_ENC_OBJS = \ UTILS_ENC_OBJS = \
src/utils/bit_writer.o \ src/utils/bit_writer_utils.o \
src/utils/huffman_encode.o \ src/utils/huffman_encode_utils.o \
src/utils/quant_levels.o \ src/utils/quant_levels_utils.o \
EXTRA_OBJS = \ EXTRA_OBJS = \
extras/extras.o \ extras/extras.o \
@ -280,12 +280,12 @@ HDRS_INSTALLED = \
src/webp/types.h \ src/webp/types.h \
HDRS = \ HDRS = \
src/dec/alphai.h \ src/dec/alphai_dec.h \
src/dec/common.h \ src/dec/common_dec.h \
src/dec/decode_vp8.h \ src/dec/vp8_dec.h \
src/dec/vp8i.h \ src/dec/vp8i_dec.h \
src/dec/vp8li.h \ src/dec/vp8li_dec.h \
src/dec/webpi.h \ src/dec/webpi_dec.h \
src/dsp/common_sse2.h \ src/dsp/common_sse2.h \
src/dsp/dsp.h \ src/dsp/dsp.h \
src/dsp/lossless.h \ src/dsp/lossless.h \
@ -294,27 +294,27 @@ HDRS = \
src/dsp/msa_macro.h \ src/dsp/msa_macro.h \
src/dsp/neon.h \ src/dsp/neon.h \
src/dsp/yuv.h \ src/dsp/yuv.h \
src/enc/backward_references.h \ src/enc/backward_references_enc.h \
src/enc/cost.h \ src/enc/cost_enc.h \
src/enc/delta_palettization.h \ src/enc/delta_palettization_enc.h \
src/enc/histogram.h \ src/enc/histogram_enc.h \
src/enc/vp8enci.h \ src/enc/vp8i_enc.h \
src/enc/vp8li.h \ src/enc/vp8li_enc.h \
src/mux/animi.h \ src/mux/animi.h \
src/mux/muxi.h \ src/mux/muxi.h \
src/utils/bit_reader.h \ src/utils/bit_reader_utils.h \
src/utils/bit_reader_inl.h \ src/utils/bit_reader_inl_utils.h \
src/utils/bit_writer.h \ src/utils/bit_writer_utils.h \
src/utils/color_cache.h \ src/utils/color_cache_utils.h \
src/utils/endian_inl.h \ src/utils/endian_inl_utils.h \
src/utils/filters.h \ src/utils/filters_utils.h \
src/utils/huffman.h \ src/utils/huffman_utils.h \
src/utils/huffman_encode.h \ src/utils/huffman_encode_utils.h \
src/utils/quant_levels.h \ src/utils/quant_levels_utils.h \
src/utils/quant_levels_dec.h \ src/utils/quant_levels_dec_utils.h \
src/utils/random.h \ src/utils/random_utils.h \
src/utils/rescaler.h \ src/utils/rescaler_utils.h \
src/utils/thread.h \ src/utils/thread_utils.h \
src/utils/utils.h \ src/utils/utils.h \
src/webp/format_constants.h \ src/webp/format_constants.h \
$(HDRS_INSTALLED) \ $(HDRS_INSTALLED) \
@ -345,12 +345,15 @@ extras: $(EXTRA_LIB)
$(EX_FORMAT_DEC_OBJS): %.o: %.h $(EX_FORMAT_DEC_OBJS): %.o: %.h
# special dependencies: # special dependencies:
# tree.c/vp8.c/bit_reader.c <-> bit_reader_inl.h, endian_inl.h # tree_dec.c/vp8_dec.c/bit_reader_utils.c <->
# bit_writer.c <-> endian_inl.h # bit_reader_inl_utils.h, endian_inl_utils.h
src/dec/tree.o: src/utils/bit_reader_inl.h src/utils/endian_inl.h # bit_writer_utils.c <-> endian_inl_utils.h
src/dec/vp8.o: src/utils/bit_reader_inl.h src/utils/endian_inl.h src/dec/tree_dec.o: src/utils/bit_reader_inl_utils.h
src/utils/bit_reader.o: src/utils/bit_reader_inl.h src/utils/endian_inl.h src/dec/tree_dec.o: src/utils/endian_inl_utils.h
src/utils/bit_writer.o: src/utils/endian_inl.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) %.o: %.c $(HDRS)
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@

32
src/dec/Makefile.am
View File

@ -1,22 +1,22 @@
noinst_LTLIBRARIES = libwebpdecode.la noinst_LTLIBRARIES = libwebpdecode.la
libwebpdecode_la_SOURCES = libwebpdecode_la_SOURCES =
libwebpdecode_la_SOURCES += alpha.c libwebpdecode_la_SOURCES += alpha_dec.c
libwebpdecode_la_SOURCES += alphai.h libwebpdecode_la_SOURCES += alphai_dec.h
libwebpdecode_la_SOURCES += buffer.c libwebpdecode_la_SOURCES += buffer_dec.c
libwebpdecode_la_SOURCES += common.h libwebpdecode_la_SOURCES += common_dec.h
libwebpdecode_la_SOURCES += decode_vp8.h libwebpdecode_la_SOURCES += vp8_dec.h
libwebpdecode_la_SOURCES += frame.c libwebpdecode_la_SOURCES += frame_dec.c
libwebpdecode_la_SOURCES += idec.c libwebpdecode_la_SOURCES += idec_dec.c
libwebpdecode_la_SOURCES += io.c libwebpdecode_la_SOURCES += io_dec.c
libwebpdecode_la_SOURCES += quant.c libwebpdecode_la_SOURCES += quant_dec.c
libwebpdecode_la_SOURCES += tree.c libwebpdecode_la_SOURCES += tree_dec.c
libwebpdecode_la_SOURCES += vp8.c libwebpdecode_la_SOURCES += vp8_dec.c
libwebpdecode_la_SOURCES += vp8i.h libwebpdecode_la_SOURCES += vp8i_dec.h
libwebpdecode_la_SOURCES += vp8l.c libwebpdecode_la_SOURCES += vp8l_dec.c
libwebpdecode_la_SOURCES += vp8li.h libwebpdecode_la_SOURCES += vp8li_dec.h
libwebpdecode_la_SOURCES += webp.c libwebpdecode_la_SOURCES += webp_dec.c
libwebpdecode_la_SOURCES += webpi.h libwebpdecode_la_SOURCES += webpi_dec.h
libwebpdecodeinclude_HEADERS = libwebpdecodeinclude_HEADERS =
libwebpdecodeinclude_HEADERS += ../webp/decode.h libwebpdecodeinclude_HEADERS += ../webp/decode.h

8
src/dec/alpha.c → src/dec/alpha_dec.c
View File

@ -12,11 +12,11 @@
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include <stdlib.h> #include <stdlib.h>
#include "./alphai.h" #include "./alphai_dec.h"
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "./vp8li.h" #include "./vp8li_dec.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/quant_levels_dec.h" #include "../utils/quant_levels_dec_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"

4
src/dec/alphai.h → src/dec/alphai_dec.h
View File

@ -14,8 +14,8 @@
#ifndef WEBP_DEC_ALPHAI_H_ #ifndef WEBP_DEC_ALPHAI_H_
#define WEBP_DEC_ALPHAI_H_ #define WEBP_DEC_ALPHAI_H_
#include "./webpi.h" #include "./webpi_dec.h"
#include "../utils/filters.h" #include "../utils/filters_utils.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
src/dec/buffer.c → src/dec/buffer_dec.c
View File

@ -13,8 +13,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "./webpi.h" #include "./webpi_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

0
src/dec/common.h → src/dec/common_dec.h
View File

2
src/dec/frame.c → src/dec/frame_dec.c
View File

@ -12,7 +12,7 @@
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include <stdlib.h> #include <stdlib.h>
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

6
src/dec/idec.c → src/dec/idec_dec.c
View File

@ -15,9 +15,9 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "./alphai.h" #include "./alphai_dec.h"
#include "./webpi.h" #include "./webpi_dec.h"
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
// In append mode, buffer allocations increase as multiples of this value. // In append mode, buffer allocations increase as multiples of this value.

4
src/dec/io.c → src/dec/io_dec.c
View File

@ -13,8 +13,8 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "../dec/vp8i.h" #include "../dec/vp8i_dec.h"
#include "./webpi.h" #include "./webpi_dec.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../dsp/yuv.h" #include "../dsp/yuv.h"
#include "../utils/utils.h" #include "../utils/utils.h"

2
src/dec/quant.c → src/dec/quant_dec.c
View File

@ -11,7 +11,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./vp8i.h" #include "./vp8i_dec.h"
static WEBP_INLINE int clip(int v, int M) { static WEBP_INLINE int clip(int v, int M) {
return v < 0 ? 0 : v > M ? M : v; return v < 0 ? 0 : v > M ? M : v;

4
src/dec/tree.c → src/dec/tree_dec.c
View File

@ -11,8 +11,8 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "../utils/bit_reader_inl.h" #include "../utils/bit_reader_inl_utils.h"
#if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__) #if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__)
// using a table is ~1-2% slower on ARM. Prefer the coded-tree approach then. // using a table is ~1-2% slower on ARM. Prefer the coded-tree approach then.

10
src/dec/vp8.c → src/dec/vp8_dec.c
View File

@ -13,11 +13,11 @@
#include <stdlib.h> #include <stdlib.h>
#include "./alphai.h" #include "./alphai_dec.h"
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "./vp8li.h" #include "./vp8li_dec.h"
#include "./webpi.h" #include "./webpi_dec.h"
#include "../utils/bit_reader_inl.h" #include "../utils/bit_reader_inl_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

0
src/dec/decode_vp8.h → src/dec/vp8_dec.h
View File

10
src/dec/vp8i.h → src/dec/vp8i_dec.h
View File

@ -15,11 +15,11 @@
#define WEBP_DEC_VP8I_H_ #define WEBP_DEC_VP8I_H_
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include "./common.h" #include "./common_dec.h"
#include "./vp8li.h" #include "./vp8li_dec.h"
#include "../utils/bit_reader.h" #include "../utils/bit_reader_utils.h"
#include "../utils/random.h" #include "../utils/random_utils.h"
#include "../utils/thread.h" #include "../utils/thread_utils.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#ifdef __cplusplus #ifdef __cplusplus

8
src/dec/vp8l.c → src/dec/vp8l_dec.c
View File

@ -14,14 +14,14 @@
#include <stdlib.h> #include <stdlib.h>
#include "./alphai.h" #include "./alphai_dec.h"
#include "./vp8li.h" #include "./vp8li_dec.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#include "../dsp/lossless_common.h" #include "../dsp/lossless_common.h"
#include "../dsp/yuv.h" #include "../dsp/yuv.h"
#include "../utils/endian_inl.h" #include "../utils/endian_inl_utils.h"
#include "../utils/huffman.h" #include "../utils/huffman_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#define NUM_ARGB_CACHE_ROWS 16 #define NUM_ARGB_CACHE_ROWS 16

8
src/dec/vp8li.h → src/dec/vp8li_dec.h
View File

@ -16,10 +16,10 @@
#define WEBP_DEC_VP8LI_H_ #define WEBP_DEC_VP8LI_H_
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include "./webpi.h" #include "./webpi_dec.h"
#include "../utils/bit_reader.h" #include "../utils/bit_reader_utils.h"
#include "../utils/color_cache.h" #include "../utils/color_cache_utils.h"
#include "../utils/huffman.h" #include "../utils/huffman_utils.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
src/dec/webp.c → src/dec/webp_dec.c
View File

@ -13,9 +13,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "./vp8i.h" #include "./vp8i_dec.h"
#include "./vp8li.h" #include "./vp8li_dec.h"
#include "./webpi.h" #include "./webpi_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/mux_types.h" // ALPHA_FLAG #include "../webp/mux_types.h" // ALPHA_FLAG

4
src/dec/webpi.h → src/dec/webpi_dec.h
View File

@ -18,8 +18,8 @@
extern "C" { extern "C" {
#endif #endif
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
#include "./decode_vp8.h" #include "./vp8_dec.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// WebPDecParams: Decoding output parameters. Transient internal object. // WebPDecParams: Decoding output parameters. Transient internal object.

2
src/dsp/Makefile.am
View File

@ -127,7 +127,7 @@ libwebpdsp_msa_la_LIBADD = libwebpdspdecode_msa.la
libwebpdsp_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES) libwebpdsp_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES)
noinst_HEADERS = noinst_HEADERS =
noinst_HEADERS += ../dec/decode_vp8.h noinst_HEADERS += ../dec/vp8_dec.h
noinst_HEADERS += ../webp/decode.h noinst_HEADERS += ../webp/decode.h
libwebpdsp_la_CPPFLAGS = libwebpdsp_la_CPPFLAGS =

2
src/dsp/cost.c
View File

@ -10,7 +10,7 @@
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./dsp.h" #include "./dsp.h"
#include "../enc/cost.h" #include "../enc/cost_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Boolean-cost cost table // Boolean-cost cost table

2
src/dsp/cost_mips32.c
View File

@ -13,7 +13,7 @@
#if defined(WEBP_USE_MIPS32) #if defined(WEBP_USE_MIPS32)
#include "../enc/cost.h" #include "../enc/cost_enc.h"
static int GetResidualCost(int ctx0, const VP8Residual* const res) { static int GetResidualCost(int ctx0, const VP8Residual* const res) {
int temp0, temp1; int temp0, temp1;

2
src/dsp/cost_mips_dsp_r2.c
View File

@ -13,7 +13,7 @@
#if defined(WEBP_USE_MIPS_DSP_R2) #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) { static int GetResidualCost(int ctx0, const VP8Residual* const res) {
int temp0, temp1; int temp0, temp1;

4
src/dsp/cost_sse2.c
View File

@ -16,8 +16,8 @@
#if defined(WEBP_USE_SSE2) #if defined(WEBP_USE_SSE2)
#include <emmintrin.h> #include <emmintrin.h>
#include "../enc/cost.h" #include "../enc/cost_enc.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
src/dsp/dec.c
View File

@ -12,7 +12,7 @@
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./dsp.h" #include "./dsp.h"
#include "../dec/vp8i.h" #include "../dec/vp8i_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
src/dsp/dec_neon.c
View File

@ -17,7 +17,7 @@
#if defined(WEBP_USE_NEON) #if defined(WEBP_USE_NEON)
#include "./neon.h" #include "./neon.h"
#include "../dec/vp8i.h" #include "../dec/vp8i_dec.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// NxM Loading functions // NxM Loading functions

2
src/dsp/dec_sse2.c
View File

@ -22,7 +22,7 @@
#include <emmintrin.h> #include <emmintrin.h>
#include "./common_sse2.h" #include "./common_sse2.h"
#include "../dec/vp8i.h" #include "../dec/vp8i_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
src/dsp/dec_sse41.c
View File

@ -16,7 +16,7 @@
#if defined(WEBP_USE_SSE41) #if defined(WEBP_USE_SSE41)
#include <smmintrin.h> #include <smmintrin.h>
#include "../dec/vp8i.h" #include "../dec/vp8i_dec.h"
#include "../utils/utils.h" #include "../utils/utils.h"
static void HE16(uint8_t* dst) { // horizontal static void HE16(uint8_t* dst) { // horizontal

2
src/dsp/enc.c
View File

@ -15,7 +15,7 @@
#include <stdlib.h> // for abs() #include <stdlib.h> // for abs()
#include "./dsp.h" #include "./dsp.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
static WEBP_INLINE uint8_t clip_8b(int v) { static WEBP_INLINE uint8_t clip_8b(int v) {
return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255; return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255;

4
src/dsp/enc_mips32.c
View File

@ -18,8 +18,8 @@
#if defined(WEBP_USE_MIPS32) #if defined(WEBP_USE_MIPS32)
#include "./mips_macro.h" #include "./mips_macro.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
#include "../enc/cost.h" #include "../enc/cost_enc.h"
static const int kC1 = 20091 + (1 << 16); static const int kC1 = 20091 + (1 << 16);
static const int kC2 = 35468; static const int kC2 = 35468;

4
src/dsp/enc_mips_dsp_r2.c
View File

@ -17,8 +17,8 @@
#if defined(WEBP_USE_MIPS_DSP_R2) #if defined(WEBP_USE_MIPS_DSP_R2)
#include "./mips_macro.h" #include "./mips_macro.h"
#include "../enc/cost.h" #include "../enc/cost_enc.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
static const int kC1 = 20091 + (1 << 16); static const int kC1 = 20091 + (1 << 16);
static const int kC2 = 35468; static const int kC2 = 35468;

2
src/dsp/enc_msa.c
View File

@ -17,7 +17,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "./msa_macro.h" #include "./msa_macro.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Transforms // Transforms

2
src/dsp/enc_neon.c
View File

@ -18,7 +18,7 @@
#include <assert.h> #include <assert.h>
#include "./neon.h" #include "./neon.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Transforms (Paragraph 14.4) // Transforms (Paragraph 14.4)

4
src/dsp/enc_sse2.c
View File

@ -19,8 +19,8 @@
#include <emmintrin.h> #include <emmintrin.h>
#include "./common_sse2.h" #include "./common_sse2.h"
#include "../enc/cost.h" #include "../enc/cost_enc.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Transforms (Paragraph 14.4) // Transforms (Paragraph 14.4)

2
src/dsp/enc_sse41.c
View File

@ -18,7 +18,7 @@
#include <stdlib.h> // for abs() #include <stdlib.h> // for abs()
#include "./common_sse2.h" #include "./common_sse2.h"
#include "../enc/vp8enci.h" #include "../enc/vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Compute susceptibility based on DCT-coeff histograms. // Compute susceptibility based on DCT-coeff histograms.

4
src/dsp/lossless.c
View File

@ -17,8 +17,8 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "../dec/vp8li.h" #include "../dec/vp8li_dec.h"
#include "../utils/endian_inl.h" #include "../utils/endian_inl_utils.h"
#include "./lossless.h" #include "./lossless.h"
#include "./lossless_common.h" #include "./lossless_common.h"

4
src/dsp/lossless.h
View File

@ -18,7 +18,7 @@
#include "../webp/types.h" #include "../webp/types.h"
#include "../webp/decode.h" #include "../webp/decode.h"
#include "../enc/histogram.h" #include "../enc/histogram_enc.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -26,7 +26,7 @@ extern "C" {
#endif #endif
#ifdef WEBP_EXPERIMENTAL_FEATURES #ifdef WEBP_EXPERIMENTAL_FEATURES
#include "../enc/delta_palettization.h" #include "../enc/delta_palettization_enc.h"
#endif // WEBP_EXPERIMENTAL_FEATURES #endif // WEBP_EXPERIMENTAL_FEATURES
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

4
src/dsp/lossless_enc.c
View File

@ -17,8 +17,8 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "../dec/vp8li.h" #include "../dec/vp8li_dec.h"
#include "../utils/endian_inl.h" #include "../utils/endian_inl_utils.h"
#include "./lossless.h" #include "./lossless.h"
#include "./lossless_common.h" #include "./lossless_common.h"
#include "./yuv.h" #include "./yuv.h"

2
src/dsp/rescaler.c
View File

@ -14,7 +14,7 @@
#include <assert.h> #include <assert.h>
#include "./dsp.h" #include "./dsp.h"
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Implementations of critical functions ImportRow / ExportRow // Implementations of critical functions ImportRow / ExportRow

2
src/dsp/rescaler_mips32.c
View File

@ -16,7 +16,7 @@
#if defined(WEBP_USE_MIPS32) #if defined(WEBP_USE_MIPS32)
#include <assert.h> #include <assert.h>
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Row import // Row import

2
src/dsp/rescaler_mips_dsp_r2.c
View File

@ -16,7 +16,7 @@
#if defined(WEBP_USE_MIPS_DSP_R2) #if defined(WEBP_USE_MIPS_DSP_R2)
#include <assert.h> #include <assert.h>
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
#define ROUNDER (WEBP_RESCALER_ONE >> 1) #define ROUNDER (WEBP_RESCALER_ONE >> 1)
#define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) #define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX)

2
src/dsp/rescaler_msa.c
View File

@ -17,7 +17,7 @@
#include <assert.h> #include <assert.h>
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
#include "./msa_macro.h" #include "./msa_macro.h"
#define ROUNDER (WEBP_RESCALER_ONE >> 1) #define ROUNDER (WEBP_RESCALER_ONE >> 1)

2
src/dsp/rescaler_neon.c
View File

@ -18,7 +18,7 @@
#include <arm_neon.h> #include <arm_neon.h>
#include <assert.h> #include <assert.h>
#include "./neon.h" #include "./neon.h"
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
#define ROUNDER (WEBP_RESCALER_ONE >> 1) #define ROUNDER (WEBP_RESCALER_ONE >> 1)
#define MULT_FIX_C(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX) #define MULT_FIX_C(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX)

2
src/dsp/rescaler_sse2.c
View File

@ -17,7 +17,7 @@
#include <emmintrin.h> #include <emmintrin.h>
#include <assert.h> #include <assert.h>
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
src/dsp/yuv.h
View File

@ -36,7 +36,7 @@
#define WEBP_DSP_YUV_H_ #define WEBP_DSP_YUV_H_
#include "./dsp.h" #include "./dsp.h"
#include "../dec/decode_vp8.h" #include "../dec/vp8_dec.h"
#if defined(WEBP_EXPERIMENTAL_FEATURES) #if defined(WEBP_EXPERIMENTAL_FEATURES)
// Do NOT activate this feature for real compression. This is only experimental! // Do NOT activate this feature for real compression. This is only experimental!

58
src/enc/Makefile.am
View File

@ -1,35 +1,35 @@
noinst_LTLIBRARIES = libwebpencode.la noinst_LTLIBRARIES = libwebpencode.la
libwebpencode_la_SOURCES = libwebpencode_la_SOURCES =
libwebpencode_la_SOURCES += alpha.c libwebpencode_la_SOURCES += alpha_enc.c
libwebpencode_la_SOURCES += analysis.c libwebpencode_la_SOURCES += analysis_enc.c
libwebpencode_la_SOURCES += backward_references.c libwebpencode_la_SOURCES += backward_references_enc.c
libwebpencode_la_SOURCES += backward_references.h libwebpencode_la_SOURCES += backward_references_enc.h
libwebpencode_la_SOURCES += config.c libwebpencode_la_SOURCES += config_enc.c
libwebpencode_la_SOURCES += cost.c libwebpencode_la_SOURCES += cost_enc.c
libwebpencode_la_SOURCES += cost.h libwebpencode_la_SOURCES += cost_enc.h
libwebpencode_la_SOURCES += delta_palettization.c libwebpencode_la_SOURCES += delta_palettization_enc.c
libwebpencode_la_SOURCES += delta_palettization.h libwebpencode_la_SOURCES += delta_palettization_enc.h
libwebpencode_la_SOURCES += filter.c libwebpencode_la_SOURCES += filter_enc.c
libwebpencode_la_SOURCES += frame.c libwebpencode_la_SOURCES += frame_enc.c
libwebpencode_la_SOURCES += histogram.c libwebpencode_la_SOURCES += histogram_enc.c
libwebpencode_la_SOURCES += histogram.h libwebpencode_la_SOURCES += histogram_enc.h
libwebpencode_la_SOURCES += iterator.c libwebpencode_la_SOURCES += iterator_enc.c
libwebpencode_la_SOURCES += near_lossless.c libwebpencode_la_SOURCES += near_lossless_enc.c
libwebpencode_la_SOURCES += picture.c libwebpencode_la_SOURCES += picture_enc.c
libwebpencode_la_SOURCES += picture_csp.c libwebpencode_la_SOURCES += picture_csp_enc.c
libwebpencode_la_SOURCES += picture_psnr.c libwebpencode_la_SOURCES += picture_psnr_enc.c
libwebpencode_la_SOURCES += picture_rescale.c libwebpencode_la_SOURCES += picture_rescale_enc.c
libwebpencode_la_SOURCES += picture_tools.c libwebpencode_la_SOURCES += picture_tools_enc.c
libwebpencode_la_SOURCES += predictor.c libwebpencode_la_SOURCES += predictor_enc.c
libwebpencode_la_SOURCES += quant.c libwebpencode_la_SOURCES += quant_enc.c
libwebpencode_la_SOURCES += syntax.c libwebpencode_la_SOURCES += syntax_enc.c
libwebpencode_la_SOURCES += token.c libwebpencode_la_SOURCES += token_enc.c
libwebpencode_la_SOURCES += tree.c libwebpencode_la_SOURCES += tree_enc.c
libwebpencode_la_SOURCES += vp8enci.h libwebpencode_la_SOURCES += vp8i_enc.h
libwebpencode_la_SOURCES += vp8l.c libwebpencode_la_SOURCES += vp8l_enc.c
libwebpencode_la_SOURCES += vp8li.h libwebpencode_la_SOURCES += vp8li_enc.h
libwebpencode_la_SOURCES += webpenc.c libwebpencode_la_SOURCES += webp_enc.c
libwebpencodeinclude_HEADERS = libwebpencodeinclude_HEADERS =
libwebpencodeinclude_HEADERS += ../webp/encode.h libwebpencodeinclude_HEADERS += ../webp/encode.h

8
src/enc/alpha.c → src/enc/alpha_enc.c
View File

@ -14,10 +14,10 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/filters.h" #include "../utils/filters_utils.h"
#include "../utils/quant_levels.h" #include "../utils/quant_levels_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"
@ -44,7 +44,7 @@
// invalid quality or method, or // invalid quality or method, or
// memory allocation for the compressed data fails. // 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, static int EncodeLossless(const uint8_t* const data, int width, int height,
int effort_level, // in [0..6] range int effort_level, // in [0..6] range

4
src/enc/analysis.c → src/enc/analysis_enc.c
View File

@ -15,8 +15,8 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "./cost.h" #include "./cost_enc.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#define MAX_ITERS_K_MEANS 6 #define MAX_ITERS_K_MEANS 6

6
src/enc/backward_references.c → src/enc/backward_references_enc.c
View File

@ -13,12 +13,12 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include "./backward_references.h" #include "./backward_references_enc.h"
#include "./histogram.h" #include "./histogram_enc.h"
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#include "../dsp/lossless_common.h" #include "../dsp/lossless_common.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/color_cache.h" #include "../utils/color_cache_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#define VALUES_IN_BYTE 256 #define VALUES_IN_BYTE 256

0
src/enc/backward_references.h → src/enc/backward_references_enc.h
View File

0
src/enc/config.c → src/enc/config_enc.c
View File

2
src/enc/cost.c → src/enc/cost_enc.c
View File

@ -11,7 +11,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./cost.h" #include "./cost_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Level cost tables // Level cost tables

2
src/enc/cost.h → src/enc/cost_enc.h
View File

@ -16,7 +16,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
src/enc/delta_palettization.c → src/enc/delta_palettization_enc.c
View File

@ -10,7 +10,7 @@
// Author: Mislav Bradac (mislavm@google.com) // Author: Mislav Bradac (mislavm@google.com)
// //
#include "./delta_palettization.h" #include "./delta_palettization_enc.h"
#ifdef WEBP_EXPERIMENTAL_FEATURES #ifdef WEBP_EXPERIMENTAL_FEATURES
#include "../webp/types.h" #include "../webp/types.h"

2
src/enc/delta_palettization.h → src/enc/delta_palettization_enc.h
View File

@ -14,7 +14,7 @@
#define WEBP_ENC_DELTA_PALETTIZATION_H_ #define WEBP_ENC_DELTA_PALETTIZATION_H_
#include "../webp/encode.h" #include "../webp/encode.h"
#include "../enc/vp8li.h" #include "../enc/vp8li_enc.h"
// Replaces enc->argb_[] input by a palettizable approximation of it, // Replaces enc->argb_[] input by a palettizable approximation of it,
// and generates optimal enc->palette_[]. // and generates optimal enc->palette_[].

2
src/enc/filter.c → src/enc/filter_enc.c
View File

@ -12,7 +12,7 @@
// Author: somnath@google.com (Somnath Banerjee) // Author: somnath@google.com (Somnath Banerjee)
#include <assert.h> #include <assert.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
// This table gives, for a given sharpness, the filtering strength to be // This table gives, for a given sharpness, the filtering strength to be

4
src/enc/frame.c → src/enc/frame_enc.c
View File

@ -14,8 +14,8 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "./cost.h" #include "./cost_enc.h"
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../webp/format_constants.h" // RIFF constants #include "../webp/format_constants.h" // RIFF constants

4
src/enc/histogram.c → src/enc/histogram_enc.c
View File

@ -15,8 +15,8 @@
#include <math.h> #include <math.h>
#include "./backward_references.h" #include "./backward_references_enc.h"
#include "./histogram.h" #include "./histogram_enc.h"
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#include "../dsp/lossless_common.h" #include "../dsp/lossless_common.h"
#include "../utils/utils.h" #include "../utils/utils.h"

2
src/enc/histogram.h → src/enc/histogram_enc.h
View File

@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include "./backward_references.h" #include "./backward_references_enc.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"
#include "../webp/types.h" #include "../webp/types.h"

2
src/enc/iterator.c → src/enc/iterator_enc.c
View File

@ -13,7 +13,7 @@
#include <string.h> #include <string.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// VP8Iterator // VP8Iterator

2
src/enc/near_lossless.c → src/enc/near_lossless_enc.c
View File

@ -19,7 +19,7 @@
#include "../dsp/lossless_common.h" #include "../dsp/lossless_common.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "./vp8enci.h" #include "./vp8i_enc.h"
#define MIN_DIM_FOR_NEAR_LOSSLESS 64 #define MIN_DIM_FOR_NEAR_LOSSLESS 64
#define MAX_LIMIT_BITS 5 #define MAX_LIMIT_BITS 5

4
src/enc/picture_csp.c → src/enc/picture_csp_enc.c
View File

@ -15,8 +15,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../utils/random.h" #include "../utils/random_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../dsp/yuv.h" #include "../dsp/yuv.h"

2
src/enc/picture.c → src/enc/picture_enc.c
View File

@ -14,7 +14,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/utils.h" #include "../utils/utils.h"

2
src/enc/picture_psnr.c → src/enc/picture_psnr_enc.c
View File

@ -14,7 +14,7 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../utils/utils.h" #include "../utils/utils.h"
typedef double (*AccumulateFunc)(const uint8_t* src, int src_stride, typedef double (*AccumulateFunc)(const uint8_t* src, int src_stride,

4
src/enc/picture_rescale.c → src/enc/picture_rescale_enc.c
View File

@ -14,8 +14,8 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../utils/rescaler.h" #include "../utils/rescaler_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#define HALVE(x) (((x) + 1) >> 1) #define HALVE(x) (((x) + 1) >> 1)

2
src/enc/picture_tools.c → src/enc/picture_tools_enc.c
View File

@ -13,7 +13,7 @@
#include <assert.h> #include <assert.h>
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../dsp/yuv.h" #include "../dsp/yuv.h"
static WEBP_INLINE uint32_t MakeARGB32(int r, int g, int b) { static WEBP_INLINE uint32_t MakeARGB32(int r, int g, int b) {

2
src/enc/predictor.c → src/enc/predictor_enc.c
View File

@ -16,7 +16,7 @@
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#include "../dsp/lossless_common.h" #include "../dsp/lossless_common.h"
#include "./vp8li.h" #include "./vp8li_enc.h"
#define MAX_DIFF_COST (1e30f) #define MAX_DIFF_COST (1e30f)

4
src/enc/quant.c → src/enc/quant_enc.c
View File

@ -15,8 +15,8 @@
#include <math.h> #include <math.h>
#include <stdlib.h> // for abs() #include <stdlib.h> // for abs()
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "./cost.h" #include "./cost_enc.h"
#define DO_TRELLIS_I4 1 #define DO_TRELLIS_I4 1
#define DO_TRELLIS_I16 1 // not a huge gain, but ok at low bitrate. #define DO_TRELLIS_I16 1 // not a huge gain, but ok at low bitrate.

2
src/enc/syntax.c → src/enc/syntax_enc.c
View File

@ -16,7 +16,7 @@
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.h" // RIFF constants #include "../webp/format_constants.h" // RIFF constants
#include "../webp/mux_types.h" // ALPHA_FLAG #include "../webp/mux_types.h" // ALPHA_FLAG
#include "./vp8enci.h" #include "./vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Helper functions // Helper functions

4
src/enc/token.c → src/enc/token_enc.c
View File

@ -20,8 +20,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "./cost.h" #include "./cost_enc.h"
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#if !defined(DISABLE_TOKEN_BUFFER) #if !defined(DISABLE_TOKEN_BUFFER)

2
src/enc/tree.c → src/enc/tree_enc.c
View File

@ -11,7 +11,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./vp8enci.h" #include "./vp8i_enc.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Default probabilities // Default probabilities

6
src/enc/vp8enci.h → src/enc/vp8i_enc.h
View File

@ -15,10 +15,10 @@
#define WEBP_ENC_VP8ENCI_H_ #define WEBP_ENC_VP8ENCI_H_
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include "../dec/common.h" #include "../dec/common_dec.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "../utils/bit_writer.h" #include "../utils/bit_writer_utils.h"
#include "../utils/thread.h" #include "../utils/thread_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/encode.h" #include "../webp/encode.h"

14
src/enc/vp8l.c → src/enc/vp8l_enc.c
View File

@ -15,18 +15,18 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "./backward_references.h" #include "./backward_references_enc.h"
#include "./histogram.h" #include "./histogram_enc.h"
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "./vp8li.h" #include "./vp8li_enc.h"
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#include "../dsp/lossless_common.h" #include "../dsp/lossless_common.h"
#include "../utils/bit_writer.h" #include "../utils/bit_writer_utils.h"
#include "../utils/huffman_encode.h" #include "../utils/huffman_encode_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
#include "../webp/format_constants.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. #define PALETTE_KEY_RIGHT_SHIFT 22 // Key for 1K buffer.
// Maximum number of histogram images (sub-blocks). // Maximum number of histogram images (sub-blocks).

6
src/enc/vp8li.h → src/enc/vp8li_enc.h
View File

@ -14,9 +14,9 @@
#ifndef WEBP_ENC_VP8LI_H_ #ifndef WEBP_ENC_VP8LI_H_
#define WEBP_ENC_VP8LI_H_ #define WEBP_ENC_VP8LI_H_
#include "./backward_references.h" #include "./backward_references_enc.h"
#include "./histogram.h" #include "./histogram_enc.h"
#include "../utils/bit_writer.h" #include "../utils/bit_writer_utils.h"
#include "../webp/encode.h" #include "../webp/encode.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"

6
src/enc/webpenc.c → src/enc/webp_enc.c
View File

@ -16,9 +16,9 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "./cost.h" #include "./cost_enc.h"
#include "./vp8enci.h" #include "./vp8i_enc.h"
#include "./vp8li.h" #include "./vp8li_enc.h"
#include "../utils/utils.h" #include "../utils/utils.h"
// #define PRINT_MEMORY_INFO // #define PRINT_MEMORY_INFO

4
src/mux/muxi.h
View File

@ -15,8 +15,8 @@
#define WEBP_MUX_MUXI_H_ #define WEBP_MUX_MUXI_H_
#include <stdlib.h> #include <stdlib.h>
#include "../dec/vp8i.h" #include "../dec/vp8i_dec.h"
#include "../dec/vp8li.h" #include "../dec/vp8li_dec.h"
#include "../webp/mux.h" #include "../webp/mux.h"
#ifdef __cplusplus #ifdef __cplusplus

48
src/utils/Makefile.am
View File

@ -14,34 +14,34 @@ noinst_HEADERS += ../webp/encode.h
noinst_HEADERS += ../webp/format_constants.h noinst_HEADERS += ../webp/format_constants.h
COMMON_SOURCES = COMMON_SOURCES =
COMMON_SOURCES += bit_reader.c COMMON_SOURCES += bit_reader_utils.c
COMMON_SOURCES += bit_reader.h COMMON_SOURCES += bit_reader_utils.h
COMMON_SOURCES += bit_reader_inl.h COMMON_SOURCES += bit_reader_inl_utils.h
COMMON_SOURCES += color_cache.c COMMON_SOURCES += color_cache_utils.c
COMMON_SOURCES += color_cache.h COMMON_SOURCES += color_cache_utils.h
COMMON_SOURCES += endian_inl.h COMMON_SOURCES += endian_inl_utils.h
COMMON_SOURCES += filters.c COMMON_SOURCES += filters_utils.c
COMMON_SOURCES += filters.h COMMON_SOURCES += filters_utils.h
COMMON_SOURCES += huffman.c COMMON_SOURCES += huffman_utils.c
COMMON_SOURCES += huffman.h COMMON_SOURCES += huffman_utils.h
COMMON_SOURCES += quant_levels_dec.c COMMON_SOURCES += quant_levels_dec_utils.c
COMMON_SOURCES += quant_levels_dec.h COMMON_SOURCES += quant_levels_dec_utils.h
COMMON_SOURCES += rescaler.c COMMON_SOURCES += rescaler_utils.c
COMMON_SOURCES += rescaler.h COMMON_SOURCES += rescaler_utils.h
COMMON_SOURCES += random.c COMMON_SOURCES += random_utils.c
COMMON_SOURCES += random.h COMMON_SOURCES += random_utils.h
COMMON_SOURCES += thread.c COMMON_SOURCES += thread_utils.c
COMMON_SOURCES += thread.h COMMON_SOURCES += thread_utils.h
COMMON_SOURCES += utils.c COMMON_SOURCES += utils.c
COMMON_SOURCES += utils.h COMMON_SOURCES += utils.h
ENC_SOURCES = ENC_SOURCES =
ENC_SOURCES += bit_writer.c ENC_SOURCES += bit_writer_utils.c
ENC_SOURCES += bit_writer.h ENC_SOURCES += bit_writer_utils.h
ENC_SOURCES += huffman_encode.c ENC_SOURCES += huffman_encode_utils.c
ENC_SOURCES += huffman_encode.h ENC_SOURCES += huffman_encode_utils.h
ENC_SOURCES += quant_levels.c ENC_SOURCES += quant_levels_utils.c
ENC_SOURCES += quant_levels.h ENC_SOURCES += quant_levels_utils.h
libwebputils_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES) libwebputils_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES)

4
src/utils/bit_reader_inl.h → src/utils/bit_reader_inl_utils.h
View File

@ -23,8 +23,8 @@
#include <string.h> // for memcpy #include <string.h> // for memcpy
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "./bit_reader.h" #include "./bit_reader_utils.h"
#include "./endian_inl.h" #include "./endian_inl_utils.h"
#include "./utils.h" #include "./utils.h"
#ifdef __cplusplus #ifdef __cplusplus

2
src/utils/bit_reader.c → src/utils/bit_reader_utils.c
View File

@ -15,7 +15,7 @@
#include "../webp/config.h" #include "../webp/config.h"
#endif #endif
#include "./bit_reader_inl.h" #include "./bit_reader_inl_utils.h"
#include "../utils/utils.h" #include "../utils/utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

0
src/utils/bit_reader.h → src/utils/bit_reader_utils.h
View File

4
src/utils/bit_writer.c → src/utils/bit_writer_utils.c
View File

@ -16,8 +16,8 @@
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include <stdlib.h> #include <stdlib.h>
#include "./bit_writer.h" #include "./bit_writer_utils.h"
#include "./endian_inl.h" #include "./endian_inl_utils.h"
#include "./utils.h" #include "./utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

0
src/utils/bit_writer.h → src/utils/bit_writer_utils.h
View File

2
src/utils/color_cache.c → src/utils/color_cache_utils.c
View File

@ -14,7 +14,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "./color_cache.h" #include "./color_cache_utils.h"
#include "./utils.h" #include "./utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

0
src/utils/color_cache.h → src/utils/color_cache_utils.h
View File

0
src/utils/endian_inl.h → src/utils/endian_inl_utils.h
View File

2
src/utils/filters.c → src/utils/filters_utils.c
View File

@ -11,7 +11,7 @@
// //
// Author: Urvang (urvang@google.com) // Author: Urvang (urvang@google.com)
#include "./filters.h" #include "./filters_utils.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

0
src/utils/filters.h → src/utils/filters_utils.h
View File

2
src/utils/huffman_encode.c → src/utils/huffman_encode_utils.c
View File

@ -14,7 +14,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "./huffman_encode.h" #include "./huffman_encode_utils.h"
#include "./utils.h" #include "./utils.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"

0
src/utils/huffman_encode.h → src/utils/huffman_encode_utils.h
View File

2
src/utils/huffman.c → src/utils/huffman_utils.c
View File

@ -14,7 +14,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "./huffman.h" #include "./huffman_utils.h"
#include "./utils.h" #include "./utils.h"
#include "../webp/format_constants.h" #include "../webp/format_constants.h"

0
src/utils/huffman.h → src/utils/huffman_utils.h
View File

2
src/utils/quant_levels_dec.c → src/utils/quant_levels_dec_utils.c
View File

@ -14,7 +14,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include "./quant_levels_dec.h" #include "./quant_levels_dec_utils.h"
#include <string.h> // for memset #include <string.h> // for memset

0
src/utils/quant_levels_dec.h → src/utils/quant_levels_dec_utils.h
View File

2
src/utils/quant_levels.c → src/utils/quant_levels_utils.c
View File

@ -14,7 +14,7 @@
#include <assert.h> #include <assert.h>
#include "./quant_levels.h" #include "./quant_levels_utils.h"
#define NUM_SYMBOLS 256 #define NUM_SYMBOLS 256

0
src/utils/quant_levels.h → src/utils/quant_levels_utils.h
View File

2
src/utils/random.c → src/utils/random_utils.c
View File

@ -12,7 +12,7 @@
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#include <string.h> #include <string.h>
#include "./random.h" #include "./random_utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

0
src/utils/random.h → src/utils/random_utils.h
View File

2
src/utils/rescaler.c → src/utils/rescaler_utils.c
View File

@ -15,7 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
#include "./rescaler.h" #include "./rescaler_utils.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More