diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-28 04:24:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-28 04:24:32 +0000 |
| commit | 0ace500b9e6c6afeebd05730680790d888ae4d3f (patch) | |
| tree | 53fb830529a783c88b45cf1a7f8979575b70c543 | |
| parent | 5d864894785ccf240717f78aa35e8a2b9371b62f (diff) | |
| parent | 3255d513ce56f98085d77dd7b92840b73ab4cfd3 (diff) | |
| download | fdk-aac-0ace500b9e6c6afeebd05730680790d888ae4d3f.tar.gz fdk-aac-0ace500b9e6c6afeebd05730680790d888ae4d3f.tar.bz2 fdk-aac-0ace500b9e6c6afeebd05730680790d888ae4d3f.zip | |
Snap for 6164373 from 3255d513ce56f98085d77dd7b92840b73ab4cfd3 to rvc-release
Change-Id: I396303dd4ab4b8a24e0c6cf05b7ea0d48e3bdbc8
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 6 | ||||
| -rw-r--r-- | libDRCdec/src/drcDec_selectionProcess.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index 86ec899..e90dbef 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -1269,9 +1269,9 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, } /* Signal bit stream interruption to other modules if required. */ - if (fTpInterruption || (flags & AACDEC_INTR)) { + if (fTpInterruption || ((flags & AACDEC_INTR) && (accessUnit == 0))) { aacDecoder_SignalInterruption(self); - if (!(flags & AACDEC_INTR)) { + if (!((flags & AACDEC_INTR) && (accessUnit == 0))) { ErrorStatus = AAC_DEC_TRANSPORT_SYNC_ERROR; goto bail; } @@ -1768,7 +1768,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, if (self->streamInfo.extAot != AOT_AAC_SLS) { INT pcmLimiterScale = 0; PCMDMX_ERROR dmxErr = PCMDMX_OK; - if (flags & (AACDEC_INTR)) { + if ((flags & AACDEC_INTR) && (accessUnit == 0)) { /* delete data from the past (e.g. mixdown coeficients) */ pcmDmx_Reset(self->hPcmUtils, PCMDMX_RESET_BS_DATA); } diff --git a/libDRCdec/src/drcDec_selectionProcess.cpp b/libDRCdec/src/drcDec_selectionProcess.cpp index d806ae9..fe6034c 100644 --- a/libDRCdec/src/drcDec_selectionProcess.cpp +++ b/libDRCdec/src/drcDec_selectionProcess.cpp @@ -753,8 +753,8 @@ static DRCDEC_SELECTION_PROCESS_RETURN _initDefaultParams( hSelProcInput->loudnessNormalizationOn = 1; hSelProcInput->targetLoudness = FL2FXCONST_DBL(-24.0f / (float)(1 << 7)); hSelProcInput->loudnessDeviationMax = DEFAULT_LOUDNESS_DEVIATION_MAX; - hSelProcInput->loudnessMeasurementMethod = MDR_DEFAULT; - hSelProcInput->loudnessMeasurementSystem = MSR_DEFAULT; + hSelProcInput->loudnessMeasurementMethod = MDR_ANCHOR_LOUDNESS; + hSelProcInput->loudnessMeasurementSystem = MSR_EXPERT_PANEL; hSelProcInput->loudnessMeasurementPreProc = LPR_DEFAULT; hSelProcInput->deviceCutOffFrequency = 500; hSelProcInput->loudnessNormalizationGainDbMax = |