if (speed == 1) {
sf->use_square_partition_only = !(cpi->common.frame_type == KEY_FRAME ||
cpi->common.intra_only);
- sf->tx_size_search_method = ((cpi->common.frame_type == KEY_FRAME ||
- cpi->common.intra_only)
- ? USE_FULL_RD : USE_LARGESTALL);
+ sf->less_rectangular_check = 1;
+ sf->tx_size_search_method = (cpi->common.frame_type == KEY_FRAME ||
+ cpi->common.intra_only)
+ ? USE_FULL_RD : USE_LARGESTALL;
if (MIN(cpi->common.width, cpi->common.height) >= 720)
- sf->disable_split_mask = DISABLE_ALL_SPLIT;
+ sf->disable_split_mask = cpi->common.show_frame ?
+ DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT;
else
sf->disable_split_mask = DISABLE_COMPOUND_SPLIT;