aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-12-29 06:31:58 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-29 06:31:58 -0800
commit907ffbf69d29ee8a3b7a0e614118d2a07c6372d7 (patch)
tree93e9b95b0bd9d3b883d353f912710061570d70a7
parent76b3d662bf5e4859502ad678070282f0ecf832f7 (diff)
parentdedce44ca873ceb1e4269c7427177da7a3110b8c (diff)
downloadfdk-aac-907ffbf69d29ee8a3b7a0e614118d2a07c6372d7.tar.gz
fdk-aac-907ffbf69d29ee8a3b7a0e614118d2a07c6372d7.tar.bz2
fdk-aac-907ffbf69d29ee8a3b7a0e614118d2a07c6372d7.zip
Merge "Clear spatial specific config struct at the beginning of parse routines" am: 0142f38904 am: 0ef6247c4f
am: dedce44ca8 Change-Id: Icc705d54048e3edf07ec658b247d2291a78695ed
-rw-r--r--libSACdec/src/sac_bitdec.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp
index 45fb17a..159cf84 100644
--- a/libSACdec/src/sac_bitdec.cpp
+++ b/libSACdec/src/sac_bitdec.cpp
@@ -325,6 +325,8 @@ SACDEC_ERROR SpatialDecParseMps212Config(
INT coreSbrFrameLengthIndex) {
int i;
+ FDKmemclear(pSpatialSpecificConfig, sizeof(SPATIAL_SPECIFIC_CONFIG));
+
pSpatialSpecificConfig->stereoConfigIndex = stereoConfigIndex;
pSpatialSpecificConfig->coreSbrFrameLengthIndex = coreSbrFrameLengthIndex;
pSpatialSpecificConfig->freqRes =
@@ -447,6 +449,8 @@ SACDEC_ERROR SpatialDecParseSpecificConfig(
int numHeaderBits;
int cfgStartPos, bitsAvailable;
+ FDKmemclear(pSpatialSpecificConfig, sizeof(SPATIAL_SPECIFIC_CONFIG));
+
cfgStartPos = FDKgetValidBits(bitstream);
/* It might be that we do not know the SSC length beforehand. */
if (sacHeaderLen == 0) {