sad.c: normalize pointer types in highbd_sadb
this matches highbd_sad and quiets a static analysis warning:
The right operand of '-' is a garbage value
sad += abs(a[x] - b[x]);
BUG=aomedia:2312
Change-Id: Ibd92d8a3e1afd06064751c8402a6a3199ae1ec7c
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c
index 9169e78..d885154 100644
--- a/aom_dsp/sad.c
+++ b/aom_dsp/sad.c
@@ -178,11 +178,12 @@
}
static INLINE unsigned int highbd_sadb(const uint8_t *a8, int a_stride,
- const uint16_t *b, int b_stride,
+ const uint8_t *b8, int b_stride,
int width, int height) {
int y, x;
unsigned int sad = 0;
const uint16_t *a = CONVERT_TO_SHORTPTR(a8);
+ const uint16_t *b = CONVERT_TO_SHORTPTR(b8);
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++) {
sad += abs(a[x] - b[x]);
@@ -204,18 +205,18 @@
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
const uint8_t *second_pred) { \
uint16_t comp_pred[m * n]; \
- aom_highbd_comp_avg_pred(CONVERT_TO_BYTEPTR(comp_pred), second_pred, m, n, \
- ref, ref_stride); \
- return highbd_sadb(src, src_stride, comp_pred, m, m, n); \
+ uint8_t *const comp_pred8 = CONVERT_TO_BYTEPTR(comp_pred); \
+ aom_highbd_comp_avg_pred(comp_pred8, second_pred, m, n, ref, ref_stride); \
+ return highbd_sadb(src, src_stride, comp_pred8, m, m, n); \
} \
unsigned int aom_highbd_dist_wtd_sad##m##x##n##_avg_c( \
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param) { \
uint16_t comp_pred[m * n]; \
- aom_highbd_dist_wtd_comp_avg_pred(CONVERT_TO_BYTEPTR(comp_pred), \
- second_pred, m, n, ref, ref_stride, \
- jcp_param); \
- return highbd_sadb(src, src_stride, comp_pred, m, m, n); \
+ uint8_t *const comp_pred8 = CONVERT_TO_BYTEPTR(comp_pred); \
+ aom_highbd_dist_wtd_comp_avg_pred(comp_pred8, second_pred, m, n, ref, \
+ ref_stride, jcp_param); \
+ return highbd_sadb(src, src_stride, comp_pred8, m, m, n); \
}
#define highbd_sadMxNx4D(m, n) \
