From 54fbf7e55f9fb19f48112a21d6c004dff7f84c5f Mon Sep 17 00:00:00 2001 From: Julia Robson Date: Thu, 7 Jan 2016 15:23:08 +0000 Subject: [PATCH] Fixing issue with txfm context when var_tx and supertx are enabled In the decoder, the txfm context was not being set for supertx blocks. Change-Id: Ifa0882bba36bc54bbd9dba3e370317b5531e33d3 --- vp10/decoder/decodeframe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index bc8608834..430f440ac 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -1021,6 +1021,12 @@ static void set_param_topblock(VP10_COMMON *const cm, MACROBLOCKD *const xd, 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, -- 2.50.1