reconinter.c: make av1_allow_warp static
This was unnecessarily made public in:
18c5f6f597 Facilitate on-the-fly padding in decoder
Bug: aomedia:3416
Change-Id: I2dc9df123040e5627d2be8c7f1c738c70c57caa1
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 11fd257..5e19e58 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -30,11 +30,11 @@
// This function will determine whether or not to create a warped
// prediction.
-int av1_allow_warp(const MB_MODE_INFO *const mbmi,
- const WarpTypesAllowed *const warp_types,
- const WarpedMotionParams *const gm_params,
- int build_for_obmc, const struct scale_factors *const sf,
- WarpedMotionParams *final_warp_params) {
+static int allow_warp(const MB_MODE_INFO *const mbmi,
+ const WarpTypesAllowed *const warp_types,
+ const WarpedMotionParams *const gm_params,
+ int build_for_obmc, const struct scale_factors *const sf,
+ WarpedMotionParams *final_warp_params) {
// Note: As per the spec, we must test the fixed point scales here, which are
// at a higher precision (1 << 14) than the xs and ys in subpel_params (that
// have 1 << 10 precision).
@@ -65,9 +65,9 @@
if (xd->cur_frame_force_integer_mv) return;
- if (av1_allow_warp(mi, warp_types, &xd->global_motion[mi->ref_frame[ref]], 0,
- inter_pred_params->scale_factors,
- &inter_pred_params->warp_params)) {
+ if (allow_warp(mi, warp_types, &xd->global_motion[mi->ref_frame[ref]], 0,
+ inter_pred_params->scale_factors,
+ &inter_pred_params->warp_params)) {
inter_pred_params->mode = WARP_PRED;
}
}
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index da7b84a..0b93d3b 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -482,12 +482,6 @@
const uint8_t *inter_pred, int inter_stride,
const uint8_t *intra_pred, int intra_stride);
-int av1_allow_warp(const MB_MODE_INFO *const mbmi,
- const WarpTypesAllowed *const warp_types,
- const WarpedMotionParams *const gm_params,
- int build_for_obmc, const struct scale_factors *const sf,
- WarpedMotionParams *final_warp_params);
-
#ifdef __cplusplus
} // extern "C"
#endif