diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-30 22:21:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-30 22:21:56 +0000 |
| commit | e3039808a0b5792f0b9ca8eb70650fc3f3750f50 (patch) | |
| tree | 5d044ed19ee8b606613bae70bdd925f1213f8e76 | |
| parent | d361b3d5c20d45b7f4b038fbd7847c8cc9f608b9 (diff) | |
| parent | 427912f659b38c5c4eff0fe0d8ab54851d65f0c9 (diff) | |
| download | fdk-aac-e3039808a0b5792f0b9ca8eb70650fc3f3750f50.tar.gz fdk-aac-e3039808a0b5792f0b9ca8eb70650fc3f3750f50.tar.bz2 fdk-aac-e3039808a0b5792f0b9ca8eb70650fc3f3750f50.zip | |
Merge "Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value." into sc-dev am: 427912f659
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14386929
Change-Id: If55f330827c4c1356399c8a6c6edb24b7b08e773
| -rw-r--r-- | libSACdec/src/sac_bitdec.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp index 4485ccf..25b3d9e 100644 --- a/libSACdec/src/sac_bitdec.cpp +++ b/libSACdec/src/sac_bitdec.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 @@ -488,12 +488,17 @@ SACDEC_ERROR SpatialDecParseSpecificConfig( pSpatialSpecificConfig->freqRes = (SPATIALDEC_FREQ_RES)freqResTable_LD[bsFreqRes]; - pSpatialSpecificConfig->treeConfig = - (SPATIALDEC_TREE_CONFIG)FDKreadBits(bitstream, 4); + { + UINT treeConfig = FDKreadBits(bitstream, 4); - if (pSpatialSpecificConfig->treeConfig != SPATIALDEC_MODE_RSVD7) { - err = MPS_UNSUPPORTED_CONFIG; - goto bail; + switch (treeConfig) { + case SPATIALDEC_MODE_RSVD7: + pSpatialSpecificConfig->treeConfig = (SPATIALDEC_TREE_CONFIG)treeConfig; + break; + default: + err = MPS_UNSUPPORTED_CONFIG; + goto bail; + } } { |