ref: af49c11250a2f49bc0a9972bae7e78787f396cc6
parent: 79327be6c729ed73cb339630b0ab770e3c54a4ab
author: John Koleszar <jkoleszar@google.com>
date: Wed Jun 8 08:09:02 EDT 2011
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
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1083,17 +1083,15 @@
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);
--
⑨