diff options
author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-04 16:08:34 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-04 16:08:34 -0700 |
commit | d0140616c0aaa411ffd2c162765dffe722fc92c6 (patch) | |
tree | e916035245dd4f7e265b5ff253778ed2a4602e10 | |
parent | 14291d960500464fb3d9ce135c5e057f038cacce (diff) | |
parent | 8e618348f91aaedc59d1d14c14d1f3eaf1e4c103 (diff) | |
download | android_external_sonivox-d0140616c0aaa411ffd2c162765dffe722fc92c6.tar.gz android_external_sonivox-d0140616c0aaa411ffd2c162765dffe722fc92c6.tar.bz2 android_external_sonivox-d0140616c0aaa411ffd2c162765dffe722fc92c6.zip |
Merge tag 'android-5.1.1_r37' into HEAD
Ticket: CYNGNOS-2213
Android 5.1.1 release 37
-rw-r--r-- | arm-wt-22k/lib_src/eas_wtengine.c | 33 | ||||
-rw-r--r-- | arm-wt-22k/lib_src/eas_wtsynth.c | 8 |
2 files changed, 41 insertions, 0 deletions
diff --git a/arm-wt-22k/lib_src/eas_wtengine.c b/arm-wt-22k/lib_src/eas_wtengine.c index 224f60d..854d4b4 100644 --- a/arm-wt-22k/lib_src/eas_wtengine.c +++ b/arm-wt-22k/lib_src/eas_wtengine.c @@ -32,6 +32,9 @@ * includes *------------------------------------ */ +#include "log/log.h" +#include <cutils/log.h> + #include "eas_types.h" #include "eas_math.h" #include "eas_audioconst.h" @@ -88,6 +91,11 @@ void WT_VoiceGain (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) /* initialize some local variables */ numSamples = pWTIntFrame->numSamples; + if (numSamples <= 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + return; + } pMixBuffer = pWTIntFrame->pMixBuffer; pInputBuffer = pWTIntFrame->pAudioBuffer; @@ -182,6 +190,11 @@ void WT_Interpolate (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) /* initialize some local variables */ numSamples = pWTIntFrame->numSamples; + if (numSamples <= 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + return; + } pOutputBuffer = pWTIntFrame->pAudioBuffer; loopEnd = (const EAS_SAMPLE*) pWTVoice->loopEnd + 1; @@ -275,6 +288,11 @@ void WT_InterpolateNoLoop (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) /* initialize some local variables */ numSamples = pWTIntFrame->numSamples; + if (numSamples <= 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + return; + } pOutputBuffer = pWTIntFrame->pAudioBuffer; phaseInc = pWTIntFrame->frame.phaseIncrement; @@ -363,6 +381,11 @@ void WT_VoiceFilter (S_FILTER_CONTROL *pFilter, S_WT_INT_FRAME *pWTIntFrame) /* initialize some local variables */ numSamples = pWTIntFrame->numSamples; + if (numSamples <= 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + return; + } pAudioBuffer = pWTIntFrame->pAudioBuffer; z1 = pFilter->z1; @@ -426,6 +449,11 @@ void WT_VoiceFilter (S_FILTER_CONTROL *pFilter, S_WT_INT_FRAME *pWTIntFrame) /* initialize some local variables */ numSamples = pWTIntFrame->numSamples; + if (numSamples <= 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + return; + } pOutputBuffer = pWTIntFrame->pAudioBuffer; phaseInc = pWTIntFrame->frame.phaseIncrement; @@ -569,6 +597,11 @@ void WT_InterpolateMono (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame) EAS_I8 *pLoopStart; numSamples = pWTIntFrame->numSamples; + if (numSamples <= 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + return; + } pMixBuffer = pWTIntFrame->pMixBuffer; /* calculate gain increment */ diff --git a/arm-wt-22k/lib_src/eas_wtsynth.c b/arm-wt-22k/lib_src/eas_wtsynth.c index 45cf4b1..9257951 100644 --- a/arm-wt-22k/lib_src/eas_wtsynth.c +++ b/arm-wt-22k/lib_src/eas_wtsynth.c @@ -28,6 +28,9 @@ */ // includes +#include "log/log.h" +#include <cutils/log.h> + #include "eas_data.h" #include "eas_report.h" #include "eas_host.h" @@ -467,6 +470,11 @@ EAS_BOOL WT_CheckSampleEnd (S_WT_VOICE *pWTVoice, S_WT_INT_FRAME *pWTIntFrame, E } else { pWTIntFrame->numSamples = numSamples; } + if (pWTIntFrame->numSamples < 0) { + ALOGE("b/26366256"); + android_errorWriteLog(0x534e4554, "26366256"); + pWTIntFrame->numSamples = 0; + } /* sound will be done this frame */ done = EAS_TRUE; |