]> code.ossystems Code Review - meta-freescale.git/commitdiff
alsa-lib: Fix fuzz
authorDaiane Angolini <daiane.angolini@foundries.io>
Wed, 1 Sep 2021 19:54:22 +0000 (16:54 -0300)
committerDaiane Angolini <daiane.angolini@foundries.io>
Sat, 11 Sep 2021 16:35:14 +0000 (13:35 -0300)
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
recipes-multimedia/alsa/alsa-lib/0001-add-conf-for-multichannel-support-in-imx.patch
recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
recipes-multimedia/alsa/alsa-lib/0005-add-ak4458-conf-for-multichannel-support.patch
recipes-multimedia/alsa/alsa-lib/0006-add-conf-for-iMX-XCVR-sound-card.patch

index 07f6e098fbfdc0d2d5597f20e4523fc6abb95f18..6894deae7462294427c491e30817fa96b5bfc95d 100644 (file)
@@ -1,4 +1,4 @@
-From 49a7eac8e02c33cae8a168e6d22d9ff8aaf86d44 Mon Sep 17 00:00:00 2001
+From e6cea74cad98963d3b0b1c267d4988be4263215c Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <b02247@freescale.com>
 Date: Thu, 5 Jun 2014 17:37:47 +0800
 Subject: [PATCH] add conf for multichannel support in imx
@@ -205,7 +205,7 @@ index 00999f0..fbf0697 100644
  if BUILD_ALISP
  cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 7e352f7..a9e6d76 100644
+index 18a920f..7a4f444 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -57,6 +57,8 @@ CMI8786 cards.CMI8788
@@ -215,5 +215,5 @@ index 7e352f7..a9e6d76 100644
 +imx-cs42888 cards.CS42888
 +imx-hdmi-soc cards.IMX-HDMI
  
- <confdir:ctl/default.conf>
  <confdir:pcm/default.conf>
+ <confdir:pcm/dmix.conf>
index 896d9426b026d3eda6494abffd6d10231390be53..1d58aeba6a3888d1afcdecee16b9f6cba2c991bd 100644 (file)
@@ -1,4 +1,4 @@
-From 09c1a959e7d007e00741606f69444c1f865a4beb Mon Sep 17 00:00:00 2001
+From 754e0c6112a181b30bd46aa13812f37db01c3387 Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <shengjiu.wang@freescale.com>
 Date: Tue, 10 May 2016 15:09:26 +0800
 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>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
-index 608593f..3d068c7 100644
+index 5b7472d..e08e46f 100644
 --- a/src/pcm/pcm_dmix.c
 +++ b/src/pcm/pcm_dmix.c
 @@ -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
        case SND_PCM_STATE_XRUN:
                if ((err = snd_pcm_direct_slave_recover(dmix)) < 0)
 diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
-index a918512..18071fb 100644
+index 8a67257..8ba61b4 100644
 --- a/src/pcm/pcm_dshare.c
 +++ b/src/pcm/pcm_dshare.c
 @@ -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
        case SND_PCM_STATE_XRUN:
                if ((err = snd_pcm_direct_slave_recover(dshare)) < 0)
 diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
-index 2c3b9f4..3b711ab 100644
+index c6e8cd2..9610482 100644
 --- a/src/pcm/pcm_dsnoop.c
 +++ b/src/pcm/pcm_dsnoop.c
-@@ -209,9 +209,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
+@@ -208,9 +208,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
        snd_pcm_state_t state;
        state = snd_pcm_state(dsnoop->spcm);
        switch (state) {
index b25aa910e0c8c3f3a1cde7c854d8aef7c648f73f..63af83f7bbd753b20552ac671cf54418f5d9cd95 100644 (file)
@@ -1,4 +1,4 @@
-From d78b7e2b964c9713c2e9889f4ec85922528ba971 Mon Sep 17 00:00:00 2001
+From bbfa5f555f8d2c448c9f36fbea11ea3e32dcdcc6 Mon Sep 17 00:00:00 2001
 From: Shengjiu Wang <shengjiu.wang@nxp.com>
 Date: Wed, 31 Jan 2018 15:06:53 +0800
 Subject: [PATCH] add ak4458 conf for multichannel support
@@ -6,6 +6,10 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 one limitation is that ALSA and pulseaudio only support
 maximum 8 channels, but ak4458 may support 16 channels
 
@@ -115,7 +119,7 @@ index fbf0697..34fa5a3 100644
  if BUILD_ALISP
  cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index a9e6d76..2f0a22a 100644
+index 7a4f444..e41f89e 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -59,6 +59,7 @@ pistachio cards.pistachio-card
@@ -124,5 +128,5 @@ index a9e6d76..2f0a22a 100644
  imx-hdmi-soc cards.IMX-HDMI
 +ak4458-audio cards.AK4458
  
- <confdir:ctl/default.conf>
  <confdir:pcm/default.conf>
+ <confdir:pcm/dmix.conf>
index bd1512e99692ef3647bc790cafc485fcc63b7610..3b5f90ec31d797185d75719eec1f84a6c27501fe 100644 (file)
@@ -1,4 +1,4 @@
-From cfbe756d55a303803805d3e8e3d3cf3b97866964 Mon Sep 17 00:00:00 2001
+From dec68918e07d6a7f4397b55b35dd5bed9c114ea9 Mon Sep 17 00:00:00 2001
 From: Viorel Suman <viorel.suman@nxp.com>
 Date: Mon, 9 Mar 2020 14:25:46 +0200
 Subject: [PATCH] add conf for iMX XCVR sound card
@@ -104,7 +104,7 @@ index 34fa5a3..70b9bab 100644
  if BUILD_ALISP
  cfg_files += aliases.alisp
 diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
-index 2f0a22a..e824145 100644
+index e41f89e..d9bfcd6 100644
 --- a/src/conf/cards/aliases.conf
 +++ b/src/conf/cards/aliases.conf
 @@ -60,6 +60,7 @@ VC4-HDMI cards.vc4-hdmi
@@ -113,5 +113,5 @@ index 2f0a22a..e824145 100644
  ak4458-audio cards.AK4458
 +imx-audio-xcvr cards.IMX-XCVR
  
- <confdir:ctl/default.conf>
  <confdir:pcm/default.conf>
+ <confdir:pcm/dmix.conf>