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 /libSBRenc/src/tran_det.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 'libSBRenc/src/tran_det.cpp')
| -rw-r--r-- | libSBRenc/src/tran_det.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libSBRenc/src/tran_det.cpp b/libSBRenc/src/tran_det.cpp index 1e0a59f..6c62b4c 100644 --- a/libSBRenc/src/tran_det.cpp +++ b/libSBRenc/src/tran_det.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -676,7 +676,7 @@ FDKsbrEnc_InitSbrTransientDetector(HANDLE_SBR_TRANSIENT_DETECTOR h_sbrTransientD tmp = fixMax(tmp, FL2FXCONST_DBL(0.0001)); tmp = fDivNorm(FL2FXCONST_DBL(0.000075), fPow2(tmp), &scale_1); - scale_1 = -(scale_1 + scale_0 + 2); + scale_1 = (scale_1 + scale_0 + 2); FDK_ASSERT(no_cols <= QMF_MAX_TIME_SLOTS); FDK_ASSERT(no_rows <= QMF_CHANNELS); @@ -684,14 +684,7 @@ FDKsbrEnc_InitSbrTransientDetector(HANDLE_SBR_TRANSIENT_DETECTOR h_sbrTransientD h_sbrTransientDetector->no_cols = no_cols; h_sbrTransientDetector->tran_thr = (FIXP_DBL)((params->tran_thr << (32-24-1)) / no_rows); h_sbrTransientDetector->tran_fc = tran_fc; - - if (scale_1>=0) { - h_sbrTransientDetector->split_thr = fMult(tmp, bitrateFactor_fix) >> scale_1; - } - else { - h_sbrTransientDetector->split_thr = fMult(tmp, bitrateFactor_fix) << (-scale_1); - } - + h_sbrTransientDetector->split_thr = scaleValueSaturate(fMult(tmp, bitrateFactor_fix), scale_1); h_sbrTransientDetector->no_rows = no_rows; h_sbrTransientDetector->mode = params->tran_det_mode; h_sbrTransientDetector->prevLowBandEnergy = FL2FXCONST_DBL(0.0f); |