November 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] bluetooth and alsa
by Anders Gnistrup 16 Nov '11

16 Nov '11

Hi Another question for the bluetooth headset support when using Linux. I am starting to get a bit frustrated about this. I have a Nokia BH-104 headset(could be some other). I have tried different bluetooth dongle's so in the USB port and the onboard receiver with the same result. So the usb-dongle is not the problem. I connect the bluetooth headeset and test using the following command. arecord -D bluetooth | aplay -Dbluetooth Very simple and sounds is played/loopedback. But the CPU usage goes sky high. Its start low (1-2%) and slowly increase to 100%, drops to 80 and increase once again to 100% and so on. I have an application (a bit more complicated) that enters the same problem. Do anyone have some experience/hints with bluetooth headset when using Alsa? Please share it. I could use some hints to get fix this problem. Anders

1 0

[alsa-devel] [PATCH] media: fix truncated entity specification
by Clemens Ladisch 16 Nov '11

16 Nov '11

When enumerating an entity, assign the entire entity specification instead of only the first two words. (This requires giving the specification union a name.) So far, no driver actually uses more than two words, but this will be needed for ALSA entities. Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> --- include/media/media-entity.h | 2 +- drivers/media/media-device.c | 3 +-- drivers/media/video/v4l2-dev.c | 4 ++-- drivers/media/video/v4l2-device.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/media/media-entity.h b/include/media/media-entity.h index cd8bca6..d13de27 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -98,7 +98,7 @@ struct media_entity { /* Sub-device specifications */ /* Nothing needed yet */ - }; + } specification; }; static inline u32 media_entity_type(struct media_entity *entity) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 16b70b4..bfb4e0b 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -107,8 +107,7 @@ static long media_device_enum_entities(struct media_device *mdev, u_ent.group_id = ent->group_id; u_ent.pads = ent->num_pads; u_ent.links = ent->num_links - ent->num_backlinks; - u_ent.v4l.major = ent->v4l.major; - u_ent.v4l.minor = ent->v4l.minor; + memcpy(&u_ent.v4l, &ent->specification, sizeof(ent->specification)); if (copy_to_user(uent, &u_ent, sizeof(u_ent))) return -EFAULT; return 0; diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index a5c9ed1..1eb9ba1 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c @@ -703,8 +703,8 @@ int __video_register_device(struct video_device *vdev, int type, int nr, vdev->vfl_type != VFL_TYPE_SUBDEV) { vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L; vdev->entity.name = vdev->name; - vdev->entity.v4l.major = VIDEO_MAJOR; - vdev->entity.v4l.minor = vdev->minor; + vdev->entity.specification.v4l.major = VIDEO_MAJOR; + vdev->entity.specification.v4l.minor = vdev->minor; ret = media_device_register_entity(vdev->v4l2_dev->mdev, &vdev->entity); if (ret < 0) diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c index e6a2c3b..d8f58d8 100644 --- a/drivers/media/video/v4l2-device.c +++ b/drivers/media/video/v4l2-device.c @@ -217,8 +217,8 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev) if (err < 0) return err; #if defined(CONFIG_MEDIA_CONTROLLER) - sd->entity.v4l.major = VIDEO_MAJOR; - sd->entity.v4l.minor = vdev->minor; + sd->entity.specification.v4l.major = VIDEO_MAJOR; + sd->entity.specification.v4l.minor = vdev->minor; #endif } return 0;

2 4

[alsa-devel] [PATCH] ASoC don't clobber platform DMA driver ops
by Alan Tull 15 Nov '11

15 Nov '11

Previously, only one static struct for ops existed for all platform DMA drivers to share. Half of the ops are shared functions and the other half are initialized to point directly to ops in the platform driver. This creates problems where each time soc_new_pcm is called, the new platform driver's ops would overwrite a subset of the ops. This patch creates and populates a ops struct for each call to soc_pcm_new. Signed-off-by: Alan Tull <alan.tull(a)freescale.com> --- sound/soc/soc-core.c | 6 ++++++ sound/soc/soc-pcm.c | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b085d8e..216803c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1541,6 +1541,12 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) soc_cleanup_card_debugfs(card); + /* free the ops */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_pcm_runtime *rtd = &card->rtd[i]; + kfree(rtd->ops); + } + /* remove the card */ if (card->remove) card->remove(card); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2879c88..091c074 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -567,17 +567,6 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) return offset; } -/* ASoC PCM operations */ -static struct snd_pcm_ops soc_pcm_ops = { - .open = soc_pcm_open, - .close = soc_pcm_close, - .hw_params = soc_pcm_hw_params, - .hw_free = soc_pcm_hw_free, - .prepare = soc_pcm_prepare, - .trigger = soc_pcm_trigger, - .pointer = soc_pcm_pointer, -}; - /* create a new pcm */ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) { @@ -586,9 +575,17 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_pcm *pcm; + struct snd_pcm_ops *soc_pcm_ops; char new_name[64]; int ret = 0, playback = 0, capture = 0; + /* ASoC PCM operations */ + soc_pcm_ops = kzalloc(sizeof(struct snd_pcm_ops), GFP_KERNEL); + if (soc_pcm_ops == NULL) { + printk(KERN_ERR "asoc: can't create pcm ops for codec %s\n", codec->name); + return -ENOMEM; + } + /* check client and interface hw capabilities */ snprintf(new_name, sizeof(new_name), "%s %s-%d", rtd->dai_link->stream_name, codec_dai->name, num); @@ -603,34 +600,45 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) num, playback, capture, &pcm); if (ret < 0) { printk(KERN_ERR "asoc: can't create pcm for codec %s\n", codec->name); + kfree(soc_pcm_ops); return ret; } /* DAPM dai link stream work */ INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); + soc_pcm_ops->open = soc_pcm_open; + soc_pcm_ops->close = soc_codec_close; + soc_pcm_ops->hw_params = soc_pcm_hw_params; + soc_pcm_ops->hw_free = soc_pcm_hw_free; + soc_pcm_ops->prepare = soc_pcm_prepare; + soc_pcm_ops->pointer = soc_pcm_pointer; + soc_pcm_ops->trigger = soc_pcm_trigger; + rtd->pcm = pcm; pcm->private_data = rtd; if (platform->driver->ops) { - soc_pcm_ops.mmap = platform->driver->ops->mmap; - soc_pcm_ops.pointer = platform->driver->ops->pointer; - soc_pcm_ops.ioctl = platform->driver->ops->ioctl; - soc_pcm_ops.copy = platform->driver->ops->copy; - soc_pcm_ops.silence = platform->driver->ops->silence; - soc_pcm_ops.ack = platform->driver->ops->ack; - soc_pcm_ops.page = platform->driver->ops->page; + soc_pcm_ops->mmap = platform->driver->ops->mmap; + soc_pcm_ops->ioctl = platform->driver->ops->ioctl; + soc_pcm_ops->copy = platform->driver->ops->copy; + soc_pcm_ops->silence = platform->driver->ops->silence; + soc_pcm_ops->ack = platform->driver->ops->ack; + soc_pcm_ops->page = platform->driver->ops->page; } + rtd->ops = soc_pcm_ops; + if (playback) - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &soc_pcm_ops); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, soc_pcm_ops); if (capture) - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &soc_pcm_ops); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, soc_pcm_ops); if (platform->driver->pcm_new) { ret = platform->driver->pcm_new(rtd); if (ret < 0) { pr_err("asoc: platform pcm constructor failed\n"); + kfree(rtd->ops); return ret; } } -- 1.6.0.4

3 2

[alsa-devel] Alsa Versions
by Krisztian Kocsis 15 Nov '11

15 Nov '11

Hi! Is it possible to use different version of ALSA kernel module and library? Example: Kernel module is 1.0.16, library is 1.0.20? BR, Krisztian Kocsis

2 1

[alsa-devel] snd_ctl_card_info_t type does not resolve on ubuntu 11.10?
by Borg Onion 15 Nov '11

15 Nov '11

Hello, Starting to write an ALSA app and trying to just list sound card info. The type "snd_ctl_card_info_t" doesn't seem to resolve by just including <alsa/asoundlib.h>. This type is needed for me to call snd_ctl_card_info(). OS is Ubuntu 11.10 with libasound2-dev installed. What am I doing wrong? Code is below: #include <stdio.h> #include <alsa/asoundlib.h> void print_card_info(snd_ctl_card_info_t info) { printf("Card #=%d, id=%s, driver=%s, name=%s, longname=%s, mixername=%s, components=%s\n", info.card, info.id, info.driver, info.name, info.longname, info.mixername, info.components); } int main(int argc, char **argv) { int card = -1; char cardascii[3]; char *name, *longname; snd_ctl_t *handle; snd_ctl_card_info_t info; while (snd_card_next(&card) >= 0) { if (card < 0) { printf("No more cards!\n"); break; } printf("Card %d\n", card); if (snd_card_get_name(card, &name)) { printf("Error getting card %d's name, skipping\n", card); continue; } printf("Name = %s\n", name); if (snd_card_get_longname(card, &longname)) { printf("Error getting card %d's long name, skipping\n", card); continue; } printf("Long name = %s\n", longname); snprintf(cardascii, sizeof(cardascii), "%d", card); if (snd_ctl_open(&handle, cardascii, 0)) { printf("Error opening card #%d, skipping\n", card); continue; } if (snd_ctl_card_info(handle, &info)) { printf("Error getting info for card #%d, skipping\n", card); snd_ctl_close(handle); continue; } print_card_info(info); snd_ctl_close(handle); } return 0; } $ make mkdir .deps cc -O2 -std=gnu99 -Wall -Wextra -pedantic -g -c -DPREFIX=\"/usr/local\" -Wp,-MD,.deps/list.d -o list.o list.c list.c:4:42: error: parameter 1 (âinfoâ) has incomplete type list.c: In function âprint_card_infoâ: list.c:4:42: warning: unused parameter âinfoâ [-Wunused-parameter] list.c: In function âmainâ: list.c:16:22: error: storage size of âinfoâ isnât known list.c:16:22: warning: unused variable âinfoâ [-Wunused-variable] list.c:10:14: warning: unused parameter âargcâ [-Wunused-parameter] list.c:10:27: warning: unused parameter âargvâ [-Wunused-parameter] make: *** [list.o] Error 1

2 1

[alsa-devel] [PATCH] ASoC: fsl_ssi: properly initialize the sysfs attribute object
by Timur Tabi 15 Nov '11

15 Nov '11

Commit 6992f533 ("sysfs: Use one lockdep class per sysfs attribute") requires 'struct attribute' objects to be initialized with sysfs_attr_init(). Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/fsl/fsl_ssi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 0268cf9..83c4bd5 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -694,6 +694,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) /* Initialize the the device_attribute structure */ dev_attr = &ssi_private->dev_attr; + sysfs_attr_init(&dev_attr->attr); dev_attr->attr.name = "statistics"; dev_attr->attr.mode = S_IRUGO; dev_attr->show = fsl_sysfs_ssi_show; -- 1.7.3.4

