Prefix two refmv functions with av1_ BUG=aomedia:1540 Change-Id: I016bf12328033f8e54318fe803f530396fa33370
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c index c4ca859..5191808 100644 --- a/av1/common/mvref_common.c +++ b/av1/common/mvref_common.c
@@ -1105,7 +1105,8 @@ } // Select samples according to the motion vector difference. -int selectSamples(MV *mv, int *pts, int *pts_inref, int len, BLOCK_SIZE bsize) { +int av1_selectSamples(MV *mv, int *pts, int *pts_inref, int len, + BLOCK_SIZE bsize) { const int bw = block_size_wide[bsize]; const int bh = block_size_high[bsize]; const int thresh = clamp(AOMMAX(bw, bh), 16, 112); @@ -1152,8 +1153,8 @@ // Note: Samples returned are at 1/8-pel precision // Sample are the neighbor block center point's coordinates relative to the // left-top pixel of current block. -int findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, int mi_col, - int *pts, int *pts_inref) { +int av1_findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, + int mi_col, int *pts, int *pts_inref) { MB_MODE_INFO *const mbmi0 = xd->mi[0]; int ref_frame = mbmi0->ref_frame[0]; int up_available = xd->up_available;
diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h index 4b535a5..da0f903 100644 --- a/av1/common/mvref_common.h +++ b/av1/common/mvref_common.h
@@ -261,9 +261,10 @@ void av1_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv, int_mv *near_mv, int is_integer); -int selectSamples(MV *mv, int *pts, int *pts_inref, int len, BLOCK_SIZE bsize); -int findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, int mi_col, - int *pts, int *pts_inref); +int av1_selectSamples(MV *mv, int *pts, int *pts_inref, int len, + BLOCK_SIZE bsize); +int av1_findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int mi_row, + int mi_col, int *pts, int *pts_inref); #define INTRABC_DELAY_PIXELS 256 // Delay of 256 pixels #define INTRABC_DELAY_SB64 (INTRABC_DELAY_PIXELS / 64)
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index 311ee76..a72fcd9 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -1393,7 +1393,8 @@ mbmi->motion_mode = SIMPLE_TRANSLATION; if (is_motion_variation_allowed_bsize(mbmi->sb_type) && !mbmi->skip_mode && !has_second_ref(mbmi)) - mbmi->num_proj_ref = findSamples(cm, xd, mi_row, mi_col, pts, pts_inref); + mbmi->num_proj_ref = + av1_findSamples(cm, xd, mi_row, mi_col, pts, pts_inref); av1_count_overlappable_neighbors(cm, xd, mi_row, mi_col); if (mbmi->ref_frame[1] != INTRA_FRAME) @@ -1462,8 +1463,8 @@ mbmi->wm_params.invalid = 0; if (mbmi->num_proj_ref > 1) - mbmi->num_proj_ref = selectSamples(&mbmi->mv[0].as_mv, pts, pts_inref, - mbmi->num_proj_ref, bsize); + mbmi->num_proj_ref = av1_selectSamples(&mbmi->mv[0].as_mv, pts, pts_inref, + mbmi->num_proj_ref, bsize); if (find_projection(mbmi->num_proj_ref, pts, pts_inref, bsize, mbmi->mv[0].as_mv.row, mbmi->mv[0].as_mv.col,
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c index 1a64d1a..93ec61d 100644 --- a/av1/encoder/mcomp.c +++ b/av1/encoder/mcomp.c
@@ -960,7 +960,7 @@ memcpy(pts_inref, pts_inref0, total_samples * 2 * sizeof(*pts_inref0)); if (total_samples > 1) mbmi->num_proj_ref = - selectSamples(&this_mv, pts, pts_inref, total_samples, bsize); + av1_selectSamples(&this_mv, pts, pts_inref, total_samples, bsize); if (!find_projection(mbmi->num_proj_ref, pts, pts_inref, bsize, *tr, *tc, &mbmi->wm_params, mi_row, mi_col)) {
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index 2d815e6..c7383d3 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -9387,7 +9387,8 @@ cm->allow_warped_motion); } if (last_motion_mode_allowed == WARPED_CAUSAL) { - mbmi->num_proj_ref = findSamples(cm, xd, mi_row, mi_col, pts0, pts_inref0); + mbmi->num_proj_ref = + av1_findSamples(cm, xd, mi_row, mi_col, pts0, pts_inref0); } const int total_samples = mbmi->num_proj_ref; if (total_samples == 0) { @@ -9494,8 +9495,8 @@ memcpy(pts_inref, pts_inref0, total_samples * 2 * sizeof(*pts_inref0)); // Select the samples according to motion vector difference if (mbmi->num_proj_ref > 1) { - mbmi->num_proj_ref = selectSamples(&mbmi->mv[0].as_mv, pts, pts_inref, - mbmi->num_proj_ref, bsize); + mbmi->num_proj_ref = av1_selectSamples( + &mbmi->mv[0].as_mv, pts, pts_inref, mbmi->num_proj_ref, bsize); } if (!find_projection(mbmi->num_proj_ref, pts, pts_inref, bsize, @@ -13728,11 +13729,12 @@ av1_count_overlappable_neighbors(cm, xd, mi_row, mi_col); if (is_motion_variation_allowed_bsize(bsize) && !has_second_ref(mbmi)) { int pts[SAMPLES_ARRAY_SIZE], pts_inref[SAMPLES_ARRAY_SIZE]; - mbmi->num_proj_ref = findSamples(cm, xd, mi_row, mi_col, pts, pts_inref); + mbmi->num_proj_ref = + av1_findSamples(cm, xd, mi_row, mi_col, pts, pts_inref); // Select the samples according to motion vector difference if (mbmi->num_proj_ref > 1) - mbmi->num_proj_ref = selectSamples(&mbmi->mv[0].as_mv, pts, pts_inref, - mbmi->num_proj_ref, bsize); + mbmi->num_proj_ref = av1_selectSamples(&mbmi->mv[0].as_mv, pts, pts_inref, + mbmi->num_proj_ref, bsize); } set_default_interp_filters(mbmi, cm->interp_filter);