Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1713e8a3 authored by Alec Mouri's avatar Alec Mouri Committed by Automerger Merge Worker
Browse files

Make screenshots leaving the device more consistent. am: 7986a3a2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24920675



Change-Id: I3608c9d04937ca3421c6cb3bcea9fd3beed27ba6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 091be313 7986a3a2

services/surfaceflinger/SurfaceFlinger.cpp

+8 −2
Original line number Diff line number Diff line
@@ -7443,7 +7443,9 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl( 
                }

            }



            if (requestedDataspace == ui::Dataspace::UNKNOWN) {

            // Screenshots leaving the device should be colorimetric

            if (requestedDataspace == ui::Dataspace::UNKNOWN &&

                renderArea->getHintForSeamlessTransition()) {

                renderIntent = state.renderIntent;

            }

        }
@@ -7487,6 +7489,10 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl( 
            }

        }



        // Screenshots leaving the device must not dim in gamma space.

        const bool dimInGammaSpaceForEnhancedScreenshots = mDimInGammaSpaceForEnhancedScreenshots &&

                renderArea->getHintForSeamlessTransition();



        std::shared_ptr<ScreenCaptureOutput> output = createScreenCaptureOutput(

                ScreenCaptureOutputArgs{.compositionEngine = *compositionEngine,

                                        .colorProfile = colorProfile,
@@ -7499,7 +7505,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl( 
                                        .regionSampling = regionSampling,

                                        .treat170mAsSrgb = mTreat170mAsSrgb,

                                        .dimInGammaSpaceForEnhancedScreenshots =

                                                mDimInGammaSpaceForEnhancedScreenshots});

                                                dimInGammaSpaceForEnhancedScreenshots});



        const float colorSaturation = grayscale ? 0 : 1;

        compositionengine::CompositionRefreshArgs refreshArgs{