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

pcm: dmix: fix sw_params handling of timestamp types in direct plugins

Browse source 
In pcms using direct plugins (dmix/dsnoop/dshare), the timestamp type could
be different from the terminating hw plugin, then the kernel driver.

Be sure such pcms have plugins using consistently the same timestamp type.

signed-off-by: Sylvain Bertrand <sylvain.bertrand@legeek.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
sylvain.bertrand@gmail.com 2020-04-15 00:44:39 +00:00 • committed by Takashi Iwai
parent fb48ad9e4f
commit d12df1dc9c
9 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/pcm/pcm_direct.c
View file

@ -991,8 +991,11 @@ int snd_pcm_direct_hw_free(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
return 0;
}
int snd_pcm_direct_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_params_t * params ATTRIBUTE_UNUSED)
int snd_pcm_direct_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
{
if (params->tstamp_type != pcm->tstamp_type)
return -EINVAL;
/* values are cached in the pcm structure */
return 0;
}
@ -1318,6 +1321,15 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
return ret;
}
if (dmix->tstamp_type != -1) {
ret = snd_pcm_sw_params_set_tstamp_type(spcm, &sw_params,
dmix->tstamp_type);
if (ret < 0) {
SNDERR("unable to set tstamp type");
return ret;
}
}
if (dmix->type != SND_PCM_TYPE_DMIX &&
dmix->type != SND_PCM_TYPE_DSHARE)
goto __skip_silencing;
@ -1878,6 +1890,7 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf,
rec->var_periodsize = 0;
rec->direct_memory_access = 1;
rec->hw_ptr_alignment = SND_PCM_HW_PTR_ALIGNMENT_AUTO;
rec->tstamp_type = -1;
/* read defaults */
if (snd_config_search(root, "defaults.pcm.dmix_max_periods", &n) >= 0) {
@ -1941,6 +1954,27 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf,
continue;
}
if (strcmp(id, "tstamp_type") == 0) {
const char *str;
err = snd_config_get_string(n, &str);
if (err < 0) {
SNDERR("Invalid type for %s", id);
return -EINVAL;
}
if (strcmp(str, "default") == 0)
rec->tstamp_type = -1;
else if (strcmp(str, "gettimeofday") == 0)
rec->tstamp_type = SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY;
else if (strcmp(str, "monotonic") == 0)
rec->tstamp_type = SND_PCM_TSTAMP_TYPE_MONOTONIC;
else if (strcmp(str, "monotonic_raw") == 0)
rec->tstamp_type = SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW;
else {
SNDERR("The field tstamp_type is invalid : %s", str);
return -EINVAL;
}
continue;
}
if (strcmp(id, "ipc_gid") == 0) {
char *group;
char *endp;