diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-27 21:47:25 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-27 21:47:25 +0000 |
| commit | 54cbe5eec30a3ad956fd4cc4c25e81dc64d265b6 (patch) | |
| tree | 730f05e8c86d86b1c8383c5eabb8a673198b77a3 /liba52 | |
| parent | 85ea1a5733395160c41c46e19c4a6c268f9de901 (diff) | |
| download | mpv-54cbe5eec30a3ad956fd4cc4c25e81dc64d265b6.tar.bz2 mpv-54cbe5eec30a3ad956fd4cc4c25e81dc64d265b6.tar.xz | |
The two attached patches *should* allow for proper
compilation of the AltiVec stuff on both Darwin
and non-Darwin system. They've only been tested
for compilation on Debian using Debian's gcc-3.2.
Romain Dolbeau <dolbeau@irisa.fr>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9123 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
| -rw-r--r-- | liba52/Makefile | 4 | ||||
| -rw-r--r-- | liba52/imdct.c | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/liba52/Makefile b/liba52/Makefile index b8c0b71311..d09e2e7378 100644 --- a/liba52/Makefile +++ b/liba52/Makefile @@ -8,7 +8,11 @@ OBJS = $(SRCS:.c=.o) CFLAGS = $(MLIB_INC) $(OPTFLAGS) ifeq ($(TARGET_ALTIVEC),yes) +ifeq ($(TARGET_OS),Darwin) CFLAGS+= -faltivec +else + CFLAGS+= -maltivec -mabi=altivec +endif endif .SUFFIXES: .c .o diff --git a/liba52/imdct.c b/liba52/imdct.c index f287094678..2b3b850269 100644 --- a/liba52/imdct.c +++ b/liba52/imdct.c @@ -387,6 +387,10 @@ imdct_do_512(sample_t data[],sample_t delay[], sample_t bias) #ifdef HAVE_ALTIVEC +#ifndef SYS_DARWIN +#include <altivec.h> +#endif + // used to build registers permutation vectors (vcprm) // the 's' are for words in the _s_econd vector #define WORD_0 0x00,0x01,0x02,0x03 @@ -398,7 +402,11 @@ imdct_do_512(sample_t data[],sample_t delay[], sample_t bias) #define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s3 0x1c,0x1d,0x1e,0x1f +#ifdef SYS_DARWIN #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) +#else +#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} +#endif // vcprmle is used to keep the same index as in the SSE version. // it's the same as vcprm, with the index inversed @@ -410,7 +418,18 @@ imdct_do_512(sample_t data[],sample_t delay[], sample_t bias) #define FLOAT_n -1. #define FLOAT_p 1. +#ifdef SYS_DARWIN #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) +#else +#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} +#endif + +#ifdef SYS_DARWIN +#define FOUROF(a) (a) +#else +#define FOUROF(a) {a,a,a,a} +#endif + void imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias) @@ -601,7 +620,7 @@ imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias) int p = k + i; int q = p + two_m; vector float vecp, vecq, vecw, temp1, temp2, temp3, temp4; - const vector float vczero = (const vector float)(0); + const vector float vczero = (const vector float)FOUROF(0.); // first compute buf[q] and buf[q+1] vecq = vec_ld(q << 3, (float*)buf); vecw = vec_ld(0, (float*)&(w[m][k])); @@ -658,7 +677,7 @@ imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias) #else vector float bufv_0, bufv_2, cosv, sinv, temp1, temp2; vector float temp0022, temp1133, tempCS01; - const vector float vczero = (const vector float)(0); + const vector float vczero = (const vector float)FOUROF(0.); bufv_0 = vec_ld((i + 0) << 3, (float*)buf); bufv_2 = vec_ld((i + 2) << 3, (float*)buf); |