diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-06-02 09:02:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-02 09:02:19 -0700 |
| commit | dbfc3692ebaf96ef54f8d4e541b1d6a12b326ac0 (patch) | |
| tree | 39f95cf1e335b4d7fe66262bae6dec900e7f29d3 | |
| parent | 538af7db5ffe2ab560511a3bc0ae74dae9316c14 (diff) | |
| download | libvpx-dbfc3692ebaf96ef54f8d4e541b1d6a12b326ac0.tar libvpx-dbfc3692ebaf96ef54f8d4e541b1d6a12b326ac0.tar.gz libvpx-dbfc3692ebaf96ef54f8d4e541b1d6a12b326ac0.tar.bz2 libvpx-dbfc3692ebaf96ef54f8d4e541b1d6a12b326ac0.zip | |
seeing a 10x slowing down, revert now for investigation
Revert "Fix a problem of using an uninitialized parameter"
This reverts commit 538af7db5ffe2ab560511a3bc0ae74dae9316c14
Change-Id: I071aa9b7068ef515abb8ae9584df15067706ccb5
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 4170fbecc..90155f3a9 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -486,11 +486,15 @@ static void update_frame_size(VP9_COMP *cpi) { 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); } |