dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unused 'shift' argument and QFIX2 define

Browse Source 
this will remove a warning about the shift amount not being
an immediate (=constant).

Change-Id: Ie9a00fefdb9a07ec8994fb113f24234518bc878a
Also: fix the NULL sharpen argument mismatch.
This commit is contained in:
Pascal Massimino 2014-06-26 00:12:51 -07:00
parent 8e867051fd
commit 1f3e5f1e60
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dsp/enc_sse2.c
View File

@ -805,9 +805,7 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b,
// Quantization // Quantization
// //
#define QFIX2 0
static WEBP_INLINE int DoQuantizeBlock(int16_t in[16], int16_t out[16], static WEBP_INLINE int DoQuantizeBlock(int16_t in[16], int16_t out[16],
int shift,
const uint16_t* const sharpen, const uint16_t* const sharpen,
const VP8Matrix* const mtx) { const VP8Matrix* const mtx) {
const __m128i max_coeff_2047 = _mm_set1_epi16(MAX_LEVEL); const __m128i max_coeff_2047 = _mm_set1_epi16(MAX_LEVEL);
@ -844,7 +842,7 @@ static WEBP_INLINE int DoQuantizeBlock(int16_t in[16], int16_t out[16],
coeff8 = _mm_add_epi16(coeff8, sharpen8); coeff8 = _mm_add_epi16(coeff8, sharpen8);
} }
// out = (coeff * iQ + B) >> (QFIX + QFIX2 - shift) // out = (coeff * iQ + B) >> QFIX
{ {
// doing calculations with 32b precision (QFIX=17) // doing calculations with 32b precision (QFIX=17)
// out = (coeff * iQ) // out = (coeff * iQ)
@ -865,11 +863,11 @@ static WEBP_INLINE int DoQuantizeBlock(int16_t in[16], int16_t out[16],
out_04 = _mm_add_epi32(out_04, bias_04); out_04 = _mm_add_epi32(out_04, bias_04);
out_08 = _mm_add_epi32(out_08, bias_08); out_08 = _mm_add_epi32(out_08, bias_08);
out_12 = _mm_add_epi32(out_12, bias_12); out_12 = _mm_add_epi32(out_12, bias_12);
// out = QUANTDIV(coeff, iQ, B, QFIX + QFIX2 - shift) // out = QUANTDIV(coeff, iQ, B, QFIX)
out_00 = _mm_srai_epi32(out_00, QFIX + QFIX2 - shift); out_00 = _mm_srai_epi32(out_00, QFIX);
out_04 = _mm_srai_epi32(out_04, QFIX + QFIX2 - shift); out_04 = _mm_srai_epi32(out_04, QFIX);
out_08 = _mm_srai_epi32(out_08, QFIX + QFIX2 - shift); out_08 = _mm_srai_epi32(out_08, QFIX);
out_12 = _mm_srai_epi32(out_12, QFIX + QFIX2 - shift); out_12 = _mm_srai_epi32(out_12, QFIX);
// pack result as 16b // pack result as 16b
out0 = _mm_packs_epi32(out_00, out_04); out0 = _mm_packs_epi32(out_00, out_04);
@ -923,12 +921,12 @@ static WEBP_INLINE int DoQuantizeBlock(int16_t in[16], int16_t out[16],
static int QuantizeBlock(int16_t in[16], int16_t out[16], static int QuantizeBlock(int16_t in[16], int16_t out[16],
const VP8Matrix* const mtx) { const VP8Matrix* const mtx) {
return DoQuantizeBlock(in, out, 0, &mtx->sharpen_[0], mtx); return DoQuantizeBlock(in, out, &mtx->sharpen_[0], mtx);
} }
static int QuantizeBlockWHT(int16_t in[16], int16_t out[16], static int QuantizeBlockWHT(int16_t in[16], int16_t out[16],
const VP8Matrix* const mtx) { const VP8Matrix* const mtx) {
return DoQuantizeBlock(in, out, 0, &mtx->sharpen_[0], mtx); return DoQuantizeBlock(in, out, NULL, mtx);
} }
// Forward declaration. // Forward declaration.