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

Commit 470b399e authored by Henrik Tillman's avatar Henrik Tillman Committed by Håkan Kvist
Browse files

No fast mixer for DEEP_BUFFER threads 

Do not initialize a fast mixer on output threads that is running as deep
buffer. Deep buffer is made for big buffers to save power and so on and
not for low latency which fast mixer is created for hence fastmixer is
not allowed on threads that is deep buffered.

Bug: 364329918
Test: manual
Change-Id: I256c168cde1f240a8c97473458bdb5aaaa09dc51
parent 78e3c8ad

services/audioflinger/Threads.cpp

+13 −4
Original line number Diff line number Diff line
@@ -3220,9 +3220,9 @@ NO_THREAD_SAFETY_ANALYSIS 


    // Calculate size of normal sink buffer relative to the HAL output buffer size

    double multiplier = 1.0;

    // Note: mType == SPATIALIZER does not support FastMixer.

    if (mType == MIXER && (kUseFastMixer == FastMixer_Static ||

            kUseFastMixer == FastMixer_Dynamic)) {

    // Note: mType == SPATIALIZER does not support FastMixer and DEEP is by definition not "fast"

    if ((mType == MIXER && !(mOutput->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER)) &&

            (kUseFastMixer == FastMixer_Static || kUseFastMixer == FastMixer_Dynamic)) {

        size_t minNormalFrameCount = (kMinNormalSinkBufferSizeMs * mSampleRate) / 1000;

        size_t maxNormalFrameCount = (kMaxNormalSinkBufferSizeMs * mSampleRate) / 1000;
@@ -5135,7 +5135,16 @@ MixerThread::MixerThread(const sp<IAfThreadCallback>& afThreadCallback, AudioStr 
            break;

        case FastMixer_Static:

        case FastMixer_Dynamic:

            if (mType == MIXER && (output->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER)) {

                /* Do not init fast mixer on deep buffer, warn if buffers are confed too small */

                initFastMixer = false;

                ALOGW_IF(mFrameCount * 1000 / mSampleRate < kMinNormalSinkBufferSizeMs,

                         "HAL DEEP BUFFER Buffer (%zu ms) is smaller than set minimal buffer "

                         "(%u ms), seems like a configuration error",

                         mFrameCount * 1000 / mSampleRate, kMinNormalSinkBufferSizeMs);

            } else {

                initFastMixer = mFrameCount < mNormalFrameCount;

            }

            break;

        }

        ALOGW_IF(initFastMixer == false && mFrameCount < mNormalFrameCount,