commit 84183ba49683678a3420c4c1108be7c1be69443c
author Eric Laurent <elaurent@google.com> Thu Aug 18 12:40:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 18 12:40:13 2016 +0000
tree 11c045f03a68cad20425e1448fbdc11fb9242b9f
parent c3fd10acaa47bc973e31f71f1925b8a2797b731a
parent 46f1c24c5ac7711702147c4db20e791827a88371

Merge "Fix for tone glitch produced in ToneGenerator"
am: 46f1c24c5a

Change-Id: If7da9dbfe106fdda640fc817a4fffe05b2ed5dff

include/media/ToneGenerator.h

diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index c41c686..7b706b6 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -307,7 +307,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 142a5f5..612d174 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -1591,8 +1591,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;
@@ -1628,8 +1628,8 @@
     }
 
     // save status
-    mS1 = (short)lS1;
-    mS2 = (short)lS2;
+    mS1 = lS1;
+    mS2 = lS2;
 }
 
 }  // end namespace android