diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-15 00:47:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-15 00:47:26 +0000 |
| commit | d99aadd0d76b1c5d1baa30741a841010e1dcf5bf (patch) | |
| tree | 07a972f8f0fee0f45c0424856ff99dbe52e7fc98 | |
| parent | eb8e26e019ab549f5e4b739512a83a17c20d2807 (diff) | |
| parent | 67cae74f74bce961e0812c1743c64df96a3396b7 (diff) | |
| download | fdk-aac-d99aadd0d76b1c5d1baa30741a841010e1dcf5bf.tar.gz fdk-aac-d99aadd0d76b1c5d1baa30741a841010e1dcf5bf.tar.bz2 fdk-aac-d99aadd0d76b1c5d1baa30741a841010e1dcf5bf.zip | |
Merge "Read uniDrcGainExtension element only if all DRC gain sequences are parsed correctly."
| -rw-r--r-- | libDRCdec/src/drcDec_reader.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libDRCdec/src/drcDec_reader.cpp b/libDRCdec/src/drcDec_reader.cpp index 367a352..b3ec187 100644 --- a/libDRCdec/src/drcDec_reader.cpp +++ b/libDRCdec/src/drcDec_reader.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -512,10 +512,13 @@ drcDec_readUniDrcGain(HANDLE_FDK_BITSTREAM hBs, fMin(tmpNNodes, (UCHAR)16) * sizeof(GAIN_NODE)); } - hUniDrcGain->uniDrcGainExtPresent = FDKreadBits(hBs, 1); - if (hUniDrcGain->uniDrcGainExtPresent == 1) { - err = _readUniDrcGainExtension(hBs, &(hUniDrcGain->uniDrcGainExtension)); - if (err) return err; + if (pCoef && (gainSequenceCount == + pCoef->gainSequenceCount)) { /* all sequences have been read */ + hUniDrcGain->uniDrcGainExtPresent = FDKreadBits(hBs, 1); + if (hUniDrcGain->uniDrcGainExtPresent == 1) { + err = _readUniDrcGainExtension(hBs, &(hUniDrcGain->uniDrcGainExtension)); + if (err) return err; + } } if (err == DE_OK && gainSequenceCount > 0) { |