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

Commit f053e8c9 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "EffectModule: robust computation of mMaxDisableWaitCnt"

parents 56953624 05083ac1

services/audioflinger/Effects.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -578,8 +578,11 @@ status_t AudioFlinger::EffectModule::configure() 
        }

        }

    }

    }





    mMaxDisableWaitCnt = (MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate) /

    // mConfig.outputCfg.buffer.frameCount cannot be zero.

            (1000 * mConfig.outputCfg.buffer.frameCount);

    mMaxDisableWaitCnt = (uint32_t)std::max(

            (uint64_t)1, // mMaxDisableWaitCnt must be greater than zero.

            (uint64_t)MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate

                / ((uint64_t)1000 * mConfig.outputCfg.buffer.frameCount));





exit:

exit:

    // TODO: consider clearing mConfig on error.

    // TODO: consider clearing mConfig on error.