diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-01-03 17:05:25 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-03 17:05:25 -0800 |
| commit | 6d1247f2e235e26635aba13f5758b8ba61e11089 (patch) | |
| tree | a405123a71cbc0b139225fc6d41c8a6941631aa2 /libAACdec/src | |
| parent | 1ce3f9e135acc3383251751cea3e174a355e1f94 (diff) | |
| parent | 4ab4454f2917470e7cc2b4fc0b36c223b3780a5b (diff) | |
| download | fdk-aac-6d1247f2e235e26635aba13f5758b8ba61e11089.tar.gz fdk-aac-6d1247f2e235e26635aba13f5758b8ba61e11089.tar.bz2 fdk-aac-6d1247f2e235e26635aba13f5758b8ba61e11089.zip | |
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()" am: bcda185d56
am: 4ab4454f29
Change-Id: I0ac3055487ce17f6218e3a0644778a0d8da27119
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: |