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

Rescaler: harmonize the suffix naming

Browse Source 
BUG=webp:355

Change-Id: I7720502c62f96c780793d3d881eac7b3afae1418
This commit is contained in:
skal 2017-08-01 11:54:46 -07:00 committed by Pascal Massimino
parent 6cb13b0532
commit c4568b47fd
7 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dsp/dsp.h
View File

@ -467,12 +467,12 @@ extern WebPRescalerExportRowFunc WebPRescalerExportRowExpand;
extern WebPRescalerExportRowFunc WebPRescalerExportRowShrink; extern WebPRescalerExportRowFunc WebPRescalerExportRowShrink;
// Plain-C implementation, as fall-back. // Plain-C implementation, as fall-back.
extern void WebPRescalerImportRowExpandC(struct WebPRescaler* const wrk, extern void WebPRescalerImportRowExpand_C(struct WebPRescaler* const wrk,
const uint8_t* src); const uint8_t* src);
extern void WebPRescalerImportRowShrinkC(struct WebPRescaler* const wrk, extern void WebPRescalerImportRowShrink_C(struct WebPRescaler* const wrk,
const uint8_t* src); const uint8_t* src);
extern void WebPRescalerExportRowExpandC(struct WebPRescaler* const wrk); extern void WebPRescalerExportRowExpand_C(struct WebPRescaler* const wrk);
extern void WebPRescalerExportRowShrinkC(struct WebPRescaler* const wrk); extern void WebPRescalerExportRowShrink_C(struct WebPRescaler* const wrk);
// Main entry calls: // Main entry calls:
extern void WebPRescalerImportRow(struct WebPRescaler* const wrk, extern void WebPRescalerImportRow(struct WebPRescaler* const wrk,

18
src/dsp/rescaler.c
View File

@ -25,7 +25,8 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Row import // Row import
void WebPRescalerImportRowExpandC(WebPRescaler* const wrk, const uint8_t* src) { void WebPRescalerImportRowExpand_C(WebPRescaler* const wrk,
const uint8_t* src) {
const int x_stride = wrk->num_channels; const int x_stride = wrk->num_channels;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
int channel; int channel;
@ -56,7 +57,8 @@ void WebPRescalerImportRowExpandC(WebPRescaler* const wrk, const uint8_t* src) {
} }
} }
void WebPRescalerImportRowShrinkC(WebPRescaler* const wrk, const uint8_t* src) { void WebPRescalerImportRowShrink_C(WebPRescaler* const wrk,
const uint8_t* src) {
const int x_stride = wrk->num_channels; const int x_stride = wrk->num_channels;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
int channel; int channel;
@ -92,7 +94,7 @@ void WebPRescalerImportRowShrinkC(WebPRescaler* const wrk, const uint8_t* src) {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Row export // Row export
void WebPRescalerExportRowExpandC(WebPRescaler* const wrk) { void WebPRescalerExportRowExpand_C(WebPRescaler* const wrk) {
int x_out; int x_out;
uint8_t* const dst = wrk->dst; uint8_t* const dst = wrk->dst;
rescaler_t* const irow = wrk->irow; rescaler_t* const irow = wrk->irow;
@ -123,7 +125,7 @@ void WebPRescalerExportRowExpandC(WebPRescaler* const wrk) {
} }
} }
void WebPRescalerExportRowShrinkC(WebPRescaler* const wrk) { void WebPRescalerExportRowShrink_C(WebPRescaler* const wrk) {
int x_out; int x_out;
uint8_t* const dst = wrk->dst; uint8_t* const dst = wrk->dst;
rescaler_t* const irow = wrk->irow; rescaler_t* const irow = wrk->irow;
@ -208,10 +210,10 @@ static volatile VP8CPUInfo rescaler_last_cpuinfo_used =
WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInit(void) { WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInit(void) {
if (rescaler_last_cpuinfo_used == VP8GetCPUInfo) return; if (rescaler_last_cpuinfo_used == VP8GetCPUInfo) return;
WebPRescalerImportRowExpand = WebPRescalerImportRowExpandC; WebPRescalerImportRowExpand = WebPRescalerImportRowExpand_C;
WebPRescalerImportRowShrink = WebPRescalerImportRowShrinkC; WebPRescalerImportRowShrink = WebPRescalerImportRowShrink_C;
WebPRescalerExportRowExpand = WebPRescalerExportRowExpandC; WebPRescalerExportRowExpand = WebPRescalerExportRowExpand_C;
WebPRescalerExportRowShrink = WebPRescalerExportRowShrinkC; WebPRescalerExportRowShrink = WebPRescalerExportRowShrink_C;
if (VP8GetCPUInfo != NULL) { if (VP8GetCPUInfo != NULL) {
#if defined(WEBP_USE_SSE2) #if defined(WEBP_USE_SSE2)

18
src/dsp/rescaler_mips32.c
View File

@ -21,7 +21,8 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Row import // Row import
static void ImportRowShrink(WebPRescaler* const wrk, const uint8_t* src) { static void ImportRowShrink_MIPS32(WebPRescaler* const wrk,
const uint8_t* src) {
const int x_stride = wrk->num_channels; const int x_stride = wrk->num_channels;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
const int fx_scale = wrk->fx_scale; const int fx_scale = wrk->fx_scale;
@ -80,7 +81,8 @@ static void ImportRowShrink(WebPRescaler* const wrk, const uint8_t* src) {
} }
} }
static void ImportRowExpand(WebPRescaler* const wrk, const uint8_t* src) { static void ImportRowExpand_MIPS32(WebPRescaler* const wrk,
const uint8_t* src) {
const int x_stride = wrk->num_channels; const int x_stride = wrk->num_channels;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
const int x_add = wrk->x_add; const int x_add = wrk->x_add;
@ -144,7 +146,7 @@ static void ImportRowExpand(WebPRescaler* const wrk, const uint8_t* src) {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Row export // Row export
static void ExportRowExpand(WebPRescaler* const wrk) { static void ExportRowExpand_MIPS32(WebPRescaler* const wrk) {
uint8_t* dst = wrk->dst; uint8_t* dst = wrk->dst;
rescaler_t* irow = wrk->irow; rescaler_t* irow = wrk->irow;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
@ -207,7 +209,7 @@ static void ExportRowExpand(WebPRescaler* const wrk) {
} }
} }
static void ExportRowShrink(WebPRescaler* const wrk) { static void ExportRowShrink_MIPS32(WebPRescaler* const wrk) {
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
uint8_t* dst = wrk->dst; uint8_t* dst = wrk->dst;
rescaler_t* irow = wrk->irow; rescaler_t* irow = wrk->irow;
@ -278,10 +280,10 @@ static void ExportRowShrink(WebPRescaler* const wrk) {
extern void WebPRescalerDspInitMIPS32(void); extern void WebPRescalerDspInitMIPS32(void);
WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitMIPS32(void) { WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitMIPS32(void) {
WebPRescalerImportRowExpand = ImportRowExpand; WebPRescalerImportRowExpand = ImportRowExpand_MIPS32;
WebPRescalerImportRowShrink = ImportRowShrink; WebPRescalerImportRowShrink = ImportRowShrink_MIPS32;
WebPRescalerExportRowExpand = ExportRowExpand; WebPRescalerExportRowExpand = ExportRowExpand_MIPS32;
WebPRescalerExportRowShrink = ExportRowShrink; WebPRescalerExportRowShrink = ExportRowShrink_MIPS32;
} }
#else // !WEBP_USE_MIPS32 #else // !WEBP_USE_MIPS32

8
src/dsp/rescaler_mips_dsp_r2.c
View File

@ -24,7 +24,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Row export // Row export
static void ExportRowShrink(WebPRescaler* const wrk) { static void ExportRowShrink_MIPSdspR2(WebPRescaler* const wrk) {
int i; int i;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
uint8_t* dst = wrk->dst; uint8_t* dst = wrk->dst;
@ -162,7 +162,7 @@ static void ExportRowShrink(WebPRescaler* const wrk) {
} }
} }
static void ExportRowExpand(WebPRescaler* const wrk) { static void ExportRowExpand_MIPSdspR2(WebPRescaler* const wrk) {
int i; int i;
uint8_t* dst = wrk->dst; uint8_t* dst = wrk->dst;
rescaler_t* irow = wrk->irow; rescaler_t* irow = wrk->irow;
@ -303,8 +303,8 @@ static void ExportRowExpand(WebPRescaler* const wrk) {
extern void WebPRescalerDspInitMIPSdspR2(void); extern void WebPRescalerDspInitMIPSdspR2(void);
WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitMIPSdspR2(void) { WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitMIPSdspR2(void) {
WebPRescalerExportRowExpand = ExportRowExpand; WebPRescalerExportRowExpand = ExportRowExpand_MIPSdspR2;
WebPRescalerExportRowShrink = ExportRowShrink; WebPRescalerExportRowShrink = ExportRowShrink_MIPSdspR2;
} }
#else // !WEBP_USE_MIPS_DSP_R2 #else // !WEBP_USE_MIPS_DSP_R2

8
src/dsp/rescaler_msa.c
View File

@ -246,7 +246,7 @@ static WEBP_INLINE void ExportRowExpand_1(const uint32_t* frow, uint32_t* irow,
} }
} }
static void RescalerExportRowExpand(WebPRescaler* const wrk) { static void RescalerExportRowExpand_MIPSdspR2(WebPRescaler* const wrk) {
uint8_t* dst = wrk->dst; uint8_t* dst = wrk->dst;
rescaler_t* irow = wrk->irow; rescaler_t* irow = wrk->irow;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
@ -411,7 +411,7 @@ static WEBP_INLINE void ExportRowShrink_1(uint32_t* irow, uint8_t* dst,
} }
} }
static void RescalerExportRowShrink(WebPRescaler* const wrk) { static void RescalerExportRowShrink_MIPSdspR2(WebPRescaler* const wrk) {
uint8_t* dst = wrk->dst; uint8_t* dst = wrk->dst;
rescaler_t* irow = wrk->irow; rescaler_t* irow = wrk->irow;
const int x_out_max = wrk->dst_width * wrk->num_channels; const int x_out_max = wrk->dst_width * wrk->num_channels;
@ -433,8 +433,8 @@ static void RescalerExportRowShrink(WebPRescaler* const wrk) {
extern void WebPRescalerDspInitMSA(void); extern void WebPRescalerDspInitMSA(void);
WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitMSA(void) { WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitMSA(void) {
WebPRescalerExportRowExpand = RescalerExportRowExpand; WebPRescalerExportRowExpand = RescalerExportRowExpand_MIPSdspR2;
WebPRescalerExportRowShrink = RescalerExportRowShrink; WebPRescalerExportRowShrink = RescalerExportRowShrink_MIPSdspR2;
} }
#else // !WEBP_USE_MSA #else // !WEBP_USE_MSA

8
src/dsp/rescaler_neon.c
View File

@ -56,7 +56,7 @@ static uint32x4_t Interpolate(const rescaler_t* const frow,
return E; return E;
} }
static void RescalerExportRowExpand(WebPRescaler* const wrk) { static void RescalerExportRowExpand_NEON(WebPRescaler* const wrk) {
int x_out; int x_out;
uint8_t* const dst = wrk->dst; uint8_t* const dst = wrk->dst;
rescaler_t* const irow = wrk->irow; rescaler_t* const irow = wrk->irow;
@ -112,7 +112,7 @@ static void RescalerExportRowExpand(WebPRescaler* const wrk) {
} }
} }
static void RescalerExportRowShrink(WebPRescaler* const wrk) { static void RescalerExportRowShrink_NEON(WebPRescaler* const wrk) {
int x_out; int x_out;
uint8_t* const dst = wrk->dst; uint8_t* const dst = wrk->dst;
rescaler_t* const irow = wrk->irow; rescaler_t* const irow = wrk->irow;
@ -175,8 +175,8 @@ static void RescalerExportRowShrink(WebPRescaler* const wrk) {
extern void WebPRescalerDspInitNEON(void); extern void WebPRescalerDspInitNEON(void);
WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitNEON(void) { WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitNEON(void) {
WebPRescalerExportRowExpand = RescalerExportRowExpand; WebPRescalerExportRowExpand = RescalerExportRowExpand_NEON;
WebPRescalerExportRowShrink = RescalerExportRowShrink; WebPRescalerExportRowShrink = RescalerExportRowShrink_NEON;
} }
#else // !WEBP_USE_NEON #else // !WEBP_USE_NEON

26
src/dsp/rescaler_sse2.c
View File

@ -42,8 +42,8 @@ static void LoadHeightPixels(const uint8_t* const src, __m128i* out) {
*out = _mm_unpacklo_epi8(A, zero); *out = _mm_unpacklo_epi8(A, zero);
} }
static void RescalerImportRowExpandSSE2(WebPRescaler* const wrk, static void RescalerImportRowExpand_SSE2(WebPRescaler* const wrk,
const uint8_t* src) { const uint8_t* src) {
rescaler_t* frow = wrk->frow; rescaler_t* frow = wrk->frow;
const rescaler_t* const frow_end = frow + wrk->dst_width * wrk->num_channels; const rescaler_t* const frow_end = frow + wrk->dst_width * wrk->num_channels;
const int x_add = wrk->x_add; const int x_add = wrk->x_add;
@ -54,7 +54,7 @@ static void RescalerImportRowExpandSSE2(WebPRescaler* const wrk,
assert(wrk->x_expand); assert(wrk->x_expand);
if (wrk->num_channels == 4) { if (wrk->num_channels == 4) {
if (wrk->src_width < 2) { if (wrk->src_width < 2) {
WebPRescalerImportRowExpandC(wrk, src); WebPRescalerImportRowExpand_C(wrk, src);
return; return;
} }
LoadTwoPixels(src, &cur_pixels); LoadTwoPixels(src, &cur_pixels);
@ -76,7 +76,7 @@ static void RescalerImportRowExpandSSE2(WebPRescaler* const wrk,
int left; int left;
const uint8_t* const src_limit = src + wrk->src_width - 8; const uint8_t* const src_limit = src + wrk->src_width - 8;
if (wrk->src_width < 8) { if (wrk->src_width < 8) {
WebPRescalerImportRowExpandC(wrk, src); WebPRescalerImportRowExpand_C(wrk, src);
return; return;
} }
LoadHeightPixels(src, &cur_pixels); LoadHeightPixels(src, &cur_pixels);
@ -110,8 +110,8 @@ static void RescalerImportRowExpandSSE2(WebPRescaler* const wrk,
assert(accum == 0); assert(accum == 0);
} }
static void RescalerImportRowShrinkSSE2(WebPRescaler* const wrk, static void RescalerImportRowShrink_SSE2(WebPRescaler* const wrk,
const uint8_t* src) { const uint8_t* src) {
const int x_sub = wrk->x_sub; const int x_sub = wrk->x_sub;
int accum = 0; int accum = 0;
const __m128i zero = _mm_setzero_si128(); const __m128i zero = _mm_setzero_si128();
@ -123,7 +123,7 @@ static void RescalerImportRowShrinkSSE2(WebPRescaler* const wrk,
const rescaler_t* const frow_end = wrk->frow + 4 * wrk->dst_width; const rescaler_t* const frow_end = wrk->frow + 4 * wrk->dst_width;
if (wrk->num_channels != 4 || wrk->x_add > (x_sub << 7)) { if (wrk->num_channels != 4 || wrk->x_add > (x_sub << 7)) {
WebPRescalerImportRowShrinkC(wrk, src); WebPRescalerImportRowShrink_C(wrk, src);
return; return;
} }
assert(!WebPRescalerInputDone(wrk)); assert(!WebPRescalerInputDone(wrk));
@ -226,7 +226,7 @@ static WEBP_INLINE void ProcessRow(const __m128i* const A0,
_mm_storel_epi64((__m128i*)dst, G); _mm_storel_epi64((__m128i*)dst, G);
} }
static void RescalerExportRowExpandSSE2(WebPRescaler* const wrk) { static void RescalerExportRowExpand_SSE2(WebPRescaler* const wrk) {
int x_out; int x_out;
uint8_t* const dst = wrk->dst; uint8_t* const dst = wrk->dst;
rescaler_t* const irow = wrk->irow; rescaler_t* const irow = wrk->irow;
@ -286,7 +286,7 @@ static void RescalerExportRowExpandSSE2(WebPRescaler* const wrk) {
} }
} }
static void RescalerExportRowShrinkSSE2(WebPRescaler* const wrk) { static void RescalerExportRowShrink_SSE2(WebPRescaler* const wrk) {
int x_out; int x_out;
uint8_t* const dst = wrk->dst; uint8_t* const dst = wrk->dst;
rescaler_t* const irow = wrk->irow; rescaler_t* const irow = wrk->irow;
@ -362,10 +362,10 @@ static void RescalerExportRowShrinkSSE2(WebPRescaler* const wrk) {
extern void WebPRescalerDspInitSSE2(void); extern void WebPRescalerDspInitSSE2(void);
WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitSSE2(void) { WEBP_TSAN_IGNORE_FUNCTION void WebPRescalerDspInitSSE2(void) {
WebPRescalerImportRowExpand = RescalerImportRowExpandSSE2; WebPRescalerImportRowExpand = RescalerImportRowExpand_SSE2;
WebPRescalerImportRowShrink = RescalerImportRowShrinkSSE2; WebPRescalerImportRowShrink = RescalerImportRowShrink_SSE2;
WebPRescalerExportRowExpand = RescalerExportRowExpandSSE2; WebPRescalerExportRowExpand = RescalerExportRowExpand_SSE2;
WebPRescalerExportRowShrink = RescalerExportRowShrinkSSE2; WebPRescalerExportRowShrink = RescalerExportRowShrink_SSE2;
} }
#else // !WEBP_USE_SSE2 #else // !WEBP_USE_SSE2