diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-28 18:41:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-28 18:41:27 +0000 |
| commit | 31608d9a1fba0ae9ce9245d468fc432e993f7125 (patch) | |
| tree | 928c023668de85b15a8ce58e93000398e67a3c49 /libSACdec/include/sac_dec_lib.h | |
| parent | e1f4578a40f070fe5bb47eed28854436884b1d7e (diff) | |
| parent | 5eb9ed1b1fe94e8bf94bba4aa305b61db19b48c5 (diff) | |
| download | fdk-aac-31608d9a1fba0ae9ce9245d468fc432e993f7125.tar.gz fdk-aac-31608d9a1fba0ae9ce9245d468fc432e993f7125.tar.bz2 fdk-aac-31608d9a1fba0ae9ce9245d468fc432e993f7125.zip | |
Merge changes Ib8b6973e,I19874768
* changes:
Check number of core channels and SAC decoder input channels to avoid a channel mismatch.
Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in fDivNorm().
Diffstat (limited to 'libSACdec/include/sac_dec_lib.h')
| -rw-r--r-- | libSACdec/include/sac_dec_lib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libSACdec/include/sac_dec_lib.h b/libSACdec/include/sac_dec_lib.h index 1827504..5aad4e0 100644 --- a/libSACdec/include/sac_dec_lib.h +++ b/libSACdec/include/sac_dec_lib.h @@ -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 @@ -316,8 +316,8 @@ SACDEC_ERROR mpegSurroundDecoder_Init( SACDEC_ERROR mpegSurroundDecoder_Config( CMpegSurroundDecoder *pMpegSurroundDecoder, HANDLE_FDK_BITSTREAM hBs, AUDIO_OBJECT_TYPE coreCodec, INT samplingRate, INT frameSize, - INT stereoConfigIndex, INT coreSbrFrameLengthIndex, INT configBytes, - const UCHAR configMode, UCHAR *configChanged); + INT numChannels, INT stereoConfigIndex, INT coreSbrFrameLengthIndex, + INT configBytes, const UCHAR configMode, UCHAR *configChanged); SACDEC_ERROR mpegSurroundDecoder_ConfigureQmfDomain( |