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

Commit 5bedff60 authored by Andy Hung's avatar Andy Hung
Browse files

Do not pre-fill OutputTrack buffer for duplicating thread 

It is not necessary to start the downstream MixerThread early,
rather allow stop() to flush the remaining frames.

Change-Id: Ibcf8e7f5eda09d0f915d50697ff0c24c32fd11c4
parent 7790a332

services/audioflinger/Tracks.cpp

+1 −22
Original line number Diff line number Diff line
@@ -1721,28 +1721,7 @@ bool AudioFlinger::PlaybackThread::OutputTrack::write(void* data, uint32_t frame 
    uint32_t waitTimeLeftMs = mSourceThread->waitTimeMs();



    if (!mActive && frames != 0) {

        start();

        sp<ThreadBase> thread = mThread.promote();

        if (thread != 0) {

            MixerThread *mixerThread = (MixerThread *)thread.get();

            if (mFrameCount > frames) {

                // For the first write after being inactive, ensure that we have

                // enough frames to fill mFrameCount (which should be multiples of

                // the minimum buffer requirements of the downstream MixerThread).

                // This provides enough frames for the downstream mixer to begin

                // (see AudioFlinger::PlaybackThread::Track::isReady()).

                if (mBufferQueue.size() < kMaxOverFlowBuffers) {

                    uint32_t startFrames = (mFrameCount - frames);

                    pInBuffer = new Buffer;

                    pInBuffer->mBuffer = calloc(1, startFrames * mFrameSize);

                    pInBuffer->frameCount = startFrames;

                    pInBuffer->raw = pInBuffer->mBuffer;

                    mBufferQueue.add(pInBuffer);

                } else {

                    ALOGW("OutputTrack::write() %p no more buffers in queue", this);

                }

            }

        }

        (void) start();

    }



    while (waitTimeLeftMs) {