From 5bedff60b2facaa1ec5b9433647ebf1504f065ca Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Fri, 16 Jan 2015 11:05:32 -0800 Subject: 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 --- services/audioflinger/Tracks.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'services') diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 7757ea2..37c1c0b 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -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 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) { -- cgit v1.1