Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CDisplayInfo: fix strict checking of edid #23175

Merged
merged 3 commits into from
Apr 20, 2023
Merged

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented Apr 19, 2023

After #19141 there was a couple things that needed fixing.

3db4483 still allows using the display info if the edid isn't valid
d1c2549 fixes the libdisplay-info multi line error logging
10bfa01 fixes the logging for static metadata types.

2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info] Error parsing EDID:
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info] ----------------------------------------------
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info] Block 1, CTA-861 Extension Block:
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info]   Colorimetry Data Block: Reserved bits MD0-MD3 must be 0.
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info]
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info] Block 0, Base EDID:
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info]   Unknown Extension Block.
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info]
2023-04-18 14:38:33.812 T:2329529   error <general>: [display-info] ----------------------------------------------
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info] make: 'Acer Technologies' model: 'XV273K'
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info] supports hdr static metadata type1: true
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info] supported eotf:
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info]   traditional sdr: true
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info]   traditional hdr: true
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info]   pq:              true
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info]   hlg:             false
2023-04-18 14:38:33.812 T:2329529    info <general>: [display-info] luma min: '0.049283653' avg: '322.09805' max: '408.75888'

What is the effect on users?

Allows broken edid's to still allow HDR modes.

@lrusak lrusak added this to the Omega 21.0 Alpha 2 milestone Apr 19, 2023
@lrusak lrusak requested a review from jernejsk April 19, 2023 03:12
xbmc/utils/DisplayInfo.cpp Outdated Show resolved Hide resolved
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
@lrusak
Copy link
Contributor Author

lrusak commented Apr 20, 2023

@jernejsk can you test this please and confirm it fixes your issue?

Copy link
Contributor

@jernejsk jernejsk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works, thanks!

@lrusak lrusak merged commit ce8c91e into xbmc:master Apr 20, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants