@@ -1320,47 +1320,6 @@ void UIRenderer::DrawDebugHUD(ID2D1DeviceContext* dc) {
13201320 dc->DrawText (buffer, (UINT32)wcslen (buffer), m_debugFormat.Get (),
13211321 D2D1::RectF (hudX + 10 , hudY + 5 , hudX + hudW - 10 , hudY + 75 ), m_whiteBrush.Get ());
13221322
1323- {
1324- std::wstring displayLine = L" Display: " ;
1325- if (m_compEngine) {
1326- const auto & displayState = m_compEngine->GetDisplayColorState ();
1327- displayLine += displayState.advancedColorActive ? L" HDR" : L" SDR" ;
1328- std::wstring peak = FormatHdrNits (displayState.maxLuminanceNits );
1329- std::wstring full = FormatHdrNits (displayState.maxFullFrameLuminanceNits );
1330- std::wstring sdrWhite = FormatHdrNits (displayState.sdrWhiteLevelNits );
1331- std::wstring headroom = FormatHdrStops (displayState.GetHdrHeadroomStops ());
1332- if (!peak.empty ()) displayLine += L" Peak " + peak;
1333- if (!full.empty ()) displayLine += L" Full " + full;
1334- if (!sdrWhite.empty ()) displayLine += L" SDR " + sdrWhite;
1335- if (!headroom.empty ()) displayLine += L" " + headroom;
1336- } else {
1337- displayLine += L" N/A" ;
1338- }
1339-
1340- std::wstring imageLine = L" Image: " ;
1341- if (IsHdrLikeContent (g_currentMetadata) || g_currentMetadata.hdrMetadata .isValid ) {
1342- const std::wstring hdrSummary = BuildHdrSummary (g_currentMetadata);
1343- const std::wstring hdrDetail = BuildHdrDetail (g_currentMetadata.hdrMetadata );
1344- imageLine += hdrSummary.empty () ? BuildDynamicRangeLabel (g_currentMetadata) : hdrSummary;
1345- if (!hdrDetail.empty ()) imageLine += L" " + hdrDetail;
1346- } else {
1347- imageLine += L" SDR / no HDR metadata" ;
1348- }
1349-
1350- dc->DrawText (
1351- displayLine.c_str (),
1352- (UINT32)displayLine.length (),
1353- m_debugFormat.Get (),
1354- D2D1::RectF (hudX + 10 , hudY + 78 , hudX + hudW - 10 , hudY + 94 ),
1355- whiteBrush.Get ());
1356- dc->DrawText (
1357- imageLine.c_str (),
1358- (UINT32)imageLine.length (),
1359- m_debugFormat.Get (),
1360- D2D1::RectF (hudX + 10 , hudY + 94 , hudX + hudW - 10 , hudY + 112 ),
1361- whiteBrush.Get ());
1362- }
1363-
13641323 // 4. Matrix (Scout + Heavy)
13651324 float px = hudX + 10 .0f ;
13661325 float py = hudY + 146 .0f ;
@@ -1980,10 +1939,12 @@ namespace {
19801939 static std::wstring BuildDisplayHeadroomLabel (const QuickView::DisplayColorState& displayState) {
19811940 const float sdrWhite = displayState.sdrWhiteLevelNits > 0 .0f ? displayState.sdrWhiteLevelNits : 80 .0f ;
19821941 const float peak = displayState.maxLuminanceNits > 0 .0f ? displayState.maxLuminanceNits : sdrWhite;
1942+ const float full = displayState.maxFullFrameLuminanceNits > 0 .0f ? displayState.maxFullFrameLuminanceNits : sdrWhite;
1943+
19831944 std::wstring label = FormatHdrRatio (peak / sdrWhite);
19841945 if (!label.empty ()) label += L" " ;
1985- wchar_t buf[96 ];
1986- swprintf_s (buf, L" (%.0f nits SDR / %.0f nits Max)" , sdrWhite, peak);
1946+ wchar_t buf[128 ];
1947+ swprintf_s (buf, L" (%.0f SDR / %.0f Max / %.0f Full )" , sdrWhite, peak, full );
19871948 label += buf;
19881949 return label;
19891950 }
0 commit comments