diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-07-21 14:31:41 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-07-21 14:31:41 +0200 |
| commit | 89639e36b29a622c641c3de3a4737a4c848dc365 (patch) | |
| tree | 2eadccdf7e7eb39cdc8c0087a7bf933150a412d5 /libSBRenc | |
| parent | d450e652c5f963a2ef3a9392f55ca07c7e06dc6c (diff) | |
| parent | af5863a78efdfccd003dd6bea68c4a2cd2ad9f37 (diff) | |
| download | fdk-aac-89639e36b29a622c641c3de3a4737a4c848dc365.tar.gz fdk-aac-89639e36b29a622c641c3de3a4737a4c848dc365.tar.bz2 fdk-aac-89639e36b29a622c641c3de3a4737a4c848dc365.zip | |
Merge 'mstorjo/master' into dabplus
This adds support for AArch64 and other improvements
listed in the ChangeLog
Diffstat (limited to 'libSBRenc')
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 2 | ||||
| -rw-r--r-- | libSBRenc/src/tran_det.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index dbaddee..c7c5797 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -1939,7 +1939,7 @@ INT sbrEncoder_Init( - if ( (aot==AOT_PS) || (aot==AOT_DABPLUS_PS) ) { + if ( aot==AOT_PS || aot==AOT_DABPLUS_PS ) { usePs = 1; } if ( aot==AOT_ER_AAC_ELD ) { diff --git a/libSBRenc/src/tran_det.cpp b/libSBRenc/src/tran_det.cpp index 33ea60e..0e35ec3 100644 --- a/libSBRenc/src/tran_det.cpp +++ b/libSBRenc/src/tran_det.cpp @@ -187,12 +187,12 @@ static FIXP_DBL spectralChange(FIXP_DBL Energies[NUMBER_TIME_SLOTS_2304][MAX_FRE /* Sum up energies in first half */ for (i=start; i<border; i++) { - accu1 += scaleValue(Energies[i][j], -energies_e_diff[i]); + accu1 = fAddSaturate(accu1, scaleValue(Energies[i][j], -energies_e_diff[i])); } /* Sum up energies in second half */ for (i=border; i<stop; i++) { - accu2 += scaleValue(Energies[i][j], -energies_e_diff[i]); + accu2 = fAddSaturate(accu2, scaleValue(Energies[i][j], -energies_e_diff[i])); } /* Energy change in current band */ |