diff options
| author | David Conrad <lessen42@gmail.com> | 2010-07-23 21:46:25 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-07-23 21:46:25 +0000 |
| commit | ca18a478e3bfadff7084938e4eae83053910e38c (patch) | |
| tree | fafa78d04cfea90534fbea4fbf14b20a4a8c3432 | |
| parent | 7697cdcf95d1f1936ac86aea78e22f3d3b6efb34 (diff) | |
| download | ffmpeg-ca18a478e3bfadff7084938e4eae83053910e38c.tar.gz | |
VP8: Inline traversing vp8_small_mvtree
Much faster read_mv_component, slightly faster overall
Originally committed as revision 24470 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vp8.c | 15 | ||||
| -rw-r--r-- | libavcodec/vp8data.h | 10 |
2 files changed, 12 insertions, 13 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index bb9876f424..4fc5a4de91 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -599,7 +599,7 @@ void find_near_mvs(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, */ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) { - int x = 0; + int bit, x = 0; if (vp56_rac_get_prob_branchy(c, p[0])) { int i; @@ -610,8 +610,17 @@ static int read_mv_component(VP56RangeCoder *c, const uint8_t *p) x += vp56_rac_get_prob(c, p[9 + i]) << i; if (!(x & 0xFFF0) || vp56_rac_get_prob(c, p[12])) x += 8; - } else - x = vp8_rac_get_tree(c, vp8_small_mvtree, &p[2]); + } else { + // small_mvtree + const uint8_t *ps = p+2; + bit = vp56_rac_get_prob(c, *ps); + ps += 1 + 3*bit; + x += 4*bit; + bit = vp56_rac_get_prob(c, *ps); + ps += 1 + bit; + x += 2*bit; + x += vp56_rac_get_prob(c, *ps); + } return (x && vp56_rac_get_prob(c, p[1])) ? -x : x; } diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index a72ad90399..28cc0b3403 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -110,16 +110,6 @@ static const int8_t vp8_pred16x16_tree_mvinter[4][2] = { { -VP8_MVMODE_NEW, -VP8_MVMODE_SPLIT } // '1110', '1111' }; -static const int8_t vp8_small_mvtree[7][2] = { - { 1, 4 }, - { 2, 3 }, - { -0, -1 }, // '000', '001' - { -2, -3 }, // '010', '011' - { 5, 6 }, - { -4, -5 }, // '100', '101' - { -6, -7 } // '110', '111' -}; - static const uint8_t vp8_mbsplits[5][16] = { { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, |