Merge "Fix failing TestBitIO test with --enable-daala_ec." into nextgenv2

870a72d6 · Yaowu Xu · Gerrit Code Review · e94767ae · e58781d3 · 870a72d6
Commit 870a72d6 authored Oct 19, 2016 by Yaowu Xu Committed by Gerrit Code Review Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

test/boolcoder_test.cc test/boolcoder_test.cc +3 -1

No files found.
--- a/test/boolcoder_test.cc
+++ b/test/boolcoder_test.cc
@@ -68,11 +68,13 @@ TEST(AV1, TestBitIO) {

        aom_stop_encode(&bw);

+#if !CONFIG_DAALA_EC
        // First bit should be zero
        GTEST_ASSERT_EQ(bw_buffer[0] & 0x80, 0);
+#endif

        aom_reader br;
-        aom_reader_init(&br, bw_buffer, kBufferSize, NULL, NULL);
+        aom_reader_init(&br, bw_buffer, bw.pos, NULL, NULL);
        bit_rnd.Reset(random_seed);
        for (int i = 0; i < kBitsToTest; ++i) {
          if (bit_method == 2) {