commit a32eadee7c1fd1612140c4148600eff2d61c6975
author Alec Mouri <alecmouri@google.com> Tue Jun 25 23:20:51 2024 +0000
committer Alec Mouri <alecmouri@google.com> Wed Jun 26 13:55:18 2024 +0000
tree de005fe542ad35603fe21f4c84472aecab8f9109
parent 77c511c4d546227e768d7594840a4845b11e7756

Use dimming ratio when detecting hdr type for local TMO

...otherwise UltraHDR isn't counted as HDR, which then disables
tonemapping to SDR.

Bug: 329464641
Flag: com.android.graphics.surfaceflinger.flags.local_tonemap_screenshots
Test: screenshot Chrome showing an HDR image
Change-Id: I71febc9ef3477938deb4cb904a464f3ab4e598f9

libs/renderengine/skia/SkiaRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp
index c39da95..5f37125 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaRenderEngine.cpp
@@ -525,7 +525,8 @@
                           static_cast<ui::PixelFormat>(targetBuffer->getPixelFormat()))
                 : std::nullopt;
 
-        const auto hdrType = getHdrRenderType(parameters.layer.sourceDataspace, format);
+        const auto hdrType = getHdrRenderType(parameters.layer.sourceDataspace, format,
+                                              parameters.layerDimmingRatio);
 
         const auto usingLocalTonemap =
                 parameters.display.tonemapStrategy == DisplaySettings::TonemapStrategy::Local &&