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/block.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/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( |