diff options
author | Daiane Angolini <daiane.angolini@foundries.io> | 2021-09-01 16:54:22 -0300 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2021-09-11 13:35:14 -0300 |
commit | 26d93b9bc34bb4c793943f6f1c8417ede534520f (patch) | |
tree | 60d782f8dbb65344912297a88b80ba17314e21bb | |
parent | 86139123e533a2d24a57d21fadb2e6cdcaf77294 (diff) | |
download | meta-freescale-26d93b9bc34bb4c793943f6f1c8417ede534520f.tar.gz |
alsa-lib: Fix fuzz
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
4 files changed, 18 insertions, 14 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch index 07f6e098..6894deae 100644 --- a/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch +++ b/recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 49a7eac8e02c33cae8a168e6d22d9ff8aaf86d44 Mon Sep 17 00:00:00 2001 | 1 | From e6cea74cad98963d3b0b1c267d4988be4263215c Mon Sep 17 00:00:00 2001 |
2 | From: Shengjiu Wang <b02247@freescale.com> | 2 | From: Shengjiu Wang <b02247@freescale.com> |
3 | Date: Thu, 5 Jun 2014 17:37:47 +0800 | 3 | Date: Thu, 5 Jun 2014 17:37:47 +0800 |
4 | Subject: [PATCH] add conf for multichannel support in imx | 4 | Subject: [PATCH] add conf for multichannel support in imx |
@@ -205,7 +205,7 @@ index 00999f0..fbf0697 100644 | |||
205 | if BUILD_ALISP | 205 | if BUILD_ALISP |
206 | cfg_files += aliases.alisp | 206 | cfg_files += aliases.alisp |
207 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf | 207 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf |
208 | index 7e352f7..a9e6d76 100644 | 208 | index 18a920f..7a4f444 100644 |
209 | --- a/src/conf/cards/aliases.conf | 209 | --- a/src/conf/cards/aliases.conf |
210 | +++ b/src/conf/cards/aliases.conf | 210 | +++ b/src/conf/cards/aliases.conf |
211 | @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788 | 211 | @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788 |
@@ -215,5 +215,5 @@ index 7e352f7..a9e6d76 100644 | |||
215 | +imx-cs42888 cards.CS42888 | 215 | +imx-cs42888 cards.CS42888 |
216 | +imx-hdmi-soc cards.IMX-HDMI | 216 | +imx-hdmi-soc cards.IMX-HDMI |
217 | 217 | ||
218 | <confdir:ctl/default.conf> | ||
219 | <confdir:pcm/default.conf> | 218 | <confdir:pcm/default.conf> |
219 | <confdir:pcm/dmix.conf> | ||
diff --git a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch index 896d9426..1d58aeba 100644 --- a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch +++ b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 09c1a959e7d007e00741606f69444c1f865a4beb Mon Sep 17 00:00:00 2001 | 1 | From 754e0c6112a181b30bd46aa13812f37db01c3387 Mon Sep 17 00:00:00 2001 |
2 | From: Shengjiu Wang <shengjiu.wang@freescale.com> | 2 | From: Shengjiu Wang <shengjiu.wang@freescale.com> |
3 | Date: Tue, 10 May 2016 15:09:26 +0800 | 3 | Date: Tue, 10 May 2016 15:09:26 +0800 |
4 | Subject: [PATCH] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED | 4 | Subject: [PATCH] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED |
@@ -21,7 +21,7 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> | |||
21 | 3 files changed, 3 insertions(+), 3 deletions(-) | 21 | 3 files changed, 3 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c | 23 | diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c |
24 | index 608593f..3d068c7 100644 | 24 | index 5b7472d..e08e46f 100644 |
25 | --- a/src/pcm/pcm_dmix.c | 25 | --- a/src/pcm/pcm_dmix.c |
26 | +++ b/src/pcm/pcm_dmix.c | 26 | +++ b/src/pcm/pcm_dmix.c |
27 | @@ -460,9 +460,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) | 27 | @@ -460,9 +460,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) |
@@ -36,7 +36,7 @@ index 608593f..3d068c7 100644 | |||
36 | case SND_PCM_STATE_XRUN: | 36 | case SND_PCM_STATE_XRUN: |
37 | if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) | 37 | if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) |
38 | diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c | 38 | diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c |
39 | index a918512..18071fb 100644 | 39 | index 8a67257..8ba61b4 100644 |
40 | --- a/src/pcm/pcm_dshare.c | 40 | --- a/src/pcm/pcm_dshare.c |
41 | +++ b/src/pcm/pcm_dshare.c | 41 | +++ b/src/pcm/pcm_dshare.c |
42 | @@ -258,9 +258,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) | 42 | @@ -258,9 +258,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) |
@@ -51,10 +51,10 @@ index a918512..18071fb 100644 | |||
51 | case SND_PCM_STATE_XRUN: | 51 | case SND_PCM_STATE_XRUN: |
52 | if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) | 52 | if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) |
53 | diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c | 53 | diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c |
54 | index 2c3b9f4..3b711ab 100644 | 54 | index c6e8cd2..9610482 100644 |
55 | --- a/src/pcm/pcm_dsnoop.c | 55 | --- a/src/pcm/pcm_dsnoop.c |
56 | +++ b/src/pcm/pcm_dsnoop.c | 56 | +++ b/src/pcm/pcm_dsnoop.c |
57 | @@ -209,9 +209,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) | 57 | @@ -208,9 +208,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) |
58 | snd_pcm_state_t state; | 58 | snd_pcm_state_t state; |
59 | state = snd_pcm_state(dsnoop->spcm); | 59 | state = snd_pcm_state(dsnoop->spcm); |
60 | switch (state) { | 60 | switch (state) { |
diff --git a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch index b25aa910..63af83f7 100644 --- a/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch +++ b/recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d78b7e2b964c9713c2e9889f4ec85922528ba971 Mon Sep 17 00:00:00 2001 | 1 | From bbfa5f555f8d2c448c9f36fbea11ea3e32dcdcc6 Mon Sep 17 00:00:00 2001 |
2 | From: Shengjiu Wang <shengjiu.wang@nxp.com> | 2 | From: Shengjiu Wang <shengjiu.wang@nxp.com> |
3 | Date: Wed, 31 Jan 2018 15:06:53 +0800 | 3 | Date: Wed, 31 Jan 2018 15:06:53 +0800 |
4 | Subject: [PATCH] add ak4458 conf for multichannel support | 4 | Subject: [PATCH] add ak4458 conf for multichannel support |
@@ -6,6 +6,10 @@ MIME-Version: 1.0 | |||
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
8 | 8 | ||
9 | MIME-Version: 1.0 | ||
10 | Content-Type: text/plain; charset=UTF-8 | ||
11 | Content-Transfer-Encoding: 8bit | ||
12 | |||
9 | one limitation is that ALSA and pulseaudio only support | 13 | one limitation is that ALSA and pulseaudio only support |
10 | maximum 8 channels, but ak4458 may support 16 channels | 14 | maximum 8 channels, but ak4458 may support 16 channels |
11 | 15 | ||
@@ -115,7 +119,7 @@ index fbf0697..34fa5a3 100644 | |||
115 | if BUILD_ALISP | 119 | if BUILD_ALISP |
116 | cfg_files += aliases.alisp | 120 | cfg_files += aliases.alisp |
117 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf | 121 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf |
118 | index a9e6d76..2f0a22a 100644 | 122 | index 7a4f444..e41f89e 100644 |
119 | --- a/src/conf/cards/aliases.conf | 123 | --- a/src/conf/cards/aliases.conf |
120 | +++ b/src/conf/cards/aliases.conf | 124 | +++ b/src/conf/cards/aliases.conf |
121 | @@ -59,6 +59,7 @@ pistachio cards.pistachio-card | 125 | @@ -59,6 +59,7 @@ pistachio cards.pistachio-card |
@@ -124,5 +128,5 @@ index a9e6d76..2f0a22a 100644 | |||
124 | imx-hdmi-soc cards.IMX-HDMI | 128 | imx-hdmi-soc cards.IMX-HDMI |
125 | +ak4458-audio cards.AK4458 | 129 | +ak4458-audio cards.AK4458 |
126 | 130 | ||
127 | <confdir:ctl/default.conf> | ||
128 | <confdir:pcm/default.conf> | 131 | <confdir:pcm/default.conf> |
132 | <confdir:pcm/dmix.conf> | ||
diff --git a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch index bd1512e9..3b5f90ec 100644 --- a/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch +++ b/recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cfbe756d55a303803805d3e8e3d3cf3b97866964 Mon Sep 17 00:00:00 2001 | 1 | From dec68918e07d6a7f4397b55b35dd5bed9c114ea9 Mon Sep 17 00:00:00 2001 |
2 | From: Viorel Suman <viorel.suman@nxp.com> | 2 | From: Viorel Suman <viorel.suman@nxp.com> |
3 | Date: Mon, 9 Mar 2020 14:25:46 +0200 | 3 | Date: Mon, 9 Mar 2020 14:25:46 +0200 |
4 | Subject: [PATCH] add conf for iMX XCVR sound card | 4 | Subject: [PATCH] add conf for iMX XCVR sound card |
@@ -104,7 +104,7 @@ index 34fa5a3..70b9bab 100644 | |||
104 | if BUILD_ALISP | 104 | if BUILD_ALISP |
105 | cfg_files += aliases.alisp | 105 | cfg_files += aliases.alisp |
106 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf | 106 | diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf |
107 | index 2f0a22a..e824145 100644 | 107 | index e41f89e..d9bfcd6 100644 |
108 | --- a/src/conf/cards/aliases.conf | 108 | --- a/src/conf/cards/aliases.conf |
109 | +++ b/src/conf/cards/aliases.conf | 109 | +++ b/src/conf/cards/aliases.conf |
110 | @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi | 110 | @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi |
@@ -113,5 +113,5 @@ index 2f0a22a..e824145 100644 | |||
113 | ak4458-audio cards.AK4458 | 113 | ak4458-audio cards.AK4458 |
114 | +imx-audio-xcvr cards.IMX-XCVR | 114 | +imx-audio-xcvr cards.IMX-XCVR |
115 | 115 | ||
116 | <confdir:ctl/default.conf> | ||
117 | <confdir:pcm/default.conf> | 116 | <confdir:pcm/default.conf> |
117 | <confdir:pcm/dmix.conf> | ||