dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

cost*.c: harmonize the suffix namings

Browse Source 
BUG=webp:355

Change-Id: Ic2e60eaab71cdffe1ebf93fc36aaa3eb25bbf08d
This commit is contained in:
skal 2017-07-31 17:18:32 -07:00
parent 6878d42720
commit 331ab34bcd
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dsp/cost.c
View File

@ -319,7 +319,7 @@ const uint8_t VP8EncBands[16 + 1] = {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Mode costs // Mode costs
static int GetResidualCost(int ctx0, const VP8Residual* const res) { static int GetResidualCost_C(int ctx0, const VP8Residual* const res) {
int n = res->first; int n = res->first;
// should be prob[VP8EncBands[n]], but it's equivalent for n=0 or 1 // should be prob[VP8EncBands[n]], but it's equivalent for n=0 or 1
const int p0 = res->prob[n][ctx0][0]; const int p0 = res->prob[n][ctx0][0];
@ -354,7 +354,7 @@ static int GetResidualCost(int ctx0, const VP8Residual* const res) {
return cost; return cost;
} }
static void SetResidualCoeffs(const int16_t* const coeffs, static void SetResidualCoeffs_C(const int16_t* const coeffs,
VP8Residual* const res) { VP8Residual* const res) {
int n; int n;
res->last = -1; res->last = -1;
@ -384,8 +384,8 @@ static volatile VP8CPUInfo cost_last_cpuinfo_used =
WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInit(void) { WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInit(void) {
if (cost_last_cpuinfo_used == VP8GetCPUInfo) return; if (cost_last_cpuinfo_used == VP8GetCPUInfo) return;
VP8GetResidualCost = GetResidualCost; VP8GetResidualCost = GetResidualCost_C;
VP8SetResidualCoeffs = SetResidualCoeffs; VP8SetResidualCoeffs = SetResidualCoeffs_C;
// If defined, use CPUInfo() to overwrite some pointers with faster versions. // If defined, use CPUInfo() to overwrite some pointers with faster versions.
if (VP8GetCPUInfo != NULL) { if (VP8GetCPUInfo != NULL) {

8
src/dsp/cost_mips32.c
View File

@ -15,7 +15,7 @@
#include "../enc/cost_enc.h" #include "../enc/cost_enc.h"
static int GetResidualCost(int ctx0, const VP8Residual* const res) { static int GetResidualCost_MIPS32(int ctx0, const VP8Residual* const res) {
int temp0, temp1; int temp0, temp1;
int v_reg, ctx_reg; int v_reg, ctx_reg;
int n = res->first; int n = res->first;
@ -96,7 +96,7 @@ static int GetResidualCost(int ctx0, const VP8Residual* const res) {
return cost; return cost;
} }
static void SetResidualCoeffs(const int16_t* const coeffs, static void SetResidualCoeffs_MIPS32(const int16_t* const coeffs,
VP8Residual* const res) { VP8Residual* const res) {
const int16_t* p_coeffs = (int16_t*)coeffs; const int16_t* p_coeffs = (int16_t*)coeffs;
int temp0, temp1, temp2, n, n1; int temp0, temp1, temp2, n, n1;
@ -143,8 +143,8 @@ static void SetResidualCoeffs(const int16_t* const coeffs,
extern void VP8EncDspCostInitMIPS32(void); extern void VP8EncDspCostInitMIPS32(void);
WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitMIPS32(void) { WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitMIPS32(void) {
VP8GetResidualCost = GetResidualCost; VP8GetResidualCost = GetResidualCost_MIPS32;
VP8SetResidualCoeffs = SetResidualCoeffs; VP8SetResidualCoeffs = SetResidualCoeffs_MIPS32;
} }
#else // !WEBP_USE_MIPS32 #else // !WEBP_USE_MIPS32

4
src/dsp/cost_mips_dsp_r2.c
View File

@ -15,7 +15,7 @@
#include "../enc/cost_enc.h" #include "../enc/cost_enc.h"
static int GetResidualCost(int ctx0, const VP8Residual* const res) { static int GetResidualCost_MIPSdspR2(int ctx0, const VP8Residual* const res) {
int temp0, temp1; int temp0, temp1;
int v_reg, ctx_reg; int v_reg, ctx_reg;
int n = res->first; int n = res->first;
@ -97,7 +97,7 @@ static int GetResidualCost(int ctx0, const VP8Residual* const res) {
extern void VP8EncDspCostInitMIPSdspR2(void); extern void VP8EncDspCostInitMIPSdspR2(void);
WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitMIPSdspR2(void) { WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitMIPSdspR2(void) {
VP8GetResidualCost = GetResidualCost; VP8GetResidualCost = GetResidualCost_MIPSdspR2;
} }
#else // !WEBP_USE_MIPS_DSP_R2 #else // !WEBP_USE_MIPS_DSP_R2

8
src/dsp/cost_sse2.c
View File

@ -22,7 +22,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void SetResidualCoeffsSSE2(const int16_t* const coeffs, static void SetResidualCoeffs_SSE2(const int16_t* const coeffs,
VP8Residual* const res) { VP8Residual* const res) {
const __m128i c0 = _mm_loadu_si128((const __m128i*)(coeffs + 0)); const __m128i c0 = _mm_loadu_si128((const __m128i*)(coeffs + 0));
const __m128i c1 = _mm_loadu_si128((const __m128i*)(coeffs + 8)); const __m128i c1 = _mm_loadu_si128((const __m128i*)(coeffs + 8));
@ -42,7 +42,7 @@ static void SetResidualCoeffsSSE2(const int16_t* const coeffs,
res->coeffs = coeffs; res->coeffs = coeffs;
} }
static int GetResidualCostSSE2(int ctx0, const VP8Residual* const res) { static int GetResidualCost_SSE2(int ctx0, const VP8Residual* const res) {
uint8_t levels[16], ctxs[16]; uint8_t levels[16], ctxs[16];
uint16_t abs_levels[16]; uint16_t abs_levels[16];
int n = res->first; int n = res->first;
@ -108,8 +108,8 @@ static int GetResidualCostSSE2(int ctx0, const VP8Residual* const res) {
extern void VP8EncDspCostInitSSE2(void); extern void VP8EncDspCostInitSSE2(void);
WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitSSE2(void) { WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitSSE2(void) {
VP8SetResidualCoeffs = SetResidualCoeffsSSE2; VP8SetResidualCoeffs = SetResidualCoeffs_SSE2;
VP8GetResidualCost = GetResidualCostSSE2; VP8GetResidualCost = GetResidualCost_SSE2;
} }
#else // !WEBP_USE_SSE2 #else // !WEBP_USE_SSE2