commit 5d3e1c5fe662fd007254bb384bf0725dba165d6e
author Xin Li <delphij@google.com> Wed Nov 10 08:05:52 2021 +0000
committer Xin Li <delphij@google.com> Wed Nov 10 08:05:52 2021 +0000
tree 428cf3250154e754aba76813cdc10dc7e6e10ab5
parent 39e7199203883ae01dd64c7d75b248c4030fea3a
parent 769b5dc50d009faa60467dffe6ea67099219680b

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: Iaecebbb4920b9e4b49b774e9e5498751b02735b8
Change-Id: I931120e34f83ca3f667d94d1cf09659908b41463

arm-wt-22k/lib_src/eas_wtengine.c

diff --git a/arm-wt-22k/lib_src/eas_wtengine.c b/arm-wt-22k/lib_src/eas_wtengine.c
index 950616e..b1ee749 100644
--- a/arm-wt-22k/lib_src/eas_wtengine.c
+++ b/arm-wt-22k/lib_src/eas_wtengine.c
@@ -202,7 +202,7 @@
     loopEnd = (const EAS_SAMPLE*) pWTVoice->loopEnd + 1;
     pSamples = (const EAS_SAMPLE*) pWTVoice->phaseAccum;
     /*lint -e{713} truncation is OK */
-    phaseFrac = pWTVoice->phaseFrac;
+    phaseFrac = pWTVoice->phaseFrac & PHASE_FRAC_MASK;
     phaseInc = pWTIntFrame->frame.phaseIncrement;
 
     /* fetch adjacent samples */
@@ -218,6 +218,8 @@
 
     while (numSamples--) {
 
+        EAS_I32 nextSamplePhaseInc;
+
         /* linear interpolation */
         acc0 = samp2 - samp1;
         acc0 = acc0 * phaseFrac;
@@ -231,19 +233,19 @@
         /* increment phase */
         phaseFrac += phaseInc;
         /*lint -e{704} <avoid divide>*/
-        acc0 = phaseFrac >> NUM_PHASE_FRAC_BITS;
+        nextSamplePhaseInc = phaseFrac >> NUM_PHASE_FRAC_BITS;
 
         /* next sample */
-        if (acc0 > 0) {
-
+        if (nextSamplePhaseInc > 0) {
             /* advance sample pointer */
-            pSamples += acc0;
-            phaseFrac = (EAS_I32)((EAS_U32)phaseFrac & PHASE_FRAC_MASK);
+            pSamples +=  nextSamplePhaseInc;
+            phaseFrac = phaseFrac & PHASE_FRAC_MASK;
 
-            /* check for loop end */
-            acc0 = (EAS_I32) (pSamples - loopEnd);
-            if (acc0 >= 0)
-                pSamples = (const EAS_SAMPLE*) pWTVoice->loopStart + acc0;
+            /* decrementing pSamples by entire buffer length until second pSample is within */
+            /* loopEnd                                                                      */
+            while (&pSamples[1] >= loopEnd) {
+                pSamples -= (loopEnd - (const EAS_SAMPLE*)pWTVoice->loopStart);
+            }
 
             /* fetch new samples */
 #if defined(_8_BIT_SAMPLES)