diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-15 03:18:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-15 03:18:33 +0000 |
| commit | 4422539a921bc39694a2ae210ce69e4410d2c235 (patch) | |
| tree | 44d6676c2975eec965bb3e6c2562e1632eaf4385 /libSBRdec/include/sbrdecoder.h | |
| parent | 67aa964d429b7bfe242b28cd223ae1dddf8e3a78 (diff) | |
| parent | e016635f0d3a5c7532b00711ce461f97a13f7bc2 (diff) | |
| download | fdk-aac-4422539a921bc39694a2ae210ce69e4410d2c235.tar.gz fdk-aac-4422539a921bc39694a2ae210ce69e4410d2c235.tar.bz2 fdk-aac-4422539a921bc39694a2ae210ce69e4410d2c235.zip | |
Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-release
Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
Diffstat (limited to 'libSBRdec/include/sbrdecoder.h')
| -rw-r--r-- | libSBRdec/include/sbrdecoder.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libSBRdec/include/sbrdecoder.h b/libSBRdec/include/sbrdecoder.h index cc55572..c09c985 100644 --- a/libSBRdec/include/sbrdecoder.h +++ b/libSBRdec/include/sbrdecoder.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 @@ -361,15 +361,20 @@ SBR_ERROR sbrDecoder_Parse(HANDLE_SBRDECODER self, HANDLE_FDK_BITSTREAM hBs, * error (0: core decoder found errors, 1: no errors). * \param psDecoded Pointer to a buffer holding a flag. Input: PS is * possible, Output: PS has been rendered. + * \param inDataHeadroom Headroom of the SBR input time signal to prevent + * clipping. + * \param outDataHeadroom Pointer to headroom of the SBR output time signal to + * prevent clipping. * * \return Error code. */ -SBR_ERROR sbrDecoder_Apply(HANDLE_SBRDECODER self, INT_PCM *input, - INT_PCM *timeData, const int timeDataSize, - int *numChannels, int *sampleRate, +SBR_ERROR sbrDecoder_Apply(HANDLE_SBRDECODER self, LONG *input, LONG *timeData, + const int timeDataSize, int *numChannels, + int *sampleRate, const FDK_channelMapDescr *const mapDescr, const int mapIdx, const int coreDecodedOk, - UCHAR *psDecoded); + UCHAR *psDecoded, const INT inDataHeadroom, + INT *outDataHeadroom); /** * \brief Close SBR decoder instance and free memory. |