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

Commit 2c8232f4 authored by Andy Hung's avatar Andy Hung Committed by The Android Automerger
Browse files

Fix clamp issue with AudioMixer with float input and int16 output 

Bug: 20706338
Change-Id: I7e3ab0da96901870cc57fbe2e79163bc81157465
parent 3ea12b8b

services/audioflinger/AudioMixerOps.h

+2 −3
Original line number Diff line number Diff line
@@ -164,13 +164,12 @@ inline int32_t MixMul<int32_t, int16_t, float>(int16_t value, float volume) { 
template <>

inline int16_t MixMul<int16_t, int16_t, float>(int16_t value, float volume) {

    LOG_ALWAYS_FATAL("MixMul<int16_t, int16_t, float> Runtime Should not be here");

    return value * volume;

    return clamp16_from_float(MixMul<float, int16_t, float>(value, volume));

}



template <>

inline int16_t MixMul<int16_t, float, float>(float value, float volume) {

    static const float q_15_from_float = (1 << 15);

    return value * volume * q_15_from_float;

    return clamp16_from_float(value * volume);

}



/*