commit d54c1cd3dd554cb8e16b73da7f327a7aabc6b82c
author Alec Mouri <alecmouri@google.com> Wed Aug 16 22:41:14 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri Aug 18 20:48:39 2023 +0000
tree a7f67fc8683bac24c8760686f589edf7fc90dabc
parent 19603058f849e776277e7fa7ff20e48bc8acf2db

Dim correctly in screenshots on some devices

Some devices are configured to dim in gamma space for non-colorimetric
rendering intents. This configuration is a per-frame configuration on
HWC, but that doesn't work for screenshots.

Bug: 293560925
Test: HDR playback in youtube and rotate
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9af38ba9d5f9de413d87a64165226a2b488059a8)
Merged-In: I3110de534d6ef1ad16f9f94d30874bca6f8838c9
Change-Id: I3110de534d6ef1ad16f9f94d30874bca6f8838c9

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 39ea248..f118d46 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -451,6 +451,9 @@
     property_get("debug.sf.treat_170m_as_sRGB", value, "0");
     mTreat170mAsSrgb = atoi(value);
 
+    property_get("debug.sf.dim_in_gamma_in_enhanced_screenshots", value, 0);
+    mDimInGammaSpaceForEnhancedScreenshots = atoi(value);
+
     mIgnoreHwcPhysicalDisplayOrientation =
             base::GetBoolProperty("debug.sf.ignore_hwc_physical_display_orientation"s, false);
 
@@ -7480,7 +7483,9 @@
                                         .displayBrightnessNits = displayBrightnessNits,
                                         .targetBrightness = targetBrightness,
                                         .regionSampling = regionSampling,
-                                        .treat170mAsSrgb = mTreat170mAsSrgb});
+                                        .treat170mAsSrgb = mTreat170mAsSrgb,
+                                        .dimInGammaSpaceForEnhancedScreenshots =
+                                                mDimInGammaSpaceForEnhancedScreenshots});
 
         const float colorSaturation = grayscale ? 0 : 1;
         compositionengine::CompositionRefreshArgs refreshArgs{