shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "seeing a 10x slowing down, revert now for investigation"

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -486,11 +486,15 @@

     vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

                        "Failed to reallocate scaled last source buffer");

-  set_speed_features(cpi);

-  if (cpi->sf.search_method == NSTEP)

-    vp9_init3smotion_compensation(&cpi->ss_cfg, cpi->scaled_source.y_stride);

-  else if (cpi->sf.search_method == DIAMOND)

-    vp9_init_dsmotion_compensation(&cpi->ss_cfg, cpi->scaled_source.y_stride);

+  {

+    int y_stride = cpi->scaled_source.y_stride;

+

+    if (cpi->sf.search_method == NSTEP) {

+      vp9_init3smotion_compensation(&cpi->ss_cfg, y_stride);

+    } else if (cpi->sf.search_method == DIAMOND) {

+      vp9_init_dsmotion_compensation(&cpi->ss_cfg, y_stride);

+    }

+  }

   init_macroblockd(cm, xd);

 }