]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - sound/core/oss/rate.c
ALSA: Kill snd_assert() in sound/core/*
[karo-tx-linux.git] / sound / core / oss / rate.c
index 4854cef6fb4f69014c910eedeee9177810cec7ca..a466443c4a2649b819147e70d9f041bc1f25b38b 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Rate conversion Plug-In
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
  *
  */
   
-#include <sound/driver.h>
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -47,7 +46,6 @@ struct rate_priv {
        unsigned int pitch;
        unsigned int pos;
        rate_f func;
-       int get, put;
        snd_pcm_sframes_t old_src_frames, old_dst_frames;
        struct rate_channel channels[0];
 };
@@ -71,21 +69,12 @@ static void resample_expand(struct snd_pcm_plugin *plugin,
        unsigned int pos = 0;
        signed int val;
        signed short S1, S2;
-       char *src, *dst;
+       signed short *src, *dst;
        unsigned int channel;
        int src_step, dst_step;
        int src_frames1, dst_frames1;
        struct rate_priv *data = (struct rate_priv *)plugin->extra_data;
        struct rate_channel *rchannels = data->channels;
-
-#define GET_S16_LABELS
-#define PUT_S16_LABELS
-#include "plugin_ops.h"
-#undef GET_S16_LABELS
-#undef PUT_S16_LABELS
-       void *get = get_s16_labels[data->get];
-       void *put = put_s16_labels[data->put];
-       signed short sample = 0;
        
        for (channel = 0; channel < plugin->src_format.channels; channel++) {
                pos = data->pos;
@@ -98,10 +87,12 @@ static void resample_expand(struct snd_pcm_plugin *plugin,
                        continue;
                }
                dst_channels[channel].enabled = 1;
-               src = (char *)src_channels[channel].area.addr + src_channels[channel].area.first / 8;
-               dst = (char *)dst_channels[channel].area.addr + dst_channels[channel].area.first / 8;
-               src_step = src_channels[channel].area.step / 8;
-               dst_step = dst_channels[channel].area.step / 8;
+               src = (signed short *)src_channels[channel].area.addr +
+                       src_channels[channel].area.first / 8 / 2;
+               dst = (signed short *)dst_channels[channel].area.addr +
+                       dst_channels[channel].area.first / 8 / 2;
+               src_step = src_channels[channel].area.step / 8 / 2;
+               dst_step = dst_channels[channel].area.step / 8 / 2;
                src_frames1 = src_frames;
                dst_frames1 = dst_frames;
                while (dst_frames1-- > 0) {
@@ -109,12 +100,7 @@ static void resample_expand(struct snd_pcm_plugin *plugin,
                                pos &= R_MASK;
                                S1 = S2;
                                if (src_frames1-- > 0) {
-                                       goto *get;
-#define GET_S16_END after_get
-#include "plugin_ops.h"
-#undef GET_S16_END
-                               after_get:
-                                       S2 = sample;
+                                       S2 = *src;
                                        src += src_step;
                                }
                        }
@@ -123,12 +109,7 @@ static void resample_expand(struct snd_pcm_plugin *plugin,
                                val = -32768;
                        else if (val > 32767)
                                val = 32767;
-                       sample = val;
-                       goto *put;
-#define PUT_S16_END after_put
-#include "plugin_ops.h"
-#undef PUT_S16_END
-               after_put:
+                       *dst = val;
                        dst += dst_step;
                        pos += data->pitch;
                }
@@ -147,21 +128,12 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
        unsigned int pos = 0;
        signed int val;
        signed short S1, S2;
-       char *src, *dst;
+       signed short *src, *dst;
        unsigned int channel;
        int src_step, dst_step;
        int src_frames1, dst_frames1;
        struct rate_priv *data = (struct rate_priv *)plugin->extra_data;
        struct rate_channel *rchannels = data->channels;
-       
-#define GET_S16_LABELS
-#define PUT_S16_LABELS
-#include "plugin_ops.h"
-#undef GET_S16_LABELS
-#undef PUT_S16_LABELS
-       void *get = get_s16_labels[data->get];
-       void *put = put_s16_labels[data->put];
-       signed short sample = 0;
 
        for (channel = 0; channel < plugin->src_format.channels; ++channel) {
                pos = data->pos;
@@ -174,21 +146,18 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
                        continue;
                }
                dst_channels[channel].enabled = 1;
-               src = (char *)src_channels[channel].area.addr + src_channels[channel].area.first / 8;
-               dst = (char *)dst_channels[channel].area.addr + dst_channels[channel].area.first / 8;
-               src_step = src_channels[channel].area.step / 8;
-               dst_step = dst_channels[channel].area.step / 8;
+               src = (signed short *)src_channels[channel].area.addr +
+                       src_channels[channel].area.first / 8 / 2;
+               dst = (signed short *)dst_channels[channel].area.addr +
+                       dst_channels[channel].area.first / 8 / 2;
+               src_step = src_channels[channel].area.step / 8 / 2;
+               dst_step = dst_channels[channel].area.step / 8 / 2;
                src_frames1 = src_frames;
                dst_frames1 = dst_frames;
                while (dst_frames1 > 0) {
                        S1 = S2;
                        if (src_frames1-- > 0) {
-                               goto *get;
-#define GET_S16_END after_get
-#include "plugin_ops.h"
-#undef GET_S16_END
-                       after_get:
-                               S2 = sample;
+                               S1 = *src;
                                src += src_step;
                        }
                        if (pos & ~R_MASK) {
@@ -198,12 +167,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
                                        val = -32768;
                                else if (val > 32767)
                                        val = 32767;
-                               sample = val;
-                               goto *put;
-#define PUT_S16_END after_put
-#include "plugin_ops.h"
-#undef PUT_S16_END
-                       after_put:
+                               *dst = val;
                                dst += dst_step;
                                dst_frames1--;
                        }
@@ -221,7 +185,8 @@ static snd_pcm_sframes_t rate_src_frames(struct snd_pcm_plugin *plugin, snd_pcm_
        struct rate_priv *data;
        snd_pcm_sframes_t res;
 
-       snd_assert(plugin != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin))
+               return -ENXIO;
        if (frames == 0)
                return 0;
        data = (struct rate_priv *)plugin->extra_data;
@@ -253,7 +218,8 @@ static snd_pcm_sframes_t rate_dst_frames(struct snd_pcm_plugin *plugin, snd_pcm_
        struct rate_priv *data;
        snd_pcm_sframes_t res;
 
-       snd_assert(plugin != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin))
+               return -ENXIO;
        if (frames == 0)
                return 0;
        data = (struct rate_priv *)plugin->extra_data;
@@ -288,19 +254,20 @@ static snd_pcm_sframes_t rate_transfer(struct snd_pcm_plugin *plugin,
        snd_pcm_uframes_t dst_frames;
        struct rate_priv *data;
 
-       snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
+               return -ENXIO;
        if (frames == 0)
                return 0;
 #ifdef CONFIG_SND_DEBUG
        {
                unsigned int channel;
                for (channel = 0; channel < plugin->src_format.channels; channel++) {
-                       snd_assert(src_channels[channel].area.first % 8 == 0 &&
-                                  src_channels[channel].area.step % 8 == 0,
-                                  return -ENXIO);
-                       snd_assert(dst_channels[channel].area.first % 8 == 0 &&
-                                  dst_channels[channel].area.step % 8 == 0,
-                                  return -ENXIO);
+                       if (snd_BUG_ON(src_channels[channel].area.first % 8 ||
+                                      src_channels[channel].area.step % 8))
+                               return -ENXIO;
+                       if (snd_BUG_ON(dst_channels[channel].area.first % 8 ||
+                                      dst_channels[channel].area.step % 8))
+                               return -ENXIO;
                }
        }
 #endif
@@ -317,7 +284,8 @@ static int rate_action(struct snd_pcm_plugin *plugin,
                       enum snd_pcm_plugin_action action,
                       unsigned long udata)
 {
-       snd_assert(plugin != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin))
+               return -ENXIO;
        switch (action) {
        case INIT:
        case PREPARE:
@@ -338,14 +306,20 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
        struct rate_priv *data;
        struct snd_pcm_plugin *plugin;
 
-       snd_assert(r_plugin != NULL, return -ENXIO);
+       if (snd_BUG_ON(!r_plugin))
+               return -ENXIO;
        *r_plugin = NULL;
 
-       snd_assert(src_format->channels == dst_format->channels, return -ENXIO);
-       snd_assert(src_format->channels > 0, return -ENXIO);
-       snd_assert(snd_pcm_format_linear(src_format->format) != 0, return -ENXIO);
-       snd_assert(snd_pcm_format_linear(dst_format->format) != 0, return -ENXIO);
-       snd_assert(src_format->rate != dst_format->rate, return -ENXIO);
+       if (snd_BUG_ON(src_format->channels != dst_format->channels))
+               return -ENXIO;
+       if (snd_BUG_ON(src_format->channels <= 0))
+               return -ENXIO;
+       if (snd_BUG_ON(src_format->format != SNDRV_PCM_FORMAT_S16))
+               return -ENXIO;
+       if (snd_BUG_ON(dst_format->format != SNDRV_PCM_FORMAT_S16))
+               return -ENXIO;
+       if (snd_BUG_ON(src_format->rate == dst_format->rate))
+               return -ENXIO;
 
        err = snd_pcm_plugin_build(plug, "rate conversion",
                                   src_format, dst_format,
@@ -355,11 +329,6 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
        if (err < 0)
                return err;
        data = (struct rate_priv *)plugin->extra_data;
-       data->get = getput_index(src_format->format);
-       snd_assert(data->get >= 0 && data->get < 4*2*2, return -EINVAL);
-       data->put = getput_index(dst_format->format);
-       snd_assert(data->put >= 0 && data->put < 4*2*2, return -EINVAL);
-
        if (src_format->rate < dst_format->rate) {
                data->pitch = ((src_format->rate << SHIFT) + (dst_format->rate >> 1)) / dst_format->rate;
                data->func = resample_expand;