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

Merge "use a macrofunc for setting NzCoeffs bits"

Browse Source
This commit is contained in:
skal 2013-10-09 03:00:49 -07:00 committed by Gerrit Code Review
commit 77585a2be6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dec/vp8.c
View File

@ -500,6 +500,12 @@ static int GetCoeffs(VP8BitReader* const br, const VP8BandProbas* const prob,
return 16; return 16;
} }
static WEBP_INLINE uint32_t NzCodeBits(uint32_t nz_coeffs, int nz, int dc_nz) {
nz_coeffs <<= 2;
nz_coeffs |= (nz > 3) ? 3 : (nz > 1) ? 2 : dc_nz;
return nz_coeffs;
}
static int ParseResiduals(VP8Decoder* const dec, static int ParseResiduals(VP8Decoder* const dec,
VP8MB* const mb, VP8BitReader* const token_br) { VP8MB* const mb, VP8BitReader* const token_br) {
VP8BandProbas (* const bands)[NUM_BANDS] = dec->proba_.bands_; VP8BandProbas (* const bands)[NUM_BANDS] = dec->proba_.bands_;
@ -545,10 +551,7 @@ static int ParseResiduals(VP8Decoder* const dec,
const int nz = GetCoeffs(token_br, ac_proba, ctx, q->y1_mat_, first, dst); const int nz = GetCoeffs(token_br, ac_proba, ctx, q->y1_mat_, first, dst);
l = (nz > first); l = (nz > first);
tnz = (tnz >> 1) | (l << 7); tnz = (tnz >> 1) | (l << 7);
nz_coeffs <<= 2; nz_coeffs = NzCodeBits(nz_coeffs, nz, dst[0] != 0);
if (nz > 3) nz_coeffs |= 3;
else if (nz > 1) nz_coeffs |= 2;
else if (dst[0] != 0) nz_coeffs |= 1;
dst += 16; dst += 16;
} }
tnz >>= 4; tnz >>= 4;
@ -569,10 +572,7 @@ static int ParseResiduals(VP8Decoder* const dec,
const int nz = GetCoeffs(token_br, bands[2], ctx, q->uv_mat_, 0, dst); const int nz = GetCoeffs(token_br, bands[2], ctx, q->uv_mat_, 0, dst);
l = (nz > 0); l = (nz > 0);
tnz = (tnz >> 1) | (l << 3); tnz = (tnz >> 1) | (l << 3);
nz_coeffs <<= 2; nz_coeffs = NzCodeBits(nz_coeffs, nz, dst[0] != 0);
if (nz > 3) nz_coeffs |= 3;
else if (nz > 1) nz_coeffs |= 2;
else if (dst[0] != 0) nz_coeffs |= 1;
dst += 16; dst += 16;
} }
tnz >>= 2; tnz >>= 2;