Merge "Merge MISC_FIXES" into nextgenv2
This commit is contained in:
@@ -963,11 +963,10 @@ static void super_block_yrd(VP10_COMP *cpi, MACROBLOCK *x, int *rate,
|
||||
|
||||
assert(bs == xd->mi[0]->mbmi.sb_type);
|
||||
|
||||
if (CONFIG_MISC_FIXES && xd->lossless[xd->mi[0]->mbmi.segment_id]) {
|
||||
if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
|
||||
choose_smallest_tx_size(cpi, x, rate, distortion, skip, ret_sse,
|
||||
ref_best_rd, bs);
|
||||
} else if (cpi->sf.tx_size_search_method == USE_LARGESTALL ||
|
||||
xd->lossless[xd->mi[0]->mbmi.segment_id]) {
|
||||
} else if (cpi->sf.tx_size_search_method == USE_LARGESTALL) {
|
||||
choose_largest_tx_size(cpi, x, rate, distortion, skip, ret_sse, ref_best_rd,
|
||||
bs);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user