commit 46475a302684885f77abc45b3b2df297054bb6ab
author Frederic Barbier <frederic.barbier@allegrodvt.com> Wed Jan 31 10:52:47 2018 +0100
committer Frédéric BARBIER <fbarbier.contact@gmail.com> Wed Jan 31 16:58:57 2018 +0000
tree 81a799289b10c5f4fe9ed2f66c8af34daa27377c
parent eb8f5e87187bd53e88a80a40e734e7896e6583ee

Reduce scope of ctx derivation

Change-Id: Ic8050cada6dc9dd14152da98ee21bb37042069e6

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 7dc7cc0..0661451 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -357,9 +357,6 @@
   const int tx_col = blk_col >> 1;
   const int max_blocks_high = max_block_high(xd, mbmi->sb_type, 0);
   const int max_blocks_wide = max_block_wide(xd, mbmi->sb_type, 0);
-  int ctx = txfm_partition_context(xd->above_txfm_context + blk_col,
-                                   xd->left_txfm_context + blk_row,
-                                   mbmi->sb_type, tx_size);
   TX_SIZE(*const inter_tx_size)
   [MAX_MIB_SIZE] =
       (TX_SIZE(*)[MAX_MIB_SIZE]) & mbmi->inter_tx_size[tx_row][tx_col];
@@ -379,6 +376,9 @@
     return;
   }
 
+  int ctx = txfm_partition_context(xd->above_txfm_context + blk_col,
+                                   xd->left_txfm_context + blk_row,
+                                   mbmi->sb_type, tx_size);
   is_split = aom_read_symbol(r, ec_ctx->txfm_partition_cdf[ctx], 2, ACCT_STR);
 
   if (is_split) {

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 41e2142..6275f14 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -182,10 +182,6 @@
   const int max_blocks_high = max_block_high(xd, mbmi->sb_type, 0);
   const int max_blocks_wide = max_block_wide(xd, mbmi->sb_type, 0);
 
-  int ctx = txfm_partition_context(xd->above_txfm_context + blk_col,
-                                   xd->left_txfm_context + blk_row,
-                                   mbmi->sb_type, tx_size);
-
   if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;
 
   if (depth == MAX_VARTX_DEPTH) {
@@ -194,6 +190,10 @@
     return;
   }
 
+  int ctx = txfm_partition_context(xd->above_txfm_context + blk_col,
+                                   xd->left_txfm_context + blk_row,
+                                   mbmi->sb_type, tx_size);
+
   const int write_txfm_partition =
       tx_size == mbmi->inter_tx_size[tx_row][tx_col];
   if (write_txfm_partition) {