commit aee0091161f588865dc56de65db4c37e83f8909c
author Alex Converse <aconverse@google.com> Tue May 31 15:42:19 2016 -0700
committer Alex Converse <aconverse@google.com> Tue May 31 15:42:19 2016 -0700
tree 4e1c689ad03d022d8858567fce1efc4b0c511d12
parent e89ca180c280e0fe1ac8b74d6ab243eeff9379e3

Replace some vpxbool calls with entropy coder agnostic calls.

Change-Id: Ifbcd0714fcf994c43b69255185456c7a255df66c

vp10/decoder/decodemv.c

diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c
index c8f35c5..3d1a5da 100644
--- a/vp10/decoder/decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -780,7 +780,7 @@
       ref_frame[!idx] = cm->comp_fwd_ref[bit];
       {
         const int ctx1 = vp10_get_pred_context_comp_bwdref_p(cm, xd);
-        const int bit1 = vpx_read(r, fc->comp_bwdref_prob[ctx1][0]);
+        const int bit1 = vp10_read(r, fc->comp_bwdref_prob[ctx1][0]);
         if (counts)
           ++counts->comp_bwdref[ctx1][0][bit1];
         ref_frame[idx] = cm->comp_bwd_ref[bit1];
@@ -860,7 +860,7 @@
 #if CONFIG_BIDIR_PRED
         if (bit1) {
           const int ctx2 = vp10_get_pred_context_single_ref_p3(xd);
-          const int bit2 = vpx_read(r, fc->single_ref_prob[ctx2][2]);
+          const int bit2 = vp10_read(r, fc->single_ref_prob[ctx2][2]);
           if (counts)
             ++counts->single_ref[ctx2][2][bit2];
           ref_frame[0] = bit2 ? ALTREF_FRAME : BWDREF_FRAME;

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 4ceb0ed..fb87767 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -857,7 +857,7 @@
       }
 #else  // CONFIG_EXT_REFS
 #if CONFIG_BIDIR_PRED
-      vpx_write(w, bit_bwd, vp10_get_pred_prob_comp_bwdref_p(cm, xd));
+      vp10_write(w, bit_bwd, vp10_get_pred_prob_comp_bwdref_p(cm, xd));
 #endif  // CONFIG_BIDIR_PRED
 #endif  // CONFIG_EXT_REFS
     } else {