commit 985bfc38b04dc9b81eea160ed1faf3f3f0d1741b
author Thomas Davies <thdavies@cisco.com> Tue Jun 27 16:51:26 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Mon Jul 10 22:09:16 2017 +0000
tree 0044717b496eec94b3e68010458bfe19b69b2a3c
parent 708c1ec5abf92c3762be1359f7340b39afcc5412

NEW_MULTISYMBOL: adapt transform partition split.

Change-Id: I9c8201c7053dba11e9ac0f02c1bffbb4a322e654

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index be7a591..5f3e83d 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -432,6 +432,10 @@
                                MB_MODE_INFO *mbmi, FRAME_COUNTS *counts,
                                TX_SIZE tx_size, int depth, int blk_row,
                                int blk_col, aom_reader *r) {
+#if CONFIG_NEW_MULTISYMBOL
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  (void)cm;
+#endif
   int is_split = 0;
   const int tx_row = blk_row >> 1;
   const int tx_col = blk_col >> 1;
@@ -459,7 +463,11 @@
     return;
   }
 
+#if CONFIG_NEW_MULTISYMBOL
+  is_split = aom_read_symbol(r, ec_ctx->txfm_partition_cdf[ctx], 2, ACCT_STR);
+#else
   is_split = aom_read(r, cm->fc->txfm_partition_prob[ctx], ACCT_STR);
+#endif
 
   if (is_split) {
     const TX_SIZE sub_txs = sub_tx_size_map[tx_size];