jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8196 from HiassofT/le11-linux-hdmi-codec-chmap-fix2

Browse Source 
[le11] linux (default): Replace hdmi-codec channel mapping patch with upstreamed version
This commit is contained in:
CvH 2023-10-07 00:53:12 +02:00 committed by GitHub
commit 44fe5a8ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/linux/patches/default/linux-022-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch
View File

@ -1,9 +1,9 @@
From a154f37e6803ffeb77156ba2c3e23c00c511c60d Mon Sep 17 00:00:00 2001 From 5e4400b24fc1f8ad41bccb6a6bdb54b961526556 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com> From: Matthias Reichl <hias@horus.com>
Date: Thu, 7 Sep 2023 20:33:25 +0200 Date: Thu, 7 Sep 2023 20:33:25 +0200
Subject: [PATCH] ASoC: hdmi-codec: Fix broken channel map reporting Subject: [PATCH] ASoC: hdmi-codec: Fix broken channel map reporting
Commit 5fe680b23327 ("ASoC: hdmi-codec: fix channel info for Commit 4e0871333661 ("ASoC: hdmi-codec: fix channel info for
compressed formats") accidentally changed hcp->chmap_idx from compressed formats") accidentally changed hcp->chmap_idx from
ca_id, the CEA channel allocation ID, to idx, the index to ca_id, the CEA channel allocation ID, to idx, the index to
the table of channel mappings ordered by preference. the table of channel mappings ordered by preference.
@ -24,26 +24,31 @@ eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected
~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values' ~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values'
: values=3,4,8,7,0,0,0,0 : values=3,4,8,7,0,0,0,0
Revert this incorrect change so that channel maps are properly Switch this back to ca_id in case of PCM audio so the correct channel
reported again. map is reported again and set it to HDMI_CODEC_CHMAP_IDX_UNKNOWN in
case of non-PCM audio so the PCM channel map control returns "Unknown"
channels (value 0).
Fixes: 5fe680b23327 ("ASoC: hdmi-codec: fix channel info for compressed formats") Fixes: 4e0871333661 ("ASoC: hdmi-codec: fix channel info for compressed formats")
Cc: stable@vger.kernel.org Cc: stable@vger.kernel.org
Signed-off-by: Matthias Reichl <hias@horus.com> Signed-off-by: Matthias Reichl <hias@horus.com>
--- ---
sound/soc/codecs/hdmi-codec.c | 2 +- sound/soc/codecs/hdmi-codec.c | 5 ++++-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index 13689e718d36f..c8e48225598f8 100644 index 13689e718d36f..09eef6042aad6 100644
--- a/sound/soc/codecs/hdmi-codec.c --- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c
@@ -531,7 +531,7 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, @@ -531,7 +531,10 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai,
hp->sample_rate = sample_rate; hp->sample_rate = sample_rate;
hp->channels = channels; hp->channels = channels;
- hcp->chmap_idx = idx; - hcp->chmap_idx = idx;
+ hcp->chmap_idx = ca_id; + if (pcm_audio)
+ hcp->chmap_idx = ca_id;
+ else
+ hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
return 0; return 0;
} }