diff options
author | Jingning Han <jingning@google.com> | 2013-12-11 13:59:10 -0800 |
---|---|---|
committer | Jingning Han <jingning@google.com> | 2013-12-11 14:00:08 -0800 |
commit | 9d6e7ce12d3168dcadf94d15669c93afe6ad4300 (patch) | |
tree | c4651fc0c743f35afbb8bed27d741c89f5d1e114 /vp9/encoder | |
parent | cf83dfb2834dad57700ff35c407c86066456a056 (diff) | |
download | libvpx-9d6e7ce12d3168dcadf94d15669c93afe6ad4300.tar libvpx-9d6e7ce12d3168dcadf94d15669c93afe6ad4300.tar.gz libvpx-9d6e7ce12d3168dcadf94d15669c93afe6ad4300.tar.bz2 libvpx-9d6e7ce12d3168dcadf94d15669c93afe6ad4300.zip |
Rename clamp_mv_min_max to set_mv_search_range
This function sets the motion search range limit. Rename it to be
more informative.
Change-Id: I2e8e01073dcb99c9bea9c9acd0a61d672d615444
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_mbgraph.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_mcomp.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_mcomp.h | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c index 544f1304d..e2ef256dd 100644 --- a/vp9/encoder/vp9_mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c @@ -42,7 +42,7 @@ static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi, (cpi->speed < 8 ? (cpi->speed > 5 ? 1 : 0) : 2); step_param = MIN(step_param, (cpi->sf.max_step_search_steps - 2)); - vp9_clamp_mv_min_max(x, &ref_mv->as_mv); + vp9_set_mv_search_range(x, &ref_mv->as_mv); ref_full.as_mv.col = ref_mv->as_mv.col >> 3; ref_full.as_mv.row = ref_mv->as_mv.row >> 3; diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index fee11fd2b..4d4fd35be 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -24,7 +24,7 @@ // #define NEW_DIAMOND_SEARCH -void vp9_clamp_mv_min_max(MACROBLOCK *x, MV *mv) { +void vp9_set_mv_search_range(MACROBLOCK *x, MV *mv) { const int col_min = (mv->col >> 3) - MAX_FULL_PEL_VAL + (mv->col & 7 ? 1 : 0); const int row_min = (mv->row >> 3) - MAX_FULL_PEL_VAL + (mv->row & 7 ? 1 : 0); const int col_max = (mv->col >> 3) + MAX_FULL_PEL_VAL; diff --git a/vp9/encoder/vp9_mcomp.h b/vp9/encoder/vp9_mcomp.h index 10c2e4fca..68e667509 100644 --- a/vp9/encoder/vp9_mcomp.h +++ b/vp9/encoder/vp9_mcomp.h @@ -28,7 +28,7 @@ #define BORDER_MV_PIXELS_B16 (16 + VP9_INTERP_EXTEND) -void vp9_clamp_mv_min_max(MACROBLOCK *x, MV *mv); +void vp9_set_mv_search_range(MACROBLOCK *x, MV *mv); int vp9_mv_bit_cost(const MV *mv, const MV *ref, const int *mvjcost, int *mvcost[2], int weight); void vp9_init_dsmotion_compensation(MACROBLOCK *x, int stride); diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 3e1832783..9bade9849 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1781,7 +1781,7 @@ static void rd_check_segment_txsize(VP9_COMP *cpi, MACROBLOCK *x, // adjust src pointer for this block mi_buf_shift(x, i); - vp9_clamp_mv_min_max(x, &bsi->ref_mv->as_mv); + vp9_set_mv_search_range(x, &bsi->ref_mv->as_mv); if (cpi->sf.search_method == HEX) { bestsme = vp9_hex_search(x, &mvp_full.as_mv, @@ -2344,7 +2344,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL); } - vp9_clamp_mv_min_max(x, &ref_mv.as_mv); + vp9_set_mv_search_range(x, &ref_mv.as_mv); // Adjust search parameters based on small partitions' result. if (x->fast_ms) { @@ -2523,7 +2523,7 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, // Compound motion search on first ref frame. if (id) xd->plane[0].pre[0] = ref_yv12[id]; - vp9_clamp_mv_min_max(x, &ref_mv[id].as_mv); + vp9_set_mv_search_range(x, &ref_mv[id].as_mv); // Use mv result from single mode as mvp. tmp_mv.as_int = frame_mv[refs[id]].as_int; |