diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-29 16:59:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-29 16:59:47 -0700 |
| commit | d2bc8816a188c20b2217b1bd3a9c16eb1e98d883 (patch) | |
| tree | 50f7d37e74cecdba1ff66d83de3183441e10a1b2 /vp9/encoder/vp9_encoder.c | |
| parent | dde35bbbcc48caf3949854e04cb74b69cdd5145b (diff) | |
| parent | aa464eca5eb63f742ea55c20fbf496a42bc33d9c (diff) | |
| download | libvpx-d2bc8816a188c20b2217b1bd3a9c16eb1e98d883.tar libvpx-d2bc8816a188c20b2217b1bd3a9c16eb1e98d883.tar.gz libvpx-d2bc8816a188c20b2217b1bd3a9c16eb1e98d883.tar.bz2 libvpx-d2bc8816a188c20b2217b1bd3a9c16eb1e98d883.zip | |
Merge "Adding search_site_config struct."
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 7ede7c476..395d26aef 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -501,9 +501,9 @@ static void update_frame_size(VP9_COMP *cpi) { int y_stride = cpi->scaled_source.y_stride; if (cpi->sf.search_method == NSTEP) { - vp9_init3smotion_compensation(&cpi->mb, y_stride); + vp9_init3smotion_compensation(&cpi->ss_cfg, y_stride); } else if (cpi->sf.search_method == DIAMOND) { - vp9_init_dsmotion_compensation(&cpi->mb, y_stride); + vp9_init_dsmotion_compensation(&cpi->ss_cfg, y_stride); } } @@ -782,9 +782,6 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) { cm->error.setjmp = 1; - CHECK_MEM_ERROR(cm, cpi->mb.ss, vpx_calloc(sizeof(search_site), - (MAX_MVSEARCH_STEPS * 8) + 1)); - vp9_rtcd(); cpi->use_svc = 0; @@ -1160,7 +1157,6 @@ void vp9_remove_compressor(VP9_COMP *cpi) { } dealloc_compressor_data(cpi); - vpx_free(cpi->mb.ss); vpx_free(cpi->tok); for (i = 0; i < sizeof(cpi->mbgraph_stats) / |