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 "Read uniDrcGainExtension element only if all DRC gain sequences are parsed correctly."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-15 00:47:26 +00:00
committed by Android (Google) Code Review
parent eb8e26e019 67cae74f74
commit d99aadd0d7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libDRCdec/src/drcDec_reader.cpp
View File

@@ -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) {