Merge "Clear spatial specific config struct at the beginning of parse routines" am: 0142f38904

am: 0ef6247c4f

Change-Id: I4e11c35bb3e4c20f2844bcec8912f15139fa185f
This commit is contained in:
Fraunhofer IIS FDK 2018-12-29 06:26:08 -08:00 committed by android-build-merger
commit dedce44ca8
1 changed files with 4 additions and 0 deletions

View File

@ -325,6 +325,8 @@ SACDEC_ERROR SpatialDecParseMps212Config(
INT coreSbrFrameLengthIndex) { INT coreSbrFrameLengthIndex) {
int i; int i;
FDKmemclear(pSpatialSpecificConfig, sizeof(SPATIAL_SPECIFIC_CONFIG));
pSpatialSpecificConfig->stereoConfigIndex = stereoConfigIndex; pSpatialSpecificConfig->stereoConfigIndex = stereoConfigIndex;
pSpatialSpecificConfig->coreSbrFrameLengthIndex = coreSbrFrameLengthIndex; pSpatialSpecificConfig->coreSbrFrameLengthIndex = coreSbrFrameLengthIndex;
pSpatialSpecificConfig->freqRes = pSpatialSpecificConfig->freqRes =
@ -447,6 +449,8 @@ SACDEC_ERROR SpatialDecParseSpecificConfig(
int numHeaderBits; int numHeaderBits;
int cfgStartPos, bitsAvailable; int cfgStartPos, bitsAvailable;
FDKmemclear(pSpatialSpecificConfig, sizeof(SPATIAL_SPECIFIC_CONFIG));
cfgStartPos = FDKgetValidBits(bitstream); cfgStartPos = FDKgetValidBits(bitstream);
/* It might be that we do not know the SSC length beforehand. */ /* It might be that we do not know the SSC length beforehand. */
if (sacHeaderLen == 0) { if (sacHeaderLen == 0) {