mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: rate - fix some gcc warnings

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-06-28 12:11:54 +02:00
parent f4f29d42be
commit 1a1f0fb244
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pcm/pcm_rate.c
View file

@ -82,12 +82,12 @@ struct _snd_pcm_rate {
/* allocate a channel area and a temporary buffer for the given size */ /* allocate a channel area and a temporary buffer for the given size */
static snd_pcm_channel_area_t * static snd_pcm_channel_area_t *
rate_alloc_tmp_buf(snd_pcm_rate_t *rate, snd_pcm_format_t format, rate_alloc_tmp_buf(snd_pcm_format_t format,
unsigned int channels, unsigned int frames) unsigned int channels, unsigned int frames)
{ {
snd_pcm_channel_area_t *ap; snd_pcm_channel_area_t *ap;
int width = snd_pcm_format_physical_width(format); int width = snd_pcm_format_physical_width(format);
int i; unsigned int i;
ap = malloc(sizeof(*ap) * channels); ap = malloc(sizeof(*ap) * channels);
if (!ap) if (!ap)
@ -354,7 +354,7 @@ static int snd_pcm_rate_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
snd_pcm_rate_t *rate = pcm->private_data; snd_pcm_rate_t *rate = pcm->private_data;
snd_pcm_t *slave = rate->gen.slave; snd_pcm_t *slave = rate->gen.slave;
snd_pcm_rate_side_info_t *sinfo, *cinfo; snd_pcm_rate_side_info_t *sinfo, *cinfo;
unsigned int channels, cwidth, swidth, chn, acc; unsigned int channels, acc;
int need_src_buf, need_dst_buf; int need_src_buf, need_dst_buf;
int err = snd_pcm_hw_params_slave(pcm, params, int err = snd_pcm_hw_params_slave(pcm, params,
snd_pcm_rate_hw_refine_cchange, snd_pcm_rate_hw_refine_cchange,
@ -401,9 +401,9 @@ static int snd_pcm_rate_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
return -EBUSY; return -EBUSY;
} }
rate->pareas = rate_alloc_tmp_buf(rate, cinfo->format, channels, rate->pareas = rate_alloc_tmp_buf(cinfo->format, channels,
cinfo->period_size); cinfo->period_size);
rate->sareas = rate_alloc_tmp_buf(rate, sinfo->format, channels, rate->sareas = rate_alloc_tmp_buf(sinfo->format, channels,
sinfo->period_size); sinfo->period_size);
if (!rate->pareas || !rate->sareas) { if (!rate->pareas || !rate->sareas) {
err = -ENOMEM; err = -ENOMEM;
@ -442,7 +442,7 @@ static int snd_pcm_rate_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
rate->src_conv_idx = rate->src_conv_idx =
snd_pcm_linear_convert_index(rate->orig_in_format, snd_pcm_linear_convert_index(rate->orig_in_format,
rate->info.in.format); rate->info.in.format);
rate->src_buf = rate_alloc_tmp_buf(rate, rate->info.in.format, rate->src_buf = rate_alloc_tmp_buf(rate->info.in.format,
channels, rate->info.in.period_size); channels, rate->info.in.period_size);
if (!rate->src_buf) { if (!rate->src_buf) {
err = -ENOMEM; err = -ENOMEM;
@ -454,7 +454,7 @@ static int snd_pcm_rate_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
rate->dst_conv_idx = rate->dst_conv_idx =
snd_pcm_linear_convert_index(rate->info.out.format, snd_pcm_linear_convert_index(rate->info.out.format,
rate->orig_out_format); rate->orig_out_format);
rate->dst_buf = rate_alloc_tmp_buf(rate, rate->info.out.format, rate->dst_buf = rate_alloc_tmp_buf(rate->info.out.format,
channels, rate->info.out.period_size); channels, rate->info.out.period_size);
if (!rate->dst_buf) { if (!rate->dst_buf) {
err = -ENOMEM; err = -ENOMEM;