commit dff3ea7ab36726aa6883bd00a70ed5f4242526ff
author Alex Converse <aconverse@google.com> Tue Jan 12 23:05:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 23:05:31 2016 +0000
tree c8ae8b8db0f8171c5cfb41c4b309bb0462a3711c
parent d738ce2b0a4849684b8997aa2f3d576b4a7ba269
parent 9ffcb469fb9748c7a5f9ececd82ee5a3c5c1c990

Merge "Add an implementation of Asymetric Numeral Systems (ANS)." into nextgenv2

vp10/decoder/decodeframe.c

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 44b5bc4..212df5d 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -1021,6 +1021,12 @@
       xd->mi[y * cm->mi_stride + x]->mbmi.tx_type = txfm;
 #endif
     }
+#if CONFIG_VAR_TX
+  xd->above_txfm_context = cm->above_txfm_context + mi_col;
+  xd->left_txfm_context = xd->left_txfm_context_buffer + (mi_row & 0x07);
+  set_txfm_ctx(xd->left_txfm_context, xd->mi[0]->mbmi.tx_size, bh);
+  set_txfm_ctx(xd->above_txfm_context, xd->mi[0]->mbmi.tx_size, bw);
+#endif
 }
 
 static void set_ref(VP10_COMMON *const cm, MACROBLOCKD *const xd,