commit b39378e7dad9104d1fe7608bae53df7663458470
author Yushin Cho <ycho@mozilla.com> Tue Feb 21 09:39:22 2017 -0800
committer Yushin Cho <ycho@mozilla.com> Wed Feb 22 00:24:02 2017 +0000
tree f6f2764c61fe2ded77341f9875234e322d8fd009
parent e68a3e4f48a49d2b2b8fb7f420e085d798f3b77b

Fix the bug that prevents both pvq and ec_adapt work together

Change-Id: Ie7edfbcdd7f5f2cc3aa3aa6c2575d081616da6b6

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 5ac1bb6..80b0a95 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4098,7 +4098,8 @@
       // NOTE: This will not work with CONFIG_ANS turned on.
       od_adapt_ctx_reset(&cpi->td.mb.daala_enc.state.adapt, 0);
       cpi->td.mb.pvq_q = &this_tile->pvq_q;
-#elif CONFIG_EC_ADAPT
+#endif
+#if CONFIG_EC_ADAPT
       // Initialise tile context from the frame context
       this_tile->tctx = *cm->fc;
       cpi->td.mb.e_mbd.tile_ctx = &this_tile->tctx;

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index a4af62a..e3ca946 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4914,10 +4914,12 @@
 #error "CONFIG_PVQ currently requires CONFIG_DAALA_EC."
 #endif
   od_adapt_ctx_reset(adapt, 0);
-#elif CONFIG_EC_ADAPT
+#endif  // #if CONFIG_PVQ
+
+#if CONFIG_EC_ADAPT
   this_tile->tctx = *cm->fc;
   td->mb.e_mbd.tile_ctx = &this_tile->tctx;
-#endif  // #if CONFIG_PVQ
+#endif  // #if CONFIG_EC_ADAPT
 
   for (mi_row = tile_info->mi_row_start; mi_row < tile_info->mi_row_end;
        mi_row += cm->mib_size) {