Mercurial > libavcodec.hg
changeset 12358:d596749eb0bc libavcodec
VP8: slightly faster DCT coefficient probability update
| author | darkshikari |
|---|---|
| date | Tue, 03 Aug 2010 23:21:47 +0000 |
| parents | 71fbfa6cda8f |
| children | 565ccbf26015 |
| files | vp8.c vp8data.h |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/vp8.c Tue Aug 03 22:29:38 2010 +0000 +++ b/vp8.c Tue Aug 03 23:21:47 2010 +0000 @@ -494,9 +494,8 @@ for (l = 0; l < NUM_DCT_TOKENS-1; l++) if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) { int prob = vp8_rac_get_uint(c, 8); - for (m = 0; m < 16; m++) - if (vp8_coeff_band[m] == j) - s->prob->token[i][m][k][l] = prob; + for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++) + s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob; } if ((s->mbskip_enabled = vp8_rac_get(c)))
--- a/vp8data.h Tue Aug 03 22:29:38 2010 +0000 +++ b/vp8data.h Tue Aug 03 23:21:47 2010 +0000 @@ -293,6 +293,20 @@ 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7 }; +/* Inverse of vp8_coeff_band: mappings of bands to coefficient indexes. + * Each list is -1-terminated. */ +static const int8_t vp8_coeff_band_indexes[8][10] = +{ + {0, -1}, + {1, -1}, + {2, -1}, + {3, -1}, + {5, -1}, + {6, -1}, + {4, 7, 8, 9, 10, 11, 12, 13, 14, -1}, + {15, -1} +}; + static const uint8_t vp8_dct_cat1_prob[] = { 159, 0 }; static const uint8_t vp8_dct_cat2_prob[] = { 165, 145, 0 }; static const uint8_t vp8_dct_cat3_prob[] = { 173, 148, 140, 0 };