string: Rename para_malloc() -> alloc().

[paraslash.git] / spxdec_filter.c

diff --git a/spxdec_filter.c b/spxdec_filter.c
index 5aa78b44bf79314dda28e82a83f0153f63d35e6d..1a4fe9a716ce0419b813ce269f8b2cd8c4d7cfc9 100644 (file)
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -48,6 +48,7 @@
 #include <speex/speex_callbacks.h>
 
 #include "para.h"
+#include "portable_io.h"
 #include "list.h"
 #include "sched.h"
 #include "buffer_tree.h"
@@ -121,12 +122,6 @@ static int speexdec_init(struct filter_node *fn)
        return 1;
 }
 
-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
-#define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#else
-#define le_short(s) ((short) (s))
-#endif
-
 /**
  * Size of the output buffer.
  *
@@ -176,9 +171,9 @@ static int speexdec_write_frames(int packet_no,
                if (new_frame_size <= 0)
                        continue;
                samples = new_frame_size * psd->shi.channels;
-               btr_output = para_malloc(2 * samples);
+               btr_output = alloc(2 * samples);
                for (i = 0; i < samples; i++)
-                       btr_output[i] = le_short(output[i + skip_idx]);
+                       btr_output[i] = read_u16(output + i + skip_idx);
                btr_add_output((char *)btr_output, samples * 2, btrn);
        }
        return 1;