2 1

[alsa-devel] [PATCH v2 0/3] ASoC: sta32x improvements
by Johannes Stezenbach 15 Nov '11

15 Nov '11

Hi, this is a rework of the "ASoC: sta32x: add workaround for ESD reset issue" patch posted on Nov 9. Since the review of that patch discovered a general issue with the coefficient RAM, I split the patch into three parts: the first fixes the coef reload after power up, the second adds the missing platform configuration (in place of hard-coded values), and the third has the ESD workaround. I think I followed all review comments, except for the ESD workaround where I decided it is much clearer to call sta32x_cache_sync() directly instead of messing around with sta32x_set_bias_level(). The patches apply to git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.2 and for-3.3. checkpatch.pl result is clean. include/sound/sta32x.h | 35 +++++++++++ sound/soc/codecs/sta32x.c | 143 +++++++++++++++++++++++++++++++++++++++++---- sound/soc/codecs/sta32x.h | 1 + 3 files changed, 168 insertions(+), 11 deletions(-) Thanks Johannes

2 8

[alsa-devel] question on snd minors
by Vinod Koul 15 Nov '11

15 Nov '11

Hi, for the compressed path work I had a question regarding the minor numbers. Looks like we have 32 minors (5 bits) and going by current table there is no space for new devices. So should i increase the number to 64 (6bits), add compressed playback and capture devices as 32-39, 40-48 respectively and keep rest as reserved, or would you like it to be kept 32 and realign the table? -- ~Vinod

