diff options
| author | UjinT34 <41110182+UjinT34@users.noreply.github.com> | 2025-08-19 21:28:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-19 19:28:52 +0100 |
| commit | 1d679874591c7848794b83f1d8bfe245772c11d2 (patch) | |
| tree | a4eb8b7e661f308b9fd0f63a502ee1eac9f6bd77 /src/helpers/Monitor.cpp | |
| parent | 1a0ed00f74f7cfcc3b7c4fd7e3bf0073c4973267 (diff) | |
hdr: fix overrides and missing edid hdr metadata (#11476)
Diffstat (limited to 'src/helpers/Monitor.cpp')
| -rw-r--r-- | src/helpers/Monitor.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp index d6d9fedd..a84c4c64 100644 --- a/src/helpers/Monitor.cpp +++ b/src/helpers/Monitor.cpp @@ -1669,16 +1669,17 @@ bool CMonitor::supportsHDR() { return supportsWideColor() && (m_supportsHDR || (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->supportsPQ : false)); } -float CMonitor::minLuminance() { - return m_minLuminance >= 0 ? m_minLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMinLuminance : 0); +float CMonitor::minLuminance(float defaultValue) { + return m_minLuminance >= 0 ? m_minLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMinLuminance : defaultValue); } -int CMonitor::maxLuminance() { - return m_maxLuminance >= 0 ? m_maxLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMaxLuminance : 80); +int CMonitor::maxLuminance(int defaultValue) { + return m_maxLuminance >= 0 ? m_maxLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMaxLuminance : defaultValue); } -int CMonitor::maxAvgLuminance() { - return m_maxAvgLuminance >= 0 ? m_maxAvgLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredMaxFrameAverageLuminance : 80); +int CMonitor::maxAvgLuminance(int defaultValue) { + return m_maxAvgLuminance >= 0 ? m_maxAvgLuminance : + (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredMaxFrameAverageLuminance : defaultValue); } CMonitorState::CMonitorState(CMonitor* owner) : m_owner(owner) { |