diff options
author | Paul Wilkins <paulwilkins@google.com> | 2012-10-30 08:53:03 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-30 08:53:03 -0700 |
commit | 655eb166272559db89a7f01ab324812267fffa46 (patch) | |
tree | e07617105452bb26d4e089c07cae268a08e89f6d /vp8/encoder | |
parent | a4d308a46856ae965c4363736a8ca2c4ba282a4f (diff) | |
parent | d36cc98ee3a9bf37865c8fc83774f9982bbc6dd6 (diff) | |
download | libvpx-655eb166272559db89a7f01ab324812267fffa46.tar libvpx-655eb166272559db89a7f01ab324812267fffa46.tar.gz libvpx-655eb166272559db89a7f01ab324812267fffa46.tar.bz2 libvpx-655eb166272559db89a7f01ab324812267fffa46.zip |
Merge "boolhuff/dboolhuff: give exported symbols a vp9_ prefix." into experimental
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/bitstream.c | 4 | ||||
-rw-r--r-- | vp8/encoder/boolhuff.c | 2 | ||||
-rw-r--r-- | vp8/encoder/boolhuff.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 92ef46905..021a9075c 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -98,9 +98,9 @@ static int remap_prob(int v, int m) { const int modulus = MODULUS_PARAM; int i; if ((m << 1) <= n) - i = recenter_nonneg(v, m) - 1; + i = vp9_recenter_nonneg(v, m) - 1; else - i = recenter_nonneg(n - 1 - v, n - 1 - m) - 1; + i = vp9_recenter_nonneg(n - 1 - v, n - 1 - m) - 1; i = split_index(i, n - 1, modulus); return i; diff --git a/vp8/encoder/boolhuff.c b/vp8/encoder/boolhuff.c index 15fe24136..9206e5596 100644 --- a/vp8/encoder/boolhuff.c +++ b/vp8/encoder/boolhuff.c @@ -65,7 +65,7 @@ void vp8_encode_value(BOOL_CODER *br, int data, int bits) { } -int recenter_nonneg(int v, int m) { +int vp9_recenter_nonneg(int v, int m) { if (v > (m << 1)) return v; else if (v >= m) return ((v - m) << 1); else return ((m - v) << 1) - 1; diff --git a/vp8/encoder/boolhuff.h b/vp8/encoder/boolhuff.h index ac9426911..6c86509c6 100644 --- a/vp8/encoder/boolhuff.h +++ b/vp8/encoder/boolhuff.h @@ -44,7 +44,7 @@ extern void vp8_encode_uniform(BOOL_CODER *bc, int v, int n); extern void vp8_encode_term_subexp(BOOL_CODER *bc, int v, int k, int n); extern int vp8_count_uniform(int v, int n); extern int vp8_count_term_subexp(int v, int k, int n); -extern int recenter_nonneg(int v, int m); +extern int vp9_recenter_nonneg(int v, int m); DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]); |