gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From b80645ad1b348a99b2cbdc170e122dc06d367ea9 Mon Sep 17 00:00:00 2001
   2 From: George Kiagiadakis <george.kiagiadakis@collabora.com>
   3 Date: Wed, 18 Sep 2019 12:31:36 +0300
   4 Subject: [PATCH] alsa: do not expose non-interleaved formats, since they won't
   5  work
   6
   7 This bug appeared when testing bluez-alsa nodes with pipewire.
   8 bluez-alsa exposes also non-interleaved formats and if such a format
   9 is picked, then nothing works because the converters are not working
  10
  11 Upstream-Status: Inappropriate [workaround]
  12 ---
  13  spa/plugins/alsa/alsa-utils.c | 2 ++
  14  1 file changed, 2 insertions(+)
  15
  16 diff --git a/spa/plugins/alsa/alsa-utils.c b/spa/plugins/alsa/alsa-utils.c
  17 index e8548345..76c81c7c 100644
  18 --- a/spa/plugins/alsa/alsa-utils.c
  19 +++ b/spa/plugins/alsa/alsa-utils.c
  20 @@ -289,12 +289,14 @@ spa_alsa_enum_format(struct state *state, int seq, uint32_t start, uint32_t num,
  21                                         spa_pod_builder_id(&b, fi->spa_format);
  22                                 spa_pod_builder_id(&b, fi->spa_format);
  23                         }
  24 +                       /*
  25                         if (snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_MMAP_NONINTERLEAVED) &&
  26                                         fi->spa_pformat != SPA_AUDIO_FORMAT_UNKNOWN) {
  27                                 if (j++ == 0)
  28                                         spa_pod_builder_id(&b, fi->spa_pformat);
  29                                 spa_pod_builder_id(&b, fi->spa_pformat);
  30                         }
  31 +                       */
  32                 }
  33         }
  34         if (j > 1)
  35 --
  36 2.23.0
  37