mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Safer params implementation

Browse source
This commit is contained in:
Abramo Bagnara 2000-10-03 09:15:50 +00:00
parent c3c4eef051
commit c6bfb82645
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pcm/pcm_plug.c
View file

@ -498,6 +498,7 @@ static int snd_pcm_plug_params(snd_pcm_t *pcm, snd_pcm_params_t *params)
memset(&slave_info, 0, sizeof(slave_info)); memset(&slave_info, 0, sizeof(slave_info));
err = snd_pcm_params_info(slave, &slave_info); err = snd_pcm_params_info(slave, &slave_info);
assert(err > 0);
if (err < 0) if (err < 0)
return err; return err;
@ -514,11 +515,22 @@ static int snd_pcm_plug_params(snd_pcm_t *pcm, snd_pcm_params_t *params)
} }
slave_format->sfmt = slave_fmt; slave_format->sfmt = slave_fmt;
} }
slave_info.req_mask |= SND_PCM_PARAMS_SFMT;
err = snd_pcm_params_info(slave, &slave_info);
assert(err > 0);
if (err < 0)
return err;
if (format->channels < slave_info.min_channels) if (format->channels < slave_info.min_channels)
slave_format->channels = slave_info.min_channels; slave_format->channels = slave_info.min_channels;
else if (format->channels > slave_info.max_channels) else if (format->channels > slave_info.max_channels)
slave_format->channels = slave_info.max_channels; slave_format->channels = slave_info.max_channels;
slave_info.req_mask |= SND_PCM_PARAMS_CHANNELS;
err = snd_pcm_params_info(slave, &slave_info);
assert(err > 0);
if (err < 0)
return err;
srate = snd_pcm_plug_slave_rate(format->rate, &slave_info); srate = snd_pcm_plug_slave_rate(format->rate, &slave_info);
if (srate < 0) { if (srate < 0) {
@ -527,14 +539,11 @@ static int snd_pcm_plug_params(snd_pcm_t *pcm, snd_pcm_params_t *params)
return srate; return srate;
} }
slave_format->rate = srate; slave_format->rate = srate;
slave_info.req_mask |= SND_PCM_PARAMS_RATE;
slave_info.req_mask = ~0;
err = snd_pcm_params_info(slave, &slave_info); err = snd_pcm_params_info(slave, &slave_info);
if (err < 0) { assert(err > 0);
params->fail_mask = slave_info.req.fail_mask; if (err < 0)
params->fail_reason = slave_info.req.fail_reason;
return err; return err;
}
if (slave_format->rate - slave_info.min_rate < slave_info.max_rate - slave_format->rate) if (slave_format->rate - slave_info.min_rate < slave_info.max_rate - slave_format->rate)
slave_format->rate = slave_info.min_rate; slave_format->rate = slave_info.min_rate;