2 7

[alsa-devel] commit bd5389278c96f585afcac4058420e4f3ac201d2a introduce big problem
by Scott Jiang 15 Nov '11

15 Nov '11

Hi Takash, commit bd5389278c96f585afcac4058420e4f3ac201d2a Author: Takashi Iwai <tiwai(a)suse.de> Date: Fri Aug 21 01:18:00 2009 +0200 pcm: workaround for avoiding automatic start in mmap mode In the normal mmap mode, the stream isn't started automatically even after the data >= start_threshold has been written. However, in the mmap-emulation mode, the stream is started because it uses snd_pcm_write_areas() internally. As a workaround for this inconsistency, start_threshold value is changed dynamically in sw_parmams and mmap_commit callbacks in mmap-emul plugin. Meanwhile, start_threshold for slave PCM is set to boundary so that only this plugin (or the one over it) can control the start of the stream. This will fix problems in some apps using pulse plugin in the mmap mode. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> src/pcm/pcm_mmap_emul.c This commit caused codec using mmap-emul plugin can't work. My config file list below: bfin-ad1836.pcm.default { @args [ CARD ] @args.CARD { type string } type plug slave.pcm { type mmap_emul slave.pcm { type hw card $CARD format S32_LE rate 48000 } } } Alsa will not send SNDRV_PCM_IOCTL_START to driver. But if I revert this patch only, the sound will be bad. I guess there must be something else to do. Regards, Scott

2 8

[alsa-devel] [PATCH] ASoC: Remove unused control_data and mutex fields from struct alc5632_priv
by Axel Lin 14 Nov '11

14 Nov '11

Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/alc5632.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index ee6a497..bfb48ba 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c @@ -68,8 +68,6 @@ static const u16 alc5632_reg_defaults[] = { /* codec private data */ struct alc5632_priv { enum snd_soc_control_type control_type; - void *control_data; - struct mutex mutex; u8 id; unsigned int sysclk; }; @@ -1092,9 +1090,7 @@ static int alc5632_i2c_probe(struct i2c_client *client, } i2c_set_clientdata(client, alc5632); - alc5632->control_data = client; alc5632->control_type = SND_SOC_I2C; - mutex_init(&alc5632->mutex); ret = snd_soc_register_codec(&client->dev, &soc_codec_device_alc5632, &alc5632_dai, 1); -- 1.7.5.4

3 4