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 /libMpegTPEnc | |
| 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 'libMpegTPEnc')
| -rw-r--r-- | libMpegTPEnc/include/tp_data.h | 3 | ||||
| -rw-r--r-- | libMpegTPEnc/src/tpenc_asc.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libMpegTPEnc/include/tp_data.h b/libMpegTPEnc/include/tp_data.h index 6f032d1..00de356 100644 --- a/libMpegTPEnc/include/tp_data.h +++ b/libMpegTPEnc/include/tp_data.h @@ -367,7 +367,8 @@ typedef INT (*cbFreeMem_t)(void *, const CSAudioSpecificConfig *); typedef INT (*cbCtrlCFGChange_t)(void *, const CCtrlCFGChange *); typedef INT (*cbSsc_t)(void *, HANDLE_FDK_BITSTREAM, const AUDIO_OBJECT_TYPE coreCodec, - const INT samplingRate, const INT stereoConfigIndex, + const INT samplingRate, const INT frameSize, + const INT stereoConfigIndex, const INT coreSbrFrameLengthIndex, const INT configBytes, const UCHAR configMode, UCHAR *configChanged); diff --git a/libMpegTPEnc/src/tpenc_asc.cpp b/libMpegTPEnc/src/tpenc_asc.cpp index ce4e364..0b484a0 100644 --- a/libMpegTPEnc/src/tpenc_asc.cpp +++ b/libMpegTPEnc/src/tpenc_asc.cpp @@ -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, NULL) + + 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, NULL); + 0, 0, NULL); } if (config->downscaleSamplingRate != 0 && |