Merge "Add min_tx_size variable to recursive transform block partition system" into...

diff --cc av1/common/blockd.h
Simple merge

diff --cc av1/common/onyxc_int.h
Simple merge

diff --cc av1/decoder/decodemv.c
Simple merge

diff --cc av1/encoder/bitstream.c
index 4b47dd4844d83c080de35808bbc7259e98eefba9,e631989fcbfca05ef28d98d415db351890422a4f..3b66fa7ace629a39912e2a9bbbcd46f7c47210b3
--- 1/av1/encoder/bitstream.c
--- 2/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@@ -1927,9 -1895,10 +1924,10 @@@ static void write_modes_b(AV1_COMP *cpi
        (*tok)++;
      }
    }
+ 
  #if CONFIG_RD_DEBUG
    for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
 -    if (m->mbmi.txb_coeff_cost[plane] != txb_coeff_cost[plane]) {
 +    if (m->mbmi.rd_stats.txb_coeff_cost[plane] != txb_coeff_cost[plane]) {
        dump_mode_info(m);
        assert(0);
      }

diff --cc av1/encoder/encodeframe.c
Simple merge

diff --cc av1/encoder/rdopt.c
index 8334842e7dcc07ab3c477c28105f9092a2b20ea6,792654a2da58fab44ad776dda66aff14e2f40559..7daa99215c5e70b236d4326fae956e850be0c4da
--- 1/av1/encoder/rdopt.c
--- 2/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@@ -3605,9 -3435,10 +3623,10 @@@ static void select_tx_type_yrd(const AV
      for (idx = 0; idx < xd->n8_w; ++idx)
        mbmi->inter_tx_size[idy][idx] = best_tx_size[idy][idx];
    mbmi->tx_size = best_tx;
+   mbmi->min_tx_size = best_min_tx_size;
  #if CONFIG_RD_DEBUG
    // record plane y's transform block coefficient cost
 -  mbmi->txb_coeff_cost[0] = rd_stats->txb_coeff_cost[0];
 +  mbmi->rd_stats = *rd_stats;
  #endif
    memcpy(x->blk_skip[0], best_blk_skip, sizeof(best_blk_skip[0]) * n4);
  }