shithub: libvpx

Info  •  Files  •  Log  •  Branches

boolhuff/dboolhuff: give exported symbols a vp9_ prefix.

Change-Id: I2f1781c70b14bf1d7b6da75d1501718445552af0

--- a/vp8/decoder/dboolhuff.c

+++ b/vp8/decoder/dboolhuff.c

@@ -60,7 +60,7 @@

   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;

   else if ((v & 1) == 0) return (v >> 1) + m;

   else return m - ((v + 1) >> 1);

--- a/vp8/decoder/dboolhuff.h

+++ b/vp8/decoder/dboolhuff.h

@@ -43,7 +43,7 @@

 int vp8_decode_uniform(BOOL_DECODER *br, int n);

 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

    sure they're all consistent.

--- a/vp8/decoder/decodframe.c

+++ b/vp8/decoder/decodframe.c

@@ -62,9 +62,9 @@

   int i;

   v = merge_index(v, n - 1, modulus);

   if ((m << 1) <= n) {

-    i = inv_recenter_nonneg(v + 1, m);

+    i = vp9_inv_recenter_nonneg(v + 1, m);

   } 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;

 }

--- a/vp8/encoder/bitstream.c

+++ b/vp8/encoder/bitstream.c

@@ -98,9 +98,9 @@

   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;

--- a/vp8/encoder/boolhuff.c

+++ b/vp8/encoder/boolhuff.c

@@ -65,7 +65,7 @@

 }

-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;

--- a/vp8/encoder/boolhuff.h

+++ b/vp8/encoder/boolhuff.h

@@ -44,7 +44,7 @@

 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]);