summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rdopt.c
diff options
context:
space:
mode:
authorRanjit Kumar Tulabandu <ranjit.tulabandu@ittiam.com>2017-02-01 16:34:49 +0530
committerYunqing Wang <yunqingwang@google.com>2017-02-01 13:03:52 -0800
commit359a6796dad01cd399f84e00ce6948640d6309e7 (patch)
treebe05f2bc0adbaeb6413d7ed75642036ebe2d881d /vp9/encoder/vp9_rdopt.c
parent106c620a23e30cccb592af21586ad0734deca2f3 (diff)
downloadlibvpx-359a6796dad01cd399f84e00ce6948640d6309e7.tar
libvpx-359a6796dad01cd399f84e00ce6948640d6309e7.tar.gz
libvpx-359a6796dad01cd399f84e00ce6948640d6309e7.tar.bz2
libvpx-359a6796dad01cd399f84e00ce6948640d6309e7.zip
Changes to facilitate row based multi-threading of ARNR filtering
Change-Id: I2fd72af00afbbeb903e4fe364611abcc148f2fbb
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r--vp9/encoder/vp9_rdopt.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 27d4e9d6d..31fed26ad 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -1998,7 +1998,8 @@ static int64_t rd_pick_best_sub8x8_mode(
vp9_set_mv_search_range(&x->mv_limits, &bsi->ref_mv[0]->as_mv);
bestsme = vp9_full_pixel_search(
- cpi, x, bsize, &mvp_full, step_param, sadpb,
+ cpi, x, bsize, &mvp_full, step_param, cpi->sf.mv.search_method,
+ sadpb,
sf->mv.subpel_search_method != SUBPEL_TREE ? cost_list : NULL,
&bsi->ref_mv[0]->as_mv, new_mv, INT_MAX, 1);
@@ -2403,9 +2404,9 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
mvp_full.col >>= 3;
mvp_full.row >>= 3;
- bestsme = vp9_full_pixel_search(cpi, x, bsize, &mvp_full, step_param, sadpb,
- cond_cost_list(cpi, cost_list), &ref_mv,
- &tmp_mv->as_mv, INT_MAX, 1);
+ bestsme = vp9_full_pixel_search(
+ cpi, x, bsize, &mvp_full, step_param, cpi->sf.mv.search_method, sadpb,
+ cond_cost_list(cpi, cost_list), &ref_mv, &tmp_mv->as_mv, INT_MAX, 1);
x->mv_limits = tmp_mv_limits;