Merge "Adjustments to cyclic refresh (aq-mode=3)."
This commit is contained in:
@@ -242,9 +242,13 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,
|
||||
else
|
||||
xd->mi[0].src_mi->mbmi.tx_size = TX_8X8;
|
||||
|
||||
if (cpi->sf.partition_search_type == VAR_BASED_PARTITION &&
|
||||
xd->mi[0].src_mi->mbmi.tx_size > TX_16X16)
|
||||
xd->mi[0].src_mi->mbmi.tx_size = TX_16X16;
|
||||
if (cpi->sf.partition_search_type == VAR_BASED_PARTITION) {
|
||||
if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ &&
|
||||
xd->mi[0].src_mi->mbmi.segment_id != CR_SEGMENT_ID_BASE)
|
||||
xd->mi[0].src_mi->mbmi.tx_size = TX_8X8;
|
||||
else if (xd->mi[0].src_mi->mbmi.tx_size > TX_16X16)
|
||||
xd->mi[0].src_mi->mbmi.tx_size = TX_16X16;
|
||||
}
|
||||
} else {
|
||||
xd->mi[0].src_mi->mbmi.tx_size =
|
||||
MIN(max_txsize_lookup[bsize],
|
||||
|
||||
Reference in New Issue
Block a user