From b5aa48551300eed678aaea86ced7086758598a35 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 May 2014 03:29:33 -0700 Subject: [PATCH] ppc: Move vec_unaligned_load macro to util_altivec This allows reusing it from multiple files. --- libavcodec/ppc/int_altivec.c | 4 +--- libavutil/ppc/util_altivec.h | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c index 42c396c244..cd1984a54c 100644 --- a/libavcodec/ppc/int_altivec.c +++ b/libavcodec/ppc/int_altivec.c @@ -30,6 +30,7 @@ #include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" +#include "libavutil/ppc/util_altivec.h" #include "libavcodec/dsputil.h" #include "dsputil_altivec.h" @@ -46,9 +47,6 @@ static int ssd_int8_vs_int16_altivec(const int8_t *pix1, const int16_t *pix2, // XXX lazy way, fix it later -#define vec_unaligned_load(b) \ - vec_perm(vec_ld(0, b), vec_ld(15, b), vec_lvsl(0, b)); - while (size16) { // score += (pix1[i] - pix2[i]) * (pix1[i] - pix2[i]); // load pix1 and the first batch of pix2 diff --git a/libavutil/ppc/util_altivec.h b/libavutil/ppc/util_altivec.h index 4b94b04ff1..5624ac5523 100644 --- a/libavutil/ppc/util_altivec.h +++ b/libavutil/ppc/util_altivec.h @@ -106,6 +106,9 @@ static inline vec_u8 load_with_perm_vec(int offset, uint8_t *src, vec_u8 perm_ve return vec_perm(a, b, perm_vec); } +#define vec_unaligned_load(b) \ + vec_perm(vec_ld(0, b), vec_ld(15, b), vec_lvsl(0, b)); + #endif /* HAVE_ALTIVEC */ #endif /* AVUTIL_PPC_UTIL_ALTIVEC_H */