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

Commit 27cb0349 authored by Huihong Luo's avatar Huihong Luo Committed by Automerger Merge Worker
Browse files

Merge "Fix color sampling for landscape" into sc-dev am: 16d96861 

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

Change-Id: I8b48c4f58524830c2ccb3cd56f217c6aa9a807a7
parents 29d9a5d6 16d96861

services/surfaceflinger/RegionSamplingThread.cpp

+3 −24
Original line number Diff line number Diff line
@@ -287,33 +287,12 @@ void RegionSamplingThread::captureSample() { 
        descriptors.emplace_back(descriptor);

    }



    auto dx = 0;

    auto dy = 0;

    switch (orientation) {

        case ui::Transform::ROT_90:

            dx = displaySize.getWidth();

            break;

        case ui::Transform::ROT_180:

            dx = displaySize.getWidth();

            dy = displaySize.getHeight();

            break;

        case ui::Transform::ROT_270:

            dy = displaySize.getHeight();

            break;

        default:

            break;

    }



    ui::Transform t(orientation);

    auto screencapRegion = t.transform(sampleRegion);

    screencapRegion = screencapRegion.translate(dx, dy);



    const Rect sampledBounds = sampleRegion.bounds();

    constexpr bool kUseIdentityTransform = false;



    SurfaceFlinger::RenderAreaFuture renderAreaFuture = ftl::defer([=] {

        return DisplayRenderArea::create(displayWeak, screencapRegion.bounds(),

                                         sampledBounds.getSize(), ui::Dataspace::V0_SRGB,

                                         orientation);

        return DisplayRenderArea::create(displayWeak, sampledBounds, sampledBounds.getSize(),

                                         ui::Dataspace::V0_SRGB, kUseIdentityTransform);

    });



    std::unordered_set<sp<IRegionSamplingListener>, SpHash<IRegionSamplingListener>> listeners;