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

Commit 12edddb3 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 

* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback
parents 32f0a8c0 a47b69c6

services/audioflinger/AudioFlinger.cpp

+7 −2
Original line number Diff line number Diff line
@@ -2066,9 +2066,14 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track 
        // The first time a track is added we wait

        // for all its buffers to be filled before processing it

        mAudioMixer->setActiveTrack(track->name());

        // make sure that we have enough frames to mix one full buffer

        // make sure that we have enough frames to mix one full buffer.

        // enforce this condition only once to enable draining the buffer in case the client

        // app does not call stop() and relies on underrun to stop:

        // hence the test on (track->mRetryCount >= kMaxTrackRetries) meaning the track was mixed

        // during last round

        uint32_t minFrames = 1;

        if (!track->isStopped() && !track->isPausing()) {

        if (!track->isStopped() && !track->isPausing() &&

                (track->mRetryCount >= kMaxTrackRetries)) {

            if (t->sampleRate() == (int)mSampleRate) {

                minFrames = mFrameCount;

            } else {