commit cfa83fd8e0d78907ce79ac5cc17e2fa738be2c97
author Alex Converse <aconverse@google.com> Wed Oct 26 16:31:48 2016 -0700
committer Alex Converse <aconverse@google.com> Fri Dec 02 02:07:27 2016 +0000
tree f9b7e834f63226ec3e8ecf99b0ba7bab9dd78551
parent 2a1b3af3294282d53b6a2a079d20d0cf7b91c1a3

ans: Use BufAnsCoder in the ANS test

Change-Id: I3da3d48ade0286d430fa22aebe1c3fc8d3a68995

test/ans_test.cc

diff --git a/test/ans_test.cc b/test/ans_test.cc
index 74ffeea..e3ea14a 100644
--- a/test/ans_test.cc
+++ b/test/ans_test.cc
@@ -20,7 +20,7 @@
 
 #include "test/acm_random.h"
 #include "aom_dsp/ansreader.h"
-#include "aom_dsp/answriter.h"
+#include "aom_dsp/buf_ans.h"
 
 namespace {
 typedef std::vector<std::pair<uint8_t, bool> > PvVec;
@@ -48,16 +48,18 @@
 }
 
 bool check_uabs(const PvVec &pv_vec, uint8_t *buf) {
-  AnsCoder a;
-  ans_write_init(&a, buf);
+  BufAnsCoder a;
+  aom_buf_ans_alloc(&a, NULL, 100);
+  buf_ans_write_init(&a, buf);
 
   std::clock_t start = std::clock();
-  for (PvVec::const_reverse_iterator it = pv_vec.rbegin(); it != pv_vec.rend();
-       ++it) {
-    uabs_write(&a, it->second, 256 - it->first);
+  for (PvVec::const_iterator it = pv_vec.begin(); it != pv_vec.end(); ++it) {
+    buf_uabs_write(&a, it->second, 256 - it->first);
   }
+  buf_ans_flush(&a);
   std::clock_t enc_time = std::clock() - start;
-  int offset = ans_write_end(&a);
+  int offset = buf_ans_write_end(&a);
+  aom_buf_ans_free(&a);
   bool okay = true;
   AnsDecoder d;
   if (ans_read_init(&d, buf, offset)) return false;
@@ -112,18 +114,21 @@
 
 bool check_rans(const std::vector<int> &sym_vec, const rans_sym *const tab,
                 uint8_t *buf) {
-  AnsCoder a;
-  ans_write_init(&a, buf);
+  BufAnsCoder a;
+  aom_buf_ans_alloc(&a, NULL, 100);
+  buf_ans_write_init(&a, buf);
   aom_cdf_prob dec_tab[kRansSymbols];
   rans_build_dec_tab(tab, dec_tab);
 
   std::clock_t start = std::clock();
-  for (std::vector<int>::const_reverse_iterator it = sym_vec.rbegin();
-       it != sym_vec.rend(); ++it) {
-    rans_write(&a, &tab[*it]);
+  for (std::vector<int>::const_iterator it = sym_vec.begin();
+       it != sym_vec.end(); ++it) {
+    buf_rans_write(&a, &tab[*it]);
   }
+  buf_ans_flush(&a);
   std::clock_t enc_time = std::clock() - start;
-  int offset = ans_write_end(&a);
+  int offset = buf_ans_write_end(&a);
+  aom_buf_ans_free(&a);
   bool okay = true;
   AnsDecoder d;
   if (ans_read_init(&d, buf, offset)) return false;