commit db65301a6eb61fd4c1c9cd4d4eff778eec261c06
author Sally Qi <sallyqi@google.com> Wed May 04 13:12:22 2022 -0700
committer Sally Qi <sallyqi@google.com> Wed May 04 15:15:43 2022 -0700
tree 6f292e885a70c46380b266fe1a0ad118b638814a
parent 0f24a7c37b3e65996c9bb88c3e22038ae2ca58ef

Fix SDR layer luminance increase

- set sdrWhitePointNits as luminance for non-dimmed SDR layer.

Bug: 229694638
Test: rotate screen when playing HDR video in portrait mode
Change-Id: I4dc227abe72f562b3431fdfe813b3e80c7bdb7e7

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e72e21c..2d274be 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6789,7 +6789,7 @@
                                        BlurSetting::Disabled
                              : compositionengine::LayerFE::ClientCompositionTargetSettings::
                                        BlurSetting::Enabled,
-                isHdrDataspace(dataspace) ? displayBrightnessNits : sdrWhitePointNits,
+                isHdrLayer(layer) ? displayBrightnessNits : sdrWhitePointNits,
 
         };
         std::vector<compositionengine::LayerFE::LayerSettings> results =
@@ -6804,7 +6804,7 @@
                 if (regionSampling) {
                     settings.backgroundBlurRadius = 0;
                 }
-                captureResults.capturedHdrLayers |= isHdrDataspace(settings.sourceDataspace);
+                captureResults.capturedHdrLayers |= isHdrLayer(layer);
             }
 
             clientCompositionLayers.insert(clientCompositionLayers.end(),