diff options
| -rw-r--r-- | vp10/common/mvref_common.c | 3 | ||||
| -rw-r--r-- | vp10/common/mvref_common.h | 14 | ||||
| -rw-r--r-- | vp10/decoder/decodemv.c | 4 | ||||
| -rw-r--r-- | vp10/encoder/rdopt.c | 18 |
4 files changed, 19 insertions, 20 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, diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c index f157ada20..2fb8da24b 100644 --- a/vp10/decoder/decodemv.c +++ b/vp10/decoder/decodemv.c @@ -523,8 +523,8 @@ static void read_inter_block_mode_info(VP10Decoder *const pbi, if (bsize < BLOCK_8X8 || mbmi->mode != ZEROMV) { for (ref = 0; ref < 1 + is_compound; ++ref) { - vp10_find_best_ref_mvs(xd, allow_hp, ref_mvs[mbmi->ref_frame[ref]], - &nearestmv[ref], &nearmv[ref]); + vp10_find_best_ref_mvs(allow_hp, ref_mvs[mbmi->ref_frame[ref]], + &nearestmv[ref], &nearmv[ref]); } } diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index e3bbdd346..3aeb9b348 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -2142,9 +2142,9 @@ static void setup_buffer_inter(VP10_COMP *cpi, MACROBLOCK *x, NULL, NULL, mbmi_ext->mode_context); // Candidate refinement carried out at encoder and decoder - vp10_find_best_ref_mvs(xd, cm->allow_high_precision_mv, candidates, - &frame_nearest_mv[ref_frame], - &frame_near_mv[ref_frame]); + vp10_find_best_ref_mvs(cm->allow_high_precision_mv, candidates, + &frame_nearest_mv[ref_frame], + &frame_near_mv[ref_frame]); // Further refinement that is encode side only to test the top few candidates // in full and choose the best as the centre point for subsequent searches. @@ -2315,6 +2315,18 @@ static int discount_newmv_test(const VP10_COMP *cpi, (mode_mv[NEARMV][ref_frame].as_int == INVALID_MV))); } +#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) + +// 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); +} + static int64_t handle_inter_mode(VP10_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int *rate2, int64_t *distortion, |