diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-28 23:03:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-28 23:03:55 +0000 |
| commit | 58221178ccc0ca2336dea1ee290600649d8f95f9 (patch) | |
| tree | 241cb02467e22336716d8b25d5304f2e1af11b23 /libSBRdec/src/psbitdec.cpp | |
| parent | 6acfe3b799e0b030fb807e1a92a8b0a507b0207d (diff) | |
| parent | 55d2c9582ad0698deb885440e0e5db48bdc1ed24 (diff) | |
| download | fdk-aac-58221178ccc0ca2336dea1ee290600649d8f95f9.tar.gz fdk-aac-58221178ccc0ca2336dea1ee290600649d8f95f9.tar.bz2 fdk-aac-58221178ccc0ca2336dea1ee290600649d8f95f9.zip | |
Merge "Extend PS concealment/error treatment"
Diffstat (limited to 'libSBRdec/src/psbitdec.cpp')
| -rw-r--r-- | libSBRdec/src/psbitdec.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libSBRdec/src/psbitdec.cpp b/libSBRdec/src/psbitdec.cpp index f40a156..82bb65b 100644 --- a/libSBRdec/src/psbitdec.cpp +++ b/libSBRdec/src/psbitdec.cpp @@ -312,6 +312,7 @@ int DecodePs(struct PS_DEC *h_ps_d, /*!< PS handle */ if (pBsData->bEnableIid) { pBsData->bFineIidQ = h_ps_d->specificTo.mpeg.bPrevFrameFineIidQ; + pBsData->freqResIid = h_ps_d->specificTo.mpeg.prevFreqResIid; for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) { pBsData->aaIidIndex[pBsData->noEnv - 1][gr] = h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[gr]; @@ -323,6 +324,7 @@ int DecodePs(struct PS_DEC *h_ps_d, /*!< PS handle */ } if (pBsData->bEnableIcc) { + pBsData->freqResIcc = h_ps_d->specificTo.mpeg.prevFreqResIcc; for (gr = 0; gr < NO_HI_RES_ICC_BINS; gr++) { pBsData->aaIccIndex[pBsData->noEnv - 1][gr] = h_ps_d->specificTo.mpeg.aIccPrevFrameIndex[gr]; @@ -337,6 +339,12 @@ 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 frequency resolution for IID */ + h_ps_d->specificTo.mpeg.prevFreqResIid = pBsData->freqResIid; + + /* Update previous frequency resolution for ICC */ + h_ps_d->specificTo.mpeg.prevFreqResIcc = pBsData->freqResIcc; + /* Update previous frame index buffers */ for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) { h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[gr] = |