Mercurial > libavcodec.hg
diff vp8.c @ 12255:7db147ea02c4 libavcodec
VP8: Inline traversing vp8_small_mvtree
Much faster read_mv_component, slightly faster overall
author | conrad |
---|---|
date | Fri, 23 Jul 2010 21:46:25 +0000 |
parents | 17c151e1280a |
children | 161c205dcdd2 |
line wrap: on
line diff
--- a/vp8.c Fri Jul 23 21:46:20 2010 +0000 +++ b/vp8.c Fri Jul 23 21:46:25 2010 +0000 @@ -599,7 +599,7 @@ */ 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 @@ 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; }