commit c9ef5806f16f3a7e6a0ddeefddd294c3737162c9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:46:32 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:46:32 2022 +0000
tree 428cf3250154e754aba76813cdc10dc7e6e10ab5
parent ca14209c66ea2d31e1da696974ae588adc317017
parent 0d9f4e132732a45318e2a507c359aeef196f6635

Snap for 8730993 from 0d9f4e132732a45318e2a507c359aeef196f6635 to mainline-tzdata3-release

Change-Id: I86a7773888a5e2f000703f7591a10733f7441b64

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

diff --git a/arm-wt-22k/lib_src/eas_dlssynth.c b/arm-wt-22k/lib_src/eas_dlssynth.c
index a07262c..8606a29 100644
--- a/arm-wt-22k/lib_src/eas_dlssynth.c
+++ b/arm-wt-22k/lib_src/eas_dlssynth.c
@@ -348,24 +348,11 @@
     pWTVoice->phaseAccum = (EAS_U32) pSynth->pDLS->pDLSSamples + pSynth->pDLS->pDLSSampleOffsets[pDLSRegion->wtRegion.waveIndex];
     if (pDLSRegion->wtRegion.region.keyGroupAndFlags & REGION_FLAG_IS_LOOPED)
     {
-#if defined (_8_BIT_SAMPLES)
         pWTVoice->loopStart = pWTVoice->phaseAccum + pDLSRegion->wtRegion.loopStart;
         pWTVoice->loopEnd = pWTVoice->phaseAccum + pDLSRegion->wtRegion.loopEnd - 1;
-#else //_16_BIT_SAMPLES
-        pWTVoice->loopStart = pWTVoice->phaseAccum + (pDLSRegion->wtRegion.loopStart<<1);
-        pWTVoice->loopEnd = pWTVoice->phaseAccum + (pDLSRegion->wtRegion.loopEnd<<1) - 2;
-#endif
     }
     else
-    {
-#if defined (_8_BIT_SAMPLES)
-       pWTVoice->loopStart = pWTVoice->loopEnd = pWTVoice->phaseAccum
-                + pSynth->pDLS->pDLSSampleLen[pDLSRegion->wtRegion.waveIndex] - 1;
-#else //_16_BIT_SAMPLES
-        pWTVoice->loopStart = pWTVoice->loopEnd = pWTVoice->phaseAccum
-                + pSynth->pDLS->pDLSSampleLen[pDLSRegion->wtRegion.waveIndex] - 2;
-#endif
-    }
+        pWTVoice->loopStart = pWTVoice->loopEnd = pWTVoice->phaseAccum + pSynth->pDLS->pDLSSampleLen[pDLSRegion->wtRegion.waveIndex] - 1;
 
     return EAS_SUCCESS;
 }