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

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

View File

@ -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 =

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

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

View File

@ -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"
//------------------------------------------------------------------------------

View File

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

View File

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

View File

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

View File

@ -15,7 +15,7 @@
#include <stdlib.h> // 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;

View File

@ -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;

View File

@ -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;

View File

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

View File

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

View File

@ -19,8 +19,8 @@
#include <emmintrin.h>
#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)

View File

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

View File

@ -17,8 +17,8 @@
#include <math.h>
#include <stdlib.h>
#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"

View File

@ -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
//------------------------------------------------------------------------------

View File

@ -17,8 +17,8 @@
#include <math.h>
#include <stdlib.h>
#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"

View File

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

View File

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

View File

@ -16,7 +16,7 @@
#if defined(WEBP_USE_MIPS_DSP_R2)
#include <assert.h>
#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)

View File

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

View File

@ -18,7 +18,7 @@
#include <arm_neon.h>
#include <assert.h>
#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)

View File

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

View File

@ -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!