diff options
| author | Xin Li <delphij@google.com> | 2020-09-08 16:53:57 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-09-08 16:53:57 -0700 |
| commit | 7f7e67fe023aa5e479aba0388a7e3fb591bda4e5 (patch) | |
| tree | 0e353968c34e8c9699663a9b252836b70847c30b /libAACdec/src/block.h | |
| parent | 946a672b0f5b8481eb3a429f854fcb34d847d692 (diff) | |
| parent | 7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45 (diff) | |
| download | fdk-aac-7f7e67fe023aa5e479aba0388a7e3fb591bda4e5.tar.gz fdk-aac-7f7e67fe023aa5e479aba0388a7e3fb591bda4e5.tar.bz2 fdk-aac-7f7e67fe023aa5e479aba0388a7e3fb591bda4e5.zip | |
Merge Android R
Bug: 168057903
Merged-In: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
Change-Id: I29b7ae1003fb72aeb5fbf1fdfdceea849c1c12b8
Diffstat (limited to 'libAACdec/src/block.h')
| -rw-r--r-- | libAACdec/src/block.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libAACdec/src/block.h b/libAACdec/src/block.h index f0f56cd..f5118a2 100644 --- a/libAACdec/src/block.h +++ b/libAACdec/src/block.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 @@ -218,16 +218,16 @@ void ApplyTools(CAacDecoderChannelInfo *pAacDecoderChannelInfo[], */ void CBlock_FrequencyToTime( CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo, - CAacDecoderChannelInfo *pAacDecoderChannelInfo, FIXP_PCM outSamples[], + CAacDecoderChannelInfo *pAacDecoderChannelInfo, PCM_DEC outSamples[], const SHORT frameLen, const int frameOk, FIXP_DBL *pWorkBuffer1, - UINT elFlags, INT elCh); + const INT aacOutDataHeadroom, UINT elFlags, INT elCh); /** * \brief Transform double lapped MDCT (AAC-ELD) spectral data into time domain. */ void CBlock_FrequencyToTimeLowDelay( CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo, - CAacDecoderChannelInfo *pAacDecoderChannelInfo, FIXP_PCM outSamples[], + CAacDecoderChannelInfo *pAacDecoderChannelInfo, PCM_DEC outSamples[], const short frameLen); AAC_DECODER_ERROR CBlock_InverseQuantizeSpectralData( |