Merge branch 'refs/heads/t/blob'

A single endian fix to blob.c.  Started on 2018-09-04, cooking since
2018-10-13, merged on 2018-12-21.

* refs/heads/t/blob:
  blob: Avoid direct access to blob IDs.

diff --git a/spxdec_filter.c b/spxdec_filter.c
index 5aa78b44bf79314dda28e82a83f0153f63d35e6d..7be817ddaa49bf97e5d4025c43be63b42da9cd4c 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.
  *
@@ -178,7 +173,7 @@ static int speexdec_write_frames(int packet_no,
                samples = new_frame_size * psd->shi.channels;
                btr_output = para_malloc(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;