Fix CFI santizer failure for test_libaom. made changes to function parameter to match their declaration BUG=webm:1564 Change-Id: Id5bdbd1ce87f2d739a052d31dd50bcaa78b6abcf
diff --git a/av1/encoder/hash.c b/av1/encoder/hash.c index 180115d..6306638 100644 --- a/av1/encoder/hash.c +++ b/av1/encoder/hash.c
@@ -99,10 +99,10 @@ /* Table-driven software version as a fall-back. This is about 15 times slower than using the hardware instructions. This assumes little-endian integers, as is the case on Intel processors that the assembler code here is for. */ -uint32_t av1_get_crc32c_value_c(CRC32C *p, uint8_t *buf, size_t len) { +uint32_t av1_get_crc32c_value_c(void *c, uint8_t *buf, size_t len) { const uint8_t *next = (const uint8_t *)(buf); uint64_t crc; - + CRC32C *p = (CRC32C *)c; crc = 0 ^ 0xffffffff; while (len && ((uintptr_t)next & 7) != 0) { crc = p->table[0][(crc ^ *next++) & 0xff] ^ (crc >> 8);
diff --git a/av1/encoder/x86/highbd_block_error_intrin_sse2.c b/av1/encoder/x86/highbd_block_error_intrin_sse2.c index 777304a..4579e4e 100644 --- a/av1/encoder/x86/highbd_block_error_intrin_sse2.c +++ b/av1/encoder/x86/highbd_block_error_intrin_sse2.c
@@ -14,7 +14,8 @@ #include "av1/common/common.h" -int64_t av1_highbd_block_error_sse2(tran_low_t *coeff, tran_low_t *dqcoeff, +int64_t av1_highbd_block_error_sse2(const tran_low_t *coeff, + const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz, int bps) { int i, j, test;