Merge "Force the VPX boolcoder trees in the ANS test." into nextgenv2

test/vp10_ans_test.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#define VP10_FORCE_VPXBOOL_TREEWRITER
+
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>

vp10/encoder/treewriter.h

@@ -11,7 +11,15 @@
 #ifndef VP10_ENCODER_TREEWRITER_H_
 #define VP10_ENCODER_TREEWRITER_H_
 
+#ifdef VP10_FORCE_VPXBOOL_TREEWRITER
 #include "vpx_dsp/bitwriter.h"
+#define tree_writer vpx_writer
+#define tree_bit_write vpx_write
+#else
+#include "vp10/encoder/bitwriter.h"
+#define tree_writer vp10_writer
+#define tree_bit_write vp10_write
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,22 +36,24 @@ struct vp10_token {
 
 void vp10_tokens_from_tree(struct vp10_token*, const vpx_tree_index *);
 
-static INLINE void vp10_write_tree(vpx_writer *w, const vpx_tree_index *tree,
+static INLINE void vp10_write_tree(tree_writer *w, const vpx_tree_index *tree,
                                   const vpx_prob *probs, int bits, int len,
                                   vpx_tree_index i) {
   do {
     const int bit = (bits >> --len) & 1;
-    vpx_write(w, bit, probs[i >> 1]);
+    tree_bit_write(w, bit, probs[i >> 1]);
     i = tree[i + bit];
   } while (len);
 }
 
-static INLINE void vp10_write_token(vpx_writer *w, const vpx_tree_index *tree,
+static INLINE void vp10_write_token(tree_writer *w, const vpx_tree_index *tree,
                                    const vpx_prob *probs,
                                    const struct vp10_token *token) {
   vp10_write_tree(w, tree, probs, token->value, token->len, 0);
 }
 
+#undef tree_writer
+#undef tree_bit_write
 #ifdef __cplusplus
 }  // extern "C"
 #endif