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

Commit 0fef5c5c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5476769 from e8abff06 to qt-release 

Change-Id: I5f731a6a9f5eab2ccfed9883831e532bc007558e
parents a75f6c51 e8abff06

libs/gui/BufferQueueProducer.cpp

+8 −8
Original line number Diff line number Diff line
@@ -1007,14 +1007,6 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
        mCallbackCondition.notify_all();

    }



    // Wait without lock held

    if (connectedApi == NATIVE_WINDOW_API_EGL) {

        // Waiting here allows for two full buffers to be queued but not a

        // third. In the event that frames take varying time, this makes a

        // small trade-off in favor of latency rather than throughput.

        lastQueuedFence->waitForever("Throttling EGL Production");

    }



    // Update and get FrameEventHistory.

    nsecs_t postedTime = systemTime(SYSTEM_TIME_MONOTONIC);

    NewFrameEventsEntry newFrameEventsEntry = {
@@ -1026,6 +1018,14 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
    addAndGetFrameTimestamps(&newFrameEventsEntry,

            getFrameTimestamps ? &output->frameTimestamps : nullptr);



    // Wait without lock held

    if (connectedApi == NATIVE_WINDOW_API_EGL) {

        // Waiting here allows for two full buffers to be queued but not a

        // third. In the event that frames take varying time, this makes a

        // small trade-off in favor of latency rather than throughput.

        lastQueuedFence->waitForever("Throttling EGL Production");

    }



    return NO_ERROR;

}

libs/input/VelocityTracker.cpp

+20 −2
Original line number Diff line number Diff line
@@ -382,7 +382,16 @@ void LeastSquaresVelocityTrackerStrategy::clearPointers(BitSet32 idBits) { 


void LeastSquaresVelocityTrackerStrategy::addMovement(nsecs_t eventTime, BitSet32 idBits,

        const VelocityTracker::Position* positions) {

    if (++mIndex == HISTORY_SIZE) {

    if (mMovements[mIndex].eventTime != eventTime) {

        // When ACTION_POINTER_DOWN happens, we will first receive ACTION_MOVE with the coordinates

        // of the existing pointers, and then ACTION_POINTER_DOWN with the coordinates that include

        // the new pointer. If the eventtimes for both events are identical, just update the data

        // for this time.

        // We only compare against the last value, as it is likely that addMovement is called

        // in chronological order as events occur.

        mIndex++;

    }

    if (mIndex == HISTORY_SIZE) {

        mIndex = 0;

    }
@@ -1017,7 +1026,16 @@ void ImpulseVelocityTrackerStrategy::clearPointers(BitSet32 idBits) { 


void ImpulseVelocityTrackerStrategy::addMovement(nsecs_t eventTime, BitSet32 idBits,

        const VelocityTracker::Position* positions) {

    if (++mIndex == HISTORY_SIZE) {

    if (mMovements[mIndex].eventTime != eventTime) {

        // When ACTION_POINTER_DOWN happens, we will first receive ACTION_MOVE with the coordinates

        // of the existing pointers, and then ACTION_POINTER_DOWN with the coordinates that include

        // the new pointer. If the eventtimes for both events are identical, just update the data

        // for this time.

        // We only compare against the last value, as it is likely that addMovement is called

        // in chronological order as events occur.

        mIndex++;

    }

    if (mIndex == HISTORY_SIZE) {

        mIndex = 0;

    }

libs/input/tests/VelocityTracker_test.cpp

+564 −427

File changed.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/TimeStats/TimeStats.cpp

+18 −0
Original line number Diff line number Diff line
@@ -291,6 +291,9 @@ void TimeStats::setLatchTime(int32_t layerID, uint64_t frameNumber, nsecs_t latc 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.latchTime = latchTime;
@@ -306,6 +309,9 @@ void TimeStats::setDesiredTime(int32_t layerID, uint64_t frameNumber, nsecs_t de 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.desiredTime = desiredTime;
@@ -321,6 +327,9 @@ void TimeStats::setAcquireTime(int32_t layerID, uint64_t frameNumber, nsecs_t ac 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.acquireTime = acquireTime;
@@ -338,6 +347,9 @@ void TimeStats::setAcquireFence(int32_t layerID, uint64_t frameNumber, 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.acquireFence = acquireFence;
@@ -353,6 +365,9 @@ void TimeStats::setPresentTime(int32_t layerID, uint64_t frameNumber, nsecs_t pr 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.presentTime = presentTime;
@@ -374,6 +389,9 @@ void TimeStats::setPresentFence(int32_t layerID, uint64_t frameNumber, 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.presentFence = presentFence;