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
124 lines
3.4 KiB
Diff
124 lines
3.4 KiB
Diff
From 36e4b296d2f4ad0034f7028256c64b8af003068d Mon Sep 17 00:00:00 2001
|
|
From: Matthias Reichl <hias@horus.com>
|
|
Date: Mon, 13 Jul 2020 23:17:04 +0200
|
|
Subject: [PATCH 08/32] pcm: iec958: set channel status bits according to rate
|
|
and format
|
|
|
|
This mimics snd_pcm_create_iec958_consumer in the kernel.
|
|
|
|
The rate and wordlength bits will only be modified if they are
|
|
set to "not indicated", which is now the default if no status
|
|
option is used.
|
|
|
|
This allows applications to override parameters determined from
|
|
the stream or implement channel status bits extensions without
|
|
needing to change pcm_iec958 code.
|
|
|
|
Signed-off-by: Matthias Reichl <hias@horus.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_iec958.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
|
1 file changed, 76 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_iec958.c b/src/pcm/pcm_iec958.c
|
|
index 17ade9571cae..a11a043924f6 100644
|
|
--- a/src/pcm/pcm_iec958.c
|
|
+++ b/src/pcm/pcm_iec958.c
|
|
@@ -365,9 +365,80 @@ static int snd_pcm_iec958_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params
|
|
iec->byteswap = format != SND_PCM_FORMAT_IEC958_SUBFRAME;
|
|
}
|
|
}
|
|
- /* FIXME: needs to adjust status_bits according to the format
|
|
- * and sample rate
|
|
- */
|
|
+
|
|
+ if ((iec->status[0] & IEC958_AES0_PROFESSIONAL) == 0) {
|
|
+ if ((iec->status[3] & IEC958_AES3_CON_FS) == IEC958_AES3_CON_FS_NOTID) {
|
|
+ unsigned int rate = 0;
|
|
+ unsigned char fs;
|
|
+
|
|
+ err = INTERNAL(snd_pcm_hw_params_get_rate)(params, &rate, 0);
|
|
+ if (err < 0)
|
|
+ rate = 0;
|
|
+
|
|
+ switch (rate) {
|
|
+ case 22050:
|
|
+ fs = IEC958_AES3_CON_FS_22050;
|
|
+ break;
|
|
+ case 24000:
|
|
+ fs = IEC958_AES3_CON_FS_24000;
|
|
+ break;
|
|
+ case 32000:
|
|
+ fs = IEC958_AES3_CON_FS_32000;
|
|
+ break;
|
|
+ case 44100:
|
|
+ fs = IEC958_AES3_CON_FS_44100;
|
|
+ break;
|
|
+ case 48000:
|
|
+ fs = IEC958_AES3_CON_FS_48000;
|
|
+ break;
|
|
+ case 88200:
|
|
+ fs = IEC958_AES3_CON_FS_88200;
|
|
+ break;
|
|
+ case 96000:
|
|
+ fs = IEC958_AES3_CON_FS_96000;
|
|
+ break;
|
|
+ case 176400:
|
|
+ fs = IEC958_AES3_CON_FS_176400;
|
|
+ break;
|
|
+ case 192000:
|
|
+ fs = IEC958_AES3_CON_FS_192000;
|
|
+ break;
|
|
+ case 768000:
|
|
+ fs = IEC958_AES3_CON_FS_768000;
|
|
+ break;
|
|
+ default:
|
|
+ fs = IEC958_AES3_CON_FS_NOTID;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ iec->status[3] &= ~IEC958_AES3_CON_FS;
|
|
+ iec->status[3] |= fs;
|
|
+ }
|
|
+
|
|
+ if ((iec->status[4] & IEC958_AES4_CON_WORDLEN) == IEC958_AES4_CON_WORDLEN_NOTID) {
|
|
+ unsigned char ws;
|
|
+ switch (snd_pcm_format_width(format)) {
|
|
+ case 16:
|
|
+ ws = IEC958_AES4_CON_WORDLEN_20_16;
|
|
+ break;
|
|
+ case 18:
|
|
+ ws = IEC958_AES4_CON_WORDLEN_22_18;
|
|
+ break;
|
|
+ case 20:
|
|
+ ws = IEC958_AES4_CON_WORDLEN_20_16 | IEC958_AES4_CON_MAX_WORDLEN_24;
|
|
+ break;
|
|
+ case 24:
|
|
+ case 32: /* Assume 24-bit width for 32-bit samples. */
|
|
+ ws = IEC958_AES4_CON_WORDLEN_24_20 | IEC958_AES4_CON_MAX_WORDLEN_24;
|
|
+ break;
|
|
+ default:
|
|
+ ws = IEC958_AES4_CON_WORDLEN_NOTID;
|
|
+ break;
|
|
+ }
|
|
+ iec->status[4] &= ~(IEC958_AES4_CON_MAX_WORDLEN_24 | IEC958_AES4_CON_WORDLEN);
|
|
+ iec->status[4] |= ws;
|
|
+ }
|
|
+ }
|
|
return 0;
|
|
}
|
|
|
|
@@ -504,7 +575,8 @@ int snd_pcm_iec958_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfo
|
|
IEC958_AES0_CON_EMPHASIS_NONE,
|
|
IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER,
|
|
0,
|
|
- IEC958_AES3_CON_FS_48000
|
|
+ IEC958_AES3_CON_FS_NOTID, /* will be set in hwparams */
|
|
+ IEC958_AES4_CON_WORDLEN_NOTID /* will be set in hwparams */
|
|
};
|
|
|
|
assert(pcmp && slave);
|
|
--
|
|
2.16.4
|
|
|