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 /libAACdec/src/aacdecoder.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 'libAACdec/src/aacdecoder.h')
| -rw-r--r-- | libAACdec/src/aacdecoder.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libAACdec/src/aacdecoder.h b/libAACdec/src/aacdecoder.h index 20f4c45..bd1f38f 100644 --- a/libAACdec/src/aacdecoder.h +++ b/libAACdec/src/aacdecoder.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 @@ -191,6 +191,9 @@ struct AAC_DECODER_INSTANCE { INT outputInterleaved; /*!< PCM output format (interleaved/none interleaved). */ + INT aacOutDataHeadroom; /*!< Headroom of the output time signal to prevent + clipping */ + HANDLE_TRANSPORTDEC hInput; /*!< Transport layer handle. */ SamplingRateInfo @@ -235,6 +238,7 @@ struct AAC_DECODER_INSTANCE { CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo[(8)]; /*!< Persistent channel memory */ + FIXP_DBL *workBufferCore1; FIXP_DBL *workBufferCore2; PCM_DEC *pTimeData2; INT timeData2Size; @@ -311,11 +315,10 @@ This structure is allocated once for each CPE. */ UCHAR limiterEnableUser; /*!< The limiter configuration requested by the library user */ UCHAR limiterEnableCurr; /*!< The current limiter configuration. */ + FIXP_DBL extGain[1]; /*!< Gain that must be applied to the output signal. */ UINT extGainDelay; /*!< Delay that must be accounted for extGain. */ - INT_PCM pcmOutputBuffer[(8) * (1024 * 2)]; - HANDLE_DRC_DECODER hUniDrcDecoder; UCHAR multibandDrcPresent; UCHAR numTimeSlots; @@ -427,7 +430,7 @@ LINKSPEC_H AAC_DECODER_ERROR CAacDecoder_Init(HANDLE_AACDECODER self, \return error status */ LINKSPEC_H AAC_DECODER_ERROR CAacDecoder_DecodeFrame( - HANDLE_AACDECODER self, const UINT flags, FIXP_PCM *pTimeData, + HANDLE_AACDECODER self, const UINT flags, PCM_DEC *pTimeData, const INT timeDataSize, const int timeDataChannelOffset); /* Free config dependent AAC memory */ |