* Copyright (C) 2002-2006 Jean-Marc Valin
* Copyright (C) 2010 Andre Noll <maan@tuebingen.mpg.de>
*
- * Licensed under the GPL v2. For licencing details see COPYING.
+ * Licensed under the GPL v2, see file COPYING.
*/
/** \file spxdec_filter.c Paraslash's ogg/speex decoder. */
#include <speex/speex_callbacks.h>
#include "para.h"
+#include "portable_io.h"
#include "list.h"
#include "sched.h"
#include "buffer_tree.h"
static void spxdec_open(struct filter_node *fn)
{
- struct private_spxdec_data *psd = para_calloc(sizeof(*psd));
+ struct private_spxdec_data *psd = zalloc(sizeof(*psd));
fn->private_data = psd;
fn->min_iqs = 200;
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.
*
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;