Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918

1 files changed, 81 insertions, 85 deletions

diff --git a/media/libaom/config/generic/av1_rtcd.h b/media/libaom/config/generic/av1_rtcd.h
index c9a1e8458..85c65c4d8 100644
--- a/media/libaom/config/generic/av1_rtcd.h
+++ b/media/libaom/config/generic/av1_rtcd.h
@@ -12,6 +12,7 @@
  */
 
 #include "aom/aom_integer.h"
+#include "aom_dsp/txfm_common.h"
 #include "av1/common/common.h"
 #include "av1/common/enums.h"
 #include "av1/common/quant_common.h"
@@ -24,6 +25,7 @@ struct macroblockd;
 
 /* Encoder forward decls */
 struct macroblock;
+struct txfm_param;
 struct aom_variance_vtable;
 struct search_site_config;
 struct mv;
@@ -62,46 +64,46 @@ int av1_diamond_search_sad_c(struct macroblock *x, const struct search_site_conf
 void av1_fdct8x8_quant_c(const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 #define av1_fdct8x8_quant av1_fdct8x8_quant_c
 
-void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht16x16 av1_fht16x16_c
 
-void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht16x32 av1_fht16x32_c
 
-void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht16x4 av1_fht16x4_c
 
-void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht16x8 av1_fht16x8_c
 
-void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht32x16 av1_fht32x16_c
 
-void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht32x32 av1_fht32x32_c
 
-void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht32x8 av1_fht32x8_c
 
-void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht4x16 av1_fht4x16_c
 
-void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht4x4 av1_fht4x4_c
 
-void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht4x8 av1_fht4x8_c
 
-void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht8x16 av1_fht8x16_c
 
-void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht8x32 av1_fht8x32_c
 
-void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht8x4 av1_fht8x4_c
 
-void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param);
 #define av1_fht8x8 av1_fht8x8_c
 
 int av1_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct aom_variance_vtable *fn_ptr, const struct mv *center_mv);
@@ -116,15 +118,33 @@ void av1_fwd_idtx_c(const int16_t *src_diff, tran_low_t *coeff, int stride, int
 void av1_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
 #define av1_fwd_txfm2d_16x16 av1_fwd_txfm2d_16x16_c
 
+void av1_fwd_txfm2d_16x32_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
+#define av1_fwd_txfm2d_16x32 av1_fwd_txfm2d_16x32_c
+
+void av1_fwd_txfm2d_16x8_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
+#define av1_fwd_txfm2d_16x8 av1_fwd_txfm2d_16x8_c
+
+void av1_fwd_txfm2d_32x16_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
+#define av1_fwd_txfm2d_32x16 av1_fwd_txfm2d_32x16_c
+
 void av1_fwd_txfm2d_32x32_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
 #define av1_fwd_txfm2d_32x32 av1_fwd_txfm2d_32x32_c
 
 void av1_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
 #define av1_fwd_txfm2d_4x4 av1_fwd_txfm2d_4x4_c
 
+void av1_fwd_txfm2d_4x8_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
+#define av1_fwd_txfm2d_4x8 av1_fwd_txfm2d_4x8_c
+
 void av1_fwd_txfm2d_64x64_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
 #define av1_fwd_txfm2d_64x64 av1_fwd_txfm2d_64x64_c
 
+void av1_fwd_txfm2d_8x16_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
+#define av1_fwd_txfm2d_8x16 av1_fwd_txfm2d_8x16_c
+
+void av1_fwd_txfm2d_8x4_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
+#define av1_fwd_txfm2d_8x4 av1_fwd_txfm2d_8x4_c
+
 void av1_fwd_txfm2d_8x8_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd);
 #define av1_fwd_txfm2d_8x8 av1_fwd_txfm2d_8x8_c
 
@@ -167,88 +187,46 @@ void av1_highbd_convolve_init_c(void);
 void av1_highbd_convolve_vert_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams fp, const int subpel_x_q4, int x_step_q4, int avg, int bd);
 #define av1_highbd_convolve_vert av1_highbd_convolve_vert_c
 
-void av1_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht16x16 av1_highbd_fht16x16_c
-
-void av1_highbd_fht16x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht16x32 av1_highbd_fht16x32_c
-
-void av1_highbd_fht16x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht16x4 av1_highbd_fht16x4_c
-
-void av1_highbd_fht16x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht16x8 av1_highbd_fht16x8_c
-
-void av1_highbd_fht32x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht32x16 av1_highbd_fht32x16_c
-
-void av1_highbd_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht32x32 av1_highbd_fht32x32_c
-
-void av1_highbd_fht32x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht32x8 av1_highbd_fht32x8_c
-
-void av1_highbd_fht4x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht4x16 av1_highbd_fht4x16_c
-
-void av1_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht4x4 av1_highbd_fht4x4_c
-
-void av1_highbd_fht4x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht4x8 av1_highbd_fht4x8_c
-
-void av1_highbd_fht8x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht8x16 av1_highbd_fht8x16_c
-
-void av1_highbd_fht8x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht8x32 av1_highbd_fht8x32_c
-
-void av1_highbd_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht8x4 av1_highbd_fht8x4_c
-
-void av1_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define av1_highbd_fht8x8 av1_highbd_fht8x8_c
-
 void av1_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
 #define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
 
