av1_block_error_lp_neon: fix block_size param type int -> intptr_t. This fixes a Control Flow Integrity (CFI) sanitizer failure. This also fixes a -Wmissing-prototypes warning. This is a port of a broader change that contained the fix: b44333201b *_neon.c: add missing rtcd includes & CONFIG check Bug: aomedia:3416 Change-Id: I2e6980fba33631f5bb612d40dfc83b6f2527fe4b
diff --git a/av1/encoder/arm/neon/av1_error_neon.c b/av1/encoder/arm/neon/av1_error_neon.c index 26d06b4..1d4299f 100644 --- a/av1/encoder/arm/neon/av1_error_neon.c +++ b/av1/encoder/arm/neon/av1_error_neon.c
@@ -13,6 +13,7 @@ #include <assert.h> #include "config/aom_config.h" +#include "config/av1_rtcd.h" #include "aom_dsp/aom_dsp_common.h" #include "aom_dsp/arm/mem_neon.h" @@ -63,7 +64,7 @@ } int64_t av1_block_error_lp_neon(const int16_t *coeff, const int16_t *dqcoeff, - int block_size) { + intptr_t block_size) { uint64x2_t err_u64 = vdupq_n_u64(0); assert(block_size >= 16);