fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge "Extend PS concealment/error treatment" am: 58221178cc

Browse Source 
am: 45903f4e5a

Change-Id: I907fa44b6ab124f4b31a04212d06ff3e22cac567
This commit is contained in:
Jean-Michel Trivi
2018-12-28 15:18:13 -08:00
committed by android-build-merger
parent 0cd0a834f6 45903f4e5a
commit 2f583c7ab7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libSBRdec/src/psbitdec.cpp
View File

@@ -312,6 +312,7 @@ int DecodePs(struct PS_DEC *h_ps_d, /*!< PS handle */
if (pBsData->bEnableIid) { if (pBsData->bEnableIid) {
pBsData->bFineIidQ = h_ps_d->specificTo.mpeg.bPrevFrameFineIidQ; 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++) { for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) {
pBsData->aaIidIndex[pBsData->noEnv - 1][gr] = pBsData->aaIidIndex[pBsData->noEnv - 1][gr] =
h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[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) { if (pBsData->bEnableIcc) {
pBsData->freqResIcc = h_ps_d->specificTo.mpeg.prevFreqResIcc;
for (gr = 0; gr < NO_HI_RES_ICC_BINS; gr++) { for (gr = 0; gr < NO_HI_RES_ICC_BINS; gr++) {
pBsData->aaIccIndex[pBsData->noEnv - 1][gr] = pBsData->aaIccIndex[pBsData->noEnv - 1][gr] =
h_ps_d->specificTo.mpeg.aIccPrevFrameIndex[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 */ /* Update previous frame Iid quantization */
h_ps_d->specificTo.mpeg.bPrevFrameFineIidQ = pBsData->bFineIidQ; 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 */ /* Update previous frame index buffers */
for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) { for (gr = 0; gr < NO_HI_RES_IID_BINS; gr++) {
h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[gr] = h_ps_d->specificTo.mpeg.aIidPrevFrameIndex[gr] =

6
libSBRdec/src/psdec.h
View File

@@ -275,7 +275,11 @@ struct PS_DEC {
SCHAR aIccPrevFrameIndex[NO_HI_RES_ICC_BINS]; /*!< The ICC index for SCHAR aIccPrevFrameIndex[NO_HI_RES_ICC_BINS]; /*!< The ICC index for
previous frame */ previous frame */
UCHAR UCHAR
bPrevFrameFineIidQ; /*!< The IID quantization of the previous frame */ bPrevFrameFineIidQ; /*!< The IID quantization of the previous frame */
UCHAR prevFreqResIid; /*!< Frequency resolution for IID of the previous
frame */
UCHAR prevFreqResIcc; /*!< Frequency resolution for ICC of the previous
frame */
UCHAR lastUsb; /*!< uppermost WMF delay band of last frame */ UCHAR lastUsb; /*!< uppermost WMF delay band of last frame */
FIXP_DBL pHybridAnaStatesLFdmx FIXP_DBL pHybridAnaStatesLFdmx