commit 55711e6f1cc012b438e47055726ef5513b93293b
author Yushin Cho <ycho@mozilla.com> Thu Nov 10 18:49:24 2016 -0800
committer Yushin Cho <ycho@mozilla.com> Sun Nov 13 20:35:43 2016 +0000
tree 0d2fccb7ace0176e991a4fbf822bac0685a11588
parent 09055d44cbb9e5e58d0eddb556edeaa60123b8b0

Fix missed checkpoint and rollback for tx_size and type rd

Probably these are missed while negenv2 is merged.
This patch does not fix the regression yet.

Change-Id: Ice51141adc504d16d1bb2cd6ab6c062889b5cd23

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0567de5..34adc6a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1423,6 +1423,9 @@
 static int64_t choose_tx_size_fix_type(const AV1_COMP *const cpi, BLOCK_SIZE bs,
                                        MACROBLOCK *x, RD_STATS *rd_stats,
                                        int64_t ref_best_rd, TX_TYPE tx_type,
+#if CONFIG_PVQ
+                                       od_rollback_buffer buf,
+#endif
                                        int prune) {
   const AV1_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &x->e_mbd;
@@ -1513,7 +1516,9 @@
 #endif  // CONFIG_EXT_TX
 
     rd = txfm_yrd(cpi, x, &this_rd_stats, ref_best_rd, bs, tx_type, n);
-
+#if CONFIG_PVQ
+    od_encode_rollback(&x->daala_enc, &buf);
+#endif
     // Early termination in transform size search.
     if (cpi->sf.tx_size_search_breakout &&
         (rd == INT64_MAX ||
@@ -1757,7 +1762,11 @@
     if (mbmi->ref_mv_idx > 0 && tx_type != DCT_DCT) continue;
 #endif
     rd = choose_tx_size_fix_type(cpi, bs, x, &this_rd_stats, ref_best_rd,
-                                 tx_type, prune);
+                                 tx_type,
+#if CONFIG_PVQ
+                                 buf,
+#endif
+                                 prune);
     if (rd < best_rd) {
       best_rd = rd;
       *rd_stats = this_rd_stats;