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

Commit 930b6ec3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Pass latency information from app to input" into sc-dev am: 2814c319 

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

Change-Id: Ia58a55bed81cf015afa2c23b6dbc07ac0d61dcac
parents b7155f63 2814c319

include/input/Input.h

+14 −0
Original line number Diff line number Diff line
@@ -265,6 +265,20 @@ enum class MotionClassification : uint8_t { 
 */

const char* motionClassificationToString(MotionClassification classification);



/**

 * Portion of FrameMetrics timeline of interest to input code.

 */

enum GraphicsTimeline : size_t {

    /** Time when the app sent the buffer to SurfaceFlinger. */

    GPU_COMPLETED_TIME = 0,



    /** Time when the frame was presented on the display */

    PRESENT_TIME = 1,



    /** Total size of the 'GraphicsTimeline' array. Must always be last. */

    SIZE = 2

};



/**

 * Generator of unique numbers used to identify input events.

 *

include/input/InputTransport.h

+31 −4
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct InputMessage { 
        FOCUS,

        CAPTURE,

        DRAG,

        TIMELINE,

    };



    struct Header {
@@ -195,6 +196,14 @@ struct InputMessage { 


            inline size_t size() const { return sizeof(Drag); }

        } drag;



        struct Timeline {

            int32_t eventId;

            uint32_t empty;

            std::array<nsecs_t, GraphicsTimeline::SIZE> graphicsTimeline;



            inline size_t size() const { return sizeof(Timeline); }

        } timeline;

    } __attribute__((aligned(8))) body;



    bool isValid(size_t actualSize) const;
@@ -381,10 +390,25 @@ public: 
        nsecs_t consumeTime;

    };



    /* Receives the finished signal from the consumer in reply to the original dispatch signal.

     * If a signal was received, returns a Finished object.

    struct Timeline {

        int32_t inputEventId;

        std::array<nsecs_t, GraphicsTimeline::SIZE> graphicsTimeline;

    };



    typedef std::variant<Finished, Timeline> ConsumerResponse;

    /* Receive a signal from the consumer in reply to the original dispatch signal.

     * If a signal was received, returns a Finished or a Timeline object.

     * The InputConsumer should return a Finished object for every InputMessage that it is sent

     * to confirm that it has been processed and that the InputConsumer is responsive.

     * If several InputMessages are sent to InputConsumer, it's possible to receive Finished

     * events out of order for those messages.

     *

     * The returned sequence number is never 0 unless the operation failed.

     * The Timeline object is returned whenever the receiving end has processed a graphical frame

     * and is returning the timeline of the frame. Not all input events will cause a Timeline

     * object to be returned, and there is not guarantee about when it will arrive.

     *

     * If an object of Finished is returned, the returned sequence number is never 0 unless the

     * operation failed.

     *

     * Returned error codes:

     *         OK on success.
@@ -392,7 +416,7 @@ public: 
     *         DEAD_OBJECT if the channel's peer has been closed.

     *         Other errors probably indicate that the channel is broken.

     */

    android::base::Result<Finished> receiveFinishedSignal();

    android::base::Result<ConsumerResponse> receiveConsumerResponse();



private:

    std::shared_ptr<InputChannel> mChannel;
@@ -448,6 +472,9 @@ public: 
     */

    status_t sendFinishedSignal(uint32_t seq, bool handled);



    status_t sendTimeline(int32_t inputEventId,

                          std::array<nsecs_t, GraphicsTimeline::SIZE> timeline);



    /* Returns true if there is a deferred event waiting.

     *

     * Should be called after calling consume() to determine whether the consumer

libs/input/InputTransport.cpp

+64 −11
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ bool InputMessage::isValid(size_t actualSize) const { 
                return true;

            case Type::DRAG:

                return true;

            case Type::TIMELINE:

                const nsecs_t gpuCompletedTime =

                        body.timeline.graphicsTimeline[GraphicsTimeline::GPU_COMPLETED_TIME];

                const nsecs_t presentTime =

                        body.timeline.graphicsTimeline[GraphicsTimeline::PRESENT_TIME];

                return presentTime > gpuCompletedTime;

        }

    }

    return false;
@@ -129,6 +135,8 @@ size_t InputMessage::size() const { 
            return sizeof(Header) + body.capture.size();

        case Type::DRAG:

            return sizeof(Header) + body.drag.size();

        case Type::TIMELINE:

            return sizeof(Header) + body.timeline.size();

    }

    return sizeof(Header);

}
@@ -260,6 +268,11 @@ void InputMessage::getSanitizedCopy(InputMessage* msg) const { 
            msg->body.drag.isExiting = body.drag.isExiting;

            break;

        }

        case InputMessage::Type::TIMELINE: {

            msg->body.timeline.eventId = body.timeline.eventId;

            msg->body.timeline.graphicsTimeline = body.timeline.graphicsTimeline;

            break;

        }

    }

}
@@ -629,7 +642,7 @@ status_t InputPublisher::publishDragEvent(uint32_t seq, int32_t eventId, float x 
    return mChannel->sendMessage(&msg);

}



android::base::Result<InputPublisher::Finished> InputPublisher::receiveFinishedSignal() {

android::base::Result<InputPublisher::ConsumerResponse> InputPublisher::receiveConsumerResponse() {

    if (DEBUG_TRANSPORT_ACTIONS) {

        ALOGD("channel '%s' publisher ~ %s", mChannel->getName().c_str(), __func__);

    }
@@ -639,11 +652,7 @@ android::base::Result<InputPublisher::Finished> InputPublisher::receiveFinishedS 
    if (result) {

        return android::base::Error(result);

    }

    if (msg.header.type != InputMessage::Type::FINISHED) {

        ALOGE("channel '%s' publisher ~ Received unexpected %s message from consumer",

              mChannel->getName().c_str(), NamedEnum::string(msg.header.type).c_str());

        return android::base::Error(UNKNOWN_ERROR);

    }

    if (msg.header.type == InputMessage::Type::FINISHED) {

        return Finished{

                .seq = msg.header.seq,

                .handled = msg.body.finished.handled,
@@ -651,6 +660,18 @@ android::base::Result<InputPublisher::Finished> InputPublisher::receiveFinishedS 
        };

    }



    if (msg.header.type == InputMessage::Type::TIMELINE) {

        return Timeline{

                .inputEventId = msg.body.timeline.eventId,

                .graphicsTimeline = msg.body.timeline.graphicsTimeline,

        };

    }



    ALOGE("channel '%s' publisher ~ Received unexpected %s message from consumer",

          mChannel->getName().c_str(), NamedEnum::string(msg.header.type).c_str());

    return android::base::Error(UNKNOWN_ERROR);

}



// --- InputConsumer ---



InputConsumer::InputConsumer(const std::shared_ptr<InputChannel>& channel)
@@ -785,7 +806,8 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, bool consum 
                break;

            }



            case InputMessage::Type::FINISHED: {

            case InputMessage::Type::FINISHED:

            case InputMessage::Type::TIMELINE: {

                LOG_ALWAYS_FATAL("Consumed a %s message, which should never be seen by "

                                 "InputConsumer!",

                                 NamedEnum::string(mMsg.header.type).c_str());
@@ -1193,6 +1215,24 @@ status_t InputConsumer::sendFinishedSignal(uint32_t seq, bool handled) { 
    return sendUnchainedFinishedSignal(seq, handled);

}



status_t InputConsumer::sendTimeline(int32_t inputEventId,

                                     std::array<nsecs_t, GraphicsTimeline::SIZE> graphicsTimeline) {

    if (DEBUG_TRANSPORT_ACTIONS) {

        ALOGD("channel '%s' consumer ~ sendTimeline: inputEventId=%" PRId32

              ", gpuCompletedTime=%" PRId64 ", presentTime=%" PRId64,

              mChannel->getName().c_str(), inputEventId,

              graphicsTimeline[GraphicsTimeline::GPU_COMPLETED_TIME],

              graphicsTimeline[GraphicsTimeline::PRESENT_TIME]);

    }



    InputMessage msg;

    msg.header.type = InputMessage::Type::TIMELINE;

    msg.header.seq = 0;

    msg.body.timeline.eventId = inputEventId;

    msg.body.timeline.graphicsTimeline = std::move(graphicsTimeline);

    return mChannel->sendMessage(&msg);

}



nsecs_t InputConsumer::getConsumeTime(uint32_t seq) const {

    auto it = mConsumeTimes.find(seq);

    // Consume time will be missing if either 'finishInputEvent' is called twice, or if it was
@@ -1399,6 +1439,19 @@ std::string InputConsumer::dump() const { 
                                                       toString(msg.body.drag.isExiting));

                    break;

                }

                case InputMessage::Type::TIMELINE: {

                    const nsecs_t gpuCompletedTime =

                            msg.body.timeline

                                    .graphicsTimeline[GraphicsTimeline::GPU_COMPLETED_TIME];

                    const nsecs_t presentTime =

                            msg.body.timeline.graphicsTimeline[GraphicsTimeline::PRESENT_TIME];

                    out += android::base::StringPrintf("inputEventId=%" PRId32

                                                       ", gpuCompletedTime=%" PRId64

                                                       ", presentTime=%" PRId64,

                                                       msg.body.timeline.eventId, gpuCompletedTime,

                                                       presentTime);

                    break;

                }

            }

            out += "\n";

        }

libs/input/tests/InputPublisherAndConsumer_test.cpp

+61 −35
Original line number Diff line number Diff line
@@ -124,13 +124,15 @@ void InputPublisherAndConsumerTest::PublishAndConsumeKeyEvent() { 
    ASSERT_EQ(OK, status)

            << "consumer sendFinishedSignal should return OK";



    Result<InputPublisher::Finished> result = mPublisher->receiveFinishedSignal();

    ASSERT_TRUE(result.ok()) << "publisher receiveFinishedSignal should return OK";

    ASSERT_EQ(seq, result->seq)

            << "receiveFinishedSignal should have returned the original sequence number";

    ASSERT_TRUE(result->handled)

            << "receiveFinishedSignal should have set handled to consumer's reply";

    ASSERT_GE(result->consumeTime, publishTime)

    Result<InputPublisher::ConsumerResponse> result = mPublisher->receiveConsumerResponse();

    ASSERT_TRUE(result.ok()) << "receiveConsumerResponse should return OK";

    ASSERT_TRUE(std::holds_alternative<InputPublisher::Finished>(*result));

    const InputPublisher::Finished& finish = std::get<InputPublisher::Finished>(*result);

    ASSERT_EQ(seq, finish.seq)

            << "receiveConsumerResponse should have returned the original sequence number";

    ASSERT_TRUE(finish.handled)

            << "receiveConsumerResponse should have set handled to consumer's reply";

    ASSERT_GE(finish.consumeTime, publishTime)

            << "finished signal's consume time should be greater than publish time";

}
@@ -264,13 +266,15 @@ void InputPublisherAndConsumerTest::PublishAndConsumeMotionEvent() { 
    ASSERT_EQ(OK, status)

            << "consumer sendFinishedSignal should return OK";



    Result<InputPublisher::Finished> result = mPublisher->receiveFinishedSignal();

    ASSERT_TRUE(result.ok()) << "receiveFinishedSignal should return OK";

    ASSERT_EQ(seq, result->seq)

            << "receiveFinishedSignal should have returned the original sequence number";

    ASSERT_FALSE(result->handled)

            << "receiveFinishedSignal should have set handled to consumer's reply";

    ASSERT_GE(result->consumeTime, publishTime)

    Result<InputPublisher::ConsumerResponse> result = mPublisher->receiveConsumerResponse();

    ASSERT_TRUE(result.ok()) << "receiveConsumerResponse should return OK";

    ASSERT_TRUE(std::holds_alternative<InputPublisher::Finished>(*result));

    const InputPublisher::Finished& finish = std::get<InputPublisher::Finished>(*result);

    ASSERT_EQ(seq, finish.seq)

            << "receiveConsumerResponse should have returned the original sequence number";

    ASSERT_FALSE(finish.handled)

            << "receiveConsumerResponse should have set handled to consumer's reply";

    ASSERT_GE(finish.consumeTime, publishTime)

            << "finished signal's consume time should be greater than publish time";

}
@@ -304,14 +308,16 @@ void InputPublisherAndConsumerTest::PublishAndConsumeFocusEvent() { 
    status = mConsumer->sendFinishedSignal(seq, true);

    ASSERT_EQ(OK, status) << "consumer sendFinishedSignal should return OK";



    Result<InputPublisher::Finished> result = mPublisher->receiveFinishedSignal();

    Result<InputPublisher::ConsumerResponse> result = mPublisher->receiveConsumerResponse();

    ASSERT_TRUE(result.ok()) << "receiveConsumerResponse should return OK";

    ASSERT_TRUE(std::holds_alternative<InputPublisher::Finished>(*result));

    const InputPublisher::Finished& finish = std::get<InputPublisher::Finished>(*result);



    ASSERT_TRUE(result.ok()) << "receiveFinishedSignal should return OK";

    ASSERT_EQ(seq, result->seq)

            << "receiveFinishedSignal should have returned the original sequence number";

    ASSERT_TRUE(result->handled)

            << "receiveFinishedSignal should have set handled to consumer's reply";

    ASSERT_GE(result->consumeTime, publishTime)

    ASSERT_EQ(seq, finish.seq)

            << "receiveConsumerResponse should have returned the original sequence number";

    ASSERT_TRUE(finish.handled)

            << "receiveConsumerResponse should have set handled to consumer's reply";

    ASSERT_GE(finish.consumeTime, publishTime)

            << "finished signal's consume time should be greater than publish time";

}
@@ -343,13 +349,15 @@ void InputPublisherAndConsumerTest::PublishAndConsumeCaptureEvent() { 
    status = mConsumer->sendFinishedSignal(seq, true);

    ASSERT_EQ(OK, status) << "consumer sendFinishedSignal should return OK";



    android::base::Result<InputPublisher::Finished> result = mPublisher->receiveFinishedSignal();

    ASSERT_TRUE(result.ok()) << "publisher receiveFinishedSignal should return OK";

    ASSERT_EQ(seq, result->seq)

            << "receiveFinishedSignal should have returned the original sequence number";

    ASSERT_TRUE(result->handled)

            << "receiveFinishedSignal should have set handled to consumer's reply";

    ASSERT_GE(result->consumeTime, publishTime)

    Result<InputPublisher::ConsumerResponse> result = mPublisher->receiveConsumerResponse();

    ASSERT_TRUE(result.ok()) << "receiveConsumerResponse should return OK";

    ASSERT_TRUE(std::holds_alternative<InputPublisher::Finished>(*result));

    const InputPublisher::Finished& finish = std::get<InputPublisher::Finished>(*result);

    ASSERT_EQ(seq, finish.seq)

            << "receiveConsumerResponse should have returned the original sequence number";

    ASSERT_TRUE(finish.handled)

            << "receiveConsumerResponse should have set handled to consumer's reply";

    ASSERT_GE(finish.consumeTime, publishTime)

            << "finished signal's consume time should be greater than publish time";

}
@@ -385,16 +393,34 @@ void InputPublisherAndConsumerTest::PublishAndConsumeDragEvent() { 
    status = mConsumer->sendFinishedSignal(seq, true);

    ASSERT_EQ(OK, status) << "consumer sendFinishedSignal should return OK";



    android::base::Result<InputPublisher::Finished> result = mPublisher->receiveFinishedSignal();

    ASSERT_TRUE(result.ok()) << "publisher receiveFinishedSignal should return OK";

    ASSERT_EQ(seq, result->seq)

            << "publisher receiveFinishedSignal should have returned the original sequence number";

    ASSERT_TRUE(result->handled)

            << "publisher receiveFinishedSignal should have set handled to consumer's reply";

    ASSERT_GE(result->consumeTime, publishTime)

    Result<InputPublisher::ConsumerResponse> result = mPublisher->receiveConsumerResponse();

    ASSERT_TRUE(result.ok()) << "receiveConsumerResponse should return OK";

    ASSERT_TRUE(std::holds_alternative<InputPublisher::Finished>(*result));

    const InputPublisher::Finished& finish = std::get<InputPublisher::Finished>(*result);

    ASSERT_EQ(seq, finish.seq)

            << "receiveConsumerResponse should have returned the original sequence number";

    ASSERT_TRUE(finish.handled)

            << "receiveConsumerResponse should have set handled to consumer's reply";

    ASSERT_GE(finish.consumeTime, publishTime)

            << "finished signal's consume time should be greater than publish time";

}



TEST_F(InputPublisherAndConsumerTest, SendTimeline) {

    const int32_t inputEventId = 20;

    std::array<nsecs_t, GraphicsTimeline::SIZE> graphicsTimeline;

    graphicsTimeline[GraphicsTimeline::GPU_COMPLETED_TIME] = 30;

    graphicsTimeline[GraphicsTimeline::PRESENT_TIME] = 40;

    status_t status = mConsumer->sendTimeline(inputEventId, graphicsTimeline);

    ASSERT_EQ(OK, status);



    Result<InputPublisher::ConsumerResponse> result = mPublisher->receiveConsumerResponse();

    ASSERT_TRUE(result.ok()) << "receiveConsumerResponse should return OK";

    ASSERT_TRUE(std::holds_alternative<InputPublisher::Timeline>(*result));

    const InputPublisher::Timeline& timeline = std::get<InputPublisher::Timeline>(*result);

    ASSERT_EQ(inputEventId, timeline.inputEventId);

    ASSERT_EQ(graphicsTimeline, timeline.graphicsTimeline);

}



TEST_F(InputPublisherAndConsumerTest, PublishKeyEvent_EndToEnd) {

    ASSERT_NO_FATAL_FAILURE(PublishAndConsumeKeyEvent());

}

libs/input/tests/StructLayout_test.cpp

+7 −0
Original line number Diff line number Diff line
@@ -96,6 +96,10 @@ void TestInputMessageAlignment() { 
  CHECK_OFFSET(InputMessage::Body::Finished, handled, 0);

  CHECK_OFFSET(InputMessage::Body::Finished, empty, 1);

  CHECK_OFFSET(InputMessage::Body::Finished, consumeTime, 8);



  CHECK_OFFSET(InputMessage::Body::Timeline, eventId, 0);

  CHECK_OFFSET(InputMessage::Body::Timeline, empty, 4);

  CHECK_OFFSET(InputMessage::Body::Timeline, graphicsTimeline, 8);

}



void TestHeaderSize() {
@@ -117,6 +121,9 @@ void TestBodySize() { 
    static_assert(sizeof(InputMessage::Body::Focus) == 8);

    static_assert(sizeof(InputMessage::Body::Capture) == 8);

    static_assert(sizeof(InputMessage::Body::Drag) == 16);

    // Timeline

    static_assert(GraphicsTimeline::SIZE == 2);

    static_assert(sizeof(InputMessage::Body::Timeline) == 24);

}



// --- VerifiedInputEvent ---