diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-01-03 17:10:27 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-03 17:10:27 -0800 |
| commit | 9dc118a7d12e117cc552825503ff793b6e945d93 (patch) | |
| tree | 1a5a50a1829f18897102f4e4f59ac7daa6ff192a /libAACdec/src | |
| parent | 455d57b7e6becd5428a8986b3bc7d44afea46e49 (diff) | |
| parent | 6d1247f2e235e26635aba13f5758b8ba61e11089 (diff) | |
| download | fdk-aac-9dc118a7d12e117cc552825503ff793b6e945d93.tar.gz fdk-aac-9dc118a7d12e117cc552825503ff793b6e945d93.tar.bz2 fdk-aac-9dc118a7d12e117cc552825503ff793b6e945d93.zip | |
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()" am: bcda185d56 am: 4ab4454f29
am: 6d1247f2e2
Change-Id: I1552fb42268ad2b019b728a8d61561a9028a60ad
Diffstat (limited to 'libAACdec/src')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index 2860bf6..cbcd404 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -387,7 +387,7 @@ static INT aacDecoder_SbrCallback( static INT aacDecoder_SscCallback(void *handle, HANDLE_FDK_BITSTREAM hBs, const AUDIO_OBJECT_TYPE coreCodec, - const INT samplingRate, + const INT samplingRate, const INT frameSize, const INT stereoConfigIndex, const INT coreSbrFrameLengthIndex, const INT configBytes, const UCHAR configMode, @@ -398,8 +398,8 @@ static INT aacDecoder_SscCallback(void *handle, HANDLE_FDK_BITSTREAM hBs, err = mpegSurroundDecoder_Config( (CMpegSurroundDecoder *)hAacDecoder->pMpegSurroundDecoder, hBs, coreCodec, - samplingRate, stereoConfigIndex, coreSbrFrameLengthIndex, configBytes, - configMode, configChanged); + samplingRate, frameSize, stereoConfigIndex, coreSbrFrameLengthIndex, + configBytes, configMode, configChanged); switch (err) { case MPS_UNSUPPORTED_CONFIG: |