From af49c11250a2f49bc0a9972bae7e78787f396cc6 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Wed, 8 Jun 2011 12:09:02 -0400 Subject: [PATCH] Update keyframe activity in non-RD mode Activity update is no longer dependent on being in RD mode, so update it unconditionally. Change-Id: Ib617a6fc210dfc045455e3e4467d7ee5e3d1fa0e --- vp8/encoder/encodeframe.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 9daaaec..e694403 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1083,18 +1083,16 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) int rate; if (cpi->sf.RD && cpi->compressor_speed != 2) - { vp8_rd_pick_intra_mode(cpi, x, &rate); - - if(cpi->oxcf.tuning == VP8_TUNE_SSIM) - { - adjust_act_zbin( cpi, x ); - vp8_update_zbin_extra(cpi, x); - } - } else vp8_pick_intra_mode(cpi, x, &rate); + if(cpi->oxcf.tuning == VP8_TUNE_SSIM) + { + adjust_act_zbin( cpi, x ); + vp8_update_zbin_extra(cpi, x); + } + if (x->e_mbd.mode_info_context->mbmi.mode == B_PRED) vp8_encode_intra4x4mby(IF_RTCD(&cpi->rtcd), x); else -- 2.7.4