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

Commit 954ca45a authored by Andy Hung's avatar Andy Hung Committed by Glenn Kasten
Browse files

For static obtainBuffer(), do not set mUnreleased if acknowledging flush. 

static audio tracks use obtainBuffer() to update position in start().

Bug: 22938515
Change-Id: I8ae32f6cce4d122386d2cf8982e158049b04ba9a
parent e5200ea7

media/libmedia/AudioTrackShared.cpp

+4 −2
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ ssize_t StaticAudioTrackServerProxy::pollPosition() 
    return (ssize_t) mState.mPosition;

}



status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush __unused)

status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush)

{

    if (mIsShutdown) {

        buffer->mFrameCount = 0;
@@ -970,7 +970,9 @@ status_t StaticAudioTrackServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush 
    // it is always larger or equal to avail.

    LOG_ALWAYS_FATAL_IF(mFramesReady < (int64_t) avail);

    buffer->mNonContig = mFramesReady == INT64_MAX ? SIZE_MAX : clampToSize(mFramesReady - avail);

    if (!ackFlush) {

        mUnreleased = avail;

    }

    return NO_ERROR;

}

services/audioflinger/Tracks.cpp

+1 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t ev 
            // But in this case we know the mixer thread (whether normal mixer or fast mixer)

            // isn't looking at this track yet:  we still hold the normal mixer thread lock,

            // and for fast tracks the track is not yet in the fast mixer thread's active set.

            // For static tracks, this is used to acknowledge change in position or loop.

            ServerProxy::Buffer buffer;

            buffer.mFrameCount = 1;

            (void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /*ackFlush*/);