Remove aom_comp_mask_upsampled_pred from rtcd
Since aom_comp_mask_upsampled_pred just call aom_upsampled_pred
and aom_comp_mask_pred, no need to separate c version from simd
version any more.
Change-Id: I1ff8bcae87d501c68a80708fd2dc6b74c6952f88
diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index dab5048..441c53f 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -1044,25 +1044,19 @@
}
}
-void aom_comp_mask_upsampled_pred_c(uint8_t *comp_pred, const uint8_t *pred,
- int width, int height, int subpel_x_q3,
- int subpel_y_q3, const uint8_t *ref,
- int ref_stride, const uint8_t *mask,
- int mask_stride, int invert_mask) {
- int i, j;
- const uint8_t *src0 = invert_mask ? pred : comp_pred;
- const uint8_t *src1 = invert_mask ? comp_pred : pred;
- aom_upsampled_pred(comp_pred, width, height, subpel_x_q3, subpel_y_q3, ref,
- ref_stride);
- for (i = 0; i < height; i++) {
- for (j = 0; j < width; j++) {
- comp_pred[j] = AOM_BLEND_A64(mask[j], src0[j], src1[j]);
- }
- comp_pred += width;
- src0 += width;
- src1 += width;
- mask += mask_stride;
+void aom_comp_mask_upsampled_pred(uint8_t *comp_pred, const uint8_t *pred,
+ int width, int height, int subpel_x_q3,
+ int subpel_y_q3, const uint8_t *ref,
+ int ref_stride, const uint8_t *mask,
+ int mask_stride, int invert_mask) {
+ if (subpel_x_q3 | subpel_y_q3) {
+ aom_upsampled_pred(comp_pred, width, height, subpel_x_q3, subpel_y_q3, ref,
+ ref_stride);
+ ref = comp_pred;
+ ref_stride = width;
}
+ aom_comp_mask_pred(comp_pred, pred, width, height, ref, ref_stride, mask,
+ mask_stride, invert_mask);
}
#define MASK_SUBPIX_VAR(W, H) \
