commit 1d043d56da23b7dad24bc855cb4476f98458321a
author Zoe Liu <zoeliu@google.com> Wed Apr 13 19:31:30 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 13 19:31:30 2016 +0000
tree e36aaf0640a5cf9f84c961631c5ed495fa3bf701
parent 200e50568b9d0b9a1ba283cedb5ac93db02003a7
parent c50aaf30494062f4cca5edef8970b28fb341a415

Merge "Make ext-refs respect encoding flags." into nextgenv2

test/vp10_ans_test.cc

diff --git a/test/vp10_ans_test.cc b/test/vp10_ans_test.cc
index 0e75157..9c93dd8 100644
--- a/test/vp10_ans_test.cc
+++ b/test/vp10_ans_test.cc
@@ -218,14 +218,16 @@
   tree[2 * i - 1] = sym;
 }
 
-// treep are the probabilites of tree nodes like:
-//          *
-//         / \
-//    -sym0  *
-//          / \
-//     -sym1  *
-//           / \
-//      -sym2  -sym3
+/* The treep array contains the probabilities of nodes of a tree structured
+ * like:
+ *          *
+ *         / \
+ *    -sym0   *
+ *           / \
+ *       -sym1  *
+ *             / \
+ *        -sym2  -sym3
+ */
 void tab2tree(const rans_sym *tab, int tab_size, vpx_prob *treep) {
   const unsigned basep = 256;
   unsigned pleft = basep;

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 7f3b6a2..19e7a7f 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -833,7 +833,7 @@
     if (cm->reference_mode == REFERENCE_MODE_SELECT) {
       vp10_write(w, is_compound, vp10_get_reference_mode_prob(cm, xd));
     } else {
-      assert(!is_compound == (cm->reference_mode == SINGLE_REFERENCE));
+      assert((!is_compound) == (cm->reference_mode == SINGLE_REFERENCE));
     }
 
     if (is_compound) {

vp9/encoder/vp9_bitstream.c

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 5600ed4..9f8004b 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -210,7 +210,7 @@
     if (cm->reference_mode == REFERENCE_MODE_SELECT) {
       vpx_write(w, is_compound, vp9_get_reference_mode_prob(cm, xd));
     } else {
-      assert(!is_compound == (cm->reference_mode == SINGLE_REFERENCE));
+      assert((!is_compound) == (cm->reference_mode == SINGLE_REFERENCE));
     }
 
     if (is_compound) {