diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-02 11:51:54 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-10-12 14:45:18 -0400 |
| commit | 5b4805d6e9161d4fe28879bc5e5eaff8a2da89c0 (patch) | |
| tree | d140433f9be215097d33e7b7e4915286cddee870 /vp10/common | |
| parent | 2e45ce1493a0dd6ff7bc13391b3600bfb9758aea (diff) | |
| download | libvpx-5b4805d6e9161d4fe28879bc5e5eaff8a2da89c0.tar libvpx-5b4805d6e9161d4fe28879bc5e5eaff8a2da89c0.tar.gz libvpx-5b4805d6e9161d4fe28879bc5e5eaff8a2da89c0.tar.bz2 libvpx-5b4805d6e9161d4fe28879bc5e5eaff8a2da89c0.zip | |
vp10: remove clamp_mv2() call from vp10_find_best_ref_mvs().
This actually has no effect whatsoever, since the input MVs themselves
are clamped by clamp_mv_ref() already, which is significantly more
restrictive in its bounds.
Change-Id: I4a3a7b2b121ee422c56428c2a12d930c3813c06e
Diffstat (limited to 'vp10/common')
| -rw-r--r-- | vp10/common/mvref_common.c | 3 | ||||
| -rw-r--r-- | vp10/common/mvref_common.h | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/vp10/common/mvref_common.c b/vp10/common/mvref_common.c index 267856065..9bf701fcc 100644 --- a/vp10/common/mvref_common.c +++ b/vp10/common/mvref_common.c @@ -168,14 +168,13 @@ static void lower_mv_precision(MV *mv, int allow_hp) { } } -void vp10_find_best_ref_mvs(MACROBLOCKD *xd, int allow_hp, +void vp10_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv, int_mv *near_mv) { int i; // Make sure all the candidates are properly clamped etc for (i = 0; i < MAX_MV_REF_CANDIDATES; ++i) { lower_mv_precision(&mvlist[i].as_mv, allow_hp); - clamp_mv2(&mvlist[i].as_mv, xd); } *nearest_mv = mvlist[0]; *near_mv = mvlist[1]; diff --git a/vp10/common/mvref_common.h b/vp10/common/mvref_common.h index 0774f7035..e92ad52cd 100644 --- a/vp10/common/mvref_common.h +++ b/vp10/common/mvref_common.h @@ -17,10 +17,6 @@ extern "C" { #endif -#define LEFT_TOP_MARGIN ((VP9_ENC_BORDER_IN_PIXELS - VP9_INTERP_EXTEND) << 3) -#define RIGHT_BOTTOM_MARGIN ((VP9_ENC_BORDER_IN_PIXELS -\ - VP9_INTERP_EXTEND) << 3) - #define MVREF_NEIGHBOURS 8 typedef struct position { @@ -200,14 +196,6 @@ static INLINE int is_inside(const TileInfo *const tile, mi_col + mi_pos->col >= tile->mi_col_end); } -// TODO(jingning): this mv clamping function should be block size dependent. -static INLINE void clamp_mv2(MV *mv, const MACROBLOCKD *xd) { - clamp_mv(mv, xd->mb_to_left_edge - LEFT_TOP_MARGIN, - xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN, - xd->mb_to_top_edge - LEFT_TOP_MARGIN, - xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN); -} - typedef void (*find_mv_refs_sync)(void *const data, int mi_row); void vp10_find_mv_refs(const VP10_COMMON *cm, const MACROBLOCKD *xd, MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame, @@ -218,7 +206,7 @@ void vp10_find_mv_refs(const VP10_COMMON *cm, const MACROBLOCKD *xd, // check a list of motion vectors by sad score using a number rows of pixels // above and a number cols of pixels in the left to select the one with best // score to use as ref motion vector -void vp10_find_best_ref_mvs(MACROBLOCKD *xd, int allow_hp, +void vp10_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv, int_mv *near_mv); void vp10_append_sub8x8_mvs_for_idx(VP10_COMMON *cm, MACROBLOCKD *xd, |