commit 9ed1a2ff446c51b933bc3f2d1898d98fbb1b058b
author Alex Converse <aconverse@google.com> Sun Sep 04 13:30:43 2016 +0200
committer Pascal Massimino <pascal.massimino@gmail.com> Thu Oct 13 05:53:58 2016 +0000
tree 80c34ee6ddaba3c1e311fbd35ea8029b7f27a3ec
parent 4ce69de9a62ba72d7d7922ff8e9d9b5ab4f945c4

Remove custom rans types

(cherry picked from aom/master commit 11206c60d930be9d29100567aa67f2a65463852a)

Includes renames in a bunch of places not handled by the original
due to differing tree states.

Change-Id: Ic74d9d8850b8c80a51e55e425bbf472a67e2653f

aom_dsp/ansreader.h

diff --git a/aom_dsp/ansreader.h b/aom_dsp/ansreader.h
index 5730100..1f66531 100644
--- a/aom_dsp/ansreader.h
+++ b/aom_dsp/ansreader.h
@@ -62,14 +62,14 @@
 
 struct rans_dec_sym {
   uint8_t val;
-  AnsP10 prob;
-  AnsP10 cum_prob;  // not-inclusive
+  aom_cdf_prob prob;
+  aom_cdf_prob cum_prob;  // not-inclusive
 };
 
-static INLINE void fetch_sym(struct rans_dec_sym *out, const rans_lut cdf,
-                             AnsP10 rem) {
+static INLINE void fetch_sym(struct rans_dec_sym *out, const aom_cdf_prob *cdf,
+                             aom_cdf_prob rem) {
   int i;
-  AnsP10 cum_prob = 0, top_prob;
+  aom_cdf_prob cum_prob = 0, top_prob;
   // TODO(skal): if critical, could be a binary search.
   // Or, better, an O(1) alias-table.
   for (i = 0; rem >= (top_prob = cdf[i]); ++i) {
@@ -80,7 +80,7 @@
   out->cum_prob = cum_prob;
 }
 
-static INLINE int rans_read(struct AnsDecoder *ans, const rans_lut tab) {
+static INLINE int rans_read(struct AnsDecoder *ans, const aom_cdf_prob *tab) {
   unsigned rem;
   unsigned quo;
   struct rans_dec_sym sym;