fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap for 6164373 from 3255d513ce to rvc-release 

Change-Id: I396303dd4ab4b8a24e0c6cf05b7ea0d48e3bdbc8
This commit is contained in:
android-build-team Robot 2020-01-28 04:24:32 +00:00
parent 5d86489478 3255d513ce
commit 0ace500b9e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libAACdec/src/aacdecoder_lib.cpp
View File

@ -1269,9 +1269,9 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern,
} }
/* Signal bit stream interruption to other modules if required. */ /* Signal bit stream interruption to other modules if required. */
if (fTpInterruption || (flags & AACDEC_INTR)) { if (fTpInterruption || ((flags & AACDEC_INTR) && (accessUnit == 0))) {
aacDecoder_SignalInterruption(self); aacDecoder_SignalInterruption(self);
if (!(flags & AACDEC_INTR)) { if (!((flags & AACDEC_INTR) && (accessUnit == 0))) {
ErrorStatus = AAC_DEC_TRANSPORT_SYNC_ERROR; ErrorStatus = AAC_DEC_TRANSPORT_SYNC_ERROR;
goto bail; goto bail;
} }
@ -1768,7 +1768,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern,
if (self->streamInfo.extAot != AOT_AAC_SLS) { if (self->streamInfo.extAot != AOT_AAC_SLS) {
INT pcmLimiterScale = 0; INT pcmLimiterScale = 0;
PCMDMX_ERROR dmxErr = PCMDMX_OK; PCMDMX_ERROR dmxErr = PCMDMX_OK;
if (flags & (AACDEC_INTR)) { if ((flags & AACDEC_INTR) && (accessUnit == 0)) {
/* delete data from the past (e.g. mixdown coeficients) */ /* delete data from the past (e.g. mixdown coeficients) */
pcmDmx_Reset(self->hPcmUtils, PCMDMX_RESET_BS_DATA); pcmDmx_Reset(self->hPcmUtils, PCMDMX_RESET_BS_DATA);
} }

4
libDRCdec/src/drcDec_selectionProcess.cpp
View File

@ -753,8 +753,8 @@ static DRCDEC_SELECTION_PROCESS_RETURN _initDefaultParams(
hSelProcInput->loudnessNormalizationOn = 1; hSelProcInput->loudnessNormalizationOn = 1;
hSelProcInput->targetLoudness = FL2FXCONST_DBL(-24.0f / (float)(1 << 7)); hSelProcInput->targetLoudness = FL2FXCONST_DBL(-24.0f / (float)(1 << 7));
hSelProcInput->loudnessDeviationMax = DEFAULT_LOUDNESS_DEVIATION_MAX; hSelProcInput->loudnessDeviationMax = DEFAULT_LOUDNESS_DEVIATION_MAX;
hSelProcInput->loudnessMeasurementMethod = MDR_DEFAULT; hSelProcInput->loudnessMeasurementMethod = MDR_ANCHOR_LOUDNESS;
hSelProcInput->loudnessMeasurementSystem = MSR_DEFAULT; hSelProcInput->loudnessMeasurementSystem = MSR_EXPERT_PANEL;
hSelProcInput->loudnessMeasurementPreProc = LPR_DEFAULT; hSelProcInput->loudnessMeasurementPreProc = LPR_DEFAULT;
hSelProcInput->deviceCutOffFrequency = 500; hSelProcInput->deviceCutOffFrequency = 500;
hSelProcInput->loudnessNormalizationGainDbMax = hSelProcInput->loudnessNormalizationGainDbMax =