diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-31 04:20:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-31 04:20:18 +0000 |
| commit | d2ffcd68adb7f00254255e81dec205ffa67a8758 (patch) | |
| tree | 45c8b795b34a9ce7fb67908b735acd88bb80f823 /libSBRdec/src/lpp_tran.cpp | |
| parent | cdc84f84e9fb9399ce410ce3c05332ffd442aad0 (diff) | |
| parent | 47b23c88cfe81bbcc9ff0c8de1608283de18a475 (diff) | |
| download | fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.tar.gz fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.tar.bz2 fdk-aac-d2ffcd68adb7f00254255e81dec205ffa67a8758.zip | |
Snap for 6104206 from 47b23c88cfe81bbcc9ff0c8de1608283de18a475 to rvc-release
Change-Id: I37ae8a78b271948e025a2e6c071453480dcc9a52
Diffstat (limited to 'libSBRdec/src/lpp_tran.cpp')
| -rw-r--r-- | libSBRdec/src/lpp_tran.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libSBRdec/src/lpp_tran.cpp b/libSBRdec/src/lpp_tran.cpp index 6acb626..93e1158 100644 --- a/libSBRdec/src/lpp_tran.cpp +++ b/libSBRdec/src/lpp_tran.cpp @@ -1014,8 +1014,8 @@ void lppTransposerHBE( pSettings->nCols) + lowBandShift); - dynamicScale = fixMax( - 0, dynamicScale - 1); /* one additional bit headroom to prevent -1.0 */ + dynamicScale = + dynamicScale - 1; /* one additional bit headroom to prevent -1.0 */ /* Scale temporal QMF buffer. @@ -1194,6 +1194,9 @@ void lppTransposerHBE( } else { /* bw <= 0 */ int descale = fixMin(DFRACT_BITS - 1, (LPC_SCALE_FACTOR + dynamicScale)); + dynamicScale += + 1; /* prevent negativ scale factor due to 'one additional bit + headroom' */ for (i = startSample; i < stopSample; i++) { FIXP_DBL accu1, accu2; @@ -1210,9 +1213,9 @@ void lppTransposerHBE( dynamicScale; qmfBufferReal[i][loBand] = - (lowBandReal[LPC_ORDER + i] >> descale) + (accu1 << 1); + (lowBandReal[LPC_ORDER + i] >> descale) + (accu1 << (1 + 1)); qmfBufferImag[i][loBand] = - (lowBandImag[LPC_ORDER + i] >> descale) + (accu2 << 1); + (lowBandImag[LPC_ORDER + i] >> descale) + (accu2 << (1 + 1)); } } /* bw <= 0 */ |