fix compress filter for big endian machines

This was broken since day one as it depended on little-endianness. Fix
it by checking the byte sex in configure and let the decoders
produce host endian 16 bit audio output by using the new
write_int16_host_endian() inline function in filter.h

This allows to omit the ugly byte-swapping in osx_write we've had
before.

diff --git a/aacdec.c b/aacdec.c
index 9ed120120de7af297a0760ad237135ae535a72af..c860a3b7eb28f2957ae3790f9300b0dcbb94dca5 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -154,8 +154,8 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                goto out;
        for (i = 0; i < padd->frame_info.samples; i++) {
                short *s = (short *)outbuffer;
-               fn->buf[fn->loaded++] = s[i] & 0xff;
-               fn->buf[fn->loaded++] = (s[i] >> 8) & 0xff;
+               write_int16_host_endian(fn->buf + fn->loaded, s);
+               fn->loaded += 2;
        }
 success:
        ret = consumed;

diff --git a/configure.ac b/configure.ac
index aeb6f8d4bf3aed0ff3b1fb5e98d608ede0a7c935..316f95c74679613748e0fcc0f12c00b707d2f4a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ AC_MSG_CHECKING(os type)
 OSTYPE="`$UNAMEPATH -s`"
 AC_MSG_RESULT("$OSTYPE")
 
+AC_C_BIGENDIAN()
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL

diff --git a/filter.h b/filter.h
index 321d763c1f9cb5b743db1cbbbf3f95f2f68774cb..06d727f5fe79488951d7a539b9bcd735e9fdce17 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -299,6 +299,20 @@ void (*print_help)(void);
  */
 void *(*parse_config)(int argc, char **argv);
 };
+
+
+static inline void write_int16_host_endian(char *buf, int16_t val)
+{
+#ifndef BIGENDIAN
+       *buf = val >> 8;
+       *(buf + 1) = val & 0xff;
+#else
+       *buf = val & 0xff;
+       *(buf + 1) = val >> 8;
+#endif
+}
+
+
 /** \cond */
 extern struct filter filters[];
 #define DECLARE_EXTERN_FILTER_INIT(name) \
@@ -348,3 +362,5 @@ DECLARE_EXTERN_FILTER_INIT(oggdec);
        AACDEC_FILTER \
        OGGDEC_FILTER \
        { .name = NULL } };
+
+

diff --git a/mp3dec.c b/mp3dec.c
index 401a03c582f418d6590a7fc27007becdfab6d73d..a1374b7319b1e66167ab316c3ee03a588f5a8327 100644 (file)
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -74,14 +74,13 @@ next_frame:
        mad_synth_frame(&pmd->synth, &pmd->frame);
 
        for (i = 0; i < pmd->synth.pcm.length; i++) {
-               /* output format: unsigned 16 bit little endian */
                signed short s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
-               fn->buf[fn->loaded++] = s & 0xff;
-               fn->buf[fn->loaded++] = s >> 8;
+               write_int16_host_endian(fn->buf + fn->loaded, s);
+               fn->loaded += 2;
                if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */
                        s = MAD_TO_SHORT(pmd->synth.pcm.samples[1][i]);
-                       fn->buf[fn->loaded++] = s & 0xff;
-                       fn->buf[fn->loaded++] = s >> 8;
+                       write_int16_host_endian(fn->buf + fn->loaded, s);
+                       fn->loaded += 2;
                }
                if (fn->loaded != fn->bufsize) /* output buffer not full */
                        continue;

diff --git a/oggdec.c b/oggdec.c
index 929e2eccf7df08435b2d59f17561a6012f7822ee..2ec13d8d21a36feb533948a8b08b6c82c6f3aa21 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -31,7 +31,11 @@
 
 /** \cond some internal constants */
 #define BITS 16
+#ifdef BIGENDIAN
 #define ENDIAN 0
+#else
+#define ENDIAN 1
+#endif
 #define SIGN 1
 /** \endcond */
 

diff --git a/osx_write.c b/osx_write.c
index 107746c78e83f8f875d640a27114ee0d57eb01fa..f13ec6e1988e00ebce5a9639167650fceea24d6d 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -111,14 +111,8 @@ static void fill_buffer(struct osx_buffer *b, short *source, long size)
                b->size = size;
        }
        dest = b->buffer;
-       while (size--) {
-               char *tmp = (char *)source;
-               char c = *tmp;
-               *tmp = *(tmp + 1);
-               *(tmp + 1) = c;
-               /* *dest++ = ((*source++) + 32768) / 65536.0; */
+       while (size--)
                *dest++ = (*source++) / 32768.0;
-       }
        b->ptr = b->buffer;
        b->remaining = b->size;
 }