August 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Question about Conversion to S24_LE from S24_3LE
by Fujikawa, Kazutoshi 10 Aug '12

10 Aug '12

Hello. I'd like to play a wav file converted from S24_3LE format to S24_LE by alsa-lib. (I use aplay command.) I recognize the following: <PCM format in wav file> ex. Valid PCM data is 0x123456. S24_LE : 0x12345600(in 4bytes, LSB 0 padding) S24_3LE : 0x123456 (in 3bytes, No padding) When the S24_LE format file is played, the ALSA driver receives data format is as follows: 0x12345600 (LSB 0 padding) However, when the S24_3LE format file which is converted to S24_LE by alsa-lib is played, the ALSA driver receives data formats is as follows: 0x00123456 (MSB 0(or 0xFF) padding) Why is the how to pad 0 different(LSB/MSB)? cf. When "snd_pcm_linear_getput" is called 'get_idx' is set 16. 'put_idx' is set 8. [alsa-lib:pcm_linear.c] 211 void snd_pcm_linear_getput(const snd_pcm_channel_area_t *dst_areas, snd_ pcm_uframes_t dst_offset, 212 const snd_pcm_channel_area_t *src_areas, snd_ pcm_uframes_t src_offset, 213 unsigned int channels, snd_pcm_uframes_t fram es, 214 unsigned int get_idx, unsigned int put_idx) 215 { 216 #define CONV24_LABELS 217 #include "plugin_ops.h" 218 #undef CONV24_LABELS 219 void *get = get32_labels[get_idx]; 220 void *put = put32_labels[put_idx]; 221 unsigned int channel; 222 u_int32_t sample = 0; 223 for (channel = 0; channel < channels; ++channel) { 224 const char *src; When 'get_idx' is 16 and 'put_idx' is 8, it is converted as follows: 0x123456(S24_3LE) -> 0x00123456(MSB 0 padding) I expect the following: 0x123456(S24_3LE) -> 0x12345600(LSB 0 padding) (If 'get_idx' is 16 and 'put_idx' is 12, it is converted like this.) I'm doing something wrong? -------------------- alsa-lib-1.0.24.1 alsa-utils-1.0.24.2 -------------------- Regards. Kaz

3 4

[alsa-devel] Error with "Unsigned 8 bit, Rate 8000 Hz, Mono" track
by Fabio Estevam 10 Aug '12

10 Aug '12

Hi, Running 3.6-rc1 on a mx28evk I get the following error with this wav format: root@freescale /home$ aplay k3b_error1.wav Playing WAVE 'k3b_error1.wav' : Unsigned 8 bit, Rate 8000 Hz, Mono [ 303.640000] asoc: machine hw_params failed: -22 aplay: set_params:959: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: U8 SUBFORMAT: STD SAMPLE_BITS: 8 FRAME_BITS: 8 CHANNELS: 1 RATE: 8000 PERIOD_TIME: 125000 PERIOD_SIZE: 1000 PERIOD_BYTES: 1000 PERIODS: 4 BUFFER_TIME: 500000 BUFFER_SIZE: 4000 BUFFER_BYTES: 4000 TICK_TIME: 0 Haven't started debugging yet, but if anyone sees something obvious, please let me know. This same file plays correctly on mx31/mx27/mx51/mx6q boards. Regards, Fabio Estevam

3 5

[alsa-devel] [PATCH] Add *.swp to .gitignore.
by Tanu Kaskinen 10 Aug '12

10 Aug '12

These are vim swap files. Signed-off-by: Tanu Kaskinen <tanu.kaskinen(a)digia.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 64d0bc6..7f1827e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ ltconfig *.pc *.o *~ +*.swp include/config.h include/stamp-h1 include/stamp-vh -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix panned "Beep Playback Switch"
by David Henningsson 10 Aug '12

10 Aug '12

When "Beep Playback Switch" had a different value on left and right channels (such as muting left but not right, or vice versa), this could result in the right channel being ignored. This patch enables beep to be sounding from right channel only, and also give correct result back to userspace (e g amixer). Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_beep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 0bc2315..d26ae65 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c @@ -237,10 +237,9 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol, { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_beep *beep = codec->beep; - if (beep) { + if (beep && !beep->enabled) { ucontrol->value.integer.value[0] = - ucontrol->value.integer.value[1] = - beep->enabled; + ucontrol->value.integer.value[1] = 0; return 0; } return snd_hda_mixer_amp_switch_get(kcontrol, ucontrol); @@ -252,9 +251,18 @@ int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol, { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); struct hda_beep *beep = codec->beep; - if (beep) - snd_hda_enable_beep_device(codec, - *ucontrol->value.integer.value); + if (beep) { + u8 chs = get_amp_channels(kcontrol); + int enable = 0; + long *valp = ucontrol->value.integer.value; + if (chs & 1) { + enable |= *valp; + valp++; + } + if (chs & 2) + enable |= *valp; + snd_hda_enable_beep_device(codec, enable); + } return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol); } EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep); -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/6] Bugfixes and clean-ups bound for the v3.6 RCs
by Lee Jones 10 Aug '12

