diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:05 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:05 -0800 |
| commit | b2511c6a79ea8d029b2b9d19130fd41d9838546f (patch) | |
| tree | 19735375d488a64d7005b3b8e9ecec5438168913 /libSBRdec/src/sbr_dec.cpp | |
| parent | 49fa8770b0adce84246d5db3feec09db02eeeaee (diff) | |
| parent | 6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff) | |
| download | android_external_aac-cm-10.1.tar.gz android_external_aac-cm-10.1.tar.bz2 android_external_aac-cm-10.1.zip | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/aac into mr1-stagingcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1
Diffstat (limited to 'libSBRdec/src/sbr_dec.cpp')
| -rw-r--r-- | libSBRdec/src/sbr_dec.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libSBRdec/src/sbr_dec.cpp b/libSBRdec/src/sbr_dec.cpp index 208120c..bd3cd10 100644 --- a/libSBRdec/src/sbr_dec.cpp +++ b/libSBRdec/src/sbr_dec.cpp @@ -581,18 +581,20 @@ sbr_dec ( HANDLE_SBR_DEC hSbrDec, /*!< handle to Decoder channel */ outScalefactor += (SCAL_HEADROOM+1); /* psDiffScale! */ { - C_ALLOC_SCRATCH_START(pWorkBuffer, FIXP_DBL, 2*(64)); + C_AALLOC_SCRATCH_START(pWorkBuffer, FIXP_DBL, 2*(64)); int maxShift = 0; - if (hSbrDec->sbrDrcChannel.prevFact_exp > maxShift) { - maxShift = hSbrDec->sbrDrcChannel.prevFact_exp; - } - if (hSbrDec->sbrDrcChannel.currFact_exp > maxShift) { - maxShift = hSbrDec->sbrDrcChannel.currFact_exp; - } - if (hSbrDec->sbrDrcChannel.nextFact_exp > maxShift) { - maxShift = hSbrDec->sbrDrcChannel.nextFact_exp; + if (hSbrDec->sbrDrcChannel.enable != 0) { + if (hSbrDec->sbrDrcChannel.prevFact_exp > maxShift) { + maxShift = hSbrDec->sbrDrcChannel.prevFact_exp; + } + if (hSbrDec->sbrDrcChannel.currFact_exp > maxShift) { + maxShift = hSbrDec->sbrDrcChannel.currFact_exp; + } + if (hSbrDec->sbrDrcChannel.nextFact_exp > maxShift) { + maxShift = hSbrDec->sbrDrcChannel.nextFact_exp; + } } /* copy DRC data to right channel (with PS both channels use the same DRC gains) */ @@ -682,7 +684,7 @@ sbr_dec ( HANDLE_SBR_DEC hSbrDec, /*!< handle to Decoder channel */ synQmf->lsb, synQmf->no_col ); - C_ALLOC_SCRATCH_END(pWorkBuffer, FIXP_DBL, 2*(64)); + C_AALLOC_SCRATCH_END(pWorkBuffer, FIXP_DBL, 2*(64)); } } |