Takashi Iwai
4f7fd72c0e
- Backport upstream fixes: 0001-ucm-substitution-remove-duplicate-allow_empty-assign.patch 0002-ucm-fix-parse_get_safe_name-safe-name-must-be-checke.patch 0003-ucm-substitute-the-merged-tree-completely.patch 0004-ctl-improve-documentation-for-identifier-of-control-.patch 0005-pcm-dmix-make-lockless-operation-optional.patch 0006-pcm-dmix-Fix-semaphore-usage-with-lockless-operation.patch 0007-pcm-iec958-implement-HDMI-HBR-audio-formatting.patch 0008-pcm-iec958-set-channel-status-bits-according-to-rate.patch 0009-conf-pcm-USB-Added-S-PDIF-fix-for-Asus-Xonar-SE.patch 0010-control-ctlparse-fix-enum-values-in-or.patch 0011-conf-USB-Audio-Disable-IEC958-on-Lenovo-ThinkStation.patch 0012-pcm-dmix-fix-access-to-sum-buffer-in-non-interleaved.patch 0014-control-Add-documentation-for-snd_ctl_elem_list_.patch 0015-conf-quote-also-strings-with-and-characters-in-strin.patch 0016-topology-decode-Fix-channel-map-memory-allocation.patch 0017-topology-decode-Fix-infinite-loop-in-decoding-enum-c.patch 0018-topology-decode-Remove-decoding-values-for-enum-cont.patch 0019-topology-decode-Add-enum-control-texts-as-separate-e.patch 0020-topology-decode-Fix-printing-texts-section.patch 0021-topology-decode-Change-declaration-of-enum-decoding-.patch 0022-topology-decode-Fix-decoding-PCM-formats-and-rates.patch 0023-topology-decode-Print-sig_bits-field-in-PCM-capabili.patch 0024-topology-decode-Add-DAI-name-printing.patch 0025-topology-Make-buffer-for-saving-dynamic-size.patch 0026-topology-return-correct-value-in-tplg_save_printf.patch 0027-topology-fix-some-gcc10-warnings-labs-signess.patch 0028-topology-fix-sort_config.patch 0029-topology-fix-the-unaligned-access.patch 0030-topology-improve-the-printf-buffer-management.patch OBS-URL: https://build.opensuse.org/request/show/836375 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=281
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From acbb0e3b1741107d01f03ee06f7819fd7f90bec4 Mon Sep 17 00:00:00 2001
|
|
From: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
|
|
Date: Mon, 31 Aug 2020 11:09:00 +0200
|
|
Subject: [PATCH 22/32] topology: decode: Fix decoding PCM formats and rates
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Not checking _LAST format and rate, which are valid indexes in arrays,
|
|
makes data loss while converting binary to standard ALSA configuration
|
|
file.
|
|
|
|
Signed-off-by: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
|
|
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
|
|
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
|
|
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/pcm.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
|
|
index b15b95045ab5..db401145f3ec 100644
|
|
--- a/src/topology/pcm.c
|
|
+++ b/src/topology/pcm.c
|
|
@@ -549,7 +549,7 @@ int tplg_save_stream_caps(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
|
|
if (err >= 0 && sc->formats) {
|
|
err = tplg_save_printf(dst, pfx, "\tformats '");
|
|
first = 1;
|
|
- for (i = 0; err >= 0 && i < SND_PCM_FORMAT_LAST; i++) {
|
|
+ for (i = 0; err >= 0 && i <= SND_PCM_FORMAT_LAST; i++) {
|
|
if (sc->formats & (1ULL << i)) {
|
|
s = snd_pcm_format_name(i);
|
|
err = tplg_save_printf(dst, NULL, "%s%s",
|
|
@@ -563,7 +563,7 @@ int tplg_save_stream_caps(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
|
|
if (err >= 0 && sc->rates) {
|
|
err = tplg_save_printf(dst, pfx, "\trates '");
|
|
first = 1;
|
|
- for (i = 0; err >= 0 && i < SND_PCM_RATE_LAST; i++) {
|
|
+ for (i = 0; err >= 0 && i <= SND_PCM_RATE_LAST; i++) {
|
|
if (sc->rates & (1ULL << i)) {
|
|
s = get_rate_name(i);
|
|
err = tplg_save_printf(dst, NULL, "%s%s",
|
|
--
|
|
2.16.4
|
|
|