shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Move set_speed_feature out of frame encoding"

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

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

@@ -2682,6 +2682,9 @@

       }

     }

   } else {

+    cpi->mb.e_mbd.lossless = cpi->oxcf.lossless;

+    select_tx_mode(cpi);

+    cm->reference_mode = SINGLE_REFERENCE;

     // Force the usage of the BILINEAR interp_filter.

     cm->interp_filter = BILINEAR;

     encode_frame_internal(cpi);

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -3234,6 +3234,8 @@

     set_high_precision_mv(cpi, q < HIGH_PRECISION_MV_QTHRESH);

   }

+  vp9_set_speed_features(cpi);

+

   if (cpi->sf.recode_loop == DISALLOW_RECODE) {

     encode_without_recode_loop(cpi, size, dest, q);

   } else {

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -282,8 +282,6 @@

   x->errorperbit = cpi->RDMULT / RD_MULT_EPB_RATIO;

   x->errorperbit += (x->errorperbit == 0);

-  vp9_set_speed_features(cpi);

-

   x->select_txfm_size = (cpi->sf.tx_size_search_method == USE_LARGESTALL &&

                          cm->frame_type != KEY_FRAME) ? 0 : 1;