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

Merge "Fix bad speed settings interaction."

Browse Source
This commit is contained in:
Yaowu Xu 2014-03-21 12:13:44 -07:00 committed by Gerrit Code Review
commit bcd102c523
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_encodeframe.c
View File

@ -3227,7 +3227,10 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
x->skip_recode = !x->select_txfm_size && mbmi->sb_type >= BLOCK_8X8 &&
(cpi->oxcf.aq_mode != COMPLEXITY_AQ &&
cpi->oxcf.aq_mode != CYCLIC_REFRESH_AQ) &&
!cpi->sf.use_nonrd_pick_mode;
!cpi->sf.use_nonrd_pick_mode &&
!cpi->sf.use_uv_intra_rd_estimate &&
!cpi->sf.skip_encode_sb;
x->skip_optimize = ctx->is_coded;
ctx->is_coded = 1;
x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;