fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-02 17:06:54 +01:00
Code Issues Projects Releases Wiki Activity

Avoid load of undefined SPATIALDEC_TREE_CONFIG enum value.

Browse Source 
Bug: 186706541
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ibf8dbc1e61ff0453ac905efc88892d39c84fece6
This commit is contained in:
Fraunhofer IIS FDK 2020-04-17 15:14:36 +02:00 committed by Jean-Michel Trivi
parent 5a83a8e5e1
commit de5b6b5def
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libSACdec/src/sac_bitdec.cpp
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -488,13 +488,18 @@ SACDEC_ERROR SpatialDecParseSpecificConfig(
pSpatialSpecificConfig->freqRes = pSpatialSpecificConfig->freqRes =
(SPATIALDEC_FREQ_RES)freqResTable_LD[bsFreqRes]; (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) { switch (treeConfig) {
case SPATIALDEC_MODE_RSVD7:
pSpatialSpecificConfig->treeConfig = (SPATIALDEC_TREE_CONFIG)treeConfig;
break;
default:
err = MPS_UNSUPPORTED_CONFIG; err = MPS_UNSUPPORTED_CONFIG;
goto bail; goto bail;
} }
}
{ {
pSpatialSpecificConfig->nOttBoxes = pSpatialSpecificConfig->nOttBoxes =