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

Commit 791854d9 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 412b8e71: am 0c2c1619: am 0cfc8f25: am 145a4c67: am 22bc10a3: Merge "Clear... 

am 412b8e71: am 0c2c1619: am 0cfc8f25: am 145a4c67: am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev

* commit '412b8e71':
  Clear effect buffer before sending to chain
parents 4c10981a 412b8e71

services/audioflinger/Threads.cpp

+3 −4
Original line number Diff line number Diff line
@@ -3671,6 +3671,9 @@ track_is_ready: ; 


    if (getEffectChain_l(AUDIO_SESSION_OUTPUT_MIX) != 0) {

        mEffectBufferValid = true;

        // as long as there are effects we should clear the effects buffer, to avoid

        // passing a non-clean buffer to the effect chain

        memset(mEffectBuffer, 0, mEffectBufferSize);

    }



    // sink or mix buffer must be cleared if all tracks are connected to an
@@ -3691,10 +3694,6 @@ track_is_ready: ; 
            // must imply MIXER_TRACKS_READY.

            // Later, we may clear buffers regardless, and skip much of this logic.

        }

        // TODO - either mEffectBuffer or mSinkBuffer needs to be cleared.

        if (mEffectBufferValid) {

            memset(mEffectBuffer, 0, mEffectBufferSize);

        }

        // FIXME as a performance optimization, should remember previous zero status

        memset(mSinkBuffer, 0, mNormalFrameCount * mFrameSize);

    }