Explicitly call daala read/write bit functions.
Calling aom_write_bit() and aom_read_bit() with --enable-daala_ec
would call aom_write() and aom_read() with probability 128 which
would ultimately call od_ec_enc_bits() and od_ec_dec_bits().
This refactors that code and makes the call explicit.
objective-1-fast:
master@2016-12-14T18:38:33Z -> daala_ec_bits@2016-12-14T18:36:22Z
PSNR | PSNR Cb | PSNR Cr | PSNR HVS | SSIM | MS SSIM | CIEDE 2000
0.0000 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | 0.0000
Change-Id: Ib69e98734fadcdc8b89936b7b6fbd0574afc7e34
diff --git a/aom_dsp/bitwriter.h b/aom_dsp/bitwriter.h
index 18af099..e1e5cc7 100644
--- a/aom_dsp/bitwriter.h
+++ b/aom_dsp/bitwriter.h
@@ -94,6 +94,7 @@
#if CONFIG_ANS
buf_uabs_write(br, bit, probability);
#elif CONFIG_DAALA_EC
+ // Note this uses raw bits and is not the same as aom_daala_write(r, 128);
aom_daala_write(br, bit, probability);
#else
aom_dk_write(br, bit, probability);
@@ -111,7 +112,11 @@
}
static INLINE void aom_write_bit(aom_writer *w, int bit) {
+#if CONFIG_DAALA_EC
+ aom_daala_write_bit(w, bit);
+#else
aom_write(w, bit, 128); // aom_prob_half
+#endif
}
static INLINE void aom_write_bit_record(aom_writer *w, int bit,
