shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix bad speed settings interaction."

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3227,7 +3227,10 @@

   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;

-- 

⑨