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

Use 8x8 transform for all 16x16 intra prediction modes in keyframes.

Browse Source 
Also use the 8x8 transform in the RD loop.

Change-Id: If1a25aa15d3f64e05c9a31875e309d8cd5bc812d
This commit is contained in:
Ronald S. Bultje 2012-07-02 11:13:18 -07:00
parent 1f889ad63f
commit 6c0b21c075
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp8/decoder/decodframe.c
View File

@ -233,8 +233,8 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
if(pbi->common.frame_type == KEY_FRAME)
{
if( pbi->common.txfm_mode==ALLOW_8X8 &&
(xd->mode_info_context->mbmi.mode == DC_PRED
||xd->mode_info_context->mbmi.mode == TM_PRED))
xd->mode_info_context->mbmi.mode != I8X8_PRED &&
xd->mode_info_context->mbmi.mode != B_PRED)
xd->mode_info_context->mbmi.txfm_size = TX_8X8;
else
xd->mode_info_context->mbmi.txfm_size = TX_4X4;

4
vp8/encoder/encodeframe.c
View File

@ -1598,8 +1598,8 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi,
/* test code: set transform size based on mode selection */
if(cpi->common.txfm_mode == ALLOW_8X8
&& ( x->e_mbd.mode_info_context->mbmi.mode == DC_PRED
|| x->e_mbd.mode_info_context->mbmi.mode == TM_PRED))
&& x->e_mbd.mode_info_context->mbmi.mode != I8X8_PRED
&& x->e_mbd.mode_info_context->mbmi.mode != B_PRED)
{
x->e_mbd.mode_info_context->mbmi.txfm_size = TX_8X8;
cpi->t8x8_count++;

2
vp8/encoder/rdopt.c
View File

@ -1093,7 +1093,7 @@ static int rd_pick_intra16x16mby_mode(VP8_COMP *cpi,
}
#endif
macro_block_yrd(x, &ratey, &distortion, IF_RTCD(&cpi->rtcd));
macro_block_yrd_8x8(x, &ratey, &distortion, IF_RTCD(&cpi->rtcd));
// FIXME add compoundmode cost
// FIXME add rate for mode2
rate = ratey + x->mbmode_cost[x->e_mbd.frame_type]