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

Commit 25ef483a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not offset to fout"

parents 76321a33 7c5ec035

services/audioflinger/AudioMixer.cpp

+7 −2
Original line number Diff line number Diff line
@@ -1611,8 +1611,13 @@ void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state) 
        // in == NULL can happen if the track was flushed just after having

        // been enabled for mixing.

        if (in == NULL || (((uintptr_t)in) & 3)) {

            memset(out, 0, numFrames

            if ( AUDIO_FORMAT_PCM_FLOAT == t.mMixerFormat ) {

                 memset((char*)fout, 0, numFrames

                         * t.mMixerChannelCount * audio_bytes_per_sample(t.mMixerFormat));

            } else {

                 memset((char*)out, 0, numFrames

                         * t.mMixerChannelCount * audio_bytes_per_sample(t.mMixerFormat));

            }

            ALOGE_IF((((uintptr_t)in) & 3),

                    "process__OneTrack16BitsStereoNoResampling: misaligned buffer"

                    " %p track %d, channels %d, needs %08x, volume %08x vfl %f vfr %f",