aboutsummaryrefslogtreecommitdiffstats
path: root/libSBRdec/src/sbr_ram.h
diff options
context:
space:
mode:
Diffstat (limited to 'libSBRdec/src/sbr_ram.h')
-rw-r--r--libSBRdec/src/sbr_ram.h213
1 files changed, 120 insertions, 93 deletions
diff --git a/libSBRdec/src/sbr_ram.h b/libSBRdec/src/sbr_ram.h
index 7ab5044..e00f8b5 100644
--- a/libSBRdec/src/sbr_ram.h
+++ b/libSBRdec/src/sbr_ram.h
@@ -1,74 +1,85 @@
-
-/* -----------------------------------------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2015 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,66 +90,86 @@ Am Wolfsmantel 33
www.iis.fraunhofer.de/amm
amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
+
+/**************************** SBR decoder library ******************************
+
+ Author(s):
+
+ Description:
+
+*******************************************************************************/
/*!
\file
\brief Memory layout
-
*/
-#ifndef _SBR_RAM_H_
-#define _SBR_RAM_H_
+#ifndef SBR_RAM_H
+#define SBR_RAM_H
#include "sbrdecoder.h"
#include "env_extr.h"
#include "sbr_dec.h"
-
-
-#define SBRDEC_MAX_CH_PER_ELEMENT (2)
-
-typedef struct
-{
- SBR_CHANNEL *pSbrChannel[SBRDEC_MAX_CH_PER_ELEMENT];
- TRANSPOSER_SETTINGS transposerSettings; /* Common transport settings for each individual channel of an element */
- HANDLE_FDK_BITSTREAM hBs;
-
- MP4_ELEMENT_ID elementID; /* Element ID set during initialization. Can be used for concealment */
- int nChannels; /* Number of elements output channels (=2 in case of PS) */
-
- UCHAR frameErrorFlag[(1)+1]; /* Frame error status (for every slot in the delay line).
- Will be copied into header at the very beginning of decodeElement() routine. */
-
- UCHAR useFrameSlot; /* Index which defines which slot will be decoded/filled next (used with additional delay) */
- UCHAR useHeaderSlot[(1)+1]; /* Index array that provides the link between header and frame data
- (important when processing with additional delay). */
+#define SBRDEC_MAX_CH_PER_ELEMENT (2)
+
+#define FRAME_OK (0)
+#define FRAME_ERROR (1)
+#define FRAME_ERROR_ALLSLOTS (2)
+
+typedef struct {
+ SBR_CHANNEL *pSbrChannel[SBRDEC_MAX_CH_PER_ELEMENT];
+ TRANSPOSER_SETTINGS
+ transposerSettings; /* Common transport settings for each individual
+ channel of an element */
+ HANDLE_FDK_BITSTREAM hBs;
+
+ MP4_ELEMENT_ID
+ elementID; /* Element ID set during initialization. Can be used for
+ concealment */
+ int nChannels; /* Number of elements output channels (=2 in case of PS) */
+
+ UCHAR frameErrorFlag[(1) + 1]; /* Frame error status (for every slot in the
+ delay line). Will be copied into header at
+ the very beginning of decodeElement()
+ routine. */
+
+ UCHAR useFrameSlot; /* Index which defines which slot will be decoded/filled
+ next (used with additional delay) */
+ UCHAR useHeaderSlot[(1) + 1]; /* Index array that provides the link between
+ header and frame data (important when
+ processing with additional delay). */
} SBR_DECODER_ELEMENT;
+struct SBR_DECODER_INSTANCE {
+ SBR_DECODER_ELEMENT *pSbrElement[(8)];
+ SBR_HEADER_DATA sbrHeader[(
+ 8)][(1) + 1]; /* Sbr header for each individual channel of an element */
-struct SBR_DECODER_INSTANCE
-{
- SBR_DECODER_ELEMENT *pSbrElement[(8)];
- SBR_HEADER_DATA sbrHeader[(8)][(1)+1]; /* Sbr header for each individual channel of an element */
-
- FIXP_DBL *workBuffer1;
- FIXP_DBL *workBuffer2;
+ HANDLE_FDK_QMF_DOMAIN pQmfDomain;
- HANDLE_PS_DEC hParametricStereoDec;
+ HANDLE_PS_DEC hParametricStereoDec;
/* Global parameters */
AUDIO_OBJECT_TYPE coreCodec; /* AOT of core codec */
int numSbrElements;
int numSbrChannels;
- INT sampleRateIn; /* SBR decoder input sampling rate; might be different than the transposer input sampling rate. */
- INT sampleRateOut; /* Sampling rate of the SBR decoder output audio samples. */
+ INT sampleRateIn; /* SBR decoder input sampling rate; might be different than
+ the transposer input sampling rate. */
+ INT sampleRateOut; /* Sampling rate of the SBR decoder output audio samples.
+ */
USHORT codecFrameSize;
UCHAR synDownsampleFac;
- UCHAR numDelayFrames; /* The current number of additional delay frames used for processing. */
- UCHAR numFlushedFrames; /* The variable counts the number of frames which are flushed consecutively. */
+ INT downscaleFactor;
+ UCHAR numDelayFrames; /* The current number of additional delay frames used
+ for processing. */
+ UCHAR harmonicSBR;
+ UCHAR
+ numFlushedFrames; /* The variable counts the number of frames which are
+ flushed consecutively. */
UINT flags;
-
};
H_ALLOC_MEM(Ram_SbrDecElement, SBR_DECODER_ELEMENT)
@@ -148,12 +179,8 @@ H_ALLOC_MEM(Ram_SbrDecoder, struct SBR_DECODER_INSTANCE)
H_ALLOC_MEM(Ram_sbr_QmfStatesSynthesis, FIXP_QSS)
H_ALLOC_MEM(Ram_sbr_OverlapBuffer, FIXP_DBL)
+H_ALLOC_MEM(Ram_sbr_HBEOverlapBuffer, FIXP_DBL)
H_ALLOC_MEM(Ram_ps_dec, PS_DEC)
-
-H_ALLOC_MEM_OVERLAY(Ram_SbrDecWorkBuffer1, FIXP_DBL)
-H_ALLOC_MEM_OVERLAY(Ram_SbrDecWorkBuffer2, FIXP_DBL)
-
-
-#endif /* _SBR_RAM_H_ */
+#endif /* SBR_RAM_H */