From 83f00dc6252b6ac08ea5e73b608087a1857e4214 Mon Sep 17 00:00:00 2001
From: James Zern <[EMAIL REDACTED]>
Date: Tue, 13 Aug 2024 17:25:22 -0700
Subject: [PATCH] mcomp.c: remove av1_get_mvpred_compound_var()
The last reference to this function was removed in:
aa434ccf42 Remove redundant av1_get_mvpred_compound_var calls
Bug: aomedia:3416
Change-Id: Ia320366867c13b0fa1a302ab1f4598043595bba8
---
av1/encoder/mcomp.c | 44 --------------------------------------------
av1/encoder/mcomp.h | 7 -------
2 files changed, 51 deletions(-)
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index a66a1e4cf..1a5e5c531 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -3951,47 +3951,3 @@ int av1_get_mvpred_sse(const MV_COST_PARAMS *mv_cost_params,
return sse + mv_err_cost_(&mv, mv_cost_params);
}
-
-static inline int get_mvpred_av_var(const MV_COST_PARAMS *mv_cost_params,
- const FULLPEL_MV best_mv,
- const uint8_t *second_pred,
- const aom_variance_fn_ptr_t *vfp,
- const struct buf_2d *src,
- const struct buf_2d *pre) {
- const MV mv = get_mv_from_fullmv(&best_mv);
- unsigned int unused;
-
- return vfp->svaf(get_buf_from_fullmv(pre, &best_mv), pre->stride, 0, 0,
- src->buf, src->stride, &unused, second_pred) +
- mv_err_cost_(&mv, mv_cost_params);
-}
-
-static inline int get_mvpred_mask_var(
- const MV_COST_PARAMS *mv_cost_params, const FULLPEL_MV best_mv,
- const uint8_t *second_pred, const uint8_t *mask, int mask_stride,
- int invert_mask, const aom_variance_fn_ptr_t *vfp, const struct buf_2d *src,
- const struct buf_2d *pre) {
- const MV mv = get_mv_from_fullmv(&best_mv);
- unsigned int unused;
-
- return vfp->msvf(get_buf_from_fullmv(pre, &best_mv), pre->stride, 0, 0,
- src->buf, src->stride, second_pred, mask, mask_stride,
- invert_mask, &unused) +
- mv_err_cost_(&mv, mv_cost_params);
-}
-
-int av1_get_mvpred_compound_var(const MV_COST_PARAMS *mv_cost_params,
- const FULLPEL_MV best_mv,
- const uint8_t *second_pred, const uint8_t *mask,
- int mask_stride, int invert_mask,
- const aom_variance_fn_ptr_t *vfp,
- const struct buf_2d *src,
- const struct buf_2d *pre) {
- if (mask) {
- return get_mvpred_mask_var(mv_cost_params, best_mv, second_pred, mask,
- mask_stride, invert_mask, vfp, src, pre);
- } else {
- return get_mvpred_av_var(mv_cost_params, best_mv, second_pred, vfp, src,
- pre);
- }
-}
diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index 6c3e9fbee..f55d8690f 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -56,13 +56,6 @@ int av1_get_mvpred_sse(const MV_COST_PARAMS *mv_cost_params,
const FULLPEL_MV best_mv,
const aom_variance_fn_ptr_t *vfp,
const struct buf_2d *src, const struct buf_2d *pre);
-int av1_get_mvpred_compound_var(const MV_COST_PARAMS *ms_params,
- const FULLPEL_MV best_mv,
- const uint8_t *second_pred, const uint8_t *mask,
- int mask_stride, int invert_mask,
- const aom_variance_fn_ptr_t *vfp,
- const struct buf_2d *src,
- const struct buf_2d *pre);
// =============================================================================
// Motion Search