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

Commit 16d96861 authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Fix color sampling for landscape" into sc-dev

parents 5dc2372a a8f66857
Loading
Loading
Loading
Loading
+3 −24
Original line number Original line Diff line number Diff line
@@ -287,33 +287,12 @@ void RegionSamplingThread::captureSample() {
        descriptors.emplace_back(descriptor);
        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();
    const Rect sampledBounds = sampleRegion.bounds();
    constexpr bool kUseIdentityTransform = false;


    SurfaceFlinger::RenderAreaFuture renderAreaFuture = ftl::defer([=] {
    SurfaceFlinger::RenderAreaFuture renderAreaFuture = ftl::defer([=] {
        return DisplayRenderArea::create(displayWeak, screencapRegion.bounds(),
        return DisplayRenderArea::create(displayWeak, sampledBounds, sampledBounds.getSize(),
                                         sampledBounds.getSize(), ui::Dataspace::V0_SRGB,
                                         ui::Dataspace::V0_SRGB, kUseIdentityTransform);
                                         orientation);
    });
    });


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