Uros Bizjak <uros@kss-loka.si>

Tue, 14 Dec 1999 09:44:18 +0100 (CET)
Endianness fixes...

diff --git a/src/pcm/plugin/adpcm.c b/src/pcm/plugin/adpcm.c
index 50c8d25da9bf540623797a07ecf0443eb131eb60..39be8db428abe07357108f006006400d1f408a5a 100644 (file)
--- a/src/pcm/plugin/adpcm.c
+++ b/src/pcm/plugin/adpcm.c
@@ -303,7 +303,7 @@ static void adpcm_conv_u16bit_adpcm(adpcm_state_t * state_ptr, unsigned short *s
 static void adpcm_conv_u16bit_swap_adpcm(adpcm_state_t * state_ptr, unsigned short *src_ptr, unsigned char *dst_ptr, size_t size)
 {
        while (size-- > 0) {
-               state_ptr->io_buffer |= adpcm_encoder((signed short)(bswap_16((*src_ptr++) ^ 0x8000)), state_ptr) << state_ptr->io_shift;
+               state_ptr->io_buffer |= adpcm_encoder((signed short)(bswap_16(*src_ptr++) ^ 0x8000), state_ptr) << state_ptr->io_shift;
                if (!(state_ptr->io_shift)) {
                        *dst_ptr++ = state_ptr->io_buffer & 0xff;
                        state_ptr->io_buffer = 0;

diff --git a/src/pcm/plugin/alaw.c b/src/pcm/plugin/alaw.c
index 5733886d26b0e9da9ab2af95f3fa87a2aaeaf586..86d73637222412041892a9822edaf54c81a9b07f 100644 (file)
--- a/src/pcm/plugin/alaw.c
+++ b/src/pcm/plugin/alaw.c
@@ -191,7 +191,7 @@ static void alaw_conv_u16bit_alaw(unsigned short *src_ptr, unsigned char *dst_pt
 static void alaw_conv_u16bit_swap_alaw(unsigned short *src_ptr, unsigned char *dst_ptr, size_t size)
 {
        while (size-- > 0)
-               *dst_ptr++ = linear2alaw((signed short)(bswap_16((*src_ptr++) ^ 0x8000)));
+               *dst_ptr++ = linear2alaw((signed short)(bswap_16(*src_ptr++) ^ 0x8000));
 }
 
 static void alaw_conv_alaw_u8bit(unsigned char *src_ptr, unsigned char *dst_ptr, size_t size)

diff --git a/src/pcm/plugin/mulaw.c b/src/pcm/plugin/mulaw.c
index d6a62ce0ef5bac8ba0a726c8c2d1671b5a52dd17..44b23830fd1fc3a96c78f8593c2d17d121f97ee7 100644 (file)
--- a/src/pcm/plugin/mulaw.c
+++ b/src/pcm/plugin/mulaw.c
@@ -207,7 +207,7 @@ static void mulaw_conv_u16bit_mulaw(unsigned short *src_ptr, unsigned char *dst_
 static void mulaw_conv_u16bit_swap_mulaw(unsigned short *src_ptr, unsigned char *dst_ptr, size_t size)
 {
        while (size-- > 0)
-               *dst_ptr++ = linear2ulaw((signed short)(bswap_16((*src_ptr++) ^ 0x8000)));
+               *dst_ptr++ = linear2ulaw((signed short)(bswap_16(*src_ptr++) ^ 0x8000));
 }
 
 static void mulaw_conv_mulaw_u8bit(unsigned char *src_ptr, unsigned char *dst_ptr, size_t size)