Skip to content

L
linux
Commit 6ac77bc1 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: PCM OSS-emulation 

Modules: ALSA<-OSS emulation

Remove xxx_t typedefs from the core PCM OSS-emulation codes.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f956b4a3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 543 additions and 533 deletions
include/sound/pcm_oss.h
View file @ 6ac77bc1
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
* *
*/ */
typedef struct _snd_pcm_plugin snd_pcm_plugin_t; struct snd_pcm_oss_setup {
typedef struct _snd_pcm_oss_setup snd_pcm_oss_setup_t;
struct _snd_pcm_oss_setup {
char *task_name; char *task_name;
unsigned int disable:1, unsigned int disable:1,
direct:1, direct:1,
...@@ -36,10 +33,10 @@ struct _snd_pcm_oss_setup { ...@@ -36,10 +33,10 @@ struct _snd_pcm_oss_setup {
buggyptr:1; buggyptr:1;
unsigned int periods; unsigned int periods;
unsigned int period_size; unsigned int period_size;
snd_pcm_oss_setup_t *next; struct snd_pcm_oss_setup *next;
}; };
typedef struct _snd_pcm_oss_runtime { struct snd_pcm_oss_runtime {
unsigned params: 1, /* format/parameter change */ unsigned params: 1, /* format/parameter change */
prepare: 1, /* need to prepare the operation */ prepare: 1, /* need to prepare the operation */
trigger: 1, /* trigger flag */ trigger: 1, /* trigger flag */
...@@ -59,30 +56,30 @@ typedef struct _snd_pcm_oss_runtime { ...@@ -59,30 +56,30 @@ typedef struct _snd_pcm_oss_runtime {
size_t mmap_bytes; size_t mmap_bytes;
char *buffer; /* vmallocated period */ char *buffer; /* vmallocated period */
size_t buffer_used; /* used length from period buffer */ size_t buffer_used; /* used length from period buffer */
snd_pcm_plugin_t *plugin_first; struct snd_pcm_plugin *plugin_first;
snd_pcm_plugin_t *plugin_last; struct snd_pcm_plugin *plugin_last;
unsigned int prev_hw_ptr_interrupt; unsigned int prev_hw_ptr_interrupt;
} snd_pcm_oss_runtime_t; };
typedef struct _snd_pcm_oss_file { struct snd_pcm_oss_file {
snd_pcm_substream_t *streams[2]; struct snd_pcm_substream *streams[2];
} snd_pcm_oss_file_t; };
typedef struct _snd_pcm_oss_substream { struct snd_pcm_oss_substream {
unsigned oss: 1; /* oss mode */ unsigned oss: 1; /* oss mode */
snd_pcm_oss_setup_t *setup; /* active setup */ struct snd_pcm_oss_setup *setup; /* active setup */
snd_pcm_oss_file_t *file; struct snd_pcm_oss_file *file;
} snd_pcm_oss_substream_t; };
typedef struct _snd_pcm_oss_stream { struct snd_pcm_oss_stream {
snd_pcm_oss_setup_t *setup_list; /* setup list */ struct snd_pcm_oss_setup *setup_list; /* setup list */
struct semaphore setup_mutex; struct semaphore setup_mutex;
snd_info_entry_t *proc_entry; struct snd_info_entry *proc_entry;
} snd_pcm_oss_stream_t; };
typedef struct _snd_pcm_oss { struct snd_pcm_oss {
int reg; int reg;
unsigned int reg_mask; unsigned int reg_mask;
} snd_pcm_oss_t; };
#endif /* __SOUND_PCM_OSS_H */ #endif /* __SOUND_PCM_OSS_H */
sound/core/oss/copy.c
View file @ 6ac77bc1
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include "pcm_plugin.h" #include "pcm_plugin.h"
static snd_pcm_sframes_t copy_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t copy_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
unsigned int channel; unsigned int channel;
...@@ -58,13 +58,13 @@ static snd_pcm_sframes_t copy_transfer(snd_pcm_plugin_t *plugin, ...@@ -58,13 +58,13 @@ static snd_pcm_sframes_t copy_transfer(snd_pcm_plugin_t *plugin,
return frames; return frames;
} }
int snd_pcm_plugin_build_copy(snd_pcm_plug_t *plug, int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug,
snd_pcm_plugin_format_t *src_format, struct snd_pcm_plugin_format *src_format,
snd_pcm_plugin_format_t *dst_format, struct snd_pcm_plugin_format *dst_format,
snd_pcm_plugin_t **r_plugin) struct snd_pcm_plugin **r_plugin)
{ {
int err; int err;
snd_pcm_plugin_t *plugin; struct snd_pcm_plugin *plugin;
int width; int width;
snd_assert(r_plugin != NULL, return -ENXIO); snd_assert(r_plugin != NULL, return -ENXIO);
......
sound/core/oss/io.c
View file @ 6ac77bc1
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
* Basic io plugin * Basic io plugin
*/ */
static snd_pcm_sframes_t io_playback_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t io_playback_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
snd_assert(plugin != NULL, return -ENXIO); snd_assert(plugin != NULL, return -ENXIO);
...@@ -58,9 +58,9 @@ static snd_pcm_sframes_t io_playback_transfer(snd_pcm_plugin_t *plugin, ...@@ -58,9 +58,9 @@ static snd_pcm_sframes_t io_playback_transfer(snd_pcm_plugin_t *plugin,
} }
} }
static snd_pcm_sframes_t io_capture_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t io_capture_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
snd_assert(plugin != NULL, return -ENXIO); snd_assert(plugin != NULL, return -ENXIO);
...@@ -82,13 +82,13 @@ static snd_pcm_sframes_t io_capture_transfer(snd_pcm_plugin_t *plugin, ...@@ -82,13 +82,13 @@ static snd_pcm_sframes_t io_capture_transfer(snd_pcm_plugin_t *plugin,
return 0; return 0;
} }
static snd_pcm_sframes_t io_src_channels(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t io_src_channels(struct snd_pcm_plugin *plugin,
snd_pcm_uframes_t frames, snd_pcm_uframes_t frames,
snd_pcm_plugin_channel_t **channels) struct snd_pcm_plugin_channel **channels)
{ {
int err; int err;
unsigned int channel; unsigned int channel;
snd_pcm_plugin_channel_t *v; struct snd_pcm_plugin_channel *v;
err = snd_pcm_plugin_client_channels(plugin, frames, &v); err = snd_pcm_plugin_client_channels(plugin, frames, &v);
if (err < 0) if (err < 0)
return err; return err;
...@@ -100,13 +100,13 @@ static snd_pcm_sframes_t io_src_channels(snd_pcm_plugin_t *plugin, ...@@ -100,13 +100,13 @@ static snd_pcm_sframes_t io_src_channels(snd_pcm_plugin_t *plugin,
return frames; return frames;
} }
int snd_pcm_plugin_build_io(snd_pcm_plug_t *plug, int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug,
snd_pcm_hw_params_t *params, struct snd_pcm_hw_params *params,
snd_pcm_plugin_t **r_plugin) struct snd_pcm_plugin **r_plugin)
{ {
int err; int err;
snd_pcm_plugin_format_t format; struct snd_pcm_plugin_format format;
snd_pcm_plugin_t *plugin; struct snd_pcm_plugin *plugin;
snd_assert(r_plugin != NULL, return -ENXIO); snd_assert(r_plugin != NULL, return -ENXIO);
*r_plugin = NULL; *r_plugin = NULL;
......
sound/core/oss/linear.c
View file @ 6ac77bc1
...@@ -30,19 +30,19 @@ ...@@ -30,19 +30,19 @@
* Basic linear conversion plugin * Basic linear conversion plugin
*/ */
typedef struct linear_private_data { struct linear_priv {
int conv; int conv;
} linear_t; };
static void convert(snd_pcm_plugin_t *plugin, static void convert(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
#define CONV_LABELS #define CONV_LABELS
#include "plugin_ops.h" #include "plugin_ops.h"
#undef CONV_LABELS #undef CONV_LABELS
linear_t *data = (linear_t *)plugin->extra_data; struct linear_priv *data = (struct linear_priv *)plugin->extra_data;
void *conv = conv_labels[data->conv]; void *conv = conv_labels[data->conv];
int channel; int channel;
int nchannels = plugin->src_format.channels; int nchannels = plugin->src_format.channels;
...@@ -75,15 +75,15 @@ static void convert(snd_pcm_plugin_t *plugin, ...@@ -75,15 +75,15 @@ static void convert(snd_pcm_plugin_t *plugin,
} }
} }
static snd_pcm_sframes_t linear_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
linear_t *data; struct linear_priv *data;
snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO); snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO);
data = (linear_t *)plugin->extra_data; data = (struct linear_priv *)plugin->extra_data;
if (frames == 0) if (frames == 0)
return 0; return 0;
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
...@@ -128,14 +128,14 @@ int conv_index(int src_format, int dst_format) ...@@ -128,14 +128,14 @@ int conv_index(int src_format, int dst_format)
return src_width * 32 + src_endian * 16 + sign * 8 + dst_width * 2 + dst_endian; return src_width * 32 + src_endian * 16 + sign * 8 + dst_width * 2 + dst_endian;
} }
int snd_pcm_plugin_build_linear(snd_pcm_plug_t *plug, int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
snd_pcm_plugin_format_t *src_format, struct snd_pcm_plugin_format *src_format,
snd_pcm_plugin_format_t *dst_format, struct snd_pcm_plugin_format *dst_format,
snd_pcm_plugin_t **r_plugin) struct snd_pcm_plugin **r_plugin)
{ {
int err; int err;
struct linear_private_data *data; struct linear_priv *data;
snd_pcm_plugin_t *plugin; struct snd_pcm_plugin *plugin;
snd_assert(r_plugin != NULL, return -ENXIO); snd_assert(r_plugin != NULL, return -ENXIO);
*r_plugin = NULL; *r_plugin = NULL;
...@@ -147,10 +147,10 @@ int snd_pcm_plugin_build_linear(snd_pcm_plug_t *plug, ...@@ -147,10 +147,10 @@ int snd_pcm_plugin_build_linear(snd_pcm_plug_t *plug,
err = snd_pcm_plugin_build(plug, "linear format conversion", err = snd_pcm_plugin_build(plug, "linear format conversion",
src_format, dst_format, src_format, dst_format,
sizeof(linear_t), &plugin); sizeof(struct linear_priv), &plugin);
if (err < 0) if (err < 0)
return err; return err;
data = (linear_t *)plugin->extra_data; data = (struct linear_priv *)plugin->extra_data;
data->conv = conv_index(src_format->format, dst_format->format); data->conv = conv_index(src_format->format, dst_format->format);
plugin->transfer = linear_transfer; plugin->transfer = linear_transfer;
*r_plugin = plugin; *r_plugin = plugin;
......
sound/core/oss/mulaw.c
View file @ 6ac77bc1
...@@ -139,25 +139,25 @@ static int ulaw2linear(unsigned char u_val) ...@@ -139,25 +139,25 @@ static int ulaw2linear(unsigned char u_val)
* Basic Mu-Law plugin * Basic Mu-Law plugin
*/ */
typedef void (*mulaw_f)(snd_pcm_plugin_t *plugin, typedef void (*mulaw_f)(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames); snd_pcm_uframes_t frames);
typedef struct mulaw_private_data { struct mulaw_priv {
mulaw_f func; mulaw_f func;
int conv; int conv;
} mulaw_t; };
static void mulaw_decode(snd_pcm_plugin_t *plugin, static void mulaw_decode(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
#define PUT_S16_LABELS #define PUT_S16_LABELS
#include "plugin_ops.h" #include "plugin_ops.h"
#undef PUT_S16_LABELS #undef PUT_S16_LABELS
mulaw_t *data = (mulaw_t *)plugin->extra_data; struct mulaw_priv *data = (struct mulaw_priv *)plugin->extra_data;
void *put = put_s16_labels[data->conv]; void *put = put_s16_labels[data->conv];
int channel; int channel;
int nchannels = plugin->src_format.channels; int nchannels = plugin->src_format.channels;
...@@ -191,15 +191,15 @@ static void mulaw_decode(snd_pcm_plugin_t *plugin, ...@@ -191,15 +191,15 @@ static void mulaw_decode(snd_pcm_plugin_t *plugin,
} }
} }
static void mulaw_encode(snd_pcm_plugin_t *plugin, static void mulaw_encode(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
#define GET_S16_LABELS #define GET_S16_LABELS
#include "plugin_ops.h" #include "plugin_ops.h"
#undef GET_S16_LABELS #undef GET_S16_LABELS
mulaw_t *data = (mulaw_t *)plugin->extra_data; struct mulaw_priv *data = (struct mulaw_priv *)plugin->extra_data;
void *get = get_s16_labels[data->conv]; void *get = get_s16_labels[data->conv];
int channel; int channel;
int nchannels = plugin->src_format.channels; int nchannels = plugin->src_format.channels;
...@@ -234,12 +234,12 @@ static void mulaw_encode(snd_pcm_plugin_t *plugin, ...@@ -234,12 +234,12 @@ static void mulaw_encode(snd_pcm_plugin_t *plugin,
} }
} }
static snd_pcm_sframes_t mulaw_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t mulaw_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
mulaw_t *data; struct mulaw_priv *data;
snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO); snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO);
if (frames == 0) if (frames == 0)
...@@ -257,20 +257,20 @@ static snd_pcm_sframes_t mulaw_transfer(snd_pcm_plugin_t *plugin, ...@@ -257,20 +257,20 @@ static snd_pcm_sframes_t mulaw_transfer(snd_pcm_plugin_t *plugin,
} }
} }
#endif #endif
data = (mulaw_t *)plugin->extra_data; data = (struct mulaw_priv *)plugin->extra_data;
data->func(plugin, src_channels, dst_channels, frames); data->func(plugin, src_channels, dst_channels, frames);
return frames; return frames;
} }
int snd_pcm_plugin_build_mulaw(snd_pcm_plug_t *plug, int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug,
snd_pcm_plugin_format_t *src_format, struct snd_pcm_plugin_format *src_format,
snd_pcm_plugin_format_t *dst_format, struct snd_pcm_plugin_format *dst_format,
snd_pcm_plugin_t **r_plugin) struct snd_pcm_plugin **r_plugin)
{ {
int err; int err;
mulaw_t *data; struct mulaw_priv *data;
snd_pcm_plugin_t *plugin; struct snd_pcm_plugin *plugin;
snd_pcm_plugin_format_t *format; struct snd_pcm_plugin_format *format;
mulaw_f func; mulaw_f func;
snd_assert(r_plugin != NULL, return -ENXIO); snd_assert(r_plugin != NULL, return -ENXIO);
...@@ -295,10 +295,10 @@ int snd_pcm_plugin_build_mulaw(snd_pcm_plug_t *plug, ...@@ -295,10 +295,10 @@ int snd_pcm_plugin_build_mulaw(snd_pcm_plug_t *plug,
err = snd_pcm_plugin_build(plug, "Mu-Law<->linear conversion", err = snd_pcm_plugin_build(plug, "Mu-Law<->linear conversion",
src_format, dst_format, src_format, dst_format,
sizeof(mulaw_t), &plugin); sizeof(struct mulaw_priv), &plugin);
if (err < 0) if (err < 0)
return err; return err;
data = (mulaw_t*)plugin->extra_data; data = (struct mulaw_priv *)plugin->extra_data;
data->func = func; data->func = func;
data->conv = getput_index(format->format); data->conv = getput_index(format->format);
snd_assert(data->conv >= 0 && data->conv < 4*2*2, return -EINVAL); snd_assert(data->conv >= 0 && data->conv < 4*2*2, return -EINVAL);
......
sound/core/oss/pcm_oss.c
View file @ 6ac77bc1
This diff is collapsed.
sound/core/oss/pcm_plugin.c
View file @ 6ac77bc1
This diff is collapsed.
sound/core/oss/pcm_plugin.h
View file @ 6ac77bc1
This diff is collapsed.
sound/core/oss/rate.c
View file @ 6ac77bc1
...@@ -33,29 +33,29 @@ ...@@ -33,29 +33,29 @@
* Basic rate conversion plugin * Basic rate conversion plugin
*/ */
typedef struct { struct rate_channel {
signed short last_S1; signed short last_S1;
signed short last_S2; signed short last_S2;
} rate_channel_t; };
typedef void (*rate_f)(snd_pcm_plugin_t *plugin, typedef void (*rate_f)(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
int src_frames, int dst_frames); int src_frames, int dst_frames);
typedef struct rate_private_data { struct rate_priv {
unsigned int pitch; unsigned int pitch;
unsigned int pos; unsigned int pos;
rate_f func; rate_f func;
int get, put; int get, put;
snd_pcm_sframes_t old_src_frames, old_dst_frames; snd_pcm_sframes_t old_src_frames, old_dst_frames;
rate_channel_t channels[0]; struct rate_channel channels[0];
} rate_t; };
static void rate_init(snd_pcm_plugin_t *plugin) static void rate_init(struct snd_pcm_plugin *plugin)
{ {
unsigned int channel; unsigned int channel;
rate_t *data = (rate_t *)plugin->extra_data; struct rate_priv *data = (struct rate_priv *)plugin->extra_data;
data->pos = 0; data->pos = 0;
for (channel = 0; channel < plugin->src_format.channels; channel++) { for (channel = 0; channel < plugin->src_format.channels; channel++) {
data->channels[channel].last_S1 = 0; data->channels[channel].last_S1 = 0;
...@@ -63,9 +63,9 @@ static void rate_init(snd_pcm_plugin_t *plugin) ...@@ -63,9 +63,9 @@ static void rate_init(snd_pcm_plugin_t *plugin)
} }
} }
static void resample_expand(snd_pcm_plugin_t *plugin, static void resample_expand(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
int src_frames, int dst_frames) int src_frames, int dst_frames)
{ {
unsigned int pos = 0; unsigned int pos = 0;
...@@ -75,8 +75,8 @@ static void resample_expand(snd_pcm_plugin_t *plugin, ...@@ -75,8 +75,8 @@ static void resample_expand(snd_pcm_plugin_t *plugin,
unsigned int channel; unsigned int channel;
int src_step, dst_step; int src_step, dst_step;
int src_frames1, dst_frames1; int src_frames1, dst_frames1;
rate_t *data = (rate_t *)plugin->extra_data; struct rate_priv *data = (struct rate_priv *)plugin->extra_data;
rate_channel_t *rchannels = data->channels; struct rate_channel *rchannels = data->channels;
#define GET_S16_LABELS #define GET_S16_LABELS
#define PUT_S16_LABELS #define PUT_S16_LABELS
...@@ -139,9 +139,9 @@ static void resample_expand(snd_pcm_plugin_t *plugin, ...@@ -139,9 +139,9 @@ static void resample_expand(snd_pcm_plugin_t *plugin,
data->pos = pos; data->pos = pos;
} }
static void resample_shrink(snd_pcm_plugin_t *plugin, static void resample_shrink(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
int src_frames, int dst_frames) int src_frames, int dst_frames)
{ {
unsigned int pos = 0; unsigned int pos = 0;
...@@ -151,8 +151,8 @@ static void resample_shrink(snd_pcm_plugin_t *plugin, ...@@ -151,8 +151,8 @@ static void resample_shrink(snd_pcm_plugin_t *plugin,
unsigned int channel; unsigned int channel;
int src_step, dst_step; int src_step, dst_step;
int src_frames1, dst_frames1; int src_frames1, dst_frames1;
rate_t *data = (rate_t *)plugin->extra_data; struct rate_priv *data = (struct rate_priv *)plugin->extra_data;
rate_channel_t *rchannels = data->channels; struct rate_channel *rchannels = data->channels;
#define GET_S16_LABELS #define GET_S16_LABELS
#define PUT_S16_LABELS #define PUT_S16_LABELS
...@@ -216,15 +216,15 @@ static void resample_shrink(snd_pcm_plugin_t *plugin, ...@@ -216,15 +216,15 @@ static void resample_shrink(snd_pcm_plugin_t *plugin,
data->pos = pos; data->pos = pos;
} }
static snd_pcm_sframes_t rate_src_frames(snd_pcm_plugin_t *plugin, snd_pcm_uframes_t frames) static snd_pcm_sframes_t rate_src_frames(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t frames)
{ {
rate_t *data; struct rate_priv *data;
snd_pcm_sframes_t res; snd_pcm_sframes_t res;
snd_assert(plugin != NULL, return -ENXIO); snd_assert(plugin != NULL, return -ENXIO);
if (frames == 0) if (frames == 0)
return 0; return 0;
data = (rate_t *)plugin->extra_data; data = (struct rate_priv *)plugin->extra_data;
if (plugin->src_format.rate < plugin->dst_format.rate) { if (plugin->src_format.rate < plugin->dst_format.rate) {
res = (((frames * data->pitch) + (BITS/2)) >> SHIFT); res = (((frames * data->pitch) + (BITS/2)) >> SHIFT);
} else { } else {
...@@ -248,15 +248,15 @@ static snd_pcm_sframes_t rate_src_frames(snd_pcm_plugin_t *plugin, snd_pcm_ufram ...@@ -248,15 +248,15 @@ static snd_pcm_sframes_t rate_src_frames(snd_pcm_plugin_t *plugin, snd_pcm_ufram
return res; return res;
} }
static snd_pcm_sframes_t rate_dst_frames(snd_pcm_plugin_t *plugin, snd_pcm_uframes_t frames) static snd_pcm_sframes_t rate_dst_frames(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t frames)
{ {
rate_t *data; struct rate_priv *data;
snd_pcm_sframes_t res; snd_pcm_sframes_t res;
snd_assert(plugin != NULL, return -ENXIO); snd_assert(plugin != NULL, return -ENXIO);
if (frames == 0) if (frames == 0)
return 0; return 0;
data = (rate_t *)plugin->extra_data; data = (struct rate_priv *)plugin->extra_data;
if (plugin->src_format.rate < plugin->dst_format.rate) { if (plugin->src_format.rate < plugin->dst_format.rate) {
res = (((frames << SHIFT) + (data->pitch / 2)) / data->pitch); res = (((frames << SHIFT) + (data->pitch / 2)) / data->pitch);
} else { } else {
...@@ -280,13 +280,13 @@ static snd_pcm_sframes_t rate_dst_frames(snd_pcm_plugin_t *plugin, snd_pcm_ufram ...@@ -280,13 +280,13 @@ static snd_pcm_sframes_t rate_dst_frames(snd_pcm_plugin_t *plugin, snd_pcm_ufram
return res; return res;
} }
static snd_pcm_sframes_t rate_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t rate_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
snd_pcm_uframes_t dst_frames; snd_pcm_uframes_t dst_frames;
rate_t *data; struct rate_priv *data;
snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO); snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO);
if (frames == 0) if (frames == 0)
...@@ -308,13 +308,13 @@ static snd_pcm_sframes_t rate_transfer(snd_pcm_plugin_t *plugin, ...@@ -308,13 +308,13 @@ static snd_pcm_sframes_t rate_transfer(snd_pcm_plugin_t *plugin,
dst_frames = rate_dst_frames(plugin, frames); dst_frames = rate_dst_frames(plugin, frames);
if (dst_frames > dst_channels[0].frames) if (dst_frames > dst_channels[0].frames)
dst_frames = dst_channels[0].frames; dst_frames = dst_channels[0].frames;
data = (rate_t *)plugin->extra_data; data = (struct rate_priv *)plugin->extra_data;
data->func(plugin, src_channels, dst_channels, frames, dst_frames); data->func(plugin, src_channels, dst_channels, frames, dst_frames);
return dst_frames; return dst_frames;
} }
static int rate_action(snd_pcm_plugin_t *plugin, static int rate_action(struct snd_pcm_plugin *plugin,
snd_pcm_plugin_action_t action, enum snd_pcm_plugin_action action,
unsigned long udata) unsigned long udata)
{ {
snd_assert(plugin != NULL, return -ENXIO); snd_assert(plugin != NULL, return -ENXIO);
...@@ -329,14 +329,14 @@ static int rate_action(snd_pcm_plugin_t *plugin, ...@@ -329,14 +329,14 @@ static int rate_action(snd_pcm_plugin_t *plugin,
return 0; /* silenty ignore other actions */ return 0; /* silenty ignore other actions */
} }
int snd_pcm_plugin_build_rate(snd_pcm_plug_t *plug, int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
snd_pcm_plugin_format_t *src_format, struct snd_pcm_plugin_format *src_format,
snd_pcm_plugin_format_t *dst_format, struct snd_pcm_plugin_format *dst_format,
snd_pcm_plugin_t **r_plugin) struct snd_pcm_plugin **r_plugin)
{ {
int err; int err;
rate_t *data; struct rate_priv *data;
snd_pcm_plugin_t *plugin; struct snd_pcm_plugin *plugin;
snd_assert(r_plugin != NULL, return -ENXIO); snd_assert(r_plugin != NULL, return -ENXIO);
*r_plugin = NULL; *r_plugin = NULL;
...@@ -349,11 +349,12 @@ int snd_pcm_plugin_build_rate(snd_pcm_plug_t *plug, ...@@ -349,11 +349,12 @@ int snd_pcm_plugin_build_rate(snd_pcm_plug_t *plug,
err = snd_pcm_plugin_build(plug, "rate conversion", err = snd_pcm_plugin_build(plug, "rate conversion",
src_format, dst_format, src_format, dst_format,
sizeof(rate_t) + src_format->channels * sizeof(rate_channel_t), sizeof(struct rate_priv) +
src_format->channels * sizeof(struct rate_channel),
&plugin); &plugin);
if (err < 0) if (err < 0)
return err; return err;
data = (rate_t *)plugin->extra_data; data = (struct rate_priv *)plugin->extra_data;
data->get = getput_index(src_format->format); data->get = getput_index(src_format->format);
snd_assert(data->get >= 0 && data->get < 4*2*2, return -EINVAL); snd_assert(data->get >= 0 && data->get < 4*2*2, return -EINVAL);
data->put = getput_index(dst_format->format); data->put = getput_index(dst_format->format);
......
sound/core/oss/route.c
View file @ 6ac77bc1
...@@ -35,61 +35,62 @@ ...@@ -35,61 +35,62 @@
#error "Add some code here" #error "Add some code here"
#endif #endif
typedef struct ttable_dst ttable_dst_t; struct ttable_dst;
typedef struct route_private_data route_t;
typedef void (*route_channel_f)(snd_pcm_plugin_t *plugin, typedef void (*route_channel_f)(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channel, struct snd_pcm_plugin_channel *dst_channel,
ttable_dst_t* ttable, snd_pcm_uframes_t frames); struct ttable_dst *ttable, snd_pcm_uframes_t frames);
typedef struct { struct ttable_src {
int channel; int channel;
int as_int; int as_int;
} ttable_src_t; };
struct ttable_dst { struct ttable_dst {
int att; /* Attenuated */ int att; /* Attenuated */
unsigned int nsrcs; unsigned int nsrcs;
ttable_src_t* srcs; struct ttable_src *srcs;
route_channel_f func; route_channel_f func;
}; };
struct route_private_data { struct route_priv {
enum {R_UINT32=0, R_UINT64=1} sum_type; enum {R_UINT32=0, R_UINT64=1} sum_type;
int get, put; int get, put;
int conv; int conv;
int src_sample_size; int src_sample_size;
ttable_dst_t ttable[0]; struct ttable_dst ttable[0];
}; };
typedef union { union sum {
u_int32_t as_uint32; u_int32_t as_uint32;
u_int64_t as_uint64; u_int64_t as_uint64;
} sum_t; };
static void route_to_channel_from_zero(snd_pcm_plugin_t *plugin, static void route_to_channel_from_zero(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channel, struct snd_pcm_plugin_channel *dst_channel,
ttable_dst_t* ttable, snd_pcm_uframes_t frames) struct ttable_dst *ttable,
snd_pcm_uframes_t frames)
{ {
if (dst_channel->wanted) if (dst_channel->wanted)
snd_pcm_area_silence(&dst_channel->area, 0, frames, plugin->dst_format.format); snd_pcm_area_silence(&dst_channel->area, 0, frames, plugin->dst_format.format);
dst_channel->enabled = 0; dst_channel->enabled = 0;
} }
static void route_to_channel_from_one(snd_pcm_plugin_t *plugin, static void route_to_channel_from_one(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channel, struct snd_pcm_plugin_channel *dst_channel,
ttable_dst_t* ttable, snd_pcm_uframes_t frames) struct ttable_dst *ttable,
snd_pcm_uframes_t frames)
{ {
#define CONV_LABELS #define CONV_LABELS
#include "plugin_ops.h" #include "plugin_ops.h"
#undef CONV_LABELS #undef CONV_LABELS
route_t *data = (route_t *)plugin->extra_data; struct route_priv *data = (struct route_priv *)plugin->extra_data;
void *conv; void *conv;
const snd_pcm_plugin_channel_t *src_channel = NULL; const struct snd_pcm_plugin_channel *src_channel = NULL;
unsigned int srcidx; unsigned int srcidx;
char *src, *dst; char *src, *dst;
int src_step, dst_step; int src_step, dst_step;
...@@ -120,10 +121,10 @@ static void route_to_channel_from_one(snd_pcm_plugin_t *plugin, ...@@ -120,10 +121,10 @@ static void route_to_channel_from_one(snd_pcm_plugin_t *plugin,
} }
} }
static void route_to_channel(snd_pcm_plugin_t *plugin, static void route_to_channel(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channel, struct snd_pcm_plugin_channel *dst_channel,
ttable_dst_t* ttable, snd_pcm_uframes_t frames) struct ttable_dst *ttable, snd_pcm_uframes_t frames)
{ {
#define GET_U_LABELS #define GET_U_LABELS
#define PUT_U32_LABELS #define PUT_U32_LABELS
...@@ -153,18 +154,18 @@ static void route_to_channel(snd_pcm_plugin_t *plugin, ...@@ -153,18 +154,18 @@ static void route_to_channel(snd_pcm_plugin_t *plugin,
&&norm_int64_16_att, &&norm_int64_16_att,
&&norm_int64_24_att, &&norm_int64_24_att,
}; };
route_t *data = (route_t *)plugin->extra_data; struct route_priv *data = (struct route_priv *)plugin->extra_data;
void *zero, *get, *add, *norm, *put_u32; void *zero, *get, *add, *norm, *put_u32;
int nsrcs = ttable->nsrcs; int nsrcs = ttable->nsrcs;
char *dst; char *dst;
int dst_step; int dst_step;
char *srcs[nsrcs]; char *srcs[nsrcs];
int src_steps[nsrcs]; int src_steps[nsrcs];
ttable_src_t src_tt[nsrcs]; struct ttable_src src_tt[nsrcs];
u_int32_t sample = 0; u_int32_t sample = 0;
int srcidx, srcidx1 = 0; int srcidx, srcidx1 = 0;
for (srcidx = 0; srcidx < nsrcs; ++srcidx) { for (srcidx = 0; srcidx < nsrcs; ++srcidx) {
const snd_pcm_plugin_channel_t *src_channel = &src_channels[ttable->srcs[srcidx].channel]; const struct snd_pcm_plugin_channel *src_channel = &src_channels[ttable->srcs[srcidx].channel];
if (!src_channel->enabled) if (!src_channel->enabled)
continue; continue;
srcs[srcidx1] = src_channel->area.addr + src_channel->area.first / 8; srcs[srcidx1] = src_channel->area.addr + src_channel->area.first / 8;
...@@ -191,8 +192,8 @@ static void route_to_channel(snd_pcm_plugin_t *plugin, ...@@ -191,8 +192,8 @@ static void route_to_channel(snd_pcm_plugin_t *plugin,
dst_step = dst_channel->area.step / 8; dst_step = dst_channel->area.step / 8;
while (frames-- > 0) { while (frames-- > 0) {
ttable_src_t *ttp = src_tt; struct ttable_src *ttp = src_tt;
sum_t sum; union sum sum;
/* Zero sum */ /* Zero sum */
goto *zero; goto *zero;
...@@ -297,20 +298,20 @@ static void route_to_channel(snd_pcm_plugin_t *plugin, ...@@ -297,20 +298,20 @@ static void route_to_channel(snd_pcm_plugin_t *plugin,
} }
} }
static int route_src_channels_mask(snd_pcm_plugin_t *plugin, static int route_src_channels_mask(struct snd_pcm_plugin *plugin,
unsigned long *dst_vmask, unsigned long *dst_vmask,
unsigned long **src_vmask) unsigned long **src_vmask)
{ {
route_t *data = (route_t *)plugin->extra_data; struct route_priv *data = (struct route_priv *)plugin->extra_data;
int schannels = plugin->src_format.channels; int schannels = plugin->src_format.channels;
int dchannels = plugin->dst_format.channels; int dchannels = plugin->dst_format.channels;
unsigned long *vmask = plugin->src_vmask; unsigned long *vmask = plugin->src_vmask;
int channel; int channel;
ttable_dst_t *dp = data->ttable; struct ttable_dst *dp = data->ttable;
bitmap_zero(vmask, schannels); bitmap_zero(vmask, schannels);
for (channel = 0; channel < dchannels; channel++, dp++) { for (channel = 0; channel < dchannels; channel++, dp++) {
unsigned int src; unsigned int src;
ttable_src_t *sp; struct ttable_src *sp;
if (!test_bit(channel, dst_vmask)) if (!test_bit(channel, dst_vmask))
continue; continue;
sp = dp->srcs; sp = dp->srcs;
...@@ -321,19 +322,19 @@ static int route_src_channels_mask(snd_pcm_plugin_t *plugin, ...@@ -321,19 +322,19 @@ static int route_src_channels_mask(snd_pcm_plugin_t *plugin,
return 0; return 0;
} }
static int route_dst_channels_mask(snd_pcm_plugin_t *plugin, static int route_dst_channels_mask(struct snd_pcm_plugin *plugin,
unsigned long *src_vmask, unsigned long *src_vmask,
unsigned long **dst_vmask) unsigned long **dst_vmask)
{ {
route_t *data = (route_t *)plugin->extra_data; struct route_priv *data = (struct route_priv *)plugin->extra_data;
int dchannels = plugin->dst_format.channels; int dchannels = plugin->dst_format.channels;
unsigned long *vmask = plugin->dst_vmask; unsigned long *vmask = plugin->dst_vmask;
int channel; int channel;
ttable_dst_t *dp = data->ttable; struct ttable_dst *dp = data->ttable;
bitmap_zero(vmask, dchannels); bitmap_zero(vmask, dchannels);
for (channel = 0; channel < dchannels; channel++, dp++) { for (channel = 0; channel < dchannels; channel++, dp++) {
unsigned int src; unsigned int src;
ttable_src_t *sp; struct ttable_src *sp;
sp = dp->srcs; sp = dp->srcs;
for (src = 0; src < dp->nsrcs; src++, sp++) { for (src = 0; src < dp->nsrcs; src++, sp++) {
if (test_bit(sp->channel, src_vmask)) { if (test_bit(sp->channel, src_vmask)) {
...@@ -346,33 +347,33 @@ static int route_dst_channels_mask(snd_pcm_plugin_t *plugin, ...@@ -346,33 +347,33 @@ static int route_dst_channels_mask(snd_pcm_plugin_t *plugin,
return 0; return 0;
} }
static void route_free(snd_pcm_plugin_t *plugin) static void route_free(struct snd_pcm_plugin *plugin)
{ {
route_t *data = (route_t *)plugin->extra_data; struct route_priv *data = (struct route_priv *)plugin->extra_data;
unsigned int dst_channel; unsigned int dst_channel;
for (dst_channel = 0; dst_channel < plugin->dst_format.channels; ++dst_channel) { for (dst_channel = 0; dst_channel < plugin->dst_format.channels; ++dst_channel) {
kfree(data->ttable[dst_channel].srcs); kfree(data->ttable[dst_channel].srcs);
} }
} }
static int route_load_ttable(snd_pcm_plugin_t *plugin, static int route_load_ttable(struct snd_pcm_plugin *plugin,
const route_ttable_entry_t* src_ttable) const int *src_ttable)
{ {
route_t *data; struct route_priv *data;
unsigned int src_channel, dst_channel; unsigned int src_channel, dst_channel;
const route_ttable_entry_t *sptr; const int *sptr;
ttable_dst_t *dptr; struct ttable_dst *dptr;
if (src_ttable == NULL) if (src_ttable == NULL)
return 0; return 0;
data = (route_t *)plugin->extra_data; data = (struct route_priv *)plugin->extra_data;
dptr = data->ttable; dptr = data->ttable;
sptr = src_ttable; sptr = src_ttable;
plugin->private_free = route_free; plugin->private_free = route_free;
for (dst_channel = 0; dst_channel < plugin->dst_format.channels; ++dst_channel) { for (dst_channel = 0; dst_channel < plugin->dst_format.channels; ++dst_channel) {
route_ttable_entry_t t = 0; int t = 0;
int att = 0; int att = 0;
int nsrcs = 0; int nsrcs = 0;
ttable_src_t srcs[plugin->src_format.channels]; struct ttable_src srcs[plugin->src_format.channels];
for (src_channel = 0; src_channel < plugin->src_format.channels; ++src_channel) { for (src_channel = 0; src_channel < plugin->src_format.channels; ++src_channel) {
snd_assert(*sptr >= 0 || *sptr <= FULL, return -ENXIO); snd_assert(*sptr >= 0 || *sptr <= FULL, return -ENXIO);
if (*sptr != 0) { if (*sptr != 0) {
...@@ -405,21 +406,21 @@ static int route_load_ttable(snd_pcm_plugin_t *plugin, ...@@ -405,21 +406,21 @@ static int route_load_ttable(snd_pcm_plugin_t *plugin,
return 0; return 0;
} }
static snd_pcm_sframes_t route_transfer(snd_pcm_plugin_t *plugin, static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin,
const snd_pcm_plugin_channel_t *src_channels, const struct snd_pcm_plugin_channel *src_channels,
snd_pcm_plugin_channel_t *dst_channels, struct snd_pcm_plugin_channel *dst_channels,
snd_pcm_uframes_t frames) snd_pcm_uframes_t frames)
{ {
route_t *data; struct route_priv *data;
int src_nchannels, dst_nchannels; int src_nchannels, dst_nchannels;
int dst_channel; int dst_channel;
ttable_dst_t *ttp; struct ttable_dst *ttp;
snd_pcm_plugin_channel_t *dvp; struct snd_pcm_plugin_channel *dvp;
snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO); snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO);
if (frames == 0) if (frames == 0)
return 0; return 0;
data = (route_t *)plugin->extra_data; data = (struct route_priv *)plugin->extra_data;
src_nchannels = plugin->src_format.channels; src_nchannels = plugin->src_format.channels;
dst_nchannels = plugin->dst_format.channels; dst_nchannels = plugin->dst_format.channels;
...@@ -469,14 +470,14 @@ int getput_index(int format) ...@@ -469,14 +470,14 @@ int getput_index(int format)
return width * 4 + endian * 2 + sign; return width * 4 + endian * 2 + sign;
} }
int snd_pcm_plugin_build_route(snd_pcm_plug_t *plug, int snd_pcm_plugin_build_route(struct snd_pcm_substream *plug,
snd_pcm_plugin_format_t *src_format, struct snd_pcm_plugin_format *src_format,
snd_pcm_plugin_format_t *dst_format, struct snd_pcm_plugin_format *dst_format,
route_ttable_entry_t *ttable, int *ttable,
snd_pcm_plugin_t **r_plugin) struct snd_pcm_plugin **r_plugin)
{ {
route_t *data; struct route_priv *data;
snd_pcm_plugin_t *plugin; struct snd_pcm_plugin *plugin;
int err; int err;
snd_assert(r_plugin != NULL, return -ENXIO); snd_assert(r_plugin != NULL, return -ENXIO);
...@@ -488,12 +489,13 @@ int snd_pcm_plugin_build_route(snd_pcm_plug_t *plug, ...@@ -488,12 +489,13 @@ int snd_pcm_plugin_build_route(snd_pcm_plug_t *plug,
err = snd_pcm_plugin_build(plug, "attenuated route conversion", err = snd_pcm_plugin_build(plug, "attenuated route conversion",
src_format, dst_format, src_format, dst_format,
sizeof(route_t) + sizeof(data->ttable[0]) * dst_format->channels, sizeof(struct route_priv) +
sizeof(data->ttable[0]) * dst_format->channels,
&plugin); &plugin);
if (err < 0) if (err < 0)
return err; return err;
data = (route_t *) plugin->extra_data; data = (struct route_priv *)plugin->extra_data;
data->get = getput_index(src_format->format); data->get = getput_index(src_format->format);
snd_assert(data->get >= 0 && data->get < 4*2*2, return -EINVAL); snd_assert(data->get >= 0 && data->get < 4*2*2, return -EINVAL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7