-void av1_highbd_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type, int bd);
+void av1_highbd_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param);
 #define av1_highbd_iht16x16_256_add av1_highbd_iht16x16_256_add_c
 
-void av1_highbd_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht16x32_512_add av1_highbd_iht16x32_512_add_c
 
-void av1_highbd_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht16x4_64_add av1_highbd_iht16x4_64_add_c
 
-void av1_highbd_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht16x8_128_add av1_highbd_iht16x8_128_add_c
 
-void av1_highbd_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht32x16_512_add av1_highbd_iht32x16_512_add_c
 
-void av1_highbd_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht32x8_256_add av1_highbd_iht32x8_256_add_c
 
-void av1_highbd_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht4x16_64_add av1_highbd_iht4x16_64_add_c
 
-void av1_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht4x4_16_add av1_highbd_iht4x4_16_add_c
 
-void av1_highbd_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht4x8_32_add av1_highbd_iht4x8_32_add_c
 
-void av1_highbd_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht8x16_128_add av1_highbd_iht8x16_128_add_c
 
-void av1_highbd_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht8x32_256_add av1_highbd_iht8x32_256_add_c
 
-void av1_highbd_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht8x4_32_add av1_highbd_iht8x4_32_add_c
 
-void av1_highbd_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd);
+void av1_highbd_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_highbd_iht8x8_64_add av1_highbd_iht8x8_64_add_c
 
 void av1_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, int log_scale);
@@ -260,63 +238,81 @@ void av1_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, in
 void av1_highbd_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
 #define av1_highbd_temporal_filter_apply av1_highbd_temporal_filter_apply_c
 
-void av1_highbd_warp_affine_c(const int32_t *mat, const uint16_t *ref, int width, int height, int stride, uint16_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int bd, int comp_avg, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
+void av1_highbd_warp_affine_c(const int32_t *mat, const uint16_t *ref, int width, int height, int stride, uint16_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int bd, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
 #define av1_highbd_warp_affine av1_highbd_warp_affine_c
 
-void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param);
 #define av1_iht16x16_256_add av1_iht16x16_256_add_c
 
-void av1_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht16x32_512_add av1_iht16x32_512_add_c
 
-void av1_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht16x4_64_add av1_iht16x4_64_add_c
 
-void av1_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht16x8_128_add av1_iht16x8_128_add_c
 
-void av1_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht32x16_512_add av1_iht32x16_512_add_c
 
-void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param);
 #define av1_iht32x32_1024_add av1_iht32x32_1024_add_c
 
-void av1_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht32x8_256_add av1_iht32x8_256_add_c
 
-void av1_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht4x16_64_add av1_iht4x16_64_add_c
 
-void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht4x4_16_add av1_iht4x4_16_add_c
 
-void av1_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht4x8_32_add av1_iht4x8_32_add_c
 
-void av1_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht8x16_128_add av1_iht8x16_128_add_c
 
-void av1_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht8x32_256_add av1_iht8x32_256_add_c
 
-void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht8x4_32_add av1_iht8x4_32_add_c
 
-void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param);
 #define av1_iht8x8_64_add av1_iht8x8_64_add_c
 
 void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
 #define av1_inv_txfm2d_add_16x16 av1_inv_txfm2d_add_16x16_c
 
+void av1_inv_txfm2d_add_16x32_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
+#define av1_inv_txfm2d_add_16x32 av1_inv_txfm2d_add_16x32_c
+
+void av1_inv_txfm2d_add_16x8_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
+#define av1_inv_txfm2d_add_16x8 av1_inv_txfm2d_add_16x8_c
+
+void av1_inv_txfm2d_add_32x16_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
+#define av1_inv_txfm2d_add_32x16 av1_inv_txfm2d_add_32x16_c
+
 void av1_inv_txfm2d_add_32x32_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
 #define av1_inv_txfm2d_add_32x32 av1_inv_txfm2d_add_32x32_c
 
 void av1_inv_txfm2d_add_4x4_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
 #define av1_inv_txfm2d_add_4x4 av1_inv_txfm2d_add_4x4_c
 
+void av1_inv_txfm2d_add_4x8_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
+#define av1_inv_txfm2d_add_4x8 av1_inv_txfm2d_add_4x8_c
+
 void av1_inv_txfm2d_add_64x64_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
 #define av1_inv_txfm2d_add_64x64 av1_inv_txfm2d_add_64x64_c
 
+void av1_inv_txfm2d_add_8x16_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
+#define av1_inv_txfm2d_add_8x16 av1_inv_txfm2d_add_8x16_c
+
+void av1_inv_txfm2d_add_8x4_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
+#define av1_inv_txfm2d_add_8x4 av1_inv_txfm2d_add_8x4_c
+
 void av1_inv_txfm2d_add_8x8_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd);
 #define av1_inv_txfm2d_add_8x8 av1_inv_txfm2d_add_8x8_c
 
@@ -335,7 +331,7 @@ void av1_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int
 void av1_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
 #define av1_temporal_filter_apply av1_temporal_filter_apply_c
 
-void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width, int height, int stride, uint8_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int comp_avg, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
+void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width, int height, int stride, uint8_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
 #define av1_warp_affine av1_warp_affine_c
 
 void av1_wedge_compute_delta_squares_c(int16_t *d, const int16_t *a, const int16_t *b, int N);