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 /libMpegTPEnc/src/tpenc_asc.cpp | |
| 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 'libMpegTPEnc/src/tpenc_asc.cpp')
| -rw-r--r-- | libMpegTPEnc/src/tpenc_asc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libMpegTPEnc/src/tpenc_asc.cpp b/libMpegTPEnc/src/tpenc_asc.cpp index 0b484a0..9591ba8 100644 --- a/libMpegTPEnc/src/tpenc_asc.cpp +++ b/libMpegTPEnc/src/tpenc_asc.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 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 @@ -795,7 +795,7 @@ static int transportEnc_writeELDSpecificConfig(HANDLE_FDK_BITSTREAM hBs, const INT eldExtLen = (cb->cbSsc(cb->cbSscData, NULL, config->aot, config->extSamplingRate, 0, - 0, 0, 0, 0, NULL) + + 0, 0, 0, 0, 0, NULL) + 7) >> 3; INT cnt = eldExtLen; @@ -818,7 +818,7 @@ static int transportEnc_writeELDSpecificConfig(HANDLE_FDK_BITSTREAM hBs, } cb->cbSsc(cb->cbSscData, hBs, config->aot, config->extSamplingRate, 0, 0, 0, - 0, 0, NULL); + 0, 0, 0, NULL); } if (config->downscaleSamplingRate != 0 && |