mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: alsa: autodetect supported iec958 codecs via ELD info

Browse source 
The alsa/acp code already supports getting a user-friendly monitor name
using the EDID-Like Data (ELD) information available from cards that follow
the Intel HDA specification.

This patch adds support for also parsing the SAD fields of the ELD, and
exposing the results as a "iec958.codecs.detected" property on the
corresponding node, which should make it possible to provide more
user-friendly configuration UIs and defaults.

The default value will take effect if the session manager does not set a
different value.

Brief example:
test@test:~/checkouts/pipewire$ pw-dump | grep -E "(iec958.codecs.detected|iec958.codecs)\":"
        "iec958.codecs": "[\"PCM\",\"AC3\",\"EAC3\",\"TrueHD\"]",
        "iec958.codecs.detected": "[\"PCM\",\"AC3\",\"EAC3\",\"TrueHD\"]",

<after powering on my receiver>

test@test:~/checkouts/pipewire$ pw-dump | grep -E "(iec958.codecs.detected|iec958.codecs)\":"
        "iec958.codecs": "[\"PCM\",\"DTS\",\"AC3\",\"EAC3\",\"TrueHD\",\"DTS-HD\"]",
        "iec958.codecs.detected": "[\"PCM\",\"DTS\",\"AC3\",\"EAC3\",\"TrueHD\",\"DTS-HD\"]",

Big thanks to Pauli Virtanen <pav@iki.fi>, who also wrote large paths of the
code for this patch.
This commit is contained in:
David Härdeman 2024-11-25 22:35:28 +01:00
parent 0570d1dd00
commit f33e1bc8c3
5 changed files with 144 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

53
spa/plugins/alsa/acp/alsa-util.c
View file

@ -26,6 +26,8 @@
#include "alsa-util.h"
#include "alsa-mixer.h"
#include <spa/param/audio/format.h>
#ifdef HAVE_UDEV
#include <modules/udev-util.h>
#endif
@ -1972,7 +1974,7 @@ int pa_alsa_get_hdmi_eld(snd_hctl_elem_t *elem, pa_hdmi_eld *eld) {
snd_ctl_elem_info_t *info;
snd_ctl_elem_value_t *value;
uint8_t *elddata;
unsigned int eldsize, mnl;
unsigned int eldsize, mnl, sad_count;
unsigned int device;
pa_assert(eld != NULL);
@ -2010,5 +2012,54 @@ int pa_alsa_get_hdmi_eld(snd_hctl_elem_t *elem, pa_hdmi_eld *eld) {
if (mnl)
pa_log_debug("Monitor name in ELD info is '%s' (for device=%d)", eld->monitor_name, device);
/* Fetch Short Audio Descriptors */
sad_count = (elddata[5] & 0xf0) >> 4;
pa_log_debug("SAD count in ELD info is %u (for device=%d)", sad_count, device);
if (20 + mnl + 3 * sad_count > eldsize) {
pa_log_debug("Invalid SAD count (%u) in ELD info (for device=%d)", sad_count, device);
sad_count = 0;
}
eld->iec958_codecs = 0;
for (unsigned i = 0; i < sad_count; i++) {
uint8_t *sad = &elddata[20 + mnl + 3 * i];
/* https://en.wikipedia.org/wiki/Extended_Display_Identification_Data#Audio_Data_Blocks */
switch ((sad[0] & 0x78) >> 3) {
case 1:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_PCM;
break;
case 2:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_AC3;
break;
case 3:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_MPEG;
break;
case 4:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_MPEG;
break;
case 5:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_MPEG;
break;
case 6:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_MPEG2_AAC;
break;
case 7:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_DTS;
break;
case 10:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_EAC3;
break;
case 11:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_DTSHD;
break;
case 12:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_TRUEHD;
break;
default:
eld->iec958_codecs |= 1ULL << SPA_AUDIO_IEC958_CODEC_UNKNOWN;
break;
}
}
return 0;
}