diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-31 21:27:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-31 21:27:42 +0200 |
| commit | 5afdb3e6b1a06a897ec6d4fe5da1619ae8bef6be (patch) | |
| tree | 1aad51e15c06538510f1597af7e05bbedbcc94e1 /libavcodec/vp8.c | |
| parent | b7d14883939e756cbda376c66552be9d843910a0 (diff) | |
| parent | 0fcf3013c4aa4f70c39899b7b3bd8c451fe2e493 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
http: Pass the proper return code of net IO operations
http: Add 'post_data', a new option which sets custom HTTP post data
lavfi: amix: check active input count before calling request_samples
vp8: move block coeff arithcoder on stack.
mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.
Conflicts:
libavformat/ac3dec.c
libavformat/mp3dec.c
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index dfaa4cde4f..b4e0566814 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -708,56 +708,58 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, uint8_ * @return 0 if no coeffs were decoded * otherwise, the index of the last coeff decoded plus one */ -static int decode_block_coeffs_internal(VP56RangeCoder *c, DCTELEM block[16], +static int decode_block_coeffs_internal(VP56RangeCoder *r, DCTELEM block[16], uint8_t probs[16][3][NUM_DCT_TOKENS-1], int i, uint8_t *token_prob, int16_t qmul[2]) { + VP56RangeCoder c = *r; goto skip_eob; do { int coeff; - if (!vp56_rac_get_prob_branchy(c, token_prob[0])) // DCT_EOB - return i; + if (!vp56_rac_get_prob_branchy(&c, token_prob[0])) // DCT_EOB + break; skip_eob: - if (!vp56_rac_get_prob_branchy(c, token_prob[1])) { // DCT_0 + if (!vp56_rac_get_prob_branchy(&c, token_prob[1])) { // DCT_0 if (++i == 16) - return i; // invalid input; blocks should end with EOB + break; // invalid input; blocks should end with EOB token_prob = probs[i][0]; goto skip_eob; } - if (!vp56_rac_get_prob_branchy(c, token_prob[2])) { // DCT_1 + if (!vp56_rac_get_prob_branchy(&c, token_prob[2])) { // DCT_1 coeff = 1; token_prob = probs[i+1][1]; } else { - if (!vp56_rac_get_prob_branchy(c, token_prob[3])) { // DCT 2,3,4 - coeff = vp56_rac_get_prob_branchy(c, token_prob[4]); + if (!vp56_rac_get_prob_branchy(&c, token_prob[3])) { // DCT 2,3,4 + coeff = vp56_rac_get_prob_branchy(&c, token_prob[4]); if (coeff) - coeff += vp56_rac_get_prob(c, token_prob[5]); + coeff += vp56_rac_get_prob(&c, token_prob[5]); coeff += 2; } else { // DCT_CAT* - if (!vp56_rac_get_prob_branchy(c, token_prob[6])) { - if (!vp56_rac_get_prob_branchy(c, token_prob[7])) { // DCT_CAT1 - coeff = 5 + vp56_rac_get_prob(c, vp8_dct_cat1_prob[0]); + if (!vp56_rac_get_prob_branchy(&c, token_prob[6])) { + if (!vp56_rac_get_prob_branchy(&c, token_prob[7])) { // DCT_CAT1 + coeff = 5 + vp56_rac_get_prob(&c, vp8_dct_cat1_prob[0]); } else { // DCT_CAT2 coeff = 7; - coeff += vp56_rac_get_prob(c, vp8_dct_cat2_prob[0]) << 1; - coeff += vp56_rac_get_prob(c, vp8_dct_cat2_prob[1]); + coeff += vp56_rac_get_prob(&c, vp8_dct_cat2_prob[0]) << 1; + coeff += vp56_rac_get_prob(&c, vp8_dct_cat2_prob[1]); } } else { // DCT_CAT3 and up - int a = vp56_rac_get_prob(c, token_prob[8]); - int b = vp56_rac_get_prob(c, token_prob[9+a]); + int a = vp56_rac_get_prob(&c, token_prob[8]); + int b = vp56_rac_get_prob(&c, token_prob[9+a]); int cat = (a<<1) + b; coeff = 3 + (8<<cat); - coeff += vp8_rac_get_coeff(c, ff_vp8_dct_cat_prob[cat]); + coeff += vp8_rac_get_coeff(&c, ff_vp8_dct_cat_prob[cat]); } } token_prob = probs[i+1][2]; } - block[zigzag_scan[i]] = (vp8_rac_get(c) ? -coeff : coeff) * qmul[!!i]; + block[zigzag_scan[i]] = (vp8_rac_get(&c) ? -coeff : coeff) * qmul[!!i]; } while (++i < 16); + *r = c; return i; } #endif |