June 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: fsl_spdif: fix spelling mistake: "receivce" -> "receive"
by Colin King 28 Jun '16

28 Jun '16

From: Colin Ian King <colin.king(a)canonical.com> trivial fix to spelling mistake in dev_err message Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/fsl/fsl_spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 151849f..beec793 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -172,7 +172,7 @@ static void spdif_irq_uqrx_full(struct fsl_spdif_priv *spdif_priv, char name) if (*pos >= size * 2) { *pos = 0; } else if (unlikely((*pos % size) + 3 > size)) { - dev_err(&pdev->dev, "User bit receivce buffer overflow\n"); + dev_err(&pdev->dev, "User bit receive buffer overflow\n"); return; } -- 2.8.1

2 2

[alsa-devel] [PATCH] ALSA: echoaudio: Fix memory allocation
by Christophe JAILLET 28 Jun '16

28 Jun '16

'commpage_bak' is allocated with 'sizeof(struct echoaudio)' bytes. We then copy 'sizeof(struct comm_page)' bytes in it. On my system, smatch complains because one is 2960 and the other is 3072. This would result in memory corruption or a oops. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/pci/echoaudio/echoaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 1cb85ae..286f5e3 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev) u32 pipe_alloc_mask; int err; - commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL); + commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL); if (commpage_bak == NULL) return -ENOMEM; commpage = chip->comm_page; - memcpy(commpage_bak, commpage, sizeof(struct comm_page)); + memcpy(commpage_bak, commpage, sizeof(*commpage)); err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device); if (err < 0) { -- 2.7.4

3 2

[alsa-devel] [alsa-lib][PATCH] ctl: use automatic variable instead of call of alloca(3)
by Takashi Sakamoto 27 Jun '16

27 Jun '16

Inner this library, layouts of all structures are public. At a compilation time, each size of the structures can be calculated. It means that we can use automatic variable instead of calling alloca(3) to program this library because in both ways storages are kept on stack frame of process VMA. Besides, the usage of automatic variables requires less instructions than calls of alloca(3). Furthermore, alloca(3) is not described in any C language standards. This commit replaces calls of alloca(3) just for structures with automatic variables, for control features. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 201 +++++++++++++++++++++++-------------------------- src/control/ctlparse.c | 7 +- src/control/namehint.c | 40 +++++----- src/control/setup.c | 5 +- src/control/tlv.c | 15 ++-- 5 files changed, 125 insertions(+), 143 deletions(-) diff --git a/src/control/control.c b/src/control/control.c index 0cb0105..5c0efc6 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -347,8 +347,8 @@ int snd_ctl_elem_add_integer_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, unsigned int member_count, long min, long max, long step) { - snd_ctl_elem_info_t *info; - snd_ctl_elem_value_t *data; + snd_ctl_elem_info_t info = {0}; + snd_ctl_elem_value_t data = {0}; unsigned int i; unsigned int j; unsigned int numid; @@ -356,38 +356,36 @@ int snd_ctl_elem_add_integer_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, assert(ctl && id && id->name[0]); - snd_ctl_elem_info_alloca(&info); - info->id = *id; - info->type = SND_CTL_ELEM_TYPE_INTEGER; - info->access = SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | - SNDRV_CTL_ELEM_ACCESS_USER; - info->owner = element_count; - info->count = member_count; - info->value.integer.min = min; - info->value.integer.max = max; - info->value.integer.step = step; - - err = ctl->ops->element_add(ctl, info); + info.id = *id; + info.type = SND_CTL_ELEM_TYPE_INTEGER; + info.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | + SNDRV_CTL_ELEM_ACCESS_USER; + info.owner = element_count; + info.count = member_count; + info.value.integer.min = min; + info.value.integer.max = max; + info.value.integer.step = step; + + err = ctl->ops->element_add(ctl, &info); if (err < 0) return err; - numid = snd_ctl_elem_id_get_numid(&info->id); + numid = snd_ctl_elem_id_get_numid(&info.id); /* Set initial value to all of members in all of added elements. */ - snd_ctl_elem_value_alloca(&data); - data->id = info->id; + data.id = info.id; for (i = 0; i < element_count; i++) { - snd_ctl_elem_id_set_numid(&data->id, numid + i); + snd_ctl_elem_id_set_numid(&data.id, numid + i); for (j = 0; j < member_count; j++) - data->value.integer.value[j] = min; + data.value.integer.value[j] = min; - err = ctl->ops->element_write(ctl, data); + err = ctl->ops->element_write(ctl, &data); if (err < 0) return err; } - *id = info->id; + *id = info.id; return 0; } @@ -436,8 +434,8 @@ int snd_ctl_elem_add_integer64_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, unsigned int member_count, long long min, long long max, long long step) { - snd_ctl_elem_info_t *info; - snd_ctl_elem_value_t *data; + snd_ctl_elem_info_t info = {0}; + snd_ctl_elem_value_t data = {0}; unsigned int i; unsigned int j; unsigned int numid; @@ -445,38 +443,36 @@ int snd_ctl_elem_add_integer64_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, assert(ctl && id && id->name[0]); - snd_ctl_elem_info_alloca(&info); - info->id = *id; - info->type = SND_CTL_ELEM_TYPE_INTEGER64; - info->access = SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | - SNDRV_CTL_ELEM_ACCESS_USER; - info->owner = element_count; - info->count = member_count; - info->value.integer64.min = min; - info->value.integer64.max = max; - info->value.integer64.step = step; - - err = ctl->ops->element_add(ctl, info); + info.id = *id; + info.type = SND_CTL_ELEM_TYPE_INTEGER64; + info.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | + SNDRV_CTL_ELEM_ACCESS_USER; + info.owner = element_count; + info.count = member_count; + info.value.integer64.min = min; + info.value.integer64.max = max; + info.value.integer64.step = step; + + err = ctl->ops->element_add(ctl, &info); if (err < 0) return err; - numid = snd_ctl_elem_id_get_numid(&info->id); + numid = snd_ctl_elem_id_get_numid(&info.id); /* Set initial value to all of members in all of added elements. */ - snd_ctl_elem_value_alloca(&data); - data->id = info->id; + data.id = info.id; for (i = 0; i < element_count; i++) { - snd_ctl_elem_id_set_numid(&data->id, numid + i); + snd_ctl_elem_id_set_numid(&data.id, numid + i); for (j = 0; j < member_count; j++) - data->value.integer64.value[j] = min; + data.value.integer64.value[j] = min; - err = ctl->ops->element_write(ctl, data); + err = ctl->ops->element_write(ctl, &data); if (err < 0) return err; } - *id = info->id; + *id = info.id; return 0; } @@ -520,25 +516,24 @@ int snd_ctl_elem_add_boolean_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, unsigned int element_count, unsigned int member_count) { - snd_ctl_elem_info_t *info; + snd_ctl_elem_info_t info = {0}; int err; assert(ctl && id && id->name[0]); - snd_ctl_elem_info_alloca(&info); - info->id = *id; - info->type = SND_CTL_ELEM_TYPE_BOOLEAN; - info->access = SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | - SNDRV_CTL_ELEM_ACCESS_USER; - info->owner = element_count; - info->count = member_count; - info->value.integer.min = 0; - info->value.integer.max = 1; - - err = ctl->ops->element_add(ctl, info); + info.id = *id; + info.type = SND_CTL_ELEM_TYPE_BOOLEAN; + info.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | + SNDRV_CTL_ELEM_ACCESS_USER; + info.owner = element_count; + info.count = member_count; + info.value.integer.min = 0; + info.value.integer.max = 1; + + err = ctl->ops->element_add(ctl, &info); if (err >= 0) - *id = info->id; + *id = info.id; return err; } @@ -590,22 +585,21 @@ int snd_ctl_elem_add_enumerated_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, unsigned int items, const char *const labels[]) { - snd_ctl_elem_info_t *info; + snd_ctl_elem_info_t info = {0}; unsigned int i, bytes; char *buf, *p; int err; assert(ctl && id && id->name[0] && labels); - snd_ctl_elem_info_alloca(&info); - info->id = *id; - info->type = SND_CTL_ELEM_TYPE_ENUMERATED; - info->access = SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | - SNDRV_CTL_ELEM_ACCESS_USER; - info->owner = element_count; - info->count = member_count; - info->value.enumerated.items = items; + info.id = *id; + info.type = SND_CTL_ELEM_TYPE_ENUMERATED; + info.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | + SNDRV_CTL_ELEM_ACCESS_USER; + info.owner = element_count; + info.count = member_count; + info.value.enumerated.items = items; bytes = 0; for (i = 0; i < items; ++i) @@ -615,17 +609,17 @@ int snd_ctl_elem_add_enumerated_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, buf = malloc(bytes); if (buf == NULL) return -ENOMEM; - info->value.enumerated.names_ptr = (uintptr_t)buf; - info->value.enumerated.names_length = bytes; + info.value.enumerated.names_ptr = (uintptr_t)buf; + info.value.enumerated.names_length = bytes; p = buf; for (i = 0; i < items; ++i) { strcpy(p, labels[i]); p += strlen(labels[i]) + 1; } - err = ctl->ops->element_add(ctl, info); + err = ctl->ops->element_add(ctl, &info); if (err >= 0) - *id = info->id; + *id = info.id; free(buf); @@ -673,23 +667,22 @@ int snd_ctl_elem_add_bytes_set(snd_ctl_t *ctl, snd_ctl_elem_id_t *id, unsigned int element_count, unsigned int member_count) { - snd_ctl_elem_info_t *info; + snd_ctl_elem_info_t info = {0}; int err; assert(ctl && id && id->name[0]); - snd_ctl_elem_info_alloca(&info); - info->id = *id; - info->type = SND_CTL_ELEM_TYPE_BYTES; - info->access = SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | - SNDRV_CTL_ELEM_ACCESS_USER; - info->owner = element_count; - info->count = member_count; + info.id = *id; + info.type = SND_CTL_ELEM_TYPE_BYTES; + info.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | + SNDRV_CTL_ELEM_ACCESS_USER; + info.owner = element_count; + info.count = member_count; - err = ctl->ops->element_add(ctl, info); + err = ctl->ops->element_add(ctl, &info); if (err >= 0) - *id = info->id; + *id = info.id; return err; } @@ -705,12 +698,11 @@ int snd_ctl_elem_add_integer(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count, long min, long max, long step) { - snd_ctl_elem_id_t *local_id; + snd_ctl_elem_id_t local_id = {0}; - snd_ctl_elem_id_alloca(&local_id); - *local_id = *id; + local_id = *id; - return snd_ctl_elem_add_integer_set(ctl, local_id, 1, member_count, + return snd_ctl_elem_add_integer_set(ctl, &local_id, 1, member_count, min, max, step); } @@ -725,12 +717,11 @@ int snd_ctl_elem_add_integer64(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count, long long min, long long max, long long step) { - snd_ctl_elem_id_t *local_id; + snd_ctl_elem_id_t local_id = {0}; - snd_ctl_elem_id_alloca(&local_id); - *local_id = *id; + local_id = *id; - return snd_ctl_elem_add_integer64_set(ctl, local_id, 1, member_count, + return snd_ctl_elem_add_integer64_set(ctl, &local_id, 1, member_count, min, max, step); } @@ -744,12 +735,11 @@ int snd_ctl_elem_add_integer64(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, int snd_ctl_elem_add_boolean(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count) { - snd_ctl_elem_id_t *local_id; + snd_ctl_elem_id_t local_id = {0}; - snd_ctl_elem_id_alloca(&local_id); - *local_id = *id; + local_id = *id; - return snd_ctl_elem_add_boolean_set(ctl, local_id, 1, member_count); + return snd_ctl_elem_add_boolean_set(ctl, &local_id, 1, member_count); } /** @@ -765,12 +755,11 @@ int snd_ctl_elem_add_enumerated(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int member_count, unsigned int items, const char *const labels[]) { - snd_ctl_elem_id_t *local_id; + snd_ctl_elem_id_t local_id = {0}; - snd_ctl_elem_id_alloca(&local_id); - *local_id = *id; + local_id = *id; - return snd_ctl_elem_add_enumerated_set(ctl, local_id, 1, member_count, + return snd_ctl_elem_add_enumerated_set(ctl, &local_id, 1, member_count, items, labels); } @@ -805,15 +794,15 @@ int snd_ctl_elem_add_enumerated(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, */ int snd_ctl_elem_add_iec958(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id) { - snd_ctl_elem_info_t *info; + snd_ctl_elem_info_t info = {0}; assert(ctl && id && id->name[0]); - snd_ctl_elem_info_alloca(&info); - info->id = *id; - info->type = SND_CTL_ELEM_TYPE_IEC958; - info->owner = 1; - info->count = 1; - return ctl->ops->element_add(ctl, info); + + info.id = *id; + info.type = SND_CTL_ELEM_TYPE_IEC958; + info.owner = 1; + info.count = 1; + return ctl->ops->element_add(ctl, &info); } /** diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c index d38b44e..5c9a168 100644 --- a/src/control/ctlparse.c +++ b/src/control/ctlparse.c @@ -312,17 +312,16 @@ int snd_ctl_ascii_value_parse(snd_ctl_t *handle, const char *value) { const char *ptr = value; - snd_ctl_elem_id_t *myid; + snd_ctl_elem_id_t myid = {0}; snd_ctl_elem_type_t type; unsigned int idx, count; long tmp; long long tmp64; - snd_ctl_elem_id_alloca(&myid); - snd_ctl_elem_info_get_id(info, myid); + snd_ctl_elem_info_get_id(info, &myid); type = snd_ctl_elem_info_get_type(info); count = snd_ctl_elem_info_get_count(info); - snd_ctl_elem_value_set_id(dst, myid); + snd_ctl_elem_value_set_id(dst, &myid); for (idx = 0; idx < count && idx < 128 && ptr && *ptr; idx++) { if (*ptr == ',') diff --git a/src/control/namehint.c b/src/control/namehint.c index ad8dda3..4dbd216 100644 --- a/src/control/namehint.c +++ b/src/control/namehint.c @@ -97,45 +97,42 @@ static int get_dev_name1(struct hint_list *list, char **res, int device, #ifdef BUILD_HWDEP case SND_CTL_ELEM_IFACE_HWDEP: { - snd_hwdep_info_t *info; - snd_hwdep_info_alloca(&info); - snd_hwdep_info_set_device(info, device); - if (snd_ctl_hwdep_info(list->ctl, info) < 0) + snd_hwdep_info_t info = {0}; + snd_hwdep_info_set_device(&info, device); + if (snd_ctl_hwdep_info(list->ctl, &info) < 0) return 0; - *res = strdup(snd_hwdep_info_get_name(info)); + *res = strdup(snd_hwdep_info_get_name(&info)); return 0; } #endif #ifdef BUILD_PCM case SND_CTL_ELEM_IFACE_PCM: { - snd_pcm_info_t *info; - snd_pcm_info_alloca(&info); - snd_pcm_info_set_device(info, device); - snd_pcm_info_set_stream(info, stream ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK); - if (snd_ctl_pcm_info(list->ctl, info) < 0) + snd_pcm_info_t info = {0}; + snd_pcm_info_set_device(&info, device); + snd_pcm_info_set_stream(&info, stream ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK); + if (snd_ctl_pcm_info(list->ctl, &info) < 0) return 0; - switch (snd_pcm_info_get_class(info)) { + switch (snd_pcm_info_get_class(&info)) { case SND_PCM_CLASS_MODEM: case SND_PCM_CLASS_DIGITIZER: return -ENODEV; default: break; } - *res = strdup(snd_pcm_info_get_name(info)); + *res = strdup(snd_pcm_info_get_name(&info)); return 0; } #endif #ifdef BUILD_RAWMIDI case SND_CTL_ELEM_IFACE_RAWMIDI: { - snd_rawmidi_info_t *info; - snd_rawmidi_info_alloca(&info); - snd_rawmidi_info_set_device(info, device); - snd_rawmidi_info_set_stream(info, stream ? SND_RAWMIDI_STREAM_INPUT : SND_RAWMIDI_STREAM_OUTPUT); - if (snd_ctl_rawmidi_info(list->ctl, info) < 0) + snd_rawmidi_info_t info = {0}; + snd_rawmidi_info_set_device(&info, device); + snd_rawmidi_info_set_stream(&info, stream ? SND_RAWMIDI_STREAM_INPUT : SND_RAWMIDI_STREAM_OUTPUT); + if (snd_ctl_rawmidi_info(list->ctl, &info) < 0) return 0; - *res = strdup(snd_rawmidi_info_get_name(info)); + *res = strdup(snd_rawmidi_info_get_name(&info)); return 0; } #endif @@ -419,11 +416,10 @@ static int add_card(snd_config_t *config, snd_config_t *rw_config, struct hint_l snd_config_iterator_t i, next; const char *str; char ctl_name[16]; - snd_ctl_card_info_t *info; + snd_ctl_card_info_t info = {0}; int device, max_device = 0; - snd_ctl_card_info_alloca(&info); - list->info = info; + list->info = &info; err = snd_config_search(config, list->siface, &conf); if (err < 0) return err; @@ -431,7 +427,7 @@ static int add_card(snd_config_t *config, snd_config_t *rw_config, struct hint_l err = snd_ctl_open(&list->ctl, ctl_name, 0); if (err < 0) return err; - err = snd_ctl_card_info(list->ctl, info); + err = snd_ctl_card_info(list->ctl, &info); if (err < 0) goto __error; snd_config_for_each(i, next, conf) { diff --git a/src/control/setup.c b/src/control/setup.c index f23bf2c..c598c8b 100644 --- a/src/control/setup.c +++ b/src/control/setup.c @@ -252,13 +252,12 @@ static int snd_config_get_ctl_elem_value(snd_config_t *conf, { int err; snd_config_iterator_t i, next; - snd_ctl_elem_id_t *id; + snd_ctl_elem_id_t id = {0}; snd_ctl_elem_type_t type; unsigned int count; long v; long idx; - snd_ctl_elem_id_alloca(&id); - snd_ctl_elem_value_get_id(val, id); + snd_ctl_elem_value_get_id(val, &id); count = snd_ctl_elem_info_get_count(info); type = snd_ctl_elem_info_get_type(info); if (count == 1) { diff --git a/src/control/tlv.c b/src/control/tlv.c index b08d887..6ad64a1 100644 --- a/src/control/tlv.c +++ b/src/control/tlv.c @@ -409,20 +409,19 @@ struct tlv_info { static int get_tlv_info(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, struct tlv_info *rec) { - snd_ctl_elem_info_t *info; + snd_ctl_elem_info_t info = {0}; int err; - snd_ctl_elem_info_alloca(&info); - snd_ctl_elem_info_set_id(info, id); - err = snd_ctl_elem_info(ctl, info); + snd_ctl_elem_info_set_id(&info, id); + err = snd_ctl_elem_info(ctl, &info); if (err < 0) return err; - if (!snd_ctl_elem_info_is_tlv_readable(info)) + if (!snd_ctl_elem_info_is_tlv_readable(&info)) return -EINVAL; - if (snd_ctl_elem_info_get_type(info) != SND_CTL_ELEM_TYPE_INTEGER) + if (snd_ctl_elem_info_get_type(&info) != SND_CTL_ELEM_TYPE_INTEGER) return -EINVAL; - rec->minval = snd_ctl_elem_info_get_min(info); - rec->maxval = snd_ctl_elem_info_get_max(info); + rec->minval = snd_ctl_elem_info_get_min(&info); + rec->maxval = snd_ctl_elem_info_get_max(&info); err = snd_ctl_elem_tlv_read(ctl, id, rec->buf, sizeof(rec->buf)); if (err < 0) return err; -- 2.7.4

2 1

[alsa-devel] period time vs. buffer time
by Joël Krähemann 27 Jun '16

27 Jun '16

Hi all Do I need to call both functions in order to get good performance? snd_pcm_hw_params_set_period_time() snd_pcm_hw_params_set_buffer_time() Or is one enough? Since I call: snd_pcm_hw_params_set_buffer_size() I have developed an application called gsequencer I experience good throughput but playback collapses after a specified amount of time. The application is unusable after 60 seconds of playback. http://www.nongnu.org/gsequencer/ http://www.nongnu.org/gsequencer/api/ags/AgsThread.html - does the JIFFIEs http://www.nongnu.org/gsequencer/api/ags/AgsDevout.html - does setup audio HW http://www.nongnu.org/gsequencer/api/ags/AgsSoundcardThread.html - calls ags_soundcard_play() I do some kind of overclocking within thread frequency. I ceil() the frequency of the thread in Hertz jiffies and add one. Within this thread I call: snd_pcm_writei() In numbers: 2 audio channels 44100 samplerate 944 buffer size in samples = 2 * 944 frames = 2 * 944 * sizeof(signed short) 48 times per second call: snd_pcm_writei() I use the soundcard in non-blocking mode because I need the time to compute the rest of the tree within time. The question is how to handle lost precision? As I round values and do some overclocking to ensure alsa has enough frames to do the playback. What do I have to do in order to get great performance and throughput? Do I need to drop frames? Or even buffers? And what is alsa's job? So playback gets delay by nanosleep() as following: if(g_atomic_pointer_get(&(thread->parent)) == NULL){ gdouble time_spent, relative_time_spent; gdouble time_cycle; static const gdouble nsec_per_jiffie = NSEC_PER_SEC / AGS_THREAD_HERTZ_JIFFIE; static const gdouble lost_per_jiffie = nsec_per_jiffie / AGS_THREAD_MAX_PRECISION; gdouble lost_precision; if(thread->tic_delay == thread->delay){ struct timespec timed_sleep = { 0, 0, }; clock_gettime(CLOCK_MONOTONIC, &time_now); if(time_now.tv_sec == thread->computing_time->tv_sec + 1){ time_spent = (time_now.tv_nsec) + (NSEC_PER_SEC - thread->computing_time->tv_nsec); }else if(time_now.tv_sec > thread->computing_time->tv_sec + 1){ time_spent = (time_now.tv_sec - thread->computing_time->tv_sec) * NSEC_PER_SEC; time_spent += (time_now.tv_nsec - thread->computing_time->tv_nsec); }else{ time_spent = time_now.tv_nsec - thread->computing_time->tv_nsec; } //FIXME:JK: do optimization time_cycle = ((gdouble) NSEC_PER_SEC / thread->freq); relative_time_spent = time_cycle - time_spent; if(relative_time_spent > 0.0 && relative_time_spent < time_cycle){ timed_sleep.tv_nsec = (long) relative_time_spent; /* lost precision */ //NOTE:JK: this is experimental lost_precision = lost_per_jiffie / (1.0 + (1.0 / thread->freq)); if(relative_time_spent - lost_precision > 0.0){ timed_sleep.tv_nsec = (long) (relative_time_spent - lost_precision); }else{ g_warning("ags_thread-posix.c - not optimized tree\0"); } /* sleep the rest of available time of the period */ nanosleep(&timed_sleep, NULL); } clock_gettime(CLOCK_MONOTONIC, thread->computing_time); } Here's a piece of soundcard initialization: /* set the period time */ period_time = (USEC_PER_SEC / (devout->samplerate)); dir = -1; err = snd_pcm_hw_params_set_period_time_near(handle, hwparams, &period_time, &dir); if (err < 0) { pthread_mutex_unlock(mutex); str = snd_strerror(err); g_warning("Unable to set period time %i for playback: %s\n", period_time, str); free(str); return; } My problem with alsa is that as I don't tell the exact values I get good throughput but playback collapses. When I do exact values the sound is soften and loses volume. Strange is I can sometimes hear some crackling and I'm unsure what to set as period time. Does it need the time to do periodic things or should it be reduced or overloaded to have accurate time? Bests, Joël -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in

1 0

[alsa-devel] [alsa-lib][PATCH] ctl: fix returning zero for dimension level 4
by Takashi Sakamoto 27 Jun '16

27 Jun '16

In ALSA kernel/userspace interfaces, 'struct snd_ctl_elem_info' has a 'dimension' parameter. This parameter consists of an array with four elements. Each element represents the number of members in corresponding dimension level to construct matrix. In current implementation, a get function, 'snd_ctl_elem_info_get_dimension()' is hardcoded to return zero to level 4, against actual value. This commit fixes the bug. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/control/control.c b/src/control/control.c index d515cff..0cb0105 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -2483,7 +2483,7 @@ int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int #endif { assert(obj); - if (idx >= 3) + if (idx > 3) return 0; return obj->dimen.d[idx]; } -- 2.7.4

2 1

[alsa-devel] [PATCH 00/39 v2][RESEND] ASoC: add simple-card-core and standardize "simple" card
by Kuninori Morimoto 27 Jun '16

27 Jun '16

Hi Mark These are resend of v2 of simple-card cleanup patches. My previous patch-set was sent almost 1month ago. Some of them are aleady accepted, but nothing happen for almost all other patches. Because of this stagnation, I already have almost 90 patches for simple-card + graph driver in locally... I would like to post them as soon as possible. OTOH, I know you don't like super big patchset, Thus, I will post small batch patch set only today. I will post next small batch patch set if 1st batch was accepted. I listed my local patch set below. It is for simple-card + graph support, and HDMI support for Renesas. This time I will post * mark patches. These are for simple-card cleanup. Kuninori Morimoto (90): * ASoC: add new simple-card-utils.c * ASoC: simple-card-utils: add asoc_simple_card_parse_tdm() * ASoC: simple-card-utils: add asoc_simple_card_parse_dailink_name() * ASoC: simple-card-utils: add asoc_simple_card_parse_card_name() * ASoC: simple-card-utils: add asoc_simple_card_parse_card_prefix() * ASoC: simple-card-utils: add asoc_simple_card_parse_clk() * ASoC: simple-card-utils: add asoc_simple_card_parse_endpoint() * ASoC: simple-card-utils: add asoc_simple_card_init_dai() * ASoC: simple-card-utils: add asoc_simple_card_canonicalize_dailink() * ASoC: simple-card-utils: add asoc_simple_card_canonicalize_cpu() * ASoC: simple-card-utils: add asoc_simple_card_clean_reference() ASoC: simple-card: use common PREFIX for each DT property ASoC: simple-card: add new asoc_simple_jack and use it ASoC: simple-card: use asoc_simple_card_parse_daifmt() ASoC: simple-card: use asoc_simple_card_parse_clk() ASoC: simple-card: use asoc_simple_card_parse_endpoint() ASoC: simple-card: use asoc_simple_card_parse_tdm() ASoC: simple-card: use asoc_simple_card_parse_card_name() ASoC: simple-card: use asoc_simple_card_parse_dailink_name() ASoC: simple-card: use asoc_simple_card_init_dai() ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() ASoC: simple-card: use asoc_simple_card_clean_reference() ASoC: rsrc-card: use asoc_simple_card_parse_daifmt() ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name() ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai ASoC: rsrc-card: use asoc_simple_card_parse_clk() ASoC: rsrc-card: use asoc_simple_card_parse_endpoint() ASoC: rsrc-card: use asoc_simple_card_parse_card_name() ASoC: rsrc-card: use asoc_simple_card_parse_card_prefix() ASoC: rsrc-card: use asoc_simple_card_parse_tdm() ASoC: rsrc-card: use asoc_simple_card_init_dai() ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() ASoC: rsrc-card: use asoc_simple_card_clean_reference() ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase1 ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase2 ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase3 Documentation: of: add type property of_graph: add of_graph_get_remote_endpoint() of_graph: add of_graph_port/endpoint_type_is() of_graph: add of_graph_get_endpoint_count() of_graph: add of_graph_get_port_parent() of_graph: add of_graph_get_top_port() of_graph: add for_each_of_port() / for_each_of_endpoint_in_port() drm: bridge: add DesignWare HDMI I2S audio support ASoC: hdmi-codec: callback function will be called with private data ASoC: hdmi-codec: enable multi probe for same device ASoC: soc-core: snd_soc_get_dai_name() become non static ASoC: soc-core: adjust for graph on snd_soc_of_parse_card_name ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_simple_widgets ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_routing ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_prefix ASoC: simple-card-utils: rename asoc_simple_card_parse_endpoint to dai ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_name ASoC: simple-card-utils: add asoc_simple_card_try_to_probe_graph_card() ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_prefix ASoC: simple-card: call of_node_put() for dai_link ASoC: simple-card: tidyup mclk-fs of_property_read_u32() usage ASoC: simple-card: code sync: tidyup simple_priv_to_xxx() macro ASoC: simple-card: code sync: use simple_priv_to_props() macro ASoC: simple-card: is GPL v2 ASoC: simple-card: code sync: tidyup white line ASoC: simple-card: use kzalloc() for dai_props / dai_link ASoC: simple-dpcm-card: tidyup codec daifmt handling method ASoC: simple-dpcm-card: tidyup asoc_simple_card_parse_links() method ASoC: simple-dpcm-card: depends on CONFIG_OF ASoC: simple-dpcm-card: add 2 CPU 1 Codec example ASoC: simple-dpcm-card: code sync: follow to simple family style ASoC: simple-dpcm-card: is GPL v2 ASoC: simple-dpcm-card: code sync: move asoc_simple_card_of_match ASoC: simple-dpcm-card: remove unused definitions ASoC: simple-dpcm-card: code sync: rename asoc_simple_card_priv ASoC: simple-dpcm-card: code sync: tidyup props/link naming ASoC: add simple-graph-card document ASoC: add simple-graph-card support ASoC: add simple-graph-dpcm-card document ASoC: add simple-graph-dpcm-card support ASoC: rsnd: remove duplicate define of rsnd_dvc_of_node() ASoC: rsnd: amend .probe/.remove call for DPCM ASoC: rsnd: add rsnd_mod_next() for for_each_rsnd_mod_xxx() ASoC: rsnd: use for_each_rsnd_mod_xxx() on rsnd_dai_call() ASoC: rsnd: use for_each_rsnd_mod_xxx() on rsnd_rdai_continuance_probe() ASoC: rsnd: add rsnd_parse_of_node() and integrate rsnd_xxx_of_node ASoC: rsnd: add support graph base DT phase 1 ASoC: rsnd: add support graph base DT phase 2 ASoC: rsnd: depends on OF ASoC: rsnd: use simple-graph-card if possible ASoC: rsnd: add HDMI output support Documentation/devicetree/bindings/graph.txt | 26 + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + .../bindings/sound/renesas,rsrc-card.txt | 75 --- .../devicetree/bindings/sound/simple-dpcm-card.txt | 109 +++++ .../bindings/sound/simple-graph-card.txt | 65 +++ .../bindings/sound/simple-graph-dpcm-card.txt | 53 +++ drivers/gpu/drm/bridge/Kconfig | 8 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw-hdmi-audio.h | 7 + drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c | 123 +++++ drivers/gpu/drm/bridge/dw-hdmi.c | 22 +- drivers/gpu/drm/bridge/dw-hdmi.h | 21 + drivers/of/base.c | 197 +++++++- include/linux/of_graph.h | 67 +++ include/sound/hdmi-codec.h | 13 +- include/sound/simple_card.h | 11 +- include/sound/simple_card_utils.h | 92 ++++ include/sound/soc.h | 31 +- sound/soc/codecs/hdmi-codec.c | 81 +++- sound/soc/generic/Kconfig | 25 + sound/soc/generic/Makefile | 12 +- sound/soc/generic/simple-card-utils.c | 387 +++++++++++++++ sound/soc/generic/simple-card.c | 501 +++++++------------- sound/soc/generic/simple-dpcm-card.c | 323 +++++++++++++ sound/soc/generic/simple-graph-card.c | 452 ++++++++++++++++++ sound/soc/generic/simple-graph-dpcm-card.c | 409 ++++++++++++++++ sound/soc/sh/Kconfig | 8 +- sound/soc/sh/rcar/Makefile | 3 - sound/soc/sh/rcar/core.c | 318 ++++++++----- sound/soc/sh/rcar/dma.c | 11 + sound/soc/sh/rcar/dvc.c | 2 - sound/soc/sh/rcar/gen.c | 2 + sound/soc/sh/rcar/rsnd.h | 62 ++- sound/soc/sh/rcar/rsrc-card.c | 527 --------------------- sound/soc/sh/rcar/ssi.c | 27 +- sound/soc/sh/rcar/ssiu.c | 37 ++ sound/soc/soc-core.c | 39 +- 37 files changed, 3003 insertions(+), 1146 deletions(-)

3 16

[alsa-devel] [PATCH] ASOC: wm8753: Remove unneeded header file
by Amitoj Kaur Chawla 26 Jun '16

26 Jun '16

Drop redundant include of moduleparam.h The Coccinelle semantic patch used to make this change is as follows: @ includesmodule @ @@ #include <linux/module.h> @ depends on includesmodule @ @@ - #include <linux/moduleparam.h> Signed-off-by: Amitoj Kaur Chawla <amitoj1606(a)gmail.com> --- sound/soc/codecs/wm8753.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 6f1024f..b4e6893 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -32,7 +32,6 @@ */ #include <linux/module.h> -#include <linux/moduleparam.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h> -- 1.9.1

3 2

[alsa-devel] [PATCH 1/2] ASoC: codecs: wm8753: Replace magic number
by Alexander Shiyan 26 Jun '16

26 Jun '16

Use SND_SOC_NOPM constant, instead of -1. Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> --- sound/soc/codecs/wm8753.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 6f1024f..9f851b8 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -486,7 +486,7 @@ SND_SOC_DAPM_DAC("Voice DAC", "Voice Playback", WM8753_PWR1, 4, 0), SND_SOC_DAPM_OUTPUT("MONO1"), SND_SOC_DAPM_MUX("Mono 2 Mux", SND_SOC_NOPM, 0, 0, &wm8753_mono2_controls), SND_SOC_DAPM_OUTPUT("MONO2"), -SND_SOC_DAPM_MIXER("Out3 Left + Right", -1, 0, 0, NULL, 0), +SND_SOC_DAPM_MIXER("Out3 Left + Right", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MUX("Out3 Mux", SND_SOC_NOPM, 0, 0, &wm8753_out3_controls), SND_SOC_DAPM_PGA("Out 3", WM8753_PWR3, 4, 0, NULL, 0), SND_SOC_DAPM_OUTPUT("OUT3"), -- 2.4.9

2 2

[alsa-devel] [PATCH] SoC: dwc: trivial fix of spelling mistake "unsuppted" -> "unsupported"
by Colin King 26 Jun '16

26 Jun '16

From: Colin Ian King <colin.king(a)canonical.com> trivial fix to spelling mistake in dev_err message Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/dwc/designware_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 0db69b7..1223ba6 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -278,7 +278,7 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream, break; default: - dev_err(dev->dev, "designware-i2s: unsuppted PCM fmt"); + dev_err(dev->dev, "designware-i2s: unsupported PCM fmt"); return -EINVAL; } -- 2.8.1

2 1

[alsa-devel] [PATCH 0/4] ASoC: tpa6130a2: Add support for multiple instances
by Helen Koike 26 Jun '16

26 Jun '16

The current tpa6130a2 driver supports only a single instance. This patch series add support for multiple instances by removing the global variable that holds the instance. This is performed by using the component API, regmap, the snd_soc_{info,put,get}_volsw API and DAPM. This patch series also touches code from the Nokia RX51 which I didn't tested (as I am testing the tpa6130a2 in another board that is not upstream). I would appreciate is if someone who possesses the Nokia RX51 (n900) could please test the code. This patch series is based on git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Available at https://git.collabora.com/cgit/user/koike/linux.git/log/?h=sound/review/tpa… Helen Koike (4): ASoC: tpa6130a2: Register component ASoC: tap6130a2: Use regmap ASoC: tpa6130a2: Use snd soc volsw functions ASoC: tpa6130a2: Add DAPM support sound/soc/codecs/tpa6130a2.c | 382 ++++++++++++------------------------------- sound/soc/codecs/tpa6130a2.h | 14 +- sound/soc/omap/rx51.c | 45 ++--- 3 files changed, 130 insertions(+), 311 deletions(-) -- 1.9.1

5 35