sad avg: align intermediate buffer
comp_avg_pred has started declaring a requirement for aligned buffers. BUG=webm:1390 Change-Id: Idaf6667498ea343e8d49b32bc9d8b9d0aa43ef5c
This commit is contained in:
@@ -39,7 +39,7 @@ static INLINE unsigned int sad(const uint8_t *a, int a_stride, const uint8_t *b,
|
|||||||
unsigned int vpx_sad##m##x##n##_avg_c(const uint8_t *src, int src_stride, \
|
unsigned int vpx_sad##m##x##n##_avg_c(const uint8_t *src, int src_stride, \
|
||||||
const uint8_t *ref, int ref_stride, \
|
const uint8_t *ref, int ref_stride, \
|
||||||
const uint8_t *second_pred) { \
|
const uint8_t *second_pred) { \
|
||||||
uint8_t comp_pred[m * n]; \
|
DECLARE_ALIGNED(16, uint8_t, comp_pred[m * n]); \
|
||||||
vpx_comp_avg_pred_c(comp_pred, second_pred, m, n, ref, ref_stride); \
|
vpx_comp_avg_pred_c(comp_pred, second_pred, m, n, ref, ref_stride); \
|
||||||
return sad(src, src_stride, comp_pred, m, m, n); \
|
return sad(src, src_stride, comp_pred, m, m, n); \
|
||||||
}
|
}
|
||||||
@@ -178,7 +178,7 @@ static INLINE unsigned int highbd_sadb(const uint8_t *a8, int a_stride,
|
|||||||
unsigned int vpx_highbd_sad##m##x##n##_avg_c( \
|
unsigned int vpx_highbd_sad##m##x##n##_avg_c( \
|
||||||
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
|
const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, \
|
||||||
const uint8_t *second_pred) { \
|
const uint8_t *second_pred) { \
|
||||||
uint16_t comp_pred[m * n]; \
|
DECLARE_ALIGNED(16, uint16_t, comp_pred[m * n]); \
|
||||||
vpx_highbd_comp_avg_pred_c(comp_pred, second_pred, m, n, ref, ref_stride); \
|
vpx_highbd_comp_avg_pred_c(comp_pred, second_pred, m, n, ref, ref_stride); \
|
||||||
return highbd_sadb(src, src_stride, comp_pred, m, m, n); \
|
return highbd_sadb(src, src_stride, comp_pred, m, m, n); \
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user