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
diff --git a/test/ans_test.cc b/test/ans_test.cc
index 4c4aff2..5860d44 100644
--- a/test/ans_test.cc
+++ b/test/ans_test.cc
@@ -79,13 +79,13 @@
const rans_sym rans_sym_tab[] = {
{ 67, 0 }, { 99, 67 }, { 575, 166 }, { 283, 741 },
};
+const int kRansSymbols =
+ static_cast<int>(sizeof(rans_sym_tab) / sizeof(rans_sym_tab[0]));
std::vector<int> ans_encode_build_vals(const rans_sym *tab, int iters) {
std::vector<int> p_to_sym;
- int i = 0;
- while (p_to_sym.size() < RANS_PRECISION) {
+ for (int i = 0; i < kRansSymbols; ++i) {
p_to_sym.insert(p_to_sym.end(), tab[i].prob, i);
- ++i;
}
assert(p_to_sym.size() == RANS_PRECISION);
std::vector<int> ret;
@@ -97,7 +97,8 @@
return ret;
}
-void rans_build_dec_tab(const struct rans_sym sym_tab[], rans_lut dec_tab) {
+void rans_build_dec_tab(const struct rans_sym sym_tab[],
+ aom_cdf_prob *dec_tab) {
unsigned int sum = 0;
for (int i = 0; sum < RANS_PRECISION; ++i) {
dec_tab[i] = sum += sym_tab[i].prob;
@@ -108,7 +109,7 @@
uint8_t *buf) {
AnsCoder a;
ans_write_init(&a, buf);
- rans_lut dec_tab;
+ aom_cdf_prob dec_tab[kRansSymbols];
rans_build_dec_tab(tab, dec_tab);
std::clock_t start = std::clock();
