Commit 655eb166 authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review
Browse files

Merge "boolhuff/dboolhuff: give exported symbols a vp9_ prefix." into experimental

parents a4d308a4 d36cc98e
...@@ -60,7 +60,7 @@ static int get_unsigned_bits(unsigned num_values) { ...@@ -60,7 +60,7 @@ static int get_unsigned_bits(unsigned num_values) {
return cat; return cat;
} }
int inv_recenter_nonneg(int v, int m) { int vp9_inv_recenter_nonneg(int v, int m) {
if (v > (m << 1)) return v; if (v > (m << 1)) return v;
else if ((v & 1) == 0) return (v >> 1) + m; else if ((v & 1) == 0) return (v >> 1) + m;
else return m - ((v + 1) >> 1); else return m - ((v + 1) >> 1);
......
...@@ -43,7 +43,7 @@ void vp8dx_bool_decoder_fill(BOOL_DECODER *br); ...@@ -43,7 +43,7 @@ void vp8dx_bool_decoder_fill(BOOL_DECODER *br);
int vp8_decode_uniform(BOOL_DECODER *br, int n); int vp8_decode_uniform(BOOL_DECODER *br, int n);
int vp8_decode_term_subexp(BOOL_DECODER *br, int k, int num_syms); int vp8_decode_term_subexp(BOOL_DECODER *br, int k, int num_syms);
int inv_recenter_nonneg(int v, int m); int vp9_inv_recenter_nonneg(int v, int m);
/*The refill loop is used in several places, so define it in a macro to make /*The refill loop is used in several places, so define it in a macro to make
sure they're all consistent. sure they're all consistent.
......
...@@ -62,9 +62,9 @@ static int inv_remap_prob(int v, int m) { ...@@ -62,9 +62,9 @@ static int inv_remap_prob(int v, int m) {
int i; int i;
v = merge_index(v, n - 1, modulus); v = merge_index(v, n - 1, modulus);
if ((m << 1) <= n) { if ((m << 1) <= n) {
i = inv_recenter_nonneg(v + 1, m); i = vp9_inv_recenter_nonneg(v + 1, m);
} else { } else {
i = n - 1 - inv_recenter_nonneg(v + 1, n - 1 - m); i = n - 1 - vp9_inv_recenter_nonneg(v + 1, n - 1 - m);
} }
return i; return i;
} }
......
...@@ -98,9 +98,9 @@ static int remap_prob(int v, int m) { ...@@ -98,9 +98,9 @@ static int remap_prob(int v, int m) {
const int modulus = MODULUS_PARAM; const int modulus = MODULUS_PARAM;
int i; int i;
if ((m << 1) <= n) if ((m << 1) <= n)
i = recenter_nonneg(v, m) - 1; i = vp9_recenter_nonneg(v, m) - 1;
else 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); i = split_index(i, n - 1, modulus);
return i; return i;
......
...@@ -65,7 +65,7 @@ void vp8_encode_value(BOOL_CODER *br, int data, int bits) { ...@@ -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; if (v > (m << 1)) return v;
else if (v >= m) return ((v - m) << 1); else if (v >= m) return ((v - m) << 1);
else return ((m - v) << 1) - 1; else return ((m - v) << 1) - 1;
......
...@@ -44,7 +44,7 @@ extern void vp8_encode_uniform(BOOL_CODER *bc, int v, int n); ...@@ -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 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_uniform(int v, int n);
extern int vp8_count_term_subexp(int v, int k, 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]); DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment