diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 17:51:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 17:51:06 +0000 |
| commit | b802750fd273c5914970b4cfa0c959fc5fcc32a4 (patch) | |
| tree | a8dc54ef8dba931c72627e7bbebf1844b81a31f7 /libAACenc/src/adj_thr.cpp | |
| parent | bb7ad8711b3b620a7c7de669b7b6409e610c29dd (diff) | |
| parent | 65750eae6583754ea9d84fed41dc12d1fc3d73d0 (diff) | |
| download | fdk-aac-b802750fd273c5914970b4cfa0c959fc5fcc32a4.tar.gz fdk-aac-b802750fd273c5914970b4cfa0c959fc5fcc32a4.tar.bz2 fdk-aac-b802750fd273c5914970b4cfa0c959fc5fcc32a4.zip | |
SBR/AAC encoder updates, code clean up am: e1c78ed
am: 65750ea
* commit '65750eae6583754ea9d84fed41dc12d1fc3d73d0':
SBR/AAC encoder updates, code clean up
Change-Id: Ife18fb3ee2fe76fab1e5ab8256addf5d39834c2f
Diffstat (limited to 'libAACenc/src/adj_thr.cpp')
| -rw-r--r-- | libAACenc/src/adj_thr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libAACenc/src/adj_thr.cpp b/libAACenc/src/adj_thr.cpp index 69a70b4..c318843 100644 --- a/libAACenc/src/adj_thr.cpp +++ b/libAACenc/src/adj_thr.cpp @@ -2138,7 +2138,7 @@ static FIXP_DBL FDKaacEnc_bitresCalcBitFac(const INT bitresBits, bresParam->clipSpendLow, bresParam->clipSpendHigh, bresParam->minBitSpend, bresParam->maxBitSpend, bitspend_slope); - pe_pers = fDivNorm(pex - adjThrChan->peMin, adjThrChan->peMax - adjThrChan->peMin); + pe_pers = (pex > adjThrChan->peMin) ? fDivNorm(pex - adjThrChan->peMin, adjThrChan->peMax - adjThrChan->peMin) : 0; tmp_fix = fMult(((FIXP_DBL)bitSpend + (FIXP_DBL)bitSave), pe_pers); bitresFac_fix = (UNITY>>1) - ((FIXP_DBL)bitSave>>1) + (tmp_fix>>1); qbres = (DFRACT_BITS-2); |