commit d7e9911354bb33742380797332cb7bfea9face9e
author Jingning Han <jingning@google.com> Wed Dec 13 09:47:45 2017 -0800
committer Jingning Han <jingning@google.com> Wed Dec 13 21:42:21 2017 +0000
tree 9bdfba49184242b8a32ad9eb5ef2864851a67750
parent a4812acfa00751202b25714defb61f264e6baf33

Properly update the lv-map context in the RD loop

Account for the txb_optimize effect on level map context modeling
in the transform block rate distortion optimization search.
Properly update such information in the txb hash rd cost.

BUG=aomedia:1118

Change-Id: I16cf80c57fa37929f94291a7500d84f9e0778400

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 65cb553..f4dad69 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3700,6 +3700,9 @@
     rd_stats->rate += rd_info_array[tx_type].rate;
     rd_stats->skip &= rd_info_array[tx_type].eob == 0;
     p->eobs[block] = rd_info_array[tx_type].eob;
+#if CONFIG_LV_MAP
+    p->txb_entropy_ctx[block] = rd_info_array[tx_type].txb_entropy_ctx;
+#endif
     return;
   }
 
@@ -3830,6 +3833,9 @@
     rd_info_array[tx_type].dist = cur_dist;
     rd_info_array[tx_type].rate = cur_rate;
     rd_info_array[tx_type].eob = eob;
+#if CONFIG_LV_MAP
+    rd_info_array[tx_type].txb_entropy_ctx = p->txb_entropy_ctx[block];
+#endif
   }
 
   rd_stats->dist += cur_dist;