aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/conceal.h
diff options
context:
space:
mode:
Diffstat (limited to 'libAACdec/src/conceal.h')
-rw-r--r--libAACdec/src/conceal.h204
1 files changed, 104 insertions, 100 deletions
diff --git a/libAACdec/src/conceal.h b/libAACdec/src/conceal.h
index 20e674f..e01a796 100644
--- a/libAACdec/src/conceal.h
+++ b/libAACdec/src/conceal.h
@@ -1,74 +1,85 @@
-
-/* -----------------------------------------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
- All rights reserved.
+© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+Forschung e.V. All rights reserved.
1. INTRODUCTION
-The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
-the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
-This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
-
-AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
-audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
-independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
-of the MPEG specifications.
-
-Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
-may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
-individually for the purpose of encoding or decoding bit streams in products that are compliant with
-the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
-these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
-software may already be covered under those patent licenses when it is used for those licensed purposes only.
-
-Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
-are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
-applications information and documentation.
+The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software
+that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding
+scheme for digital audio. This FDK AAC Codec software is intended to be used on
+a wide variety of Android devices.
+
+AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient
+general perceptual audio codecs. AAC-ELD is considered the best-performing
+full-bandwidth communications codec by independent studies and is widely
+deployed. AAC has been standardized by ISO and IEC as part of the MPEG
+specifications.
+
+Patent licenses for necessary patent claims for the FDK AAC Codec (including
+those of Fraunhofer) may be obtained through Via Licensing
+(www.vialicensing.com) or through the respective patent owners individually for
+the purpose of encoding or decoding bit streams in products that are compliant
+with the ISO/IEC MPEG audio standards. Please note that most manufacturers of
+Android devices already license these patent claims through Via Licensing or
+directly from the patent owners, and therefore FDK AAC Codec software may
+already be covered under those patent licenses when it is used for those
+licensed purposes only.
+
+Commercially-licensed AAC software libraries, including floating-point versions
+with enhanced sound quality, are also available from Fraunhofer. Users are
+encouraged to check the Fraunhofer website for additional applications
+information and documentation.
2. COPYRIGHT LICENSE
-Redistribution and use in source and binary forms, with or without modification, are permitted without
-payment of copyright license fees provided that you satisfy the following conditions:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted without payment of copyright license fees provided that you
+satisfy the following conditions:
-You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
-your modifications thereto in source code form.
+You must retain the complete text of this software license in redistributions of
+the FDK AAC Codec or your modifications thereto in source code form.
-You must retain the complete text of this software license in the documentation and/or other materials
-provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
-You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
+You must retain the complete text of this software license in the documentation
+and/or other materials provided with redistributions of the FDK AAC Codec or
+your modifications thereto in binary form. You must make available free of
+charge copies of the complete source code of the FDK AAC Codec and your
modifications thereto to recipients of copies in binary form.
-The name of Fraunhofer may not be used to endorse or promote products derived from this library without
-prior written permission.
+The name of Fraunhofer may not be used to endorse or promote products derived
+from this library without prior written permission.
-You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
-software or your modifications thereto.
+You may not charge copyright license fees for anyone to use, copy or distribute
+the FDK AAC Codec software or your modifications thereto.
-Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
-and the date of any change. For modified versions of the FDK AAC Codec, the term
-"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
-"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
+Your modified versions of the FDK AAC Codec must carry prominent notices stating
+that you changed the software and the date of any change. For modified versions
+of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android"
+must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK
+AAC Codec Library for Android."
3. NO PATENT LICENSE
-NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
-ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
-respect to this software.
+NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without
+limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE.
+Fraunhofer provides no warranty of patent non-infringement with respect to this
+software.
-You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
-by appropriate patent licenses.
+You may use this FDK AAC Codec software or modifications thereto only for
+purposes that are authorized by appropriate patent licenses.
4. DISCLAIMER
-This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
-"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
-of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages,
-including but not limited to procurement of substitute goods or services; loss of use, data, or profits,
-or business interruption, however caused and on any theory of liability, whether in contract, strict
-liability, or tort (including negligence), arising in any way out of the use of this software, even if
-advised of the possibility of such damage.
+This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright
+holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
+including but not limited to the implied warranties of merchantability and
+fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary,
+or consequential damages, including but not limited to procurement of substitute
+goods or services; loss of use, data, or profits, or business interruption,
+however caused and on any theory of liability, whether in contract, strict
+liability, or tort (including negligence), arising in any way out of the use of
+this software, even if advised of the possibility of such damage.
5. CONTACT INFORMATION
@@ -79,70 +90,63 @@ Am Wolfsmantel 33
www.iis.fraunhofer.de/amm
amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
-/***************************** MPEG-4 AAC Decoder **************************
+/**************************** AAC decoder library ******************************
Author(s): Josef Hoepfl
- Description: independent channel concealment
-******************************************************************************/
+ Description: independent channel concealment
-#ifndef _CONCEAL_H_
-#define _CONCEAL_H_
+*******************************************************************************/
-#include "aacdecoder_lib.h"
+#ifndef CONCEAL_H
+#define CONCEAL_H
#include "channelinfo.h"
-#define AACDEC_CONCEAL_PARAM_NOT_SPECIFIED ( 0xFFFE )
+#define AACDEC_CONCEAL_PARAM_NOT_SPECIFIED (0xFFFE)
-void CConcealment_InitCommonData (CConcealParams *pConcealCommonData);
+void CConcealment_InitCommonData(CConcealParams *pConcealCommonData);
-void CConcealment_InitChannelData (CConcealmentInfo *hConcealmentInfo,
- CConcealParams *pConcealCommonData,
- int samplesPerFrame);
+void CConcealment_InitChannelData(CConcealmentInfo *hConcealmentInfo,
+ CConcealParams *pConcealCommonData,
+ AACDEC_RENDER_MODE initRenderMode,
+ int samplesPerFrame);
-CConcealmentMethod
- CConcealment_GetMethod (CConcealParams *pConcealCommonData);
+CConcealmentMethod CConcealment_GetMethod(CConcealParams *pConcealCommonData);
-UINT
- CConcealment_GetDelay (CConcealParams *pConcealCommonData);
+UINT CConcealment_GetDelay(CConcealParams *pConcealCommonData);
AAC_DECODER_ERROR
- CConcealment_SetParams (CConcealParams *concealParams,
- int method,
- int fadeOutSlope,
- int fadeInSlope,
- int muteRelease,
- int comfNoiseLevel);
+CConcealment_SetParams(CConcealParams *concealParams, int method,
+ int fadeOutSlope, int fadeInSlope, int muteRelease,
+ FIXP_DBL comfNoiseLevel);
-CConcealmentState
- CConcealment_GetState (CConcealmentInfo *hConcealmentInfo);
+CConcealmentState CConcealment_GetState(CConcealmentInfo *hConcealmentInfo);
AAC_DECODER_ERROR
- CConcealment_SetAttenuation (CConcealParams *concealParams,
- SHORT *fadeOutAttenuationVector,
- SHORT *fadeInAttenuationVector);
-
-void CConcealment_Store (CConcealmentInfo *hConcealmentInfo,
- CAacDecoderChannelInfo *pAacDecoderChannelInfo,
- CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo );
-
-int CConcealment_Apply (CConcealmentInfo *hConcealmentInfo,
- CAacDecoderChannelInfo *pAacDecoderChannelInfo,
- CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo,
- const SamplingRateInfo *pSamplingRateInfo,
- const int samplesPerFrame,
- const UCHAR lastLpdMode,
- const int FrameOk,
- const UINT flags);
-
-FIXP_DBL
- CConcealment_GetFadeFactor (CConcealmentInfo *hConcealmentInfo,
- const int fPreviousFactor);
-
-int CConcealment_GetLastFrameOk (CConcealmentInfo *hConcealmentInfo,
- const int fBeforeApply);
-
-#endif /* #ifndef _CONCEAL_H_ */
+CConcealment_SetAttenuation(CConcealParams *concealParams,
+ const SHORT *fadeOutAttenuationVector,
+ const SHORT *fadeInAttenuationVector);
+
+void CConcealment_Store(
+ CConcealmentInfo *hConcealmentInfo,
+ CAacDecoderChannelInfo *pAacDecoderChannelInfo,
+ CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo);
+
+int CConcealment_Apply(
+ CConcealmentInfo *hConcealmentInfo,
+ CAacDecoderChannelInfo *pAacDecoderChannelInfo,
+ CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo,
+ const SamplingRateInfo *pSamplingRateInfo, const int samplesPerFrame,
+ const UCHAR lastLpdMode, const int FrameOk, const UINT flags);
+
+int CConcealment_GetLastFrameOk(CConcealmentInfo *hConcealmentInfo,
+ const int fBeforeApply);
+
+INT CConcealment_TDFading(
+ int len, CAacDecoderStaticChannelInfo **ppAacDecoderStaticChannelInfo,
+ FIXP_PCM *pcmdata, FIXP_PCM *pcmdata_1);
+
+#endif /* #ifndef CONCEAL_H */