commit 43412fc79ceda964cf9d16e3b4c563849db57d3a
author Eric Laurent <elaurent@google.com> Fri May 08 16:14:36 2015 -0700
committer Eric Laurent <elaurent@google.com> Fri May 08 16:29:24 2015 -0700
tree 98c5f3ccebfd54d45ed631256b47febfe03c3505
parent 70c75d8c15707d5eade38fe3e622f8500c29556b

AudioMixer: fix for volume ramp in float mode

Bug: 20912450.
Bug: 19952126.
Change-Id: I1ff3c3f4c0dd673bbbc17ce8da14d446fdb7e8a8

services/audioflinger/AudioMixer.cpp

diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 7040af4..959c140 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -775,7 +775,8 @@
 {
     if (useFloat) {
         for (uint32_t i = 0; i < MAX_NUM_VOLUMES; i++) {
-            if (mVolumeInc[i] != 0 && fabs(mVolume[i] - mPrevVolume[i]) <= fabs(mVolumeInc[i])) {
+            if ((mVolumeInc[i] > 0 && mPrevVolume[i] + mVolumeInc[i] >= mVolume[i]) ||
+                     (mVolumeInc[i] < 0 && mPrevVolume[i] + mVolumeInc[i] <= mVolume[i])) {
                 volumeInc[i] = 0;
                 prevVolume[i] = volume[i] << 16;
                 mVolumeInc[i] = 0.;