ref: f13c99562ca6a6a8a543a911cdf1d89a526d30eb
parent: c40a968e1314fc3c1711c5a609dd114e0b8e56b2
parent: dbfc3692ebaf96ef54f8d4e541b1d6a12b326ac0
author: Yaowu Xu <yaowu@google.com>
date: Mon Jun 2 05:02:32 EDT 2014
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);
}
--
⑨