diff options
| author | Xin Li <delphij@google.com> | 2021-10-07 23:50:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-07 23:50:23 +0000 |
| commit | 0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494 (patch) | |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd /libSACdec/src/sac_bitdec.cpp | |
| parent | 6d10f91a77002b6371ebada491f507ef974ca572 (diff) | |
| parent | 1b5221d9fee482e03342eb1593f580754fa7ab3f (diff) | |
| download | fdk-aac-0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494.tar.gz fdk-aac-0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494.tar.bz2 fdk-aac-0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494.zip | |
Merge "Merge Android 12"
Diffstat (limited to 'libSACdec/src/sac_bitdec.cpp')
| -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; + } } { |