10 Aug '12

This patch-set includes some important changes which should make their way to the Mainline Release Candidates for the v3.6 release. Without them Audio doesn't even probe (at all) when booting with Device Tree selected. The kernel can't compile with ux500 audio enabled. Even if we can get that far SoC Core will assume we're using regmaps and attempt to use them; however, none exist for this driver, so the kernel will oops. arch/arm/mach-ux500/Kconfig | 1 + arch/arm/mach-ux500/board-mop500-msp.c | 2 +- arch/arm/mach-ux500/board-mop500.c | 9 ++++----- sound/soc/codecs/ab8500-codec.c | 4 ++++ sound/soc/soc-dapm.c | 2 -- 5 files changed, 10 insertions(+), 8 deletions(-)

7 49

[alsa-devel] [patch] ALSA: cs46xx - signedness bug in snd_cs46xx_codec_read()
by Dan Carpenter 10 Aug '12

10 Aug '12

This function returns its own error codes instead of normal negative error codes. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index f75f5ff..a71d1c1 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -94,7 +94,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip, if (snd_BUG_ON(codec_index != CS46XX_PRIMARY_CODEC_INDEX && codec_index != CS46XX_SECONDARY_CODEC_INDEX)) - return -EINVAL; + return 0xffff; chip->active_ctrl(chip, 1);

2 1

[alsa-devel] PCM substream
by arun kumar 10 Aug '12

10 Aug '12

Hi All, >From the last couple of days, I have been trying to understand the Linux Alsa Subsystem.I have read the Alsa Driver API and Application API's. But I could not understand the concept of PCM substreams, Could you please give me some pointers to get a good understanding on the PCM substream. regards, Arun.

3 4

[alsa-devel] [PATCH 0/4] ASoC/OMAP: ASoC machine driver for simple SoC with twl4030
by Peter Ujfalusi 10 Aug '12

10 Aug '12

Hello, Create new unified ASoC machine driver (with DT support) for boards using simple configuration for audio and using the twl4030 codec. This driver will replace the following machine drivers (since they are basically the same): igep0020, omap3beagle, omap3evm and overo. This series will switch the boards I can identify to use the new unified ASoC machine driver. Changes under arch/arm/mach-omap2/ are trivial, I don't expect merge issues later. If it is OK for the maintainers I would like this to go via audio tree (with the McBSP and the twl4030-audio stack DT support). The series has been tested on BeagleBoard (with the McBSP and twl4030-audio DT support). Regards, Peter --- Peter Ujfalusi (4): ASoC: omap-twl4030: Simple machine driver for TI SoC with twl4030 codec ARM: OMAP: twl-common: Add helper function to register the omap-twl4030 audio driver ARM: OMAP3: Switch to use the unified audio driver (omap-twl4030) for selected boards ASoC: Remove obsolete OMAP3 machine drivers .../devicetree/bindings/sound/omap-twl4030.txt | 19 ++ arch/arm/mach-omap2/board-cm-t35.c | 1 + arch/arm/mach-omap2/board-devkit8000.c | 1 + arch/arm/mach-omap2/board-igep0020.c | 1 + arch/arm/mach-omap2/board-omap3beagle.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-overo.c | 1 + arch/arm/mach-omap2/twl-common.c | 28 +++ arch/arm/mach-omap2/twl-common.h | 2 + include/linux/platform_data/omap-twl4030.h | 33 +++ sound/soc/omap/Kconfig | 48 ++--- sound/soc/omap/Makefile | 10 +- sound/soc/omap/igep0020.c | 120 ----------- sound/soc/omap/omap-twl4030.c | 219 ++++++++++++++++++++ sound/soc/omap/omap3beagle.c | 150 ------------- sound/soc/omap/omap3evm.c | 118 ----------- sound/soc/omap/overo.c | 122 ----------- 17 files changed, 322 insertions(+), 553 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt create mode 100644 include/linux/platform_data/omap-twl4030.h delete mode 100644 sound/soc/omap/igep0020.c create mode 100644 sound/soc/omap/omap-twl4030.c delete mode 100644 sound/soc/omap/omap3beagle.c delete mode 100644 sound/soc/omap/omap3evm.c delete mode 100644 sound/soc/omap/overo.c -- 1.7.8.6

3 8

Re: [alsa-devel] [PATCH] ASoC: Samsung: Fix build error
by Kukjin Kim 10 Aug '12

10 Aug '12

