commit b29385110c3f6a52e209c0e1cf70e9cf2eed5e89
author Eric Laurent <elaurent@google.com> Thu Aug 18 12:49:40 2016 +0000
committer Eric Laurent <elaurent@google.com> Thu Aug 18 18:38:43 2016 +0000
tree 722a025510796ae61a30b2c7c99ca64d111c790a
parent 6da0f8d15b38d7979caf22cf5865a959358f9c58

Merge "Fix for tone glitch produced in ToneGenerator" am: 46f1c24c5a am: 84183ba496 am: 09b0b40fb4
am: 67b5bb745b

Bug: 29922404

Change-Id: Ie5185fda8ad4043ec199e9ebe74e67974ce7e44f
(cherry picked from commit 7f68f0f06504664b8b328f8b99ab5479f9dbd1a8)

include/media/ToneGenerator.h

diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index 75515ac..a419e17 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -313,7 +313,7 @@
 
         short mA1_Q14;  // Q14 coefficient
         // delay line of full amplitude generator
-        short mS1, mS2;  // delay line S2 oldest
+        long mS1, mS2;  // delay line S2 oldest
         short mS2_0;  // saved value for reinitialisation
         short mAmplitude_Q15;  // Q15 amplitude
     };

media/libmedia/ToneGenerator.cpp

diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 2f53637..9a087ff 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -1612,8 +1612,8 @@
         lS1 = (long)0;
         lS2 = (long)mS2_0;
     } else {
-        lS1 = (long)mS1;
-        lS2 = (long)mS2;
+        lS1 = mS1;
+        lS2 = mS2;
     }
     lA1 = (long)mA1_Q14;
     lAmplitude = (long)mAmplitude_Q15;
@@ -1649,8 +1649,8 @@
     }
 
     // save status
-    mS1 = (short)lS1;
-    mS2 = (short)lS2;
+    mS1 = lS1;
+    mS2 = lS2;
 }
 
 }  // end namespace android