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

Commit e2353715 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Clamp float data sent to HAL am: 68436cf9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20039919



Change-Id: Ibc0dd1bc1356d87d2ee6fa6f24edb02c42329558
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25e9fdf5 68436cf9

services/audioflinger/Threads.cpp

+13 −4
Original line number Diff line number Diff line
@@ -4102,10 +4102,19 @@ bool AudioFlinger::PlaybackThread::threadLoop() 
                                       mEffectBufferFormat,

                                       mNormalFrameCount * mHapticChannelCount);

            }



            memcpy_by_audio_format(mSinkBuffer, mFormat, effectBuffer, mEffectBufferFormat,

                    mNormalFrameCount * (mChannelCount + mHapticChannelCount));



            const size_t framesToCopy = mNormalFrameCount * (mChannelCount + mHapticChannelCount);

            if (mFormat == AUDIO_FORMAT_PCM_FLOAT &&

                    mEffectBufferFormat == AUDIO_FORMAT_PCM_FLOAT) {

                // Clamp PCM float values more than this distance from 0 to insulate

                // a HAL which doesn't handle NaN correctly.

                static constexpr float HAL_FLOAT_SAMPLE_LIMIT = 2.0f;

                memcpy_to_float_from_float_with_clamping(static_cast<float*>(mSinkBuffer),

                        static_cast<const float*>(effectBuffer),

                        framesToCopy, HAL_FLOAT_SAMPLE_LIMIT /* absMax */);

            } else {

                memcpy_by_audio_format(mSinkBuffer, mFormat,

                        effectBuffer, mEffectBufferFormat, framesToCopy);

            }

            // The sample data is partially interleaved when haptic channels exist,

            // we need to adjust channels here.

            if (mHapticChannelCount > 0) {