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

MIPS update to new Unfilter API

Browse Source 
Change-Id: I2b5960812954dfcabc84663382b9e032fd1eeb43
This commit is contained in:
Jovan Zelincevic 2016-05-05 00:38:56 +02:00
parent c80b9fc8fc
commit 4154a8395d
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/dsp/filters_mips_dsp_r2.c
View File

@ -33,18 +33,37 @@
assert(row >= 0 && num_rows > 0 && row + num_rows <= height); \ assert(row >= 0 && num_rows > 0 && row + num_rows <= height); \
(void)height; // Silence unused warning. (void)height; // Silence unused warning.
// preds == &src[-1] != &dst[-1] #define DO_PREDICT_LINE(SRC, DST, LENGTH, INVERSE) do { \
#define DO_PREDICT_LINE(SRC, DST, LENGTH) do { \ const uint8_t* psrc = (uint8_t*)(SRC); \
const uint8_t* psrc = (const uint8_t*)(SRC); \
uint8_t* pdst = (uint8_t*)(DST); \ uint8_t* pdst = (uint8_t*)(DST); \
const int ilength = (int)(LENGTH); \ const int ilength = (int)(LENGTH); \
int temp0, temp1, temp2, temp3, temp4, temp5, temp6; \ int temp0, temp1, temp2, temp3, temp4, temp5, temp6; \
__asm__ volatile ( \ __asm__ volatile ( \
".set push \n\t" \ ".set push \n\t" \
".set noreorder \n\t" \ ".set noreorder \n\t" \
"srl %[temp0], %[length], 0x2 \n\t" \ "srl %[temp0], %[length], 2 \n\t" \
"beqz %[temp0], 4f \n\t" \ "beqz %[temp0], 4f \n\t" \
" andi %[temp6], %[length], 0x3 \n\t" \ " andi %[temp6], %[length], 3 \n\t" \
".if " #INVERSE " \n\t" \
"1: \n\t" \
"lbu %[temp1], -1(%[dst]) \n\t" \
"lbu %[temp2], 0(%[src]) \n\t" \
"lbu %[temp3], 1(%[src]) \n\t" \
"lbu %[temp4], 2(%[src]) \n\t" \
"lbu %[temp5], 3(%[src]) \n\t" \
"addu %[temp1], %[temp1], %[temp2] \n\t" \
"addu %[temp2], %[temp1], %[temp3] \n\t" \
"addu %[temp3], %[temp2], %[temp4] \n\t" \
"addu %[temp4], %[temp3], %[temp5] \n\t" \
"sb %[temp1], 0(%[dst]) \n\t" \
"sb %[temp2], 1(%[dst]) \n\t" \
"sb %[temp3], 2(%[dst]) \n\t" \
"sb %[temp4], 3(%[dst]) \n\t" \
"addiu %[src], %[src], 4 \n\t" \
"addiu %[temp0], %[temp0], -1 \n\t" \
"bnez %[temp0], 1b \n\t" \
" addiu %[dst], %[dst], 4 \n\t" \
".else \n\t" \
"1: \n\t" \ "1: \n\t" \
"ulw %[temp1], -1(%[src]) \n\t" \ "ulw %[temp1], -1(%[src]) \n\t" \
"ulw %[temp2], 0(%[src]) \n\t" \ "ulw %[temp2], 0(%[src]) \n\t" \
@ -54,14 +73,20 @@
"usw %[temp3], 0(%[dst]) \n\t" \ "usw %[temp3], 0(%[dst]) \n\t" \
"bnez %[temp0], 1b \n\t" \ "bnez %[temp0], 1b \n\t" \
" addiu %[dst], %[dst], 4 \n\t" \ " addiu %[dst], %[dst], 4 \n\t" \
".endif \n\t" \
"4: \n\t" \ "4: \n\t" \
"beqz %[temp6], 3f \n\t" \ "beqz %[temp6], 3f \n\t" \
" nop \n\t" \ " nop \n\t" \
"2: \n\t" \ "2: \n\t" \
"lbu %[temp1], -1(%[src]) \n\t" \
"lbu %[temp2], 0(%[src]) \n\t" \ "lbu %[temp2], 0(%[src]) \n\t" \
"addiu %[src], %[src], 1 \n\t" \ ".if " #INVERSE " \n\t" \
"lbu %[temp1], -1(%[dst]) \n\t" \
"addu %[temp3], %[temp1], %[temp2] \n\t" \
".else \n\t" \
"lbu %[temp1], -1(%[src]) \n\t" \
"subu %[temp3], %[temp1], %[temp2] \n\t" \ "subu %[temp3], %[temp1], %[temp2] \n\t" \
".endif \n\t" \
"addiu %[src], %[src], 1 \n\t" \
"sb %[temp3], 0(%[dst]) \n\t" \ "sb %[temp3], 0(%[dst]) \n\t" \
"addiu %[temp6], %[temp6], -1 \n\t" \ "addiu %[temp6], %[temp6], -1 \n\t" \
"bnez %[temp6], 2b \n\t" \ "bnez %[temp6], 2b \n\t" \
@ -78,7 +103,7 @@
static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst,
int length) { int length) {
DO_PREDICT_LINE(src, dst, length); DO_PREDICT_LINE(src, dst, length, 0);
} }
#define DO_PREDICT_LINE_VERTICAL(SRC, PRED, DST, LENGTH, INVERSE) do { \ #define DO_PREDICT_LINE_VERTICAL(SRC, PRED, DST, LENGTH, INVERSE) do { \
@ -159,7 +184,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst,
#define FILTER_LINE_BY_LINE do { \ #define FILTER_LINE_BY_LINE do { \
while (row < last_row) { \ while (row < last_row) { \
PREDICT_LINE_ONE_PASS(in, preds - stride, out); \ PREDICT_LINE_ONE_PASS(in, preds - stride, out); \
DO_PREDICT_LINE(in + 1, out + 1, width - 1); \ DO_PREDICT_LINE(in + 1, out + 1, width - 1, 0); \
++row; \ ++row; \
preds += stride; \ preds += stride; \
in += stride; \ in += stride; \
@ -314,9 +339,8 @@ static void GradientFilter(const uint8_t* data, int width, int height,
static void HorizontalUnfilter(const uint8_t* prev, const uint8_t* in, static void HorizontalUnfilter(const uint8_t* prev, const uint8_t* in,
uint8_t* out, int width) { uint8_t* out, int width) {
int i; out[0] = in[0] + (prev == NULL ? 0 : prev[0]);
out[0] = in[0] + (prev == NULL ? 0 : prev[0]); DO_PREDICT_LINE(in + 1, out + 1, width - 1, 1);
for (i = 1; i < width; ++i) out[i] = in[i] + out[i - 1];
} }
static void VerticalUnfilter(const uint8_t* prev, const uint8_t* in, static void VerticalUnfilter(const uint8_t* prev, const uint8_t* in,