generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Simplify RDMULT and RDDIV derivation"

Browse Source
This commit is contained in:
Guillaume Martres 2013-09-27 16:32:54 -07:00 committed by Gerrit Code Review
commit ceaa3c37a9
1 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
vp9/encoder/vp9_rdopt.c
View File

@ -186,6 +186,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex) {
// cpi->common.refresh_alt_ref_frame) // cpi->common.refresh_alt_ref_frame)
qindex = clamp(qindex, 0, MAXQ); qindex = clamp(qindex, 0, MAXQ);
cpi->RDDIV = 100;
cpi->RDMULT = compute_rd_mult(qindex); cpi->RDMULT = compute_rd_mult(qindex);
if (cpi->pass == 2 && (cpi->common.frame_type != KEY_FRAME)) { if (cpi->pass == 2 && (cpi->common.frame_type != KEY_FRAME)) {
if (cpi->twopass.next_iiratio > 31) if (cpi->twopass.next_iiratio > 31)
@ -204,42 +205,18 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex) {
if (q < 8) if (q < 8)
q = 8; q = 8;
if (cpi->RDMULT > 1000) { for (bsize = 0; bsize < BLOCK_SIZES; ++bsize) {
cpi->RDDIV = 1; for (i = 0; i < MAX_MODES; i++) {
cpi->RDMULT /= 100; // Threshold here seem unecessarily harsh but fine given actual
// range of values used for cpi->sf.thresh_mult[]
int thresh_max = INT_MAX / (q * rd_thresh_block_size_factor[bsize]);
for (bsize = 0; bsize < BLOCK_SIZES; ++bsize) { if (cpi->sf.thresh_mult[i] < thresh_max) {
for (i = 0; i < MAX_MODES; ++i) { cpi->rd_threshes[bsize][i] =
// Threshold here seem unecessarily harsh but fine given actual
// range of values used for cpi->sf.thresh_mult[]
int thresh_max = INT_MAX / (q * rd_thresh_block_size_factor[bsize]);
// *4 relates to the scaling of rd_thresh_block_size_factor[]
if ((int64_t)cpi->sf.thresh_mult[i] < thresh_max) {
cpi->rd_threshes[bsize][i] =
cpi->sf.thresh_mult[i] * q *
rd_thresh_block_size_factor[bsize] / (4 * 100);
} else {
cpi->rd_threshes[bsize][i] = INT_MAX;
}
}
}
} else {
cpi->RDDIV = 100;
for (bsize = 0; bsize < BLOCK_SIZES; ++bsize) {
for (i = 0; i < MAX_MODES; i++) {
// Threshold here seem unecessarily harsh but fine given actual
// range of values used for cpi->sf.thresh_mult[]
int thresh_max = INT_MAX / (q * rd_thresh_block_size_factor[bsize]);
if (cpi->sf.thresh_mult[i] < thresh_max) {
cpi->rd_threshes[bsize][i] =
cpi->sf.thresh_mult[i] * q * cpi->sf.thresh_mult[i] * q *
rd_thresh_block_size_factor[bsize] / 4; rd_thresh_block_size_factor[bsize] / 4;
} else { } else {
cpi->rd_threshes[bsize][i] = INT_MAX; cpi->rd_threshes[bsize][i] = INT_MAX;
}
} }
} }
} }