Miroirs/libdisplay-info
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/emersion/libdisplay-info.git synced 2024-11-16 19:48:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cta: HDMI Audio: Add a failure when NonMixed is supported without MS

Browse source 
Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
This commit is contained in:
Sebastian Wick 2024-06-05 13:30:38 +02:00
parent 08a4d543c8
commit c0c0c8acc5
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci.yml
View file

@ -11,7 +11,7 @@ include:
# $ git push -f -o ci.variable="FDO_FORCE_REBUILD=1"
variables:
FDO_UPSTREAM_REPO: 'emersion/libdisplay-info'
FDO_DISTRIBUTION_TAG: '2024-05-29.0'
FDO_DISTRIBUTION_TAG: '2024-06-06.0'
workflow:
rules:
@ -45,9 +45,10 @@ prepare-container:
FDO_DISTRIBUTION_EXEC: |
git clone git://linuxtv.org/edid-decode.git
cd edid-decode
git checkout 3d635499e4aca3319f0796ba787213c981c5a770
make
make install
git checkout a645579430980c89af961b68193461329bd3eb4d
meson setup build/
ninja -C build/
ninja -C build/ install
cd ..
rm -rf edid-decode

8
cta.c
View file

@ -1220,6 +1220,7 @@ parse_hdmi_audio_block(struct di_edid_cta *cta,
struct di_cta_hdmi_audio_multi_stream *ms = &priv->ms;
struct di_cta_hdmi_audio_3d *a3d = &priv->a3d;
uint8_t multi_stream;
bool ms_non_mixed;
size_t num_3d_audio_descs;
size_t num_descs;
struct di_cta_sad_priv *sad_priv;
@ -1231,10 +1232,15 @@ parse_hdmi_audio_block(struct di_edid_cta *cta,
}
multi_stream = get_bit_range(data[0], 1, 0);
ms_non_mixed = has_bit(data[0], 2);
if (multi_stream > 0) {
hdmi_audio->multi_stream = ms;
ms->max_streams = multi_stream + 1;
ms->supports_non_mixed = has_bit(data[0], 2);
ms->supports_non_mixed = ms_non_mixed;
} else if (ms_non_mixed) {
add_failure(cta, "HDMI Audio Data Block: MS NonMixed support indicated but "
"Max Stream Count == 0.");
}
if (size < 2)

13
test/data/tcl-smart-tv-5655.diff
View file

@ -1,14 +1,6 @@
--- ref
+++ di
@@ -84,7 +84,6 @@
Supported sample rates (kHz): 96 48 44.1 32
Supports Joint Object Coding
HDMI Audio Data Block:
- Supports MS NonMixed
Linear PCM:
Max channels: 12
Supported sample rates (kHz): 44.1 32
@@ -106,15 +105,6 @@
@@ -105,15 +105,6 @@
PT scan behavior: No Data
IT scan behavior: Always Underscanned
CE scan behavior: Supports both over- and underscan
@ -24,7 +16,7 @@
Detailed Timing Descriptors:
DTD 3: 1920x1080 60.000000 Hz 16:9 67.500 kHz 148.500000 MHz (1209 mm x 680 mm)
Hfront 88 Hsync 44 Hback 148 Hpol P
@@ -122,30 +112,12 @@
@@ -121,31 +112,13 @@
DTD 4: 1280x720 60.000000 Hz 16:9 45.000 kHz 74.250000 MHz (1209 mm x 680 mm)
Hfront 110 Hsync 40 Hback 220 Hpol P
Vfront 5 Vsync 5 Vback 20 Vpol P
@ -51,6 +43,7 @@
-Block 0, Base EDID:
- Detailed Timing Descriptor #1: Mismatch of image size 800x450 mm vs display size 1210x680 mm.
Block 1, CTA-861 Extension Block:
HDMI Audio Data Block: MS NonMixed support indicated but Max Stream Count == 0.
Video Capability Data Block: Set Selectable RGB Quantization to avoid interop issues.
-EDID:
- CTA-861: Native progressive timings are a mix of several resolutions.

2
test/data/tcl-smart-tv-5655.ref
View file

@ -84,7 +84,6 @@ Block 1, CTA-861 Extension Block:
Supported sample rates (kHz): 96 48 44.1 32
Supports Joint Object Coding
HDMI Audio Data Block:
Supports MS NonMixed
Linear PCM:
Max channels: 12
Supported sample rates (kHz): 44.1 32
@ -144,6 +143,7 @@ Failures:
Block 0, Base EDID:
Detailed Timing Descriptor #1: Mismatch of image size 800x450 mm vs display size 1210x680 mm.
Block 1, CTA-861 Extension Block:
HDMI Audio Data Block: MS NonMixed support indicated but Max Stream Count == 0.
Video Capability Data Block: Set Selectable RGB Quantization to avoid interop issues.
EDID:
CTA-861: Native progressive timings are a mix of several resolutions.