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

Commit 24ea3138 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6263357 from a1642fee to qt-qpr3-release 

Change-Id: Ifdea83ee5c6db9e38295d00c1974079e9a19e546
parents dfaaaee9 a1642fee

libs/input/TouchVideoFrame.cpp

+2 −2
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ const struct timeval& TouchVideoFrame::getTimestamp() const { return mTimestamp; 
void TouchVideoFrame::rotate(int32_t orientation) {

    switch (orientation) {

        case DISPLAY_ORIENTATION_90:

            rotateQuarterTurn(true /*clockwise*/);

            rotateQuarterTurn(false /*clockwise*/);

            break;

        case DISPLAY_ORIENTATION_180:

            rotate180();

            break;

        case DISPLAY_ORIENTATION_270:

            rotateQuarterTurn(false /*clockwise*/);

            rotateQuarterTurn(true /*clockwise*/);

            break;

    }

}

libs/input/tests/TouchVideoFrame_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ TEST(TouchVideoFrame, Rotate90_1x1) { 


TEST(TouchVideoFrame, Rotate90_2x2) {

    TouchVideoFrame frame(2, 2, {1, 2, 3, 4}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 2, {3, 1, 4, 2}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 2, {2, 4, 1, 3}, TIMESTAMP);

    frame.rotate(DISPLAY_ORIENTATION_90);

    ASSERT_EQ(frame, frameRotated);

}



TEST(TouchVideoFrame, Rotate90_3x2) {

    TouchVideoFrame frame(3, 2, {1, 2, 3, 4, 5, 6}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 3, {5, 3, 1, 6, 4, 2}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 3, {2, 4, 6, 1, 3, 5}, TIMESTAMP);

    frame.rotate(DISPLAY_ORIENTATION_90);

    ASSERT_EQ(frame, frameRotated);

}
@@ -170,14 +170,14 @@ TEST(TouchVideoFrame, Rotate270_1x1) { 


TEST(TouchVideoFrame, Rotate270_2x2) {

    TouchVideoFrame frame(2, 2, {1, 2, 3, 4}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 2, {2, 4, 1, 3}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 2, {3, 1, 4, 2}, TIMESTAMP);

    frame.rotate(DISPLAY_ORIENTATION_270);

    ASSERT_EQ(frame, frameRotated);

}



TEST(TouchVideoFrame, Rotate270_3x2) {

    TouchVideoFrame frame(3, 2, {1, 2, 3, 4, 5, 6}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 3, {2, 4, 6, 1, 3, 5}, TIMESTAMP);

    TouchVideoFrame frameRotated(2, 3, {5, 3, 1, 6, 4, 2}, TIMESTAMP);

    frame.rotate(DISPLAY_ORIENTATION_270);

    ASSERT_EQ(frame, frameRotated);

}