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

Commit 33dbf5d2 authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge "input: handle change in std::span::size type" into main

parents c699f8ff 841b07c6

libs/input/MotionPredictor.cpp

+3 −2
Original line number Diff line number Diff line
@@ -176,12 +176,13 @@ std::unique_ptr<MotionEvent> MotionPredictor::predict(nsecs_t timestamp) { 
    int64_t predictionTime = mBuffers->lastTimestamp();

    const int64_t futureTime = timestamp + mPredictionTimestampOffsetNanos;



    for (int i = 0; i < predictedR.size() && predictionTime <= futureTime; ++i) {

    for (size_t i = 0; i < static_cast<size_t>(predictedR.size()) && predictionTime <= futureTime;

         ++i) {

        const TfLiteMotionPredictorSample::Point point =

                convertPrediction(axisFrom, axisTo, predictedR[i], predictedPhi[i]);

        // TODO(b/266747654): Stop predictions if confidence is < some threshold.



        ALOGD_IF(isDebug(), "prediction %d: %f, %f", i, point.x, point.y);

        ALOGD_IF(isDebug(), "prediction %zu: %f, %f", i, point.x, point.y);

        PointerCoords coords;

        coords.clear();

        coords.setAxisValue(AMOTION_EVENT_AXIS_X, point.x);

libs/input/TfLiteMotionPredictor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ std::span<T> getTensorBuffer(typename std::conditional<std::is_const<T>::value, 
                        tensor->name, TfLiteTypeGetName(tensor->type), TfLiteTypeGetName(type));



    LOG_ALWAYS_FATAL_IF(!tensor->data.data);

    return {reinterpret_cast<T*>(tensor->data.data),

            static_cast<typename std::span<T>::index_type>(tensor->bytes / sizeof(T))};

    return std::span<T>(reinterpret_cast<T*>(tensor->data.data), tensor->bytes / sizeof(T));

}



// Verifies that a tensor exists and has an underlying buffer of type T.