Mercurial > libavcodec.hg
changeset 12362:4dc177e736f6 libavcodec
VP8: partially inline decode_block_coeffs
Avoids a function call in the case of empty DCT blocks (most of the time).
| author | darkshikari |
|---|---|
| date | Wed, 04 Aug 2010 02:23:25 +0000 |
| parents | a66d6456df90 |
| children | 8e3a8008bb90 |
| files | vp8.c |
| diffstat | 1 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/vp8.c Wed Aug 04 01:40:58 2010 +0000 +++ b/vp8.c Wed Aug 04 02:23:25 2010 +0000 @@ -821,18 +821,13 @@ * @return 0 if no coeffs were decoded * otherwise, the index of the last coeff decoded plus one */ -static int decode_block_coeffs(VP56RangeCoder *c, DCTELEM block[16], - uint8_t probs[8][3][NUM_DCT_TOKENS-1], - int i, int zero_nhood, int16_t qmul[2]) +static int decode_block_coeffs_internal(VP56RangeCoder *c, DCTELEM block[16], + uint8_t probs[8][3][NUM_DCT_TOKENS-1], + int i, uint8_t *token_prob, int16_t qmul[2]) { - uint8_t *token_prob = probs[i][zero_nhood]; - int coeff; - - if (!vp56_rac_get_prob_branchy(c, token_prob[0])) - return 0; goto skip_eob; - do { + int coeff; if (!vp56_rac_get_prob_branchy(c, token_prob[0])) // DCT_EOB return i; @@ -880,6 +875,17 @@ } static av_always_inline +int decode_block_coeffs(VP56RangeCoder *c, DCTELEM block[16], + uint8_t probs[8][3][NUM_DCT_TOKENS-1], + int i, int zero_nhood, int16_t qmul[2]) +{ + uint8_t *token_prob = probs[i][zero_nhood]; + if (!vp56_rac_get_prob_branchy(c, token_prob[0])) // DCT_EOB + return 0; + return decode_block_coeffs_internal(c, block, probs, i, token_prob, qmul); +} + +static av_always_inline void decode_mb_coeffs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb, uint8_t t_nnz[9], uint8_t l_nnz[9]) {