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

pcm: rate - rewrite the may_wait_for_avail_min callback for the rate plugin

Browse source 
Shuffle the code to avoid special conditions using the plugin type
in the generic plugin code. The rate plugin has the own
may_wait_for_avail_min callback implementation now.

Fixes: d21e0e01 ("pcm: plugin - fix avail_min calculation on rate plugin")
Fixes: https://github.com/alsa-project/alsa-lib/pull/218
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-05-20 10:47:43 +02:00
parent d21e0e01c6
commit d9dbb57b94
4 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pcm/pcm_plugin.c
View file

@ -574,8 +574,10 @@ static int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
return 0;
}
int snd_pcm_plugin_may_wait_for_avail_min(snd_pcm_t *pcm,
snd_pcm_uframes_t avail)
int snd_pcm_plugin_may_wait_for_avail_min_conv(
snd_pcm_t *pcm,
snd_pcm_uframes_t avail,
snd_pcm_uframes_t (*conv)(snd_pcm_t *, snd_pcm_uframes_t))
{
if (pcm->stream == SND_PCM_STREAM_CAPTURE &&
pcm->access != SND_PCM_ACCESS_RW_INTERLEAVED &&
@ -619,8 +621,8 @@ int snd_pcm_plugin_may_wait_for_avail_min(snd_pcm_t *pcm,
* Can happen only on built-in rate plugin.
* This code is also used by extplug, but extplug does not allow to alter the sampling rate.
*/
if (snd_pcm_type(pcm) == SND_PCM_TYPE_RATE)
needed_slave_avail_min = snd_pcm_rate_slave_frames(pcm, needed_slave_avail_min);
if (conv)
needed_slave_avail_min = conv(pcm, needed_slave_avail_min);
if (slave->avail_min != needed_slave_avail_min) {
snd_pcm_sw_params_t *swparams;
@ -644,6 +646,12 @@ int snd_pcm_plugin_may_wait_for_avail_min(snd_pcm_t *pcm,
return snd_pcm_generic_may_wait_for_avail_min(pcm, avail);
}
int snd_pcm_plugin_may_wait_for_avail_min(snd_pcm_t *pcm,
snd_pcm_uframes_t avail)
{
return snd_pcm_plugin_may_wait_for_avail_min_conv(pcm, avail, NULL);
}
const snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = {
.status = snd_pcm_plugin_status,
.state = snd_pcm_generic_state,