Sachin Kamat wrote: > > Fixes the following build error: > In file included from arch/arm/mach-exynos/include/mach/dma.h:24:0, > from arch/arm/plat-samsung/include/plat/dma-ops.h:17, > from arch/arm/plat-samsung/include/plat/dma.h:128, > from sound/soc/samsung/pcm.c:23: > arch/arm/plat-samsung/include/plat/dma-pl330.h:106:8: > error: redefinition of ‘struct s3c2410_dma_client’ > arch/arm/plat-samsung/include/plat/dma.h:40:8: note: originally defined > here > make[3]: *** [sound/soc/samsung/pcm.o] Error 1 > > Cc: Kukjin Kim <kgene.kim(a)samsung.com> > Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> > Signed-off-by: Sachin Kamat <sachin.kamat(a)samsung.com> BTW, Sachin, do you _really_ need to keep above double signoff with different e-mail? I think, last one should be removed? Because in the field of author, 'linaro.org' e-mail is used? Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim(a)samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

1 0

Re: [alsa-devel] [PATCH] ASoC: Samsung: Fix build error
by Kukjin Kim 10 Aug '12

10 Aug '12

Kukjin Kim wrote: > > Sachin Kamat wrote: > > > > On 8 August 2012 17:08, Kukjin Kim <kgene.kim(a)samsung.com> wrote: > > > Sachin Kamat wrote: > > >> > > >> Hi Mark, > > >> > > >> On 8 August 2012 16:39, Mark Brown > > <broonie(a)opensource.wolfsonmicro.com> > > >> wrote: > > >> > On Wed, Aug 08, 2012 at 11:34:43AM +0530, Sachin Kamat wrote: > > >> >> Fixes the following build error: > > >> >> In file included from arch/arm/mach-exynos/include/mach/dma.h:24:0, > > >> >> from arch/arm/plat-samsung/include/plat/dma-ops.h:17, > > >> >> from arch/arm/plat-samsung/include/plat/dma.h:128, > > >> >> from sound/soc/samsung/pcm.c:23: > > >> >> arch/arm/plat-samsung/include/plat/dma-pl330.h:106:8: > > >> >> error: redefinition of 'struct > > > s3c2410_dma_client' > > >> >> arch/arm/plat-samsung/include/plat/dma.h:40:8: note: originally > > defined > > >> here > > >> >> make[3]: *** [sound/soc/samsung/pcm.o] Error 1 > > >> > > > >> > Shouldn't this be being fixed in the headers? It looks like they > > >> > reference and disagree with each other on Exynos (my primary > > development > > >> > platform is S3C6410 based so I'd notice if it was a generic Samsung > > >> > issue. > > >> > > > >> > Pasting the error message isn't really that useful unless the fix > is > > >> > obvious, it's better to explain in words what's wrong. > > >> > > >> I had sent the initial patch trying to fix this in the headers and it > > >> worked for exynos4 config. However Kukjin pointed out that the patch > > >> created similar errors with 2410 and 6400 configs. Fixing it further > > >> in the headers did not look quite straight forward as there are many > > >> headers trying to include one another. Hence I felt it is better > > >> handled in the current way. I understand i should have added this > > >> information in the commit message. Below is the link for your > > >> reference that provides the complete discussion. > > >> > > >> http://comments.gmane.org/gmane.linux.kernel.samsung-soc/11274 > > >> > > >> Please let me know your opinion about this. > > >> > > >> > > > I also agree with Mark's opinion and current Sachin's approach cannot > > avoid > > > whole similar build error. > > > > With the current change I did not see any build error with the configs > > (2410, 6400, 64x0 and exyno4) i checked with (after enabling audio). > > Please let me know if you observed any such build error after adding > > this patch. > > > > > > Happens following error with s5pv210_defcofnig (after enabling s5p-sss). > > In file included from arch/arm/mach-s5pv210/include/mach/dma.h:24, > from arch/arm/plat-samsung/include/plat/dma-ops.h:17, > from arch/arm/plat-samsung/include/plat/dma.h:128, > from drivers/crypto/s5p-sss.c:33: > arch/arm/plat-samsung/include/plat/dma-pl330.h:106: error: redefinition of > 'struct s3c2410_dma_client' > make[2]: *** [drivers/crypto/s5p-sss.o] Error 1 > make[1]: *** [drivers/crypto] Error 2 > make[1]: *** Waiting for unfinished jobs.... > make: *** [drivers] Error 2 > make: *** Waiting for unfinished jobs.... > > Actually, <mach/dma.h> is including <plat/dma-pl330.h> for s5p64x0, > s5pc100, s5pv210 and exynos or <plat/dma.h> for s3c24xx and s3c64xx. And > the cause of build error you reported is duplicated declaration of > s3c2410_dma_client. So it can happen when <plat/dma-pl330.h> and > <plat/dma.h> are included together at the same time... > Of course, following can fix above build error similarly... --- diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index bc986f8..6a3e98e 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -30,7 +30,7 @@ #include <crypto/ctr.h> #include <plat/cpu.h> -#include <plat/dma.h> +#include <mach/dma.h> #define _SBF(s, v) ((v) << (s)) #define _BIT(b) _SBF(b, 1) --- Hmm...I need to sort this out... Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim(a)samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

1 1