diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-06-01 14:25:25 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-06-01 14:25:25 +0200 |
| commit | e778887e4e5589528b06b04404ce4c71aaae267a (patch) | |
| tree | fcce7bfb237a99ac174e16611f39bf363f6b280c /libSACdec/include | |
| parent | 97182034e8829014bdfc0449c2116d629196f1d4 (diff) | |
| parent | 801f67f671929311e0c9952c5f92d6e147c7b003 (diff) | |
| download | fdk-aac-e778887e4e5589528b06b04404ce4c71aaae267a.tar.gz fdk-aac-e778887e4e5589528b06b04404ce4c71aaae267a.tar.bz2 fdk-aac-e778887e4e5589528b06b04404ce4c71aaae267a.zip | |
Merge v2.0.2 into dabplus2
Diffstat (limited to 'libSACdec/include')
| -rw-r--r-- | libSACdec/include/sac_dec_lib.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libSACdec/include/sac_dec_lib.h b/libSACdec/include/sac_dec_lib.h index 9913279..1827504 100644 --- a/libSACdec/include/sac_dec_lib.h +++ b/libSACdec/include/sac_dec_lib.h @@ -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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -252,7 +252,7 @@ typedef enum { scenario. Default parameter value is 3 frames. */ } SACDEC_PARAM; -#define PCM_MPS INT_PCM +#define PCM_MPS LONG /** * \brief MPEG Surround decoder handle. @@ -401,17 +401,22 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder, * for each output audio channel is stored into. * \param mapDescr Channep map descriptor for output channel mapping * to be used (From MPEG PCE ordering to whatever is required). + * \param inDataHeadroom Headroom of SAC input time signal to prevent + * clipping. + * \param outDataHeadroom Pointer to headroom of SAC output time signal to + * prevent clipping. * * \return Error code. */ int mpegSurroundDecoder_Apply(CMpegSurroundDecoder *pMpegSurroundDecoder, - INT_PCM *input, PCM_MPS *pTimeData, + PCM_MPS *input, PCM_MPS *pTimeData, const int timeDataSize, int timeDataFrameSize, int *nChannels, int *frameSize, int sampleRate, AUDIO_OBJECT_TYPE coreCodec, AUDIO_CHANNEL_TYPE channelType[], UCHAR channelIndices[], - const FDK_channelMapDescr *const mapDescr); + const FDK_channelMapDescr *const mapDescr, + const INT inDataHeadroom, INT *outDataHeadroom); /** * \brief Deallocate a MPEG Surround decoder instance. |