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

Commit 76f5f2fd authored by chaviw's avatar chaviw
Browse files

Fix the position set for setGeometry calculation. 

The current implementation of setGeometry will set the position as the x
and y value of destination. However, this value will not work if the
source is not at 0, 0 since it will start crop at a non zero position.
The position will be set based on the non cropped area so the final
content frame will not be positioned at the specified position.

This change calculates the offset for x and y based on the source's
crop's position and scale since it will need to create a negative offset
to compensate for the crop

Test: SetGeometryTest
Fixes: 141495784
Change-Id: I7dc0e5f9e65f9838ebd86f304bc1ca0beffc4393
parent e2930c4a

libs/gui/SurfaceComposerClient.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1327,7 +1327,9 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setGeome 
            break;

    }

    setMatrix(sc, matrix[0], matrix[1], matrix[2], matrix[3]);

    setPosition(sc, x, y);

    float offsetX = xScale * source.left;

    float offsetY = yScale * source.top;

    setPosition(sc, x - offsetX, y - offsetY);



    return *this;

}

services/surfaceflinger/tests/Android.bp

+11 −10
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ cc_test { 
        "LayerUpdate_test.cpp",

        "MultiDisplayLayerBounds_test.cpp",

        "RelativeZ_test.cpp",

        "SetGeometry_test.cpp",

        "Stress_test.cpp",

        "SurfaceInterceptor_test.cpp",

        "VirtualDisplay_test.cpp",

services/surfaceflinger/tests/SetGeometry_test.cpp

0 → 100644
+99 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "LayerTransactionTest.h"



namespace android {



class SetGeometryTest : public LayerTransactionTest {

protected:

    void SetUp() {

        LayerTransactionTest::SetUp();

        ASSERT_EQ(NO_ERROR, mClient->initCheck());



        mLayer = createLayer("Layer", mLayerWidth, mLayerHeight);

        fillBufferQueueLayerColor(mLayer, Color::RED, mLayerWidth, mLayerHeight);

        asTransaction([&](Transaction& t) { t.setLayer(mLayer, INT32_MAX - 1).show(mLayer); });



        {

            SCOPED_TRACE("init");

            ScreenCapture::captureScreen(&sc);

            sc->expectColor(Rect(0, 0, mLayerWidth, mLayerHeight), Color::RED);

            sc->expectBorder(Rect(0, 0, mLayerWidth, mLayerHeight), Color::BLACK);

        }

    }



    void TearDown() {

        LayerTransactionTest::TearDown();

        sc = 0;

        mLayer = 0;

    }



    std::unique_ptr<ScreenCapture> sc;

    sp<SurfaceControl> mLayer;

    const int mLayerWidth = 100;

    const int mLayerHeight = 200;

};



TEST_F(SetGeometryTest, SourceAtZeroNoScale) {

    Rect source = Rect(0, 0, 30, 30);

    Rect dest = Rect(60, 60, 90, 90);

    Transaction{}.setGeometry(mLayer, source, dest, 0).apply();



    {

        SCOPED_TRACE("geometry applied");

        ScreenCapture::captureScreen(&sc);

        sc->expectColor(dest, Color::RED);

        sc->expectBorder(dest, Color::BLACK);

    }

}



TEST_F(SetGeometryTest, SourceNotAtZero) {

    Rect source = Rect(40, 40, 70, 70);

    Rect dest = Rect(60, 60, 90, 90);

    Transaction{}.setGeometry(mLayer, source, dest, 0).apply();



    {

        SCOPED_TRACE("geometry applied");

        ScreenCapture::captureScreen(&sc);

        sc->expectColor(dest, Color::RED);

        sc->expectBorder(dest, Color::BLACK);

    }

}



TEST_F(SetGeometryTest, Scale) {

    Rect source = Rect(0, 0, 100, 200);

    Rect dest = Rect(0, 0, 200, 400);

    Transaction{}.setGeometry(mLayer, source, dest, 0).apply();



    {

        SCOPED_TRACE("Scaled by 2");

        ScreenCapture::captureScreen(&sc);

        sc->expectColor(dest, Color::RED);

        sc->expectBorder(dest, Color::BLACK);

    }



    dest = Rect(0, 0, 50, 100);

    Transaction{}.setGeometry(mLayer, source, dest, 0).apply();

    {

        SCOPED_TRACE("Scaled by .5");

        ScreenCapture::captureScreen(&sc);

        sc->expectColor(dest, Color::RED);

        sc->expectBorder(dest, Color::BLACK);

    }

}



} // namespace android

services/surfaceflinger/tests/SurfaceFlinger_test.filter

+1 −1
Original line number Diff line number Diff line 
{

        "presubmit": {

            "filter": "CredentialsTest.*:SurfaceFlingerStress.*:SurfaceInterceptorTest.*:LayerTransactionTest.*:LayerTypeTransactionTest.*:LayerUpdateTest.*:GeometryLatchingTest.*:CropLatchingTest.*:ChildLayerTest.*:ScreenCaptureTest.*:ScreenCaptureChildOnlyTest.*:DereferenceSurfaceControlTest.*:BoundlessLayerTest.*:MultiDisplayLayerBoundsTest.*:InvalidHandleTest.*:VirtualDisplayTest.*:RelativeZTest.*"

            "filter": "CredentialsTest.*:SurfaceFlingerStress.*:SurfaceInterceptorTest.*:LayerTransactionTest.*:LayerTypeTransactionTest.*:LayerUpdateTest.*:GeometryLatchingTest.*:CropLatchingTest.*:ChildLayerTest.*:ScreenCaptureTest.*:ScreenCaptureChildOnlyTest.*:DereferenceSurfaceControlTest.*:BoundlessLayerTest.*:MultiDisplayLayerBoundsTest.*:InvalidHandleTest.*:VirtualDisplayTest.*:RelativeZTest.*:SetGeometryTest.*"

        }

}