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

Commit a23408f7 authored by Andy Hung's avatar Andy Hung Committed by Android Git Automerger
Browse files

am 24a9cb4e: am 5c0adc3e: Merge "Workaround static fast track start-after-stop... 

am 24a9cb4e: am 5c0adc3e: Merge "Workaround static fast track start-after-stop issue" into mnc-dr-dev

* commit '24a9cb4e':
  Workaround static fast track start-after-stop issue
parents f3bd13d9 24a9cb4e

services/audioflinger/Tracks.cpp

+4 −1
Original line number Diff line number Diff line
@@ -432,7 +432,10 @@ AudioFlinger::PlaybackThread::Track::Track( 
    }

    // only allocate a fast track index if we were able to allocate a normal track name

    if (flags & IAudioFlinger::TRACK_FAST) {

        mAudioTrackServerProxy->framesReadyIsCalledByMultipleThreads();

        // FIXME: Not calling framesReadyIsCalledByMultipleThreads() exposes a potential

        // race with setSyncEvent(). However, if we call it, we cannot properly start

        // static fast tracks (SoundPool) immediately after stopping.

        //mAudioTrackServerProxy->framesReadyIsCalledByMultipleThreads();

        ALOG_ASSERT(thread->mFastTrackAvailMask != 0);

        int i = __builtin_ctz(thread->mFastTrackAvailMask);

        ALOG_ASSERT(0 < i && i < (int)FastMixerState::kMaxFastTracks);