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

Commit 290e7ed8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "AudioFlinger: Account for frames dropped in suspend mode"

parents c1184a79 12932980

services/audioflinger/Threads.cpp

+9 −5
Original line number Diff line number Diff line
@@ -1573,6 +1573,7 @@ AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinge 
        mEffectBufferValid(false),

        mSuspended(0), mBytesWritten(0),

        mFramesWritten(0),

        mSuspendedFrames(0),

        mActiveTracksGeneration(0),

        // mStreamTypes[] initialized in constructor body

        mOutput(output),
@@ -2915,7 +2916,8 @@ bool AudioFlinger::PlaybackThread::threadLoop() 


                // copy over kernel info

                mTimestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL] =

                        timestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL];

                        timestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL]

                        + mSuspendedFrames; // add frames discarded when suspended

                mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_KERNEL] =

                        timestamp.mTimeNs[ExtendedTimestamp::LOCATION_KERNEL];

            }
@@ -3079,10 +3081,12 @@ bool AudioFlinger::PlaybackThread::threadLoop() 


            mBytesRemaining = mCurrentWriteLength;

            if (isSuspended()) {

                mSleepTimeUs = suspendSleepTimeUs();

                // simulate write to HAL when suspended

                mBytesWritten += mSinkBufferSize;

                mFramesWritten += mSinkBufferSize / mFrameSize;

                // Simulate write to HAL when suspended (e.g. BT SCO phone call).

                mSleepTimeUs = suspendSleepTimeUs(); // assumes full buffer.

                const size_t framesRemaining = mBytesRemaining / mFrameSize;

                mBytesWritten += mBytesRemaining;

                mFramesWritten += framesRemaining;

                mSuspendedFrames += framesRemaining; // to adjust kernel HAL position

                mBytesRemaining = 0;

            }

services/audioflinger/Threads.h

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ protected: 


    int64_t                         mBytesWritten;

    int64_t                         mFramesWritten; // not reset on standby

    int64_t                         mSuspendedFrames; // not reset on standby

private:

    // mMasterMute is in both PlaybackThread and in AudioFlinger.  When a

    // PlaybackThread needs to find out if master-muted, it checks it's local