From aa464eca5eb63f742ea55c20fbf496a42bc33d9c Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 25 Apr 2014 18:22:27 -0700 Subject: Adding search_site_config struct. Change-Id: I2ad333553e673dbabcdc0f0366aea311e90849bf --- vp9/encoder/vp9_encoder.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'vp9/encoder/vp9_encoder.c') diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 6816f555e..f04b51553 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; @@ -1182,7 +1179,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) / -- cgit v1.2.3