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

Merge "make rdmult adaptive for intra in quantizer RDO"

Browse Source
This commit is contained in:
Yaowu Xu 2010-11-15 09:22:45 -08:00 committed by Code Review
commit 73189f21b3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp8/encoder/encodemb.c
View File

@ -309,8 +309,10 @@ void vp8_optimize_b(MACROBLOCK *mb, int ib, int type,
eob = d->eob; eob = d->eob;
/* Now set up a Viterbi trellis to evaluate alternative roundings. */ /* Now set up a Viterbi trellis to evaluate alternative roundings. */
/* TODO: These should vary with the block type, since the quantizer does. */
rdmult = (mb->rdmult << 2)*err_mult; rdmult = (mb->rdmult << 2)*err_mult;
if(mb->e_mbd.mode_info_context->mbmi.ref_frame==INTRA_FRAME)
rdmult = (rdmult * 9)>>4;
rddiv = mb->rddiv; rddiv = mb->rddiv;
best_mask[0] = best_mask[1] = 0; best_mask[0] = best_mask[1] = 0;
/* Initialize the sentinel node of the trellis. */ /* Initialize the sentinel node of the trellis. */