diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-01-03 16:58:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-03 16:58:03 -0800 |
| commit | 4ab4454f2917470e7cc2b4fc0b36c223b3780a5b (patch) | |
| tree | e9970ed3bbd5a7c21574e50edd994fafee37ffe1 /libAACdec/src | |
| parent | 195d913e654401e0b8a20d012b906c3e1f29db59 (diff) | |
| parent | bcda185d5694ad9d3f28f919f8b03000510b4d63 (diff) | |
| download | fdk-aac-4ab4454f2917470e7cc2b4fc0b36c223b3780a5b.tar.gz fdk-aac-4ab4454f2917470e7cc2b4fc0b36c223b3780a5b.tar.bz2 fdk-aac-4ab4454f2917470e7cc2b4fc0b36c223b3780a5b.zip | |
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()"
am: bcda185d56
Change-Id: I0717e1ac3818b2516b3a57b929e2d84f4384dbce
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: |