# HG changeset patch # User jkeil # Date 1034452921 0 # Node ID 41e8d0916c6063233ecfa3c99accf797a8e44c38 # Parent 05ded2e1327a04608d27198abeaf1c69ac6dfe50 Fix for audio filters on big endian cpus. It's working now on Solaris SPARC & x86 diff -r 05ded2e1327a -r 41e8d0916c60 libaf/af_format.c --- a/libaf/af_format.c Sat Oct 12 16:40:56 2002 +0000 +++ b/libaf/af_format.c Sat Oct 12 20:02:01 2002 +0000 @@ -28,6 +28,12 @@ #define LE (1<<2) // Little Endian #define END_MASK (1<<2) +#if WORDS_BIGENDIAN // native endian of cpu +#define NE BE +#else +#define NE LE +#endif + // Signed #define US (0<<3) // Un Signed #define SI (1<<3) // SIgned @@ -128,8 +134,8 @@ la = l->audio; - // Change to little endian - if((cf&END_MASK)!=LE){ + // Change to cpu native endian + if((cf&END_MASK)!=NE){ switch(cf&NBITS_MASK){ case(B16):{ register uint16_t s; @@ -150,6 +156,7 @@ break; } } + // Change signed/unsigned if((cf&SIGN_MASK) != (lf&SIGN_MASK)){ switch((cf&NBITS_MASK)){ @@ -234,8 +241,9 @@ break; } } - // Switch to the correct endainess (again the problem with sun?) - if((lf&END_MASK)!=LE){ + + // Switch from cpu native endian to the correct endianess + if((lf&END_MASK)!=NE){ switch(lf&NBITS_MASK){ case(B16):{ register uint16_t s; diff -r 05ded2e1327a -r 41e8d0916c60 libaf/af_resample.c --- a/libaf/af_resample.c Sat Oct 12 16:40:56 2002 +0000 +++ b/libaf/af_resample.c Sat Oct 12 20:02:01 2002 +0000 @@ -212,11 +212,11 @@ // Set parameters af->data->nch = n->nch; - af->data->format = AFMT_S16_LE; + af->data->format = AFMT_S16_NE; af->data->bps = 2; if(af->data->format != n->format || af->data->bps != n->bps) rv = AF_FALSE; - n->format = AFMT_S16_LE; + n->format = AFMT_S16_NE; n->bps = 2; // Calculate up and down sampling factors diff -r 05ded2e1327a -r 41e8d0916c60 libao2/afmt.h --- a/libao2/afmt.h Sat Oct 12 16:40:56 2002 +0000 +++ b/libao2/afmt.h Sat Oct 12 20:02:01 2002 +0000 @@ -36,3 +36,14 @@ # define AFMT_S32_BE 0x00002000 #endif + +/* native endian formats */ +#ifndef AFMT_S16_NE +# if WORDS_BIGENDIAN +# define AFMT_S16_NE AFMT_S16_BE +# define AFMT_S32_NE AFMT_S32_BE +# else +# define AFMT_S16_NE AFMT_S16_LE +# define AFMT_S32_NE AFMT_S32_LE +# endif +#endif