Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9390ec85c0ab98444140190f936a37fa4eb945a2
Commit:     9390ec85c0ab98444140190f936a37fa4eb945a2
Parent:     887f9f0253ba4a52f38810f3056cdf040a6157b3
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 8 15:50:58 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 15:58:31 2007 +0200

    [ALSA] Simplify the format conversion in PCM OSS emulation
    
    Simplify the format conversion code in PCM OSS emulation.
    This patch also adds the support of 3bytes 24bit formats with linear
    and mulaw, but they are not enabled in pcm_plugin.c yet.
    
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/oss/linear.c     |   80 ++++++----
 sound/core/oss/mulaw.c      |   83 ++++++----
 sound/core/oss/plugin_ops.h |  370 -------------------------------------------
 3 files changed, 97 insertions(+), 436 deletions(-)

diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index a3cfe7c..41b2885 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -31,19 +31,34 @@
  */
  
 struct linear_priv {
-       int conv;
+       int cvt_endian;         /* need endian conversion? */
+       unsigned int src_ofs;   /* byte offset in source format */
+       unsigned int dst_ofs;   /* byte soffset in destination format */
+       unsigned int copy_ofs;  /* byte offset in temporary u32 data */
+       unsigned int dst_bytes;         /* byte size of destination format */
+       unsigned int copy_bytes;        /* bytes to copy per conversion */
+       unsigned int flip; /* MSB flip for signeness, done after endian conv */
 };
 
+static inline void do_convert(struct linear_priv *data,
+                             unsigned char *dst, unsigned char *src)
+{
+       unsigned int tmp = 0;
+       unsigned char *p = (unsigned char *)&tmp;
+
+       memcpy(p + data->copy_ofs, src + data->src_ofs, data->copy_bytes);
+       if (data->cvt_endian)
+               tmp = swab32(tmp);
+       tmp ^= data->flip;
+       memcpy(dst, p + data->dst_ofs, data->dst_bytes);
+}
+
 static void convert(struct snd_pcm_plugin *plugin,
                    const struct snd_pcm_plugin_channel *src_channels,
                    struct snd_pcm_plugin_channel *dst_channels,
                    snd_pcm_uframes_t frames)
 {
-#define CONV_LABELS
-#include "plugin_ops.h"
-#undef CONV_LABELS
        struct linear_priv *data = (struct linear_priv *)plugin->extra_data;
-       void *conv = conv_labels[data->conv];
        int channel;
        int nchannels = plugin->src_format.channels;
        for (channel = 0; channel < nchannels; ++channel) {
@@ -64,11 +79,7 @@ static void convert(struct snd_pcm_plugin *plugin,
                dst_step = dst_channels[channel].area.step / 8;
                frames1 = frames;
                while (frames1-- > 0) {
-                       goto *conv;
-#define CONV_END after
-#include "plugin_ops.h"
-#undef CONV_END
-               after:
+                       do_convert(data, dst, src);
                        src += src_step;
                        dst += dst_step;
                }
@@ -103,29 +114,36 @@ static snd_pcm_sframes_t linear_transfer(struct 
snd_pcm_plugin *plugin,
        return frames;
 }
 
-static int conv_index(int src_format, int dst_format)
+static void init_data(struct linear_priv *data, int src_format, int dst_format)
 {
-       int src_endian, dst_endian, sign, src_width, dst_width;
+       int src_le, dst_le, src_bytes, dst_bytes;
 
-       sign = (snd_pcm_format_signed(src_format) !=
-               snd_pcm_format_signed(dst_format));
-#ifdef SNDRV_LITTLE_ENDIAN
-       src_endian = snd_pcm_format_big_endian(src_format);
-       dst_endian = snd_pcm_format_big_endian(dst_format);
-#else
-       src_endian = snd_pcm_format_little_endian(src_format);
-       dst_endian = snd_pcm_format_little_endian(dst_format);
-#endif
-
-       if (src_endian < 0)
-               src_endian = 0;
-       if (dst_endian < 0)
-               dst_endian = 0;
+       src_bytes = snd_pcm_format_width(src_format) / 8;
+       dst_bytes = snd_pcm_format_width(dst_format) / 8;
+       src_le = snd_pcm_format_little_endian(src_format) > 0;
+       dst_le = snd_pcm_format_little_endian(dst_format) > 0;
 
-       src_width = snd_pcm_format_width(src_format) / 8 - 1;
-       dst_width = snd_pcm_format_width(dst_format) / 8 - 1;
-
-       return src_width * 32 + src_endian * 16 + sign * 8 + dst_width * 2 + 
dst_endian;
+       data->dst_bytes = dst_bytes;
+       data->cvt_endian = src_le != dst_le;
+       data->copy_bytes = src_bytes < dst_bytes ? src_bytes : dst_bytes;
+       if (src_le) {
+               data->copy_ofs = 4 - data->copy_bytes;
+               data->src_ofs = src_bytes - data->copy_bytes;
+       } else
+               data->src_ofs = snd_pcm_format_physical_width(src_format) / 8 -
+                       src_bytes;
+       if (dst_le)
+               data->dst_ofs = 4 - data->dst_bytes;
+       else
+               data->dst_ofs = snd_pcm_format_physical_width(dst_format) / 8 -
+                       dst_bytes;
+       if (snd_pcm_format_signed(src_format) !=
+           snd_pcm_format_signed(dst_format)) {
+               if (dst_le)
+                       data->flip = cpu_to_le32(0x80000000);
+               else
+                       data->flip = cpu_to_be32(0x80000000);
+       }
 }
 
 int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
@@ -151,7 +169,7 @@ int snd_pcm_plugin_build_linear(struct snd_pcm_substream 
*plug,
        if (err < 0)
                return err;
        data = (struct linear_priv *)plugin->extra_data;
-       data->conv = conv_index(src_format->format, dst_format->format);
+       init_data(data, src_format->format, dst_format->format);
        plugin->transfer = linear_transfer;
        *r_plugin = plugin;
        return 0;
diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c
index 91b6242..3da3b81 100644
--- a/sound/core/oss/mulaw.c
+++ b/sound/core/oss/mulaw.c
@@ -146,19 +146,32 @@ typedef void (*mulaw_f)(struct snd_pcm_plugin *plugin,
 
 struct mulaw_priv {
        mulaw_f func;
-       int conv;
+       int cvt_endian;                 /* need endian conversion? */
+       unsigned int native_ofs;        /* byte offset in native format */
+       unsigned int copy_ofs;          /* byte offset in s16 format */
+       unsigned int native_bytes;      /* byte size of the native format */
+       unsigned int copy_bytes;        /* bytes to copy per conversion */
+       u16 flip; /* MSB flip for signedness, done after endian conversion */
 };
 
+static inline void cvt_s16_to_native(struct mulaw_priv *data,
+                                    unsigned char *dst, u16 sample)
+{
+       sample ^= data->flip;
+       if (data->cvt_endian)
+               sample = swab16(sample);
+       if (data->native_bytes > data->copy_bytes)
+               memset(dst, 0, data->native_bytes);
+       memcpy(dst + data->native_ofs, (char *)&sample + data->copy_ofs,
+              data->copy_bytes);
+}
+
 static void mulaw_decode(struct snd_pcm_plugin *plugin,
                        const struct snd_pcm_plugin_channel *src_channels,
                        struct snd_pcm_plugin_channel *dst_channels,
                        snd_pcm_uframes_t frames)
 {
-#define PUT_S16_LABELS
-#include "plugin_ops.h"
-#undef PUT_S16_LABELS
        struct mulaw_priv *data = (struct mulaw_priv *)plugin->extra_data;
-       void *put = put_s16_labels[data->conv];
        int channel;
        int nchannels = plugin->src_format.channels;
        for (channel = 0; channel < nchannels; ++channel) {
@@ -180,30 +193,33 @@ static void mulaw_decode(struct snd_pcm_plugin *plugin,
                frames1 = frames;
                while (frames1-- > 0) {
                        signed short sample = ulaw2linear(*src);
-                       goto *put;
-#define PUT_S16_END after
-#include "plugin_ops.h"
-#undef PUT_S16_END
-               after:
+                       cvt_s16_to_native(data, dst, sample);
                        src += src_step;
                        dst += dst_step;
                }
        }
 }
 
+static inline signed short cvt_native_to_s16(struct mulaw_priv *data,
+                                            unsigned char *src)
+{
+       u16 sample = 0;
+       memcpy((char *)&sample + data->copy_ofs, src + data->native_ofs,
+              data->copy_bytes);
+       if (data->cvt_endian)
+               sample = swab16(sample);
+       sample ^= data->flip;
+       return (signed short)sample;
+}
+
 static void mulaw_encode(struct snd_pcm_plugin *plugin,
                        const struct snd_pcm_plugin_channel *src_channels,
                        struct snd_pcm_plugin_channel *dst_channels,
                        snd_pcm_uframes_t frames)
 {
-#define GET_S16_LABELS
-#include "plugin_ops.h"
-#undef GET_S16_LABELS
        struct mulaw_priv *data = (struct mulaw_priv *)plugin->extra_data;
-       void *get = get_s16_labels[data->conv];
        int channel;
        int nchannels = plugin->src_format.channels;
-       signed short sample = 0;
        for (channel = 0; channel < nchannels; ++channel) {
                char *src;
                char *dst;
@@ -222,11 +238,7 @@ static void mulaw_encode(struct snd_pcm_plugin *plugin,
                dst_step = dst_channels[channel].area.step / 8;
                frames1 = frames;
                while (frames1-- > 0) {
-                       goto *get;
-#define GET_S16_END after
-#include "plugin_ops.h"
-#undef GET_S16_END
-               after:
+                       signed short sample = cvt_native_to_s16(data, src);
                        *dst = linear2ulaw(sample);
                        src += src_step;
                        dst += dst_step;
@@ -262,23 +274,25 @@ static snd_pcm_sframes_t mulaw_transfer(struct 
snd_pcm_plugin *plugin,
        return frames;
 }
 
-static int getput_index(int format)
+static void init_data(struct mulaw_priv *data, int format)
 {
-       int sign, width, endian;
-       sign = !snd_pcm_format_signed(format);
-       width = snd_pcm_format_width(format) / 8 - 1;
-       if (width < 0 || width > 3) {
-               snd_printk(KERN_ERR "snd-pcm-oss: invalid format %d\n", format);
-               width = 0;
-       }
 #ifdef SNDRV_LITTLE_ENDIAN
-       endian = snd_pcm_format_big_endian(format);
+       data->cvt_endian = snd_pcm_format_big_endian(format) > 0;
 #else
-       endian = snd_pcm_format_little_endian(format);
+       data->cvt_endian = snd_pcm_format_little_endian(format) > 0;
 #endif
-       if (endian < 0)
-               endian = 0;
-       return width * 4 + endian * 2 + sign;
+       if (!snd_pcm_format_signed(format))
+               data->flip = 0x8000;
+       data->native_bytes = snd_pcm_format_physical_width(format) / 8;
+       data->copy_bytes = data->native_bytes < 2 ? 1 : 2;
+       if (snd_pcm_format_little_endian(format)) {
+               data->native_ofs = data->native_bytes - data->copy_bytes;
+               data->copy_ofs = 2 - data->copy_bytes;
+       } else {
+               /* S24 in 4bytes need an 1 byte offset */
+               data->native_ofs = data->native_bytes -
+                       snd_pcm_format_width(format) / 8;
+       }
 }
 
 int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug,
@@ -319,8 +333,7 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream 
*plug,
                return err;
        data = (struct mulaw_priv *)plugin->extra_data;
        data->func = func;
-       data->conv = getput_index(format->format);
-       snd_assert(data->conv >= 0 && data->conv < 4*2*2, return -EINVAL);
+       init_data(data, format->format);
        plugin->transfer = mulaw_transfer;
        *r_plugin = plugin;
        return 0;
diff --git a/sound/core/oss/plugin_ops.h b/sound/core/oss/plugin_ops.h
deleted file mode 100644
index 1f5bde4..0000000
--- a/sound/core/oss/plugin_ops.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- *  Plugin sample operators with fast switch
- *  Copyright (c) 2000 by Jaroslav Kysela <[EMAIL PROTECTED]>
- *
- *
- *   This library is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Library General Public License as
- *   published by the Free Software Foundation; either version 2 of
- *   the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Library General Public License for more details.
- *
- *   You should have received a copy of the GNU Library General Public
- *   License along with this library; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
-
-#define as_u8(ptr) (*(u_int8_t*)(ptr))
-#define as_u16(ptr) (*(u_int16_t*)(ptr))
-#define as_u32(ptr) (*(u_int32_t*)(ptr))
-#define as_u64(ptr) (*(u_int64_t*)(ptr))
-#define as_s8(ptr) (*(int8_t*)(ptr))
-#define as_s16(ptr) (*(int16_t*)(ptr))
-#define as_s32(ptr) (*(int32_t*)(ptr))
-#define as_s64(ptr) (*(int64_t*)(ptr))
-
-#ifdef COPY_LABELS
-static void *copy_labels[4] = {
-       &&copy_8,
-       &&copy_16,
-       &&copy_32,
-       &&copy_64
-};
-#endif
-
-#ifdef COPY_END
-while(0) {
-copy_8: as_s8(dst) = as_s8(src); goto COPY_END;
-copy_16: as_s16(dst) = as_s16(src); goto COPY_END;
-copy_32: as_s32(dst) = as_s32(src); goto COPY_END;
-copy_64: as_s64(dst) = as_s64(src); goto COPY_END;
-}
-#endif
-
-#ifdef CONV_LABELS
-/* src_wid src_endswap sign_toggle dst_wid dst_endswap */
-static void *conv_labels[4 * 2 * 2 * 4 * 2] = {
-       &&conv_xxx1_xxx1,        /*  8h ->  8h */
-       &&conv_xxx1_xxx1,        /*  8h ->  8s */
-       &&conv_xxx1_xx10,        /*  8h -> 16h */
-       &&conv_xxx1_xx01,        /*  8h -> 16s */
-       &&conv_xxx1_x100,        /*  8h -> 24h */
-       &&conv_xxx1_001x,        /*  8h -> 24s */
-       &&conv_xxx1_1000,        /*  8h -> 32h */
-       &&conv_xxx1_0001,        /*  8h -> 32s */
-       &&conv_xxx1_xxx9,        /*  8h ^>  8h */
-       &&conv_xxx1_xxx9,        /*  8h ^>  8s */
-       &&conv_xxx1_xx90,        /*  8h ^> 16h */
-       &&conv_xxx1_xx09,        /*  8h ^> 16s */
-       &&conv_xxx1_x900,        /*  8h ^> 24h */
-       &&conv_xxx1_009x,        /*  8h ^> 24s */
-       &&conv_xxx1_9000,        /*  8h ^> 32h */
-       &&conv_xxx1_0009,        /*  8h ^> 32s */
-       &&conv_xxx1_xxx1,        /*  8s ->  8h */
-       &&conv_xxx1_xxx1,        /*  8s ->  8s */
-       &&conv_xxx1_xx10,        /*  8s -> 16h */
-       &&conv_xxx1_xx01,        /*  8s -> 16s */
-       &&conv_xxx1_x100,        /*  8s -> 24h */
-       &&conv_xxx1_001x,        /*  8s -> 24s */
-       &&conv_xxx1_1000,        /*  8s -> 32h */
-       &&conv_xxx1_0001,        /*  8s -> 32s */
-       &&conv_xxx1_xxx9,        /*  8s ^>  8h */
-       &&conv_xxx1_xxx9,        /*  8s ^>  8s */
-       &&conv_xxx1_xx90,        /*  8s ^> 16h */
-       &&conv_xxx1_xx09,        /*  8s ^> 16s */
-       &&conv_xxx1_x900,        /*  8s ^> 24h */
-       &&conv_xxx1_009x,        /*  8s ^> 24s */
-       &&conv_xxx1_9000,        /*  8s ^> 32h */
-       &&conv_xxx1_0009,        /*  8s ^> 32s */
-       &&conv_xx12_xxx1,        /* 16h ->  8h */
-       &&conv_xx12_xxx1,        /* 16h ->  8s */
-       &&conv_xx12_xx12,        /* 16h -> 16h */
-       &&conv_xx12_xx21,        /* 16h -> 16s */
-       &&conv_xx12_x120,        /* 16h -> 24h */
-       &&conv_xx12_021x,        /* 16h -> 24s */
-       &&conv_xx12_1200,        /* 16h -> 32h */
-       &&conv_xx12_0021,        /* 16h -> 32s */
-       &&conv_xx12_xxx9,        /* 16h ^>  8h */
-       &&conv_xx12_xxx9,        /* 16h ^>  8s */
-       &&conv_xx12_xx92,        /* 16h ^> 16h */
-       &&conv_xx12_xx29,        /* 16h ^> 16s */
-       &&conv_xx12_x920,        /* 16h ^> 24h */
-       &&conv_xx12_029x,        /* 16h ^> 24s */
-       &&conv_xx12_9200,        /* 16h ^> 32h */
-       &&conv_xx12_0029,        /* 16h ^> 32s */
-       &&conv_xx12_xxx2,        /* 16s ->  8h */
-       &&conv_xx12_xxx2,        /* 16s ->  8s */
-       &&conv_xx12_xx21,        /* 16s -> 16h */
-       &&conv_xx12_xx12,        /* 16s -> 16s */
-       &&conv_xx12_x210,        /* 16s -> 24h */
-       &&conv_xx12_012x,        /* 16s -> 24s */
-       &&conv_xx12_2100,        /* 16s -> 32h */
-       &&conv_xx12_0012,        /* 16s -> 32s */
-       &&conv_xx12_xxxA,        /* 16s ^>  8h */
-       &&conv_xx12_xxxA,        /* 16s ^>  8s */
-       &&conv_xx12_xxA1,        /* 16s ^> 16h */
-       &&conv_xx12_xx1A,        /* 16s ^> 16s */
-       &&conv_xx12_xA10,        /* 16s ^> 24h */
-       &&conv_xx12_01Ax,        /* 16s ^> 24s */
-       &&conv_xx12_A100,        /* 16s ^> 32h */
-       &&conv_xx12_001A,        /* 16s ^> 32s */
-       &&conv_x123_xxx1,        /* 24h ->  8h */
-       &&conv_x123_xxx1,        /* 24h ->  8s */
-       &&conv_x123_xx12,        /* 24h -> 16h */
-       &&conv_x123_xx21,        /* 24h -> 16s */
-       &&conv_x123_x123,        /* 24h -> 24h */
-       &&conv_x123_321x,        /* 24h -> 24s */
-       &&conv_x123_1230,        /* 24h -> 32h */
-       &&conv_x123_0321,        /* 24h -> 32s */
-       &&conv_x123_xxx9,        /* 24h ^>  8h */
-       &&conv_x123_xxx9,        /* 24h ^>  8s */
-       &&conv_x123_xx92,        /* 24h ^> 16h */
-       &&conv_x123_xx29,        /* 24h ^> 16s */
-       &&conv_x123_x923,        /* 24h ^> 24h */
-       &&conv_x123_329x,        /* 24h ^> 24s */
-       &&conv_x123_9230,        /* 24h ^> 32h */
-       &&conv_x123_0329,        /* 24h ^> 32s */
-       &&conv_123x_xxx3,        /* 24s ->  8h */
-       &&conv_123x_xxx3,        /* 24s ->  8s */
-       &&conv_123x_xx32,        /* 24s -> 16h */
-       &&conv_123x_xx23,        /* 24s -> 16s */
-       &&conv_123x_x321,        /* 24s -> 24h */
-       &&conv_123x_123x,        /* 24s -> 24s */
-       &&conv_123x_3210,        /* 24s -> 32h */
-       &&conv_123x_0123,        /* 24s -> 32s */
-       &&conv_123x_xxxB,        /* 24s ^>  8h */
-       &&conv_123x_xxxB,        /* 24s ^>  8s */
-       &&conv_123x_xxB2,        /* 24s ^> 16h */
-       &&conv_123x_xx2B,        /* 24s ^> 16s */
-       &&conv_123x_xB21,        /* 24s ^> 24h */
-       &&conv_123x_12Bx,        /* 24s ^> 24s */
-       &&conv_123x_B210,        /* 24s ^> 32h */
-       &&conv_123x_012B,        /* 24s ^> 32s */
-       &&conv_1234_xxx1,        /* 32h ->  8h */
-       &&conv_1234_xxx1,        /* 32h ->  8s */
-       &&conv_1234_xx12,        /* 32h -> 16h */
-       &&conv_1234_xx21,        /* 32h -> 16s */
-       &&conv_1234_x123,        /* 32h -> 24h */
-       &&conv_1234_321x,        /* 32h -> 24s */
-       &&conv_1234_1234,        /* 32h -> 32h */
-       &&conv_1234_4321,        /* 32h -> 32s */
-       &&conv_1234_xxx9,        /* 32h ^>  8h */
-       &&conv_1234_xxx9,        /* 32h ^>  8s */
-       &&conv_1234_xx92,        /* 32h ^> 16h */
-       &&conv_1234_xx29,        /* 32h ^> 16s */
-       &&conv_1234_x923,        /* 32h ^> 24h */
-       &&conv_1234_329x,        /* 32h ^> 24s */
-       &&conv_1234_9234,        /* 32h ^> 32h */
-       &&conv_1234_4329,        /* 32h ^> 32s */
-       &&conv_1234_xxx4,        /* 32s ->  8h */
-       &&conv_1234_xxx4,        /* 32s ->  8s */
-       &&conv_1234_xx43,        /* 32s -> 16h */
-       &&conv_1234_xx34,        /* 32s -> 16s */
-       &&conv_1234_x432,        /* 32s -> 24h */
-       &&conv_1234_234x,        /* 32s -> 24s */
-       &&conv_1234_4321,        /* 32s -> 32h */
-       &&conv_1234_1234,        /* 32s -> 32s */
-       &&conv_1234_xxxC,        /* 32s ^>  8h */
-       &&conv_1234_xxxC,        /* 32s ^>  8s */
-       &&conv_1234_xxC3,        /* 32s ^> 16h */
-       &&conv_1234_xx3C,        /* 32s ^> 16s */
-       &&conv_1234_xC32,        /* 32s ^> 24h */
-       &&conv_1234_23Cx,        /* 32s ^> 24s */
-       &&conv_1234_C321,        /* 32s ^> 32h */
-       &&conv_1234_123C,        /* 32s ^> 32s */
-};
-#endif
-
-#ifdef CONV_END
-while(0) {
-conv_xxx1_xxx1: as_u8(dst) = as_u8(src); goto CONV_END;
-conv_xxx1_xx10: as_u16(dst) = (u_int16_t)as_u8(src) << 8; goto CONV_END;
-conv_xxx1_xx01: as_u16(dst) = (u_int16_t)as_u8(src); goto CONV_END;
-conv_xxx1_x100: as_u32(dst) = (u_int32_t)as_u8(src) << 16; goto CONV_END;
-conv_xxx1_001x: as_u32(dst) = (u_int32_t)as_u8(src) << 8; goto CONV_END;
-conv_xxx1_1000: as_u32(dst) = (u_int32_t)as_u8(src) << 24; goto CONV_END;
-conv_xxx1_0001: as_u32(dst) = (u_int32_t)as_u8(src); goto CONV_END;
-conv_xxx1_xxx9: as_u8(dst) = as_u8(src) ^ 0x80; goto CONV_END;
-conv_xxx1_xx90: as_u16(dst) = (u_int16_t)(as_u8(src) ^ 0x80) << 8; goto 
CONV_END;
-conv_xxx1_xx09: as_u16(dst) = (u_int16_t)(as_u8(src) ^ 0x80); goto CONV_END;
-conv_xxx1_x900: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80) << 16; goto 
CONV_END;
-conv_xxx1_009x: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80) << 8; goto 
CONV_END;
-conv_xxx1_9000: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80) << 24; goto 
CONV_END;
-conv_xxx1_0009: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80); goto CONV_END;
-conv_xx12_xxx1: as_u8(dst) = as_u16(src) >> 8; goto CONV_END;
-conv_xx12_xx12: as_u16(dst) = as_u16(src); goto CONV_END;
-conv_xx12_xx21: as_u16(dst) = swab16(as_u16(src)); goto CONV_END;
-conv_xx12_x120: as_u32(dst) = (u_int32_t)as_u16(src) << 8; goto CONV_END;
-conv_xx12_021x: as_u32(dst) = (u_int32_t)swab16(as_u16(src)) << 8; goto 
CONV_END;
-conv_xx12_1200: as_u32(dst) = (u_int32_t)as_u16(src) << 16; goto CONV_END;
-conv_xx12_0021: as_u32(dst) = (u_int32_t)swab16(as_u16(src)); goto CONV_END;
-conv_xx12_xxx9: as_u8(dst) = (as_u16(src) >> 8) ^ 0x80; goto CONV_END;
-conv_xx12_xx92: as_u16(dst) = as_u16(src) ^ 0x8000; goto CONV_END;
-conv_xx12_xx29: as_u16(dst) = swab16(as_u16(src)) ^ 0x80; goto CONV_END;
-conv_xx12_x920: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x8000) << 8; goto 
CONV_END;
-conv_xx12_029x: as_u32(dst) = (u_int32_t)(swab16(as_u16(src)) ^ 0x80) << 8; 
goto CONV_END;
-conv_xx12_9200: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x8000) << 16; goto 
CONV_END;
-conv_xx12_0029: as_u32(dst) = (u_int32_t)(swab16(as_u16(src)) ^ 0x80); goto 
CONV_END;
-conv_xx12_xxx2: as_u8(dst) = as_u16(src) & 0xff; goto CONV_END;
-conv_xx12_x210: as_u32(dst) = (u_int32_t)swab16(as_u16(src)) << 8; goto 
CONV_END;
-conv_xx12_012x: as_u32(dst) = (u_int32_t)as_u16(src) << 8; goto CONV_END;
-conv_xx12_2100: as_u32(dst) = (u_int32_t)swab16(as_u16(src)) << 16; goto 
CONV_END;
-conv_xx12_0012: as_u32(dst) = (u_int32_t)as_u16(src); goto CONV_END; 
-conv_xx12_xxxA: as_u8(dst) = (as_u16(src) ^ 0x80) & 0xff; goto CONV_END;
-conv_xx12_xxA1: as_u16(dst) = swab16(as_u16(src) ^ 0x80); goto CONV_END;
-conv_xx12_xx1A: as_u16(dst) = as_u16(src) ^ 0x80; goto CONV_END;
-conv_xx12_xA10: as_u32(dst) = (u_int32_t)swab16(as_u16(src) ^ 0x80) << 8; goto 
CONV_END;
-conv_xx12_01Ax: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x80) << 8; goto 
CONV_END;
-conv_xx12_A100: as_u32(dst) = (u_int32_t)swab16(as_u16(src) ^ 0x80) << 16; 
goto CONV_END;
-conv_xx12_001A: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x80); goto CONV_END;
-conv_x123_xxx1: as_u8(dst) = as_u32(src) >> 16; goto CONV_END;
-conv_x123_xx12: as_u16(dst) = as_u32(src) >> 8; goto CONV_END;
-conv_x123_xx21: as_u16(dst) = swab16(as_u32(src) >> 8); goto CONV_END;
-conv_x123_x123: as_u32(dst) = as_u32(src); goto CONV_END;
-conv_x123_321x: as_u32(dst) = swab32(as_u32(src)); goto CONV_END;
-conv_x123_1230: as_u32(dst) = as_u32(src) << 8; goto CONV_END;
-conv_x123_0321: as_u32(dst) = swab32(as_u32(src)) >> 8; goto CONV_END;
-conv_x123_xxx9: as_u8(dst) = (as_u32(src) >> 16) ^ 0x80; goto CONV_END;
-conv_x123_xx92: as_u16(dst) = (as_u32(src) >> 8) ^ 0x8000; goto CONV_END;
-conv_x123_xx29: as_u16(dst) = swab16(as_u32(src) >> 8) ^ 0x80; goto CONV_END;
-conv_x123_x923: as_u32(dst) = as_u32(src) ^ 0x800000; goto CONV_END;
-conv_x123_329x: as_u32(dst) = swab32(as_u32(src)) ^ 0x8000; goto CONV_END;
-conv_x123_9230: as_u32(dst) = (as_u32(src) ^ 0x800000) << 8; goto CONV_END;
-conv_x123_0329: as_u32(dst) = (swab32(as_u32(src)) >> 8) ^ 0x80; goto CONV_END;
-conv_123x_xxx3: as_u8(dst) = (as_u32(src) >> 8) & 0xff; goto CONV_END;
-conv_123x_xx32: as_u16(dst) = swab16(as_u32(src) >> 8); goto CONV_END;
-conv_123x_xx23: as_u16(dst) = (as_u32(src) >> 8) & 0xffff; goto CONV_END;
-conv_123x_x321: as_u32(dst) = swab32(as_u32(src)); goto CONV_END;
-conv_123x_123x: as_u32(dst) = as_u32(src); goto CONV_END;
-conv_123x_3210: as_u32(dst) = swab32(as_u32(src)) << 8; goto CONV_END;
-conv_123x_0123: as_u32(dst) = as_u32(src) >> 8; goto CONV_END;
-conv_123x_xxxB: as_u8(dst) = ((as_u32(src) >> 8) & 0xff) ^ 0x80; goto CONV_END;
-conv_123x_xxB2: as_u16(dst) = swab16((as_u32(src) >> 8) ^ 0x80); goto CONV_END;
-conv_123x_xx2B: as_u16(dst) = ((as_u32(src) >> 8) & 0xffff) ^ 0x80; goto 
CONV_END;
-conv_123x_xB21: as_u32(dst) = swab32(as_u32(src)) ^ 0x800000; goto CONV_END;
-conv_123x_12Bx: as_u32(dst) = as_u32(src) ^ 0x8000; goto CONV_END;
-conv_123x_B210: as_u32(dst) = swab32(as_u32(src) ^ 0x8000) << 8; goto CONV_END;
-conv_123x_012B: as_u32(dst) = (as_u32(src) >> 8) ^ 0x80; goto CONV_END;
-conv_1234_xxx1: as_u8(dst) = as_u32(src) >> 24; goto CONV_END;
-conv_1234_xx12: as_u16(dst) = as_u32(src) >> 16; goto CONV_END;
-conv_1234_xx21: as_u16(dst) = swab16(as_u32(src) >> 16); goto CONV_END;
-conv_1234_x123: as_u32(dst) = as_u32(src) >> 8; goto CONV_END;
-conv_1234_321x: as_u32(dst) = swab32(as_u32(src)) << 8; goto CONV_END;
-conv_1234_1234: as_u32(dst) = as_u32(src); goto CONV_END;
-conv_1234_4321: as_u32(dst) = swab32(as_u32(src)); goto CONV_END;
-conv_1234_xxx9: as_u8(dst) = (as_u32(src) >> 24) ^ 0x80; goto CONV_END;
-conv_1234_xx92: as_u16(dst) = (as_u32(src) >> 16) ^ 0x8000; goto CONV_END;
-conv_1234_xx29: as_u16(dst) = swab16(as_u32(src) >> 16) ^ 0x80; goto CONV_END;
-conv_1234_x923: as_u32(dst) = (as_u32(src) >> 8) ^ 0x800000; goto CONV_END;
-conv_1234_329x: as_u32(dst) = (swab32(as_u32(src)) ^ 0x80) << 8; goto CONV_END;
-conv_1234_9234: as_u32(dst) = as_u32(src) ^ 0x80000000; goto CONV_END;
-conv_1234_4329: as_u32(dst) = swab32(as_u32(src)) ^ 0x80; goto CONV_END;
-conv_1234_xxx4: as_u8(dst) = as_u32(src) & 0xff; goto CONV_END;
-conv_1234_xx43: as_u16(dst) = swab16(as_u32(src)); goto CONV_END;
-conv_1234_xx34: as_u16(dst) = as_u32(src) & 0xffff; goto CONV_END;
-conv_1234_x432: as_u32(dst) = swab32(as_u32(src)) >> 8; goto CONV_END;
-conv_1234_234x: as_u32(dst) = as_u32(src) << 8; goto CONV_END;
-conv_1234_xxxC: as_u8(dst) = (as_u32(src) & 0xff) ^ 0x80; goto CONV_END;
-conv_1234_xxC3: as_u16(dst) = swab16(as_u32(src) ^ 0x80); goto CONV_END;
-conv_1234_xx3C: as_u16(dst) = (as_u32(src) & 0xffff) ^ 0x80; goto CONV_END;
-conv_1234_xC32: as_u32(dst) = (swab32(as_u32(src)) >> 8) ^ 0x800000; goto 
CONV_END;
-conv_1234_23Cx: as_u32(dst) = (as_u32(src) ^ 0x80) << 8; goto CONV_END;
-conv_1234_C321: as_u32(dst) = swab32(as_u32(src) ^ 0x80); goto CONV_END;
-conv_1234_123C: as_u32(dst) = as_u32(src) ^ 0x80; goto CONV_END;
-}
-#endif
-
-#ifdef GET_S16_LABELS
-/* src_wid src_endswap unsigned */
-static void *get_s16_labels[4 * 2 * 2] = {
-       &&get_s16_xxx1_xx10,     /*  8h -> 16h */
-       &&get_s16_xxx1_xx90,     /*  8h ^> 16h */
-       &&get_s16_xxx1_xx10,     /*  8s -> 16h */
-       &&get_s16_xxx1_xx90,     /*  8s ^> 16h */
-       &&get_s16_xx12_xx12,     /* 16h -> 16h */
-       &&get_s16_xx12_xx92,     /* 16h ^> 16h */
-       &&get_s16_xx12_xx21,     /* 16s -> 16h */
-       &&get_s16_xx12_xxA1,     /* 16s ^> 16h */
-       &&get_s16_x123_xx12,     /* 24h -> 16h */
-       &&get_s16_x123_xx92,     /* 24h ^> 16h */
-       &&get_s16_123x_xx32,     /* 24s -> 16h */
-       &&get_s16_123x_xxB2,     /* 24s ^> 16h */
-       &&get_s16_1234_xx12,     /* 32h -> 16h */
-       &&get_s16_1234_xx92,     /* 32h ^> 16h */
-       &&get_s16_1234_xx43,     /* 32s -> 16h */
-       &&get_s16_1234_xxC3,     /* 32s ^> 16h */
-};
-#endif
-
-#ifdef GET_S16_END
-while(0) {
-get_s16_xxx1_xx10: sample = (u_int16_t)as_u8(src) << 8; goto GET_S16_END;
-get_s16_xxx1_xx90: sample = (u_int16_t)(as_u8(src) ^ 0x80) << 8; goto 
GET_S16_END;
-get_s16_xx12_xx12: sample = as_u16(src); goto GET_S16_END;
-get_s16_xx12_xx92: sample = as_u16(src) ^ 0x8000; goto GET_S16_END;
-get_s16_xx12_xx21: sample = swab16(as_u16(src)); goto GET_S16_END;
-get_s16_xx12_xxA1: sample = swab16(as_u16(src) ^ 0x80); goto GET_S16_END;
-get_s16_x123_xx12: sample = as_u32(src) >> 8; goto GET_S16_END;
-get_s16_x123_xx92: sample = (as_u32(src) >> 8) ^ 0x8000; goto GET_S16_END;
-get_s16_123x_xx32: sample = swab16(as_u32(src) >> 8); goto GET_S16_END;
-get_s16_123x_xxB2: sample = swab16((as_u32(src) >> 8) ^ 0x8000); goto 
GET_S16_END;
-get_s16_1234_xx12: sample = as_u32(src) >> 16; goto GET_S16_END;
-get_s16_1234_xx92: sample = (as_u32(src) >> 16) ^ 0x8000; goto GET_S16_END;
-get_s16_1234_xx43: sample = swab16(as_u32(src)); goto GET_S16_END;
-get_s16_1234_xxC3: sample = swab16(as_u32(src) ^ 0x80); goto GET_S16_END;
-}
-#endif
-
-#ifdef PUT_S16_LABELS
-/* dst_wid dst_endswap unsigned */
-static void *put_s16_labels[4 * 2 * 2] = {
-       &&put_s16_xx12_xxx1,     /* 16h ->  8h */
-       &&put_s16_xx12_xxx9,     /* 16h ^>  8h */
-       &&put_s16_xx12_xxx1,     /* 16h ->  8s */
-       &&put_s16_xx12_xxx9,     /* 16h ^>  8s */
-       &&put_s16_xx12_xx12,     /* 16h -> 16h */
-       &&put_s16_xx12_xx92,     /* 16h ^> 16h */
-       &&put_s16_xx12_xx21,     /* 16h -> 16s */
-       &&put_s16_xx12_xx29,     /* 16h ^> 16s */
-       &&put_s16_xx12_x120,     /* 16h -> 24h */
-       &&put_s16_xx12_x920,     /* 16h ^> 24h */
-       &&put_s16_xx12_021x,     /* 16h -> 24s */
-       &&put_s16_xx12_029x,     /* 16h ^> 24s */
-       &&put_s16_xx12_1200,     /* 16h -> 32h */
-       &&put_s16_xx12_9200,     /* 16h ^> 32h */
-       &&put_s16_xx12_0021,     /* 16h -> 32s */
-       &&put_s16_xx12_0029,     /* 16h ^> 32s */
-};
-#endif
-
-#ifdef PUT_S16_END
-while (0) {
-put_s16_xx12_xxx1: as_u8(dst) = sample >> 8; goto PUT_S16_END;
-put_s16_xx12_xxx9: as_u8(dst) = (sample >> 8) ^ 0x80; goto PUT_S16_END;
-put_s16_xx12_xx12: as_u16(dst) = sample; goto PUT_S16_END;
-put_s16_xx12_xx92: as_u16(dst) = sample ^ 0x8000; goto PUT_S16_END;
-put_s16_xx12_xx21: as_u16(dst) = swab16(sample); goto PUT_S16_END;
-put_s16_xx12_xx29: as_u16(dst) = swab16(sample) ^ 0x80; goto PUT_S16_END;
-put_s16_xx12_x120: as_u32(dst) = (u_int32_t)sample << 8; goto PUT_S16_END;
-put_s16_xx12_x920: as_u32(dst) = (u_int32_t)(sample ^ 0x8000) << 8; goto 
PUT_S16_END;
-put_s16_xx12_021x: as_u32(dst) = (u_int32_t)swab16(sample) << 8; goto 
PUT_S16_END;
-put_s16_xx12_029x: as_u32(dst) = (u_int32_t)(swab16(sample) ^ 0x80) << 8; goto 
PUT_S16_END;
-put_s16_xx12_1200: as_u32(dst) = (u_int32_t)sample << 16; goto PUT_S16_END;
-put_s16_xx12_9200: as_u32(dst) = (u_int32_t)(sample ^ 0x8000) << 16; goto 
PUT_S16_END;
-put_s16_xx12_0021: as_u32(dst) = (u_int32_t)swab16(sample); goto PUT_S16_END;
-put_s16_xx12_0029: as_u32(dst) = (u_int32_t)swab16(sample) ^ 0x80; goto 
PUT_S16_END;
-}
-#endif
-
-#undef as_u8
-#undef as_u16
-#undef as_u32
-#undef as_s8
-#undef as_s16
-#undef as_s32
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to