diff options
| author | Conley Owens <cco3@android.com> | 2012-03-09 08:53:39 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-03-09 08:53:40 -0800 |
| commit | 6db6ea02b999e86dfbddd08780eeab0034389f93 (patch) | |
| tree | ce67aa6f5036d5b4a4405d0ef0682a947c42c189 /media/libstagefright | |
| parent | 34ccd7af4216f571c2f88b32fea8bfed8ef0baab (diff) | |
| parent | 27bd8da964055446a5f0d1696f412c854aaf7b70 (diff) | |
| download | frameworks_base-6db6ea02b999e86dfbddd08780eeab0034389f93.zip frameworks_base-6db6ea02b999e86dfbddd08780eeab0034389f93.tar.gz frameworks_base-6db6ea02b999e86dfbddd08780eeab0034389f93.tar.bz2 | |
Merge changes I00c852e4,Ib31bf028
* changes:
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/adj_thr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c index 373b063..07b33b7 100644 --- a/media/libstagefright/codecs/aacenc/src/adj_thr.c +++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c @@ -438,7 +438,7 @@ static void correctThresh(PSY_OUT_CHANNEL psyOutChannel[MAX_CHANNELS], for (sfb=0; sfb<psyOutChan->maxSfbPerGroup; sfb++) { Word32 redThrExp = thrExp[ch][sfbGrp+sfb] + redVal; - if (((*pahFlag < AH_ACTIVE) || (deltaPe > 0)) && (redThrExp > 0) ) { + if (((*pahFlag < AH_ACTIVE) || (deltaPe > 0)) && (redThrExp > 0) && (redThrExp >= *psfbNActiveLines)) { *psfbPeFactors = (*psfbNActiveLines) * (0x7fffffff / redThrExp); normFactor = L_add(normFactor, *psfbPeFactors); @@ -466,7 +466,7 @@ static void correctThresh(PSY_OUT_CHANNEL psyOutChannel[MAX_CHANNELS], deltaSfbPe = *psfbPeFactors * deltaPe; /* thr3(n) = thr2(n)*2^deltaSfbPe/b(n) */ - if (*psfbNActiveLines > 0) { + if (*psfbNActiveLines > 0 && (normFactor* (*psfbNActiveLines)) != 0) { /* new threshold */ Word32 thrFactor; sfbEn = psyOutChan->sfbEnergy[sfbGrp+sfb]; |