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

Commit 2ce99907 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0 

* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
  Limit AudioFlinger log.
parents 5c5e2c63 5c4e818c

services/audioflinger/AudioFlinger.cpp

+7 −3
Original line number Diff line number Diff line
@@ -1832,7 +1832,9 @@ bool AudioFlinger::MixerThread::threadLoop() 
    size_t mixBufferSize = mFrameCount * mFrameSize;

    // FIXME: Relaxed timing because of a certain device that can't meet latency

    // Should be reduced to 2x after the vendor fixes the driver issue

    nsecs_t maxPeriod = seconds(mFrameCount) / mSampleRate * 3;

    // increase threshold again due to low power audio mode. The way this warning threshold is

    // calculated and its usefulness should be reconsidered anyway.

    nsecs_t maxPeriod = seconds(mFrameCount) / mSampleRate * 15;

    nsecs_t lastWarning = 0;

    bool longStandbyExit = false;

    uint32_t activeSleepTime = activeSleepTimeUs();
@@ -1886,7 +1888,9 @@ bool AudioFlinger::MixerThread::threadLoop() 
                mixBufferSize = mFrameCount * mFrameSize;

                // FIXME: Relaxed timing because of a certain device that can't meet latency

                // Should be reduced to 2x after the vendor fixes the driver issue

                maxPeriod = seconds(mFrameCount) / mSampleRate * 3;

                // increase threshold again due to low power audio mode. The way this warning

                // threshold is calculated and its usefulness should be reconsidered anyway.

                maxPeriod = seconds(mFrameCount) / mSampleRate * 15;

                activeSleepTime = activeSleepTimeUs();

                idleSleepTime = idleSleepTimeUs();

            }
@@ -1983,7 +1987,7 @@ bool AudioFlinger::MixerThread::threadLoop() 
            mInWrite = false;

            nsecs_t now = systemTime();

            nsecs_t delta = now - mLastWriteTime;

            if (delta > maxPeriod) {

            if (!mStandby && delta > maxPeriod) {

                mNumDelayedWrites++;

                if ((now - lastWarning) > kWarningThrottle) {

                    LOGW("write blocked for %llu msecs, %d delayed writes, thread %p",