Merge "Non-rd partition: reduce variance threshold low resolutions."

This commit is contained in:
Marco Paniconi 2015-11-12 06:08:38 +00:00 committed by Gerrit Code Review
commit 1b63238b67

View File

@ -497,10 +497,10 @@ static void set_vbp_thresholds(VP9_COMP *cpi, int64_t thresholds[], int q) {
if (cpi->noise_estimate.level == kMedium)
threshold_base = threshold_base << 1;
}
thresholds[1] = threshold_base;
if (cm->width <= 352 && cm->height <= 288) {
thresholds[0] = threshold_base >> 2;
thresholds[2] = threshold_base << 3;
thresholds[0] = threshold_base >> 3;
thresholds[1] = threshold_base >> 1;
thresholds[2] = threshold_base << 2;
} else {
thresholds[0] = threshold_base;
thresholds[1] = (5 * threshold_base) >> 2;
@ -526,7 +526,7 @@ void vp9_set_variance_partition_thresholds(VP9_COMP *cpi, int q) {
cpi->vbp_bsize_min = BLOCK_8X8;
} else {
if (cm->width <= 352 && cm->height <= 288)
cpi->vbp_threshold_sad = 100;
cpi->vbp_threshold_sad = 10;
else
cpi->vbp_threshold_sad = (cpi->y_dequant[q][1] << 1) > 1000 ?
(cpi->y_dequant[q][1] << 1) : 1000;