diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-05-24 07:24:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-24 07:24:02 -0700 |
| commit | 634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e (patch) | |
| tree | 4f088dbfd47d22d3f90ebcbcf054a26d6e69bdce /libSBRdec | |
| parent | 57d474b424be58783e7abba469d2f3d800094967 (diff) | |
| parent | a4d1f0ad52e2cf6f168d2193216602f52033fc27 (diff) | |
| download | fdk-aac-634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e.tar.gz fdk-aac-634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e.tar.bz2 fdk-aac-634d4f789cc713fd374db7b9dbcaeb1d89bf2d5e.zip | |
FDKv2 ubsan patches
am: a4d1f0ad52
Change-Id: Ic489768836aae6a9b9cab9e866ecc8b21d819368
Diffstat (limited to 'libSBRdec')
| -rw-r--r-- | libSBRdec/src/psbitdec.cpp | 4 | ||||
| -rw-r--r-- | libSBRdec/src/psdec.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libSBRdec/src/psbitdec.cpp b/libSBRdec/src/psbitdec.cpp index 1521178..f40a156 100644 --- a/libSBRdec/src/psbitdec.cpp +++ b/libSBRdec/src/psbitdec.cpp @@ -311,6 +311,7 @@ int DecodePs(struct PS_DEC *h_ps_d, /*!< PS handle */ pBsData->noEnv = 1; if (pBsData->bEnableIid) { + pBsData->bFineIidQ = h_ps_d->specificTo.mpeg.bPrevFrameFineIidQ; for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) { pBsData->aaIidIndex[pBsData->noEnv - 1][gr] = h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[gr]; @@ -333,6 +334,9 @@ int DecodePs(struct PS_DEC *h_ps_d, /*!< PS handle */ } } + /* Update previous frame Iid quantization */ + h_ps_d->specificTo.mpeg.bPrevFrameFineIidQ = pBsData->bFineIidQ; + /* Update previous frame index buffers */ for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) { h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[gr] = diff --git a/libSBRdec/src/psdec.h b/libSBRdec/src/psdec.h index b6d9a12..6ae1473 100644 --- a/libSBRdec/src/psdec.h +++ b/libSBRdec/src/psdec.h @@ -274,7 +274,9 @@ struct PS_DEC { previous frame */ SCHAR aIccPrevFrameIndex[NO_HI_RES_ICC_BINS]; /*!< The ICC index for previous frame */ - UCHAR lastUsb; /*!< uppermost WMF delay band of last frame */ + UCHAR + bPrevFrameFineIidQ; /*!< The IID quantization of the previous frame */ + UCHAR lastUsb; /*!< uppermost WMF delay band of last frame */ FIXP_DBL pHybridAnaStatesLFdmx [2 * 13 * NO_QMF_BANDS_HYBRID20]; /*!< Memory used in hybrid analysis |