diff options
Diffstat (limited to 'libSYS/include')
| -rw-r--r-- | libSYS/include/FDK_audio.h | 986 | ||||
| -rw-r--r-- | libSYS/include/audio.h | 106 | ||||
| -rw-r--r-- | libSYS/include/cmdl_parser.h | 221 | ||||
| -rw-r--r-- | libSYS/include/conv_string.h | 136 | ||||
| -rw-r--r-- | libSYS/include/genericStds.h | 612 | ||||
| -rw-r--r-- | libSYS/include/machine_type.h | 414 | ||||
| -rw-r--r-- | libSYS/include/syslib_channelMapDescr.h | 196 | ||||
| -rw-r--r-- | libSYS/include/wav_file.h | 233 |
8 files changed, 1361 insertions, 1543 deletions
diff --git a/libSYS/include/FDK_audio.h b/libSYS/include/FDK_audio.h index 98ded3b..0e440c9 100644 --- a/libSYS/include/FDK_audio.h +++ b/libSYS/include/FDK_audio.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,13 +90,15 @@ Am Wolfsmantel 33 www.iis.fraunhofer.de/amm amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ +----------------------------------------------------------------------------- */ -/************************** Fraunhofer IIS FDK SysLib ********************** +/************************* System integration library ************************** Author(s): Manuel Jander -******************************************************************************/ + Description: + +*******************************************************************************/ /** \file FDK_audio.h * \brief Global audio struct and constant definitions. @@ -96,309 +109,409 @@ amm-info@iis.fraunhofer.de #include "machine_type.h" #include "genericStds.h" +#include "syslib_channelMapDescr.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /** * File format identifiers. */ -typedef enum -{ - FF_UNKNOWN = -1, /**< Unknown format. */ - FF_RAW = 0, /**< No container, bit stream data conveyed "as is". */ - - FF_MP4_3GPP = 3, /**< 3GPP file format. */ - FF_MP4_MP4F = 4, /**< MPEG-4 File format. */ +typedef enum { + FF_UNKNOWN = -1, /**< Unknown format. */ + FF_RAW = 0, /**< No container, bit stream data conveyed "as is". */ - FF_RAWPACKETS = 5, /**< Proprietary raw packet file. */ + FF_MP4_3GPP = 3, /**< 3GPP file format. */ + FF_MP4_MP4F = 4, /**< MPEG-4 File format. */ - FF_DRMCT = 12 /**< Digital Radio Mondial (DRM30/DRM+) CT proprietary file format. */ + FF_RAWPACKETS = 5 /**< Proprietary raw packet file. */ } FILE_FORMAT; /** * Transport type identifiers. */ -typedef enum -{ - TT_UNKNOWN = -1, /**< Unknown format. */ - TT_MP4_RAW = 0, /**< "as is" access units (packet based since there is obviously no sync layer) */ - TT_MP4_ADIF = 1, /**< ADIF bitstream format. */ - TT_MP4_ADTS = 2, /**< ADTS bitstream format. */ +typedef enum { + TT_UNKNOWN = -1, /**< Unknown format. */ + TT_MP4_RAW = 0, /**< "as is" access units (packet based since there is + obviously no sync layer) */ + TT_MP4_ADIF = 1, /**< ADIF bitstream format. */ + TT_MP4_ADTS = 2, /**< ADTS bitstream format. */ - TT_MP4_LATM_MCP1 = 6, /**< Audio Mux Elements with muxConfigPresent = 1 */ - TT_MP4_LATM_MCP0 = 7, /**< Audio Mux Elements with muxConfigPresent = 0, out of band StreamMuxConfig */ + TT_MP4_LATM_MCP1 = 6, /**< Audio Mux Elements with muxConfigPresent = 1 */ + TT_MP4_LATM_MCP0 = 7, /**< Audio Mux Elements with muxConfigPresent = 0, out + of band StreamMuxConfig */ - TT_MP4_LOAS = 10, /**< Audio Sync Stream. */ + TT_MP4_LOAS = 10, /**< Audio Sync Stream. */ - TT_DRM = 12 /**< Digital Radio Mondial (DRM30/DRM+) bitstream format. */ + TT_DRM = 12 /**< Digital Radio Mondial (DRM30/DRM+) bitstream format. */ } TRANSPORT_TYPE; -#define TT_IS_PACKET(x) \ - ( ((x) == TT_MP4_RAW) \ - || ((x) == TT_DRM) \ - || ((x) == TT_MP4_LATM_MCP0) \ - || ((x) == TT_MP4_LATM_MCP1) ) +#define TT_IS_PACKET(x) \ + (((x) == TT_MP4_RAW) || ((x) == TT_DRM) || ((x) == TT_MP4_LATM_MCP0) || \ + ((x) == TT_MP4_LATM_MCP1)) /** * Audio Object Type definitions. */ -typedef enum -{ - AOT_NONE = -1, - AOT_NULL_OBJECT = 0, - AOT_AAC_MAIN = 1, /**< Main profile */ - AOT_AAC_LC = 2, /**< Low Complexity object */ - AOT_AAC_SSR = 3, - AOT_AAC_LTP = 4, - AOT_SBR = 5, - AOT_AAC_SCAL = 6, - AOT_TWIN_VQ = 7, - AOT_CELP = 8, - AOT_HVXC = 9, - AOT_RSVD_10 = 10, /**< (reserved) */ - AOT_RSVD_11 = 11, /**< (reserved) */ - AOT_TTSI = 12, /**< TTSI Object */ - AOT_MAIN_SYNTH = 13, /**< Main Synthetic object */ - AOT_WAV_TAB_SYNTH = 14, /**< Wavetable Synthesis object */ - AOT_GEN_MIDI = 15, /**< General MIDI object */ +typedef enum { + AOT_NONE = -1, + AOT_NULL_OBJECT = 0, + AOT_AAC_MAIN = 1, /**< Main profile */ + AOT_AAC_LC = 2, /**< Low Complexity object */ + AOT_AAC_SSR = 3, + AOT_AAC_LTP = 4, + AOT_SBR = 5, + AOT_AAC_SCAL = 6, + AOT_TWIN_VQ = 7, + AOT_CELP = 8, + AOT_HVXC = 9, + AOT_RSVD_10 = 10, /**< (reserved) */ + AOT_RSVD_11 = 11, /**< (reserved) */ + AOT_TTSI = 12, /**< TTSI Object */ + AOT_MAIN_SYNTH = 13, /**< Main Synthetic object */ + AOT_WAV_TAB_SYNTH = 14, /**< Wavetable Synthesis object */ + AOT_GEN_MIDI = 15, /**< General MIDI object */ AOT_ALG_SYNTH_AUD_FX = 16, /**< Algorithmic Synthesis and Audio FX object */ - AOT_ER_AAC_LC = 17, /**< Error Resilient(ER) AAC Low Complexity */ - AOT_RSVD_18 = 18, /**< (reserved) */ - AOT_ER_AAC_LTP = 19, /**< Error Resilient(ER) AAC LTP object */ - AOT_ER_AAC_SCAL = 20, /**< Error Resilient(ER) AAC Scalable object */ - AOT_ER_TWIN_VQ = 21, /**< Error Resilient(ER) TwinVQ object */ - AOT_ER_BSAC = 22, /**< Error Resilient(ER) BSAC object */ - AOT_ER_AAC_LD = 23, /**< Error Resilient(ER) AAC LowDelay object */ - AOT_ER_CELP = 24, /**< Error Resilient(ER) CELP object */ - AOT_ER_HVXC = 25, /**< Error Resilient(ER) HVXC object */ - AOT_ER_HILN = 26, /**< Error Resilient(ER) HILN object */ - AOT_ER_PARA = 27, /**< Error Resilient(ER) Parametric object */ - AOT_RSVD_28 = 28, /**< might become SSC */ - AOT_PS = 29, /**< PS, Parametric Stereo (includes SBR) */ - AOT_MPEGS = 30, /**< MPEG Surround */ - - AOT_ESCAPE = 31, /**< Signal AOT uses more than 5 bits */ - - AOT_MP3ONMP4_L1 = 32, /**< MPEG-Layer1 in mp4 */ - AOT_MP3ONMP4_L2 = 33, /**< MPEG-Layer2 in mp4 */ - AOT_MP3ONMP4_L3 = 34, /**< MPEG-Layer3 in mp4 */ - AOT_RSVD_35 = 35, /**< might become DST */ - AOT_RSVD_36 = 36, /**< might become ALS */ - AOT_AAC_SLS = 37, /**< AAC + SLS */ - AOT_SLS = 38, /**< SLS */ - AOT_ER_AAC_ELD = 39, /**< AAC Enhanced Low Delay */ - - AOT_USAC = 42, /**< USAC */ - AOT_SAOC = 43, /**< SAOC */ - AOT_LD_MPEGS = 44, /**< Low Delay MPEG Surround */ + AOT_ER_AAC_LC = 17, /**< Error Resilient(ER) AAC Low Complexity */ + AOT_RSVD_18 = 18, /**< (reserved) */ + AOT_ER_AAC_LTP = 19, /**< Error Resilient(ER) AAC LTP object */ + AOT_ER_AAC_SCAL = 20, /**< Error Resilient(ER) AAC Scalable object */ + AOT_ER_TWIN_VQ = 21, /**< Error Resilient(ER) TwinVQ object */ + AOT_ER_BSAC = 22, /**< Error Resilient(ER) BSAC object */ + AOT_ER_AAC_LD = 23, /**< Error Resilient(ER) AAC LowDelay object */ + AOT_ER_CELP = 24, /**< Error Resilient(ER) CELP object */ + AOT_ER_HVXC = 25, /**< Error Resilient(ER) HVXC object */ + AOT_ER_HILN = 26, /**< Error Resilient(ER) HILN object */ + AOT_ER_PARA = 27, /**< Error Resilient(ER) Parametric object */ + AOT_RSVD_28 = 28, /**< might become SSC */ + AOT_PS = 29, /**< PS, Parametric Stereo (includes SBR) */ + AOT_MPEGS = 30, /**< MPEG Surround */ + + AOT_ESCAPE = 31, /**< Signal AOT uses more than 5 bits */ + + AOT_MP3ONMP4_L1 = 32, /**< MPEG-Layer1 in mp4 */ + AOT_MP3ONMP4_L2 = 33, /**< MPEG-Layer2 in mp4 */ + AOT_MP3ONMP4_L3 = 34, /**< MPEG-Layer3 in mp4 */ + AOT_RSVD_35 = 35, /**< might become DST */ + AOT_RSVD_36 = 36, /**< might become ALS */ + AOT_AAC_SLS = 37, /**< AAC + SLS */ + AOT_SLS = 38, /**< SLS */ + AOT_ER_AAC_ELD = 39, /**< AAC Enhanced Low Delay */ + + AOT_USAC = 42, /**< USAC */ + AOT_SAOC = 43, /**< SAOC */ + AOT_LD_MPEGS = 44, /**< Low Delay MPEG Surround */ /* Pseudo AOTs */ - AOT_DRM_AAC = 143, /**< Virtual AOT for DRM (ER-AAC-SCAL without SBR) */ - AOT_DRM_SBR = 144, /**< Virtual AOT for DRM (ER-AAC-SCAL with SBR) */ - AOT_DRM_MPEG_PS = 145 /**< Virtual AOT for DRM (ER-AAC-SCAL with SBR and MPEG-PS) */ + AOT_MP2_AAC_LC = 129, /**< Virtual AOT MP2 Low Complexity profile */ + AOT_MP2_SBR = 132, /**< Virtual AOT MP2 Low Complexity Profile with SBR */ + + AOT_DRM_AAC = 143, /**< Virtual AOT for DRM (ER-AAC-SCAL without SBR) */ + AOT_DRM_SBR = 144, /**< Virtual AOT for DRM (ER-AAC-SCAL with SBR) */ + AOT_DRM_MPEG_PS = + 145, /**< Virtual AOT for DRM (ER-AAC-SCAL with SBR and MPEG-PS) */ + AOT_DRM_SURROUND = + 146, /**< Virtual AOT for DRM Surround (ER-AAC-SCAL (+SBR) +MPS) */ + AOT_DRM_USAC = 147 /**< Virtual AOT for DRM with USAC */ } AUDIO_OBJECT_TYPE; -#define CAN_DO_PS(aot) \ - ((aot) == AOT_AAC_LC \ -|| (aot) == AOT_SBR \ -|| (aot) == AOT_PS \ -|| (aot) == AOT_ER_BSAC \ -|| (aot) == AOT_DRM_AAC) +#define CAN_DO_PS(aot) \ + ((aot) == AOT_AAC_LC || (aot) == AOT_SBR || (aot) == AOT_PS || \ + (aot) == AOT_ER_BSAC || (aot) == AOT_DRM_AAC) -#define IS_USAC(aot) \ - ((aot) == AOT_USAC) +#define IS_USAC(aot) ((aot) == AOT_USAC) -#define IS_LOWDELAY(aot) \ - ((aot) == AOT_ER_AAC_LD \ -|| (aot) == AOT_ER_AAC_ELD) +#define IS_LOWDELAY(aot) ((aot) == AOT_ER_AAC_LD || (aot) == AOT_ER_AAC_ELD) -/** Channel Mode ( 1-7 equals MPEG channel configurations, others are arbitrary). */ +/** Channel Mode ( 1-7 equals MPEG channel configurations, others are + * arbitrary). */ typedef enum { - MODE_INVALID = -1, - MODE_UNKNOWN = 0, - MODE_1 = 1, /**< C */ - MODE_2 = 2, /**< L+R */ - MODE_1_2 = 3, /**< C, L+R */ - MODE_1_2_1 = 4, /**< C, L+R, Rear */ - MODE_1_2_2 = 5, /**< C, L+R, LS+RS */ - MODE_1_2_2_1 = 6, /**< C, L+R, LS+RS, LFE */ - MODE_1_2_2_2_1 = 7, /**< C, LC+RC, L+R, LS+RS, LFE */ - + MODE_INVALID = -1, + MODE_UNKNOWN = 0, + MODE_1 = 1, /**< C */ + MODE_2 = 2, /**< L+R */ + MODE_1_2 = 3, /**< C, L+R */ + MODE_1_2_1 = 4, /**< C, L+R, Rear */ + MODE_1_2_2 = 5, /**< C, L+R, LS+RS */ + MODE_1_2_2_1 = 6, /**< C, L+R, LS+RS, LFE */ + MODE_1_2_2_2_1 = 7, /**< C, LC+RC, L+R, LS+RS, LFE */ - MODE_1_1 = 16, /**< 2 SCEs (dual mono) */ - MODE_1_1_1_1 = 17, /**< 4 SCEs */ - MODE_1_1_1_1_1_1 = 18, /**< 6 SCEs */ - MODE_1_1_1_1_1_1_1_1 = 19, /**< 8 SCEs */ - MODE_1_1_1_1_1_1_1_1_1_1_1_1 = 20, /**< 12 SCEs */ + MODE_6_1 = 11, /**< C, L+R, LS+RS, Crear, LFE */ + MODE_7_1_BACK = 12, /**< C, L+R, LS+RS, Lrear+Rrear, LFE */ + MODE_7_1_TOP_FRONT = 14, /**< C, L+R, LS+RS, LFE, Ltop+Rtop */ - MODE_2_2 = 21, /**< 2 CPEs */ - MODE_2_2_2 = 22, /**< 3 CPEs */ - MODE_2_2_2_2 = 23, /**< 4 CPEs */ - MODE_2_2_2_2_2_2 = 24, /**< 6 CPEs */ + MODE_7_1_REAR_SURROUND = 33, /**< C, L+R, LS+RS, Lrear+Rrear, LFE */ + MODE_7_1_FRONT_CENTER = 34, /**< C, LC+RC, L+R, LS+RS, LFE */ - MODE_2_1 = 30, /**< CPE,SCE (ARIB standard B32) */ - - MODE_7_1_REAR_SURROUND = 33, /**< C, L+R, LS+RS, Lrear+Rrear, LFE */ - MODE_7_1_FRONT_CENTER = 34 /**< C, LC+RC, L+R, LS+RS, LFE */ + MODE_212 = 128 /**< 212 configuration, used in ELDv2 */ } CHANNEL_MODE; /** * Speaker description tags. - * Do not change the enumeration values unless it keeps the following segmentation: + * Do not change the enumeration values unless it keeps the following + * segmentation: * - Bit 0-3: Horizontal postion (0: none, 1: front, 2: side, 3: back, 4: lfe) * - Bit 4-7: Vertical position (0: normal, 1: top, 2: bottom) */ typedef enum { - ACT_NONE = 0x00, - ACT_FRONT = 0x01, /*!< Front speaker position (at normal height) */ - ACT_SIDE = 0x02, /*!< Side speaker position (at normal height) */ - ACT_BACK = 0x03, /*!< Back speaker position (at normal height) */ - ACT_LFE = 0x04, /*!< Low frequency effect speaker postion (front) */ - - ACT_TOP = 0x10, /*!< Top speaker area (for combination with speaker positions) */ - ACT_FRONT_TOP = 0x11, /*!< Top front speaker = (ACT_FRONT|ACT_TOP) */ - ACT_SIDE_TOP = 0x12, /*!< Top side speaker = (ACT_SIDE |ACT_TOP) */ - ACT_BACK_TOP = 0x13, /*!< Top back speaker = (ACT_BACK |ACT_TOP) */ - - ACT_BOTTOM = 0x20, /*!< Bottom speaker area (for combination with speaker positions) */ - ACT_FRONT_BOTTOM = 0x21, /*!< Bottom front speaker = (ACT_FRONT|ACT_BOTTOM) */ - ACT_SIDE_BOTTOM = 0x22, /*!< Bottom side speaker = (ACT_SIDE |ACT_BOTTOM) */ - ACT_BACK_BOTTOM = 0x23 /*!< Bottom back speaker = (ACT_BACK |ACT_BOTTOM) */ + ACT_NONE = 0x00, + ACT_FRONT = 0x01, /*!< Front speaker position (at normal height) */ + ACT_SIDE = 0x02, /*!< Side speaker position (at normal height) */ + ACT_BACK = 0x03, /*!< Back speaker position (at normal height) */ + ACT_LFE = 0x04, /*!< Low frequency effect speaker postion (front) */ + + ACT_TOP = + 0x10, /*!< Top speaker area (for combination with speaker positions) */ + ACT_FRONT_TOP = 0x11, /*!< Top front speaker = (ACT_FRONT|ACT_TOP) */ + ACT_SIDE_TOP = 0x12, /*!< Top side speaker = (ACT_SIDE |ACT_TOP) */ + ACT_BACK_TOP = 0x13, /*!< Top back speaker = (ACT_BACK |ACT_TOP) */ + + ACT_BOTTOM = + 0x20, /*!< Bottom speaker area (for combination with speaker positions) */ + ACT_FRONT_BOTTOM = 0x21, /*!< Bottom front speaker = (ACT_FRONT|ACT_BOTTOM) */ + ACT_SIDE_BOTTOM = 0x22, /*!< Bottom side speaker = (ACT_SIDE |ACT_BOTTOM) */ + ACT_BACK_BOTTOM = 0x23 /*!< Bottom back speaker = (ACT_BACK |ACT_BOTTOM) */ } AUDIO_CHANNEL_TYPE; -typedef enum -{ - SIG_UNKNOWN = -1, - SIG_IMPLICIT = 0, - SIG_EXPLICIT_BW_COMPATIBLE = 1, - SIG_EXPLICIT_HIERARCHICAL = 2 +typedef enum { + SIG_UNKNOWN = -1, + SIG_IMPLICIT = 0, + SIG_EXPLICIT_BW_COMPATIBLE = 1, + SIG_EXPLICIT_HIERARCHICAL = 2 } SBR_PS_SIGNALING; /** * Audio Codec flags. */ -#define AC_ER_VCB11 0x000001 /*!< aacSectionDataResilienceFlag flag (from ASC): 1 means use virtual codebooks */ -#define AC_ER_RVLC 0x000002 /*!< aacSpectralDataResilienceFlag flag (from ASC): 1 means use huffman codeword reordering */ -#define AC_ER_HCR 0x000004 /*!< aacSectionDataResilienceFlag flag (from ASC): 1 means use virtual codebooks */ -#define AC_SCALABLE 0x000008 /*!< AAC Scalable*/ -#define AC_ELD 0x000010 /*!< AAC-ELD */ -#define AC_LD 0x000020 /*!< AAC-LD */ -#define AC_ER 0x000040 /*!< ER syntax */ -#define AC_BSAC 0x000080 /*!< BSAC */ -#define AC_USAC 0x000100 /*!< USAC */ -#define AC_USAC_TW 0x000200 /*!< USAC time warped filter bank is active */ -#define AC_USAC_NOISE 0x000400 /*!< USAC noise filling is active */ -#define AC_USAC_HBE 0x000800 /*!< USAC harmonic bandwidth extension is active */ -#define AC_RSVD50 0x001000 /*!< Rsvd50 */ -#define AC_SBR_PRESENT 0x002000 /*!< SBR present flag (from ASC) */ -#define AC_SBRCRC 0x004000 /*!< SBR CRC present flag. Only relevant for AAC-ELD for now. */ -#define AC_PS_PRESENT 0x008000 /*!< PS present flag (from ASC or implicit) */ -#define AC_MPS_PRESENT 0x010000 /*!< MPS present flag (from ASC or implicit) */ -#define AC_DRM 0x020000 /*!< DRM bit stream syntax */ -#define AC_INDEP 0x040000 /*!< Independency flag */ -#define AC_MPS_RES 0x080000 /*!< MPS residual individual channel data. */ -#define AC_DAB 0x800000 /*!< DAB bit stream syntax */ -#define AC_LD_MPS 0x01000000 /*!< Low Delay MPS. */ +#define AC_ER_VCB11 \ + 0x000001 /*!< aacSectionDataResilienceFlag flag (from ASC): 1 means use \ + virtual codebooks */ +#define AC_ER_RVLC \ + 0x000002 /*!< aacSpectralDataResilienceFlag flag (from ASC): 1 means use \ + huffman codeword reordering */ +#define AC_ER_HCR \ + 0x000004 /*!< aacSectionDataResilienceFlag flag (from ASC): 1 means use \ + virtual codebooks */ +#define AC_SCALABLE 0x000008 /*!< AAC Scalable*/ +#define AC_ELD 0x000010 /*!< AAC-ELD */ +#define AC_LD 0x000020 /*!< AAC-LD */ +#define AC_ER 0x000040 /*!< ER syntax */ +#define AC_BSAC 0x000080 /*!< BSAC */ +#define AC_USAC 0x000100 /*!< USAC */ +#define AC_RSV603DA 0x000200 /*!< RSVD60 3D audio */ +#define AC_HDAAC 0x000400 /*!< HD-AAC */ +#define AC_RSVD50 0x004000 /*!< Rsvd50 */ +#define AC_SBR_PRESENT 0x008000 /*!< SBR present flag (from ASC) */ +#define AC_SBRCRC \ + 0x010000 /*!< SBR CRC present flag. Only relevant for AAC-ELD for now. */ +#define AC_PS_PRESENT 0x020000 /*!< PS present flag (from ASC or implicit) */ +#define AC_MPS_PRESENT \ + 0x040000 /*!< MPS present flag (from ASC or implicit) \ + */ +#define AC_DRM 0x080000 /*!< DRM bit stream syntax */ +#define AC_INDEP 0x100000 /*!< Independency flag */ +#define AC_MPEGD_RES 0x200000 /*!< MPEG-D residual individual channel data. */ +#define AC_SAOC_PRESENT 0x400000 /*!< SAOC Present Flag */ +#define AC_DAB 0x800000 /*!< DAB bit stream syntax */ +#define AC_ELD_DOWNSCALE 0x1000000 /*!< ELD Downscaled playout */ +#define AC_LD_MPS 0x2000000 /*!< Low Delay MPS. */ +#define AC_DRC_PRESENT \ + 0x4000000 /*!< Dynamic Range Control (DRC) data found. \ + */ +#define AC_USAC_SCFGI3 \ + 0x8000000 /*!< USAC flag: If stereoConfigIndex is 3 the flag is set. */ +/** + * Audio Codec flags (reconfiguration). + */ +#define AC_CM_DET_CFG_CHANGE \ + 0x000001 /*!< Config mode signalizes the callback to work in config change \ + detection mode */ +#define AC_CM_ALLOC_MEM \ + 0x000002 /*!< Config mode signalizes the callback to work in memory \ + allocation mode */ +/** + * Audio Codec flags (element specific). + */ +#define AC_EL_USAC_TW 0x000001 /*!< USAC time warped filter bank is active */ +#define AC_EL_USAC_NOISE 0x000002 /*!< USAC noise filling is active */ +#define AC_EL_USAC_ITES 0x000004 /*!< USAC SBR inter-TES tool is active */ +#define AC_EL_USAC_PVC \ + 0x000008 /*!< USAC SBR predictive vector coding tool is active */ +#define AC_EL_USAC_MPS212 0x000010 /*!< USAC MPS212 tool is active */ +#define AC_EL_USAC_LFE 0x000020 /*!< USAC element is LFE */ +#define AC_EL_USAC_CP_POSSIBLE \ + 0x000040 /*!< USAC may use Complex Stereo Prediction in this channel element \ + */ +#define AC_EL_ENHANCED_NOISE 0x000080 /*!< Enhanced noise filling*/ +#define AC_EL_IGF_AFTER_TNS 0x000100 /*!< IGF after TNS */ +#define AC_EL_IGF_INDEP_TILING 0x000200 /*!< IGF independent tiling */ +#define AC_EL_IGF_USE_ENF 0x000400 /*!< IGF use enhanced noise filling */ +#define AC_EL_FULLBANDLPD 0x000800 /*!< enable fullband LPD tools */ +#define AC_EL_LPDSTEREOIDX 0x001000 /*!< LPD-stereo-tool stereo index */ +#define AC_EL_LFE 0x002000 /*!< The element is of type LFE. */ /* CODER_CONFIG::flags */ -#define CC_MPEG_ID 0x00100000 -#define CC_IS_BASELAYER 0x00200000 -#define CC_PROTECTION 0x00400000 -#define CC_SBR 0x00800000 -#define CC_SBRCRC 0x00010000 -#define CC_RVLC 0x01000000 -#define CC_VCB11 0x02000000 -#define CC_HCR 0x04000000 +#define CC_MPEG_ID 0x00100000 +#define CC_IS_BASELAYER 0x00200000 +#define CC_PROTECTION 0x00400000 +#define CC_SBR 0x00800000 +#define CC_SBRCRC 0x00010000 +#define CC_SAC 0x00020000 +#define CC_RVLC 0x01000000 +#define CC_VCB11 0x02000000 +#define CC_HCR 0x04000000 #define CC_PSEUDO_SURROUND 0x08000000 -#define CC_USAC_NOISE 0x10000000 -#define CC_USAC_TW 0x20000000 -#define CC_USAC_HBE 0x40000000 +#define CC_USAC_NOISE 0x10000000 +#define CC_USAC_TW 0x20000000 +#define CC_USAC_HBE 0x40000000 /** Generic audio coder configuration structure. */ typedef struct { - AUDIO_OBJECT_TYPE aot; /**< Audio Object Type (AOT). */ - AUDIO_OBJECT_TYPE extAOT; /**< Extension Audio Object Type (SBR). */ - CHANNEL_MODE channelMode; /**< Channel mode. */ - INT samplingRate; /**< Sampling rate. */ - INT extSamplingRate; /**< Extended samplerate (SBR). */ - INT bitRate; /**< Average bitrate. */ - int samplesPerFrame; /**< Number of PCM samples per codec frame and audio channel. */ - int noChannels; /**< Number of audio channels. */ - int bitsFrame; - int nSubFrames; /**< Amount of encoder subframes. 1 means no subframing. */ - int BSACnumOfSubFrame; /**< The number of the sub-frames which are grouped and transmitted in a super-frame (BSAC). */ - int BSAClayerLength; /**< The average length of the large-step layers in bytes (BSAC). */ - UINT flags; /**< flags */ - UCHAR matrixMixdownA; /**< Matrix mixdown index to put into PCE. Default value 0 means no mixdown coefficient, - valid values are 1-4 which correspond to matrix_mixdown_idx 0-3. */ - UCHAR headerPeriod; /**< Frame period for sending in band configuration buffers in the transport layer. */ - - UCHAR stereoConfigIndex; /**< USAC MPS stereo mode */ - UCHAR sbrMode; /**< USAC SBR mode */ - SBR_PS_SIGNALING sbrSignaling;/**< 0: implicit signaling, 1: backwards compatible explicit signaling, 2: hierarcical explicit signaling */ - - UCHAR sbrPresent; - UCHAR psPresent; + AUDIO_OBJECT_TYPE aot; /**< Audio Object Type (AOT). */ + AUDIO_OBJECT_TYPE extAOT; /**< Extension Audio Object Type (SBR). */ + CHANNEL_MODE channelMode; /**< Channel mode. */ + UCHAR channelConfigZero; /**< Use channel config zero + pce although a + standard channel config could be signaled. */ + INT samplingRate; /**< Sampling rate. */ + INT extSamplingRate; /**< Extended samplerate (SBR). */ + INT downscaleSamplingRate; /**< Downscale sampling rate (ELD downscaled mode) + */ + INT bitRate; /**< Average bitrate. */ + int samplesPerFrame; /**< Number of PCM samples per codec frame and audio + channel. */ + int noChannels; /**< Number of audio channels. */ + int bitsFrame; + int nSubFrames; /**< Amount of encoder subframes. 1 means no subframing. */ + int BSACnumOfSubFrame; /**< The number of the sub-frames which are grouped and + transmitted in a super-frame (BSAC). */ + int BSAClayerLength; /**< The average length of the large-step layers in bytes + (BSAC). */ + UINT flags; /**< flags */ + UCHAR matrixMixdownA; /**< Matrix mixdown index to put into PCE. Default value + 0 means no mixdown coefficient, valid values are 1-4 + which correspond to matrix_mixdown_idx 0-3. */ + UCHAR headerPeriod; /**< Frame period for sending in band configuration + buffers in the transport layer. */ + + UCHAR stereoConfigIndex; /**< USAC MPS stereo mode */ + UCHAR sbrMode; /**< USAC SBR mode */ + SBR_PS_SIGNALING sbrSignaling; /**< 0: implicit signaling, 1: backwards + compatible explicit signaling, 2: + hierarcical explicit signaling */ + + UCHAR rawConfig[64]; /**< raw codec specific config as bit stream */ + int rawConfigBits; /**< Size of rawConfig in bits */ + + UCHAR sbrPresent; + UCHAR psPresent; } CODER_CONFIG; +#define USAC_ID_BIT 16 /** USAC element IDs start at USAC_ID_BIT */ + /** MP4 Element IDs. */ -typedef enum -{ - ID_NONE = -1, /**< Invalid Element helper ID. */ - ID_SCE = 0, /**< Single Channel Element. */ - ID_CPE = 1, /**< Channel Pair Element. */ - ID_CCE = 2, /**< Coupling Channel Element. */ - ID_LFE = 3, /**< LFE Channel Element. */ - ID_DSE = 4, /**< Currently one Data Stream Element for ancillary data is supported. */ - ID_PCE = 5, /**< Program Config Element. */ - ID_FIL = 6, /**< Fill Element. */ - ID_END = 7, /**< Arnie (End Element = Terminator). */ - ID_EXT = 8, /**< Extension Payload (ER only). */ - ID_SCAL = 9, /**< AAC scalable element (ER only). */ +typedef enum { + /* mp4 element IDs */ + ID_NONE = -1, /**< Invalid Element helper ID. */ + ID_SCE = 0, /**< Single Channel Element. */ + ID_CPE = 1, /**< Channel Pair Element. */ + ID_CCE = 2, /**< Coupling Channel Element. */ + ID_LFE = 3, /**< LFE Channel Element. */ + ID_DSE = 4, /**< Currently one Data Stream Element for ancillary data is + supported. */ + ID_PCE = 5, /**< Program Config Element. */ + ID_FIL = 6, /**< Fill Element. */ + ID_END = 7, /**< Arnie (End Element = Terminator). */ + ID_EXT = 8, /**< Extension Payload (ER only). */ + ID_SCAL = 9, /**< AAC scalable element (ER only). */ + /* USAC element IDs */ + ID_USAC_SCE = 0 + USAC_ID_BIT, /**< Single Channel Element. */ + ID_USAC_CPE = 1 + USAC_ID_BIT, /**< Channel Pair Element. */ + ID_USAC_LFE = 2 + USAC_ID_BIT, /**< LFE Channel Element. */ + ID_USAC_EXT = 3 + USAC_ID_BIT, /**< Extension Element. */ + ID_USAC_END = 4 + USAC_ID_BIT, /**< Arnie (End Element = Terminator). */ ID_LAST } MP4_ELEMENT_ID; -#define IS_CHANNEL_ELEMENT(elementId) \ - ((elementId) == ID_SCE \ -|| (elementId) == ID_CPE \ -|| (elementId) == ID_LFE) - -#define EXT_ID_BITS 4 /**< Size in bits of extension payload type tags. */ +/* usacConfigExtType q.v. ISO/IEC DIS 23008-3 Table 52 and ISO/IEC FDIS + * 23003-3:2011(E) Table 74*/ +typedef enum { + /* USAC and RSVD60 3DA */ + ID_CONFIG_EXT_FILL = 0, + /* RSVD60 3DA */ + ID_CONFIG_EXT_DOWNMIX = 1, + ID_CONFIG_EXT_LOUDNESS_INFO = 2, + ID_CONFIG_EXT_AUDIOSCENE_INFO = 3, + ID_CONFIG_EXT_HOA_MATRIX = 4, + ID_CONFIG_EXT_SIG_GROUP_INFO = 6 + /* 5-127 => reserved for ISO use */ + /* > 128 => reserved for use outside of ISO scope */ +} CONFIG_EXT_ID; + +#define IS_CHANNEL_ELEMENT(elementId) \ + ((elementId) == ID_SCE || (elementId) == ID_CPE || (elementId) == ID_LFE || \ + (elementId) == ID_USAC_SCE || (elementId) == ID_USAC_CPE || \ + (elementId) == ID_USAC_LFE) + +#define IS_MP4_CHANNEL_ELEMENT(elementId) \ + ((elementId) == ID_SCE || (elementId) == ID_CPE || (elementId) == ID_LFE) + +#define EXT_ID_BITS 4 /**< Size in bits of extension payload type tags. */ /** Extension payload types. */ typedef enum { - EXT_FIL = 0x00, - EXT_FILL_DATA = 0x01, - EXT_DATA_ELEMENT = 0x02, - EXT_DATA_LENGTH = 0x03, - EXT_LDSAC_DATA = 0x09, - EXT_SAOC_DATA = 0x0a, + EXT_FIL = 0x00, + EXT_FILL_DATA = 0x01, + EXT_DATA_ELEMENT = 0x02, + EXT_DATA_LENGTH = 0x03, + EXT_UNI_DRC = 0x04, + EXT_LDSAC_DATA = 0x09, + EXT_SAOC_DATA = 0x0a, EXT_DYNAMIC_RANGE = 0x0b, - EXT_SAC_DATA = 0x0c, - EXT_SBR_DATA = 0x0d, - EXT_SBR_DATA_CRC = 0x0e + EXT_SAC_DATA = 0x0c, + EXT_SBR_DATA = 0x0d, + EXT_SBR_DATA_CRC = 0x0e } EXT_PAYLOAD_TYPE; +#define IS_USAC_CHANNEL_ELEMENT(elementId) \ + ((elementId) == ID_USAC_SCE || (elementId) == ID_USAC_CPE || \ + (elementId) == ID_USAC_LFE) + +/** MPEG-D USAC & RSVD60 3D audio Extension Element Types. */ +typedef enum { + /* usac */ + ID_EXT_ELE_FILL = 0x00, + ID_EXT_ELE_MPEGS = 0x01, + ID_EXT_ELE_SAOC = 0x02, + ID_EXT_ELE_AUDIOPREROLL = 0x03, + ID_EXT_ELE_UNI_DRC = 0x04, + /* rsv603da */ + ID_EXT_ELE_OBJ_METADATA = 0x05, + ID_EXT_ELE_SAOC_3D = 0x06, + ID_EXT_ELE_HOA = 0x07, + ID_EXT_ELE_FMT_CNVRTR = 0x08, + ID_EXT_ELE_MCT = 0x09, + ID_EXT_ELE_ENHANCED_OBJ_METADATA = 0x0d, + /* reserved for use outside of ISO scope */ + ID_EXT_ELE_VR_METADATA = 0x81, + ID_EXT_ELE_UNKNOWN = 0xFF +} USAC_EXT_ELEMENT_TYPE; /** * Proprietary raw packet file configuration data type identifier. */ -typedef enum -{ - TC_NOTHING = 0, /* No configuration available -> in-band configuration. */ - TC_RAW_ASC, /* Configuration data field is a raw AudioSpecificConfig. */ - TC_RAW_SMC, /* Configuration data field is a raw StreamMuxConfig. */ - TC_RAW_SDC /* Configuration data field is a raw Drm SDC. */ +typedef enum { + TC_NOTHING = 0, /* No configuration available -> in-band configuration. */ + TC_RAW_ADTS = 2, /* Transfer type is ADTS. */ + TC_RAW_LATM_MCP1 = 6, /* Transfer type is LATM with SMC present. */ + TC_RAW_SDC = 21 /* Configuration data field is Drm SDC. */ } TP_CONFIG_TYPE; @@ -408,109 +521,171 @@ typedef enum * ############################################################################################## */ /* \cond */ -#define MODULE_ID_MASK (0x000000ff) -#define MODULE_ID_SHIFT (24) typedef enum { - FDK_NONE = 0, - FDK_TOOLS = 1, + FDK_NONE = 0, + FDK_TOOLS = 1, FDK_SYSLIB = 2, FDK_AACDEC = 3, FDK_AACENC = 4, FDK_SBRDEC = 5, FDK_SBRENC = 6, - FDK_TPDEC = 7, - FDK_TPENC = 8, + FDK_TPDEC = 7, + FDK_TPENC = 8, FDK_MPSDEC = 9, - FDK_MPEGFILEREAD = 10, + FDK_MPEGFILEREAD = 10, FDK_MPEGFILEWRITE = 11, - FDK_MP2DEC = 12, - FDK_DABDEC = 13, - FDK_DABPARSE = 14, - FDK_DRMDEC = 15, - FDK_DRMPARSE = 16, - FDK_AACLDENC = 17, - FDK_MP2ENC = 18, - FDK_MP3ENC = 19, - FDK_MP3DEC = 20, - FDK_MP3HEADPHONE = 21, - FDK_MP3SDEC = 22, - FDK_MP3SENC = 23, - FDK_EAEC = 24, - FDK_DABENC = 25, - FDK_DMBDEC = 26, - FDK_FDREVERB = 27, - FDK_DRMENC = 28, - FDK_METADATATRANSCODER = 29, - FDK_AC3DEC = 30, FDK_PCMDMX = 31, + FDK_MPSENC = 34, + FDK_TDLIMIT = 35, + FDK_UNIDRCDEC = 38, FDK_MODULE_LAST } FDK_MODULE_ID; /* AAC capability flags */ -#define CAPF_AAC_LC 0x00000001 /**< Support flag for AAC Low Complexity. */ -#define CAPF_ER_AAC_LD 0x00000002 /**< Support flag for AAC Low Delay with Error Resilience tools. */ -#define CAPF_ER_AAC_SCAL 0x00000004 /**< Support flag for AAC Scalable. */ -#define CAPF_ER_AAC_LC 0x00000008 /**< Support flag for AAC Low Complexity with Error Resilience tools. */ -#define CAPF_AAC_480 0x00000010 /**< Support flag for AAC with 480 framelength. */ -#define CAPF_AAC_512 0x00000020 /**< Support flag for AAC with 512 framelength. */ -#define CAPF_AAC_960 0x00000040 /**< Support flag for AAC with 960 framelength. */ -#define CAPF_AAC_1024 0x00000080 /**< Support flag for AAC with 1024 framelength. */ -#define CAPF_AAC_HCR 0x00000100 /**< Support flag for AAC with Huffman Codeword Reordering. */ -#define CAPF_AAC_VCB11 0x00000200 /**< Support flag for AAC Virtual Codebook 11. */ -#define CAPF_AAC_RVLC 0x00000400 /**< Support flag for AAC Reversible Variable Length Coding. */ -#define CAPF_AAC_MPEG4 0x00000800 /**< Support flag for MPEG file format. */ -#define CAPF_AAC_DRC 0x00001000 /**< Support flag for AAC Dynamic Range Control. */ -#define CAPF_AAC_CONCEALMENT 0x00002000 /**< Support flag for AAC concealment. */ -#define CAPF_AAC_DRM_BSFORMAT 0x00004000 /**< Support flag for AAC DRM bistream format. */ -#define CAPF_ER_AAC_ELD 0x00008000 /**< Support flag for AAC Enhanced Low Delay with Error Resilience tools. */ -#define CAPF_ER_AAC_BSAC 0x00010000 /**< Support flag for AAC BSAC. */ -#define CAPF_AAC_SUPERFRAMING 0x00020000 /**< Support flag for AAC Superframing. */ +#define CAPF_AAC_LC 0x00000001 /**< Support flag for AAC Low Complexity. */ +#define CAPF_ER_AAC_LD \ + 0x00000002 /**< Support flag for AAC Low Delay with Error Resilience tools. \ + */ +#define CAPF_ER_AAC_SCAL 0x00000004 /**< Support flag for AAC Scalable. */ +#define CAPF_ER_AAC_LC \ + 0x00000008 /**< Support flag for AAC Low Complexity with Error Resilience \ + tools. */ +#define CAPF_AAC_480 \ + 0x00000010 /**< Support flag for AAC with 480 framelength. */ +#define CAPF_AAC_512 \ + 0x00000020 /**< Support flag for AAC with 512 framelength. */ +#define CAPF_AAC_960 \ + 0x00000040 /**< Support flag for AAC with 960 framelength. */ +#define CAPF_AAC_1024 \ + 0x00000080 /**< Support flag for AAC with 1024 framelength. */ +#define CAPF_AAC_HCR \ + 0x00000100 /**< Support flag for AAC with Huffman Codeword Reordering. */ +#define CAPF_AAC_VCB11 \ + 0x00000200 /**< Support flag for AAC Virtual Codebook 11. */ +#define CAPF_AAC_RVLC \ + 0x00000400 /**< Support flag for AAC Reversible Variable Length Coding. */ +#define CAPF_AAC_MPEG4 0x00000800 /**< Support flag for MPEG file format. */ +#define CAPF_AAC_DRC \ + 0x00001000 /**< Support flag for AAC Dynamic Range Control. */ +#define CAPF_AAC_CONCEALMENT \ + 0x00002000 /**< Support flag for AAC concealment. */ +#define CAPF_AAC_DRM_BSFORMAT \ + 0x00004000 /**< Support flag for AAC DRM bistream format. */ +#define CAPF_ER_AAC_ELD \ + 0x00008000 /**< Support flag for AAC Enhanced Low Delay with Error \ + Resilience tools. */ +#define CAPF_ER_AAC_BSAC \ + 0x00010000 /**< Support flag for AAC BSAC. */ +#define CAPF_AAC_ELD_DOWNSCALE \ + 0x00040000 /**< Support flag for AAC-ELD Downscaling */ +#define CAPF_AAC_USAC_LP \ + 0x00100000 /**< Support flag for USAC low power mode. */ +#define CAPF_AAC_USAC \ + 0x00200000 /**< Support flag for Unified Speech and Audio Coding (USAC). */ +#define CAPF_ER_AAC_ELDV2 \ + 0x00800000 /**< Support flag for AAC Enhanced Low Delay with MPS 212. */ +#define CAPF_AAC_UNIDRC \ + 0x01000000 /**< Support flag for MPEG-D Dynamic Range Control (uniDrc). */ /* Transport capability flags */ -#define CAPF_ADTS 0x00000001 /**< Support flag for ADTS transport format. */ -#define CAPF_ADIF 0x00000002 /**< Support flag for ADIF transport format. */ -#define CAPF_LATM 0x00000004 /**< Support flag for LATM transport format. */ -#define CAPF_LOAS 0x00000008 /**< Support flag for LOAS transport format. */ -#define CAPF_RAWPACKETS 0x00000010 /**< Support flag for RAW PACKETS transport format. */ -#define CAPF_DRM 0x00000020 /**< Support flag for DRM/DRM+ transport format. */ -#define CAPF_RSVD50 0x00000040 /**< Support flag for RSVD50 transport format */ +#define CAPF_ADTS \ + 0x00000001 /**< Support flag for ADTS transport format. */ +#define CAPF_ADIF \ + 0x00000002 /**< Support flag for ADIF transport format. */ +#define CAPF_LATM \ + 0x00000004 /**< Support flag for LATM transport format. */ +#define CAPF_LOAS \ + 0x00000008 /**< Support flag for LOAS transport format. */ +#define CAPF_RAWPACKETS \ + 0x00000010 /**< Support flag for RAW PACKETS transport format. */ +#define CAPF_DRM \ + 0x00000020 /**< Support flag for DRM/DRM+ transport format. */ +#define CAPF_RSVD50 \ + 0x00000040 /**< Support flag for RSVD50 transport format */ /* SBR capability flags */ -#define CAPF_SBR_LP 0x00000001 /**< Support flag for SBR Low Power mode. */ -#define CAPF_SBR_HQ 0x00000002 /**< Support flag for SBR High Quality mode. */ -#define CAPF_SBR_DRM_BS 0x00000004 /**< Support flag for */ -#define CAPF_SBR_CONCEALMENT 0x00000008 /**< Support flag for SBR concealment. */ -#define CAPF_SBR_DRC 0x00000010 /**< Support flag for SBR Dynamic Range Control. */ -#define CAPF_SBR_PS_MPEG 0x00000020 /**< Support flag for MPEG Parametric Stereo. */ -#define CAPF_SBR_PS_DRM 0x00000040 /**< Support flag for DRM Parametric Stereo. */ - -/* MP2 encoder capability flags */ -#define CAPF_MP2ENC_SS 0x00000001 /**< Support flag for Seamless Switching. */ -#define CAPF_MP2ENC_DAB 0x00000002 /**< Support flag for Layer2 DAB. */ - -/* DAB capability flags */ -#define CAPF_DAB_MP2 0x00000001 /**< Support flag for Layer2 DAB. */ -#define CAPF_DAB_AAC 0x00000002 /**< Support flag for DAB+ (HE-AAC v2). */ -#define CAPF_DAB_PAD 0x00000004 /**< Support flag for PAD extraction. */ -#define CAPF_DAB_DRC 0x00000008 /**< Support flag for Dynamic Range Control. */ -#define CAPF_DAB_SURROUND 0x00000010 /**< Support flag for DAB Surround (MPS). */ - -/* DMB capability flags */ -#define CAPF_DMB_BSAC 0x00000001 /**< Support flag for ER AAC BSAC. */ -#define CAPF_DMB_DRC 0x00000008 /**< Support flag for Dynamic Range Control. */ -#define CAPF_DMB_SURROUND 0x00000010 /**< Support flag for DMB Surround (MPS). */ - -/* PCM up/downmmix capability flags */ -#define CAPF_DMX_BLIND 0x00000001 /**< Support flag for blind downmixing. */ -#define CAPF_DMX_PCE 0x00000002 /**< Support flag for guided downmix with data from MPEG-2/4 Program Config Elements (PCE). */ -#define CAPF_DMX_ARIB 0x00000004 /**< Support flag for PCE guided downmix with slightly different equations and levels to fulfill ARIB standard. */ -#define CAPF_DMX_DVB 0x00000008 /**< Support flag for guided downmix with data from DVB ancillary data fields. */ -#define CAPF_DMX_CH_EXP 0x00000010 /**< Support flag for simple upmixing by dublicating channels or adding zero channels. */ -/* \endcond */ +#define CAPF_SBR_LP \ + 0x00000001 /**< Support flag for SBR Low Power mode. */ +#define CAPF_SBR_HQ \ + 0x00000002 /**< Support flag for SBR High Quality mode. */ +#define CAPF_SBR_DRM_BS \ + 0x00000004 /**< Support flag for */ +#define CAPF_SBR_CONCEALMENT \ + 0x00000008 /**< Support flag for SBR concealment. */ +#define CAPF_SBR_DRC \ + 0x00000010 /**< Support flag for SBR Dynamic Range Control. */ +#define CAPF_SBR_PS_MPEG \ + 0x00000020 /**< Support flag for MPEG Parametric Stereo. */ +#define CAPF_SBR_PS_DRM \ + 0x00000040 /**< Support flag for DRM Parametric Stereo. */ +#define CAPF_SBR_ELD_DOWNSCALE \ + 0x00000080 /**< Support flag for ELD reduced delay mode */ +#define CAPF_SBR_HBEHQ \ + 0x00000100 /**< Support flag for HQ HBE */ + +/* PCM utils capability flags */ +#define CAPF_DMX_BLIND \ + 0x00000001 /**< Support flag for blind downmixing. */ +#define CAPF_DMX_PCE \ + 0x00000002 /**< Support flag for guided downmix with data from MPEG-2/4 \ + Program Config Elements (PCE). */ +#define CAPF_DMX_ARIB \ + 0x00000004 /**< Support flag for PCE guided downmix with slightly different \ + equations and levels to fulfill ARIB standard. */ +#define CAPF_DMX_DVB \ + 0x00000008 /**< Support flag for guided downmix with data from DVB ancillary \ + data fields. */ +#define CAPF_DMX_CH_EXP \ + 0x00000010 /**< Support flag for simple upmixing by dublicating channels or \ + adding zero channels. */ +#define CAPF_DMX_6_CH \ + 0x00000020 /**< Support flag for 5.1 channel configuration (input and \ + output). */ +#define CAPF_DMX_8_CH \ + 0x00000040 /**< Support flag for 6 and 7.1 channel configurations (input and \ + output). */ +#define CAPF_DMX_24_CH \ + 0x00000080 /**< Support flag for 22.2 channel configuration (input and \ + output). */ +#define CAPF_LIMITER \ + 0x00002000 /**< Support flag for signal level limiting. \ + */ + +/* MPEG Surround capability flags */ +#define CAPF_MPS_STD \ + 0x00000001 /**< Support flag for MPEG Surround. */ +#define CAPF_MPS_LD \ + 0x00000002 /**< Support flag for Low Delay MPEG Surround. \ + */ +#define CAPF_MPS_USAC \ + 0x00000004 /**< Support flag for USAC MPEG Surround. */ +#define CAPF_MPS_HQ \ + 0x00000010 /**< Support flag indicating if high quality processing is \ + supported */ +#define CAPF_MPS_LP \ + 0x00000020 /**< Support flag indicating if partially complex (low power) \ + processing is supported */ +#define CAPF_MPS_BLIND \ + 0x00000040 /**< Support flag indicating if blind processing is supported */ +#define CAPF_MPS_BINAURAL \ + 0x00000080 /**< Support flag indicating if binaural output is possible */ +#define CAPF_MPS_2CH_OUT \ + 0x00000100 /**< Support flag indicating if 2ch output is possible */ +#define CAPF_MPS_6CH_OUT \ + 0x00000200 /**< Support flag indicating if 6ch output is possible */ +#define CAPF_MPS_8CH_OUT \ + 0x00000400 /**< Support flag indicating if 8ch output is possible */ +#define CAPF_MPS_1CH_IN \ + 0x00001000 /**< Support flag indicating if 1ch dmx input is possible */ +#define CAPF_MPS_2CH_IN \ + 0x00002000 /**< Support flag indicating if 2ch dmx input is possible */ +#define CAPF_MPS_6CH_IN \ + 0x00004000 /**< Support flag indicating if 5ch dmx input is possible */ +/* \endcond */ /* * ############################################################################################## @@ -519,37 +694,45 @@ typedef enum { */ /** - * Convert each member of version numbers to one single numeric version representation. + * Convert each member of version numbers to one single numeric version + * representation. * \param lev0 1st level of version number. * \param lev1 2nd level of version number. * \param lev2 3rd level of version number. - */ -#define LIB_VERSION(lev0, lev1, lev2) ((lev0<<24 & 0xff000000) | \ - (lev1<<16 & 0x00ff0000) | \ - (lev2<<8 & 0x0000ff00)) + */ +#define LIB_VERSION(lev0, lev1, lev2) \ + ((lev0 << 24 & 0xff000000) | (lev1 << 16 & 0x00ff0000) | \ + (lev2 << 8 & 0x0000ff00)) /** * Build text string of version. */ -#define LIB_VERSION_STRING(info) FDKsprintf((info)->versionStr, "%d.%d.%d", (((info)->version >> 24) & 0xff), (((info)->version >> 16) & 0xff), (((info)->version >> 8 ) & 0xff)) +#define LIB_VERSION_STRING(info) \ + FDKsprintf((info)->versionStr, "%d.%d.%d", (((info)->version >> 24) & 0xff), \ + (((info)->version >> 16) & 0xff), \ + (((info)->version >> 8) & 0xff)) /** * Library information. */ -typedef struct LIB_INFO -{ +typedef struct LIB_INFO { const char* title; const char* build_date; const char* build_time; FDK_MODULE_ID module_id; INT version; - UINT flags; + UINT flags; char versionStr[32]; } LIB_INFO; +#ifdef __cplusplus +#define FDK_AUDIO_INLINE inline +#else +#define FDK_AUDIO_INLINE +#endif + /** Initialize library info. */ -static inline void FDKinitLibInfo( LIB_INFO* info ) -{ +static FDK_AUDIO_INLINE void FDKinitLibInfo(LIB_INFO* info) { int i; for (i = 0; i < FDK_MODULE_LAST; i++) { @@ -558,11 +741,11 @@ static inline void FDKinitLibInfo( LIB_INFO* info ) } /** Aquire supported features of library. */ -static inline UINT FDKlibInfo_getCapabilities( const LIB_INFO* info, FDK_MODULE_ID module_id ) -{ +static FDK_AUDIO_INLINE UINT +FDKlibInfo_getCapabilities(const LIB_INFO* info, FDK_MODULE_ID module_id) { int i; - for (i=0; i<FDK_MODULE_LAST; i++) { + for (i = 0; i < FDK_MODULE_LAST; i++) { if (info[i].module_id == module_id) { return info[i].flags; } @@ -571,23 +754,19 @@ static inline UINT FDKlibInfo_getCapabilities( const LIB_INFO* info, FDK_MODULE_ } /** Search for next free tab. */ -static inline INT FDKlibInfo_lookup( const LIB_INFO* info, FDK_MODULE_ID module_id ) -{ +static FDK_AUDIO_INLINE INT FDKlibInfo_lookup(const LIB_INFO* info, + FDK_MODULE_ID module_id) { int i = -1; for (i = 0; i < FDK_MODULE_LAST; i++) { - if (info[i].module_id == module_id) - return -1; - if (info[i].module_id == FDK_NONE) - break; + if (info[i].module_id == module_id) return -1; + if (info[i].module_id == FDK_NONE) break; } - if (i == FDK_MODULE_LAST) - return -1; + if (i == FDK_MODULE_LAST) return -1; return i; } - /* * ############################################################################################## * Buffer description @@ -597,34 +776,35 @@ static inline INT FDKlibInfo_lookup( const LIB_INFO* info, FDK_MODULE_ID module_ /** * I/O buffer descriptor. */ -typedef struct FDK_bufDescr -{ - void **ppBase; /*!< Pointer to an array containing buffer base addresses. - Set to NULL for buffer requirement info. */ - UINT *pBufSize; /*!< Pointer to an array containing the number of elements that can - be placed in the specific buffer. */ - UINT *pEleSize; /*!< Pointer to an array containing the element size for each buffer - in bytes. That is mostly the number returned by the sizeof() - operator for the data type used for the specific buffer. */ - UINT *pBufType; /*!< Pointer to an array of bit fields containing a description - for each buffer. See XXX below for more details. */ - UINT numBufs; /*!< Total number of buffers. */ +typedef struct FDK_bufDescr { + void** ppBase; /*!< Pointer to an array containing buffer base addresses. + Set to NULL for buffer requirement info. */ + UINT* pBufSize; /*!< Pointer to an array containing the number of elements + that can be placed in the specific buffer. */ + UINT* pEleSize; /*!< Pointer to an array containing the element size for each + buffer in bytes. That is mostly the number returned by the + sizeof() operator for the data type used for the specific + buffer. */ + UINT* + pBufType; /*!< Pointer to an array of bit fields containing a description + for each buffer. See XXX below for more details. */ + UINT numBufs; /*!< Total number of buffers. */ } FDK_bufDescr; /** * Buffer type description field. */ -#define FDK_BUF_TYPE_MASK_IO ( 0x03 << 30 ) -#define FDK_BUF_TYPE_MASK_DESCR ( 0x3F << 16 ) -#define FDK_BUF_TYPE_MASK_ID ( 0xFF ) +#define FDK_BUF_TYPE_MASK_IO ((UINT)0x03 << 30) +#define FDK_BUF_TYPE_MASK_DESCR ((UINT)0x3F << 16) +#define FDK_BUF_TYPE_MASK_ID ((UINT)0xFF) -#define FDK_BUF_TYPE_INPUT ( 0x1 << 30 ) -#define FDK_BUF_TYPE_OUTPUT ( 0x2 << 30 ) +#define FDK_BUF_TYPE_INPUT ((UINT)0x1 << 30) +#define FDK_BUF_TYPE_OUTPUT ((UINT)0x2 << 30) -#define FDK_BUF_TYPE_PCM_DATA ( 0x1 << 16 ) -#define FDK_BUF_TYPE_ANC_DATA ( 0x2 << 16 ) -#define FDK_BUF_TYPE_BS_DATA ( 0x4 << 16 ) +#define FDK_BUF_TYPE_PCM_DATA ((UINT)0x1 << 16) +#define FDK_BUF_TYPE_ANC_DATA ((UINT)0x2 << 16) +#define FDK_BUF_TYPE_BS_DATA ((UINT)0x4 << 16) #ifdef __cplusplus } diff --git a/libSYS/include/audio.h b/libSYS/include/audio.h deleted file mode 100644 index 6ef83ae..0000000 --- a/libSYS/include/audio.h +++ /dev/null @@ -1,106 +0,0 @@ - -/* ----------------------------------------------------------------------------------------------------------- -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. - - 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. - -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: - -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 -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. - -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." - -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. - -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. - -5. CONTACT INFORMATION - -Fraunhofer Institute for Integrated Circuits IIS -Attention: Audio and Multimedia Departments - FDK AAC LL -Am Wolfsmantel 33 -91058 Erlangen, Germany - -www.iis.fraunhofer.de/amm -amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ - -/************************** Fraunhofer IIS FDK SysLib ********************** - - Author: Manuel Jander - -******************************************************************************/ - -/** \file audio.h - * \brief Audio device support. - * - * This component features audio playback and capture with a common API for - * any software/hardware platform. - * - * If you use Microsoft Visual C++ Version 6 and Ksmedia.h cannot be found, - * installing DirectX (e.g. dx9sdk_summer2004.exe) solves it. - * - */ - -#ifndef AUDIO_H -#define AUDIO_H - - - -#endif diff --git a/libSYS/include/cmdl_parser.h b/libSYS/include/cmdl_parser.h deleted file mode 100644 index 266e41d..0000000 --- a/libSYS/include/cmdl_parser.h +++ /dev/null @@ -1,221 +0,0 @@ - -/* ----------------------------------------------------------------------------------------------------------- -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. - - 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. - -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: - -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 -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. - -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." - -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. - -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. - -5. CONTACT INFORMATION - -Fraunhofer Institute for Integrated Circuits IIS -Attention: Audio and Multimedia Departments - FDK AAC LL -Am Wolfsmantel 33 -91058 Erlangen, Germany - -www.iis.fraunhofer.de/amm -amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ - -/************************** Fraunhofer IIS FDK SysLib ********************** - - Author(s): - Description: command line parser - -******************************************************************************/ - -/** \file cmdl_parser.h - * \brief Command line parser. - * - * The command line parser can extract certain data fields out of a character - * string and assign values to variables. It has 2 main functions. One to parse - * a command line in the form of standard C runtime "argc" and "argv" parameters, - * and the other to assemble these parameters reading text lines from a file in - * case the C runtime does not provide them. - */ - -#ifndef __PARSER_H -#define __PARSER_H - - - -#include "machine_type.h" - -#define CMDL_MAX_STRLEN 255 -#define CMDL_MAX_ARGC 30 - -/* \cond */ -/* Type definition for text */ - - -#ifdef WIN32 - #include <tchar.h> - #ifndef _tstof /* For Visual Studio 6 */ - #ifdef _UNICODE - #include <wchar.h> - #define _tstof(x) (float) wcstod(x, NULL) /* For Visual Studio 6 */ - #else - #define _tstof atof - #endif - #endif - - #ifndef _tstol /* For Visual Studio 6 */ - #ifdef _UNICODE - #define _tstol _wtol - #else - #define _tstol atol - #endif - #endif - - #ifndef _tstoi /* For Visual Studio 6 */ - #ifdef _UNICODE - #define _tstoi _wtoi - #else - #define _tstoi atoi - #endif - #endif - - #ifndef TEXTCHAR - #define TEXTCHAR char - #endif - - #ifndef _TEXT - #define _TEXT - #endif - -#else /* WIN32 */ - - #define TEXTCHAR char - #define _tcslen(a) FDKstrlen(a) - #define _tcscpy strcpy - #define _tcscmp FDKstrcmp - #define _tcsncmp FDKstrncmp - #define _tscanf scanf - #define _TEXT(x) x - #define _tfopen fopen - #define _ftprintf fprintf - #define _tcsncpy FDKstrncpy - #define _tstof FDKatof - #define _tstol FDKatol - #define _tstoi FDKatoi - #define _tcstol strtol - #define _istdigit isdigit -#endif /* WIN32 */ - -/* \endcond */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -/** - * Scans argc, argv and a scanf style format string for parameters and stores the - * values in the variable number of pointers passed to the function. - - For example: - \code - #define ARG_PARAM "(-a %d) (-v %1)" - #define ARG_VALUE &config->aot, &verbose - int nFoundArgs = IIS_ScanCmdl(argc, argv, ARG_PARAM, ARG_VALUE); - \endcode - wheras the wild-cards (\%d, \%1, ..) define the data type of the argument: - - \%1 boolean (e. g. -x) - - \%d integer (e. g. -x 23) - - \%f float (e. g. -x 3.4) - - \%y double (e. g. -x 31415926535897932384626433832795028841971693993751) - - \%s string (e. g. -x "file.dat") - - \%u unsigned character (e. g. -x 3) - - \%c signed character (e. g. -x -3) - More examples on how to use it are located in every (encoder/decoder) example framework. - - * \param argc Number of arguments. - * \param argv Complete character string of the command line arguments. - * \param pReqArgs A list of parameters and a corresponding list of memory addresses to - * assign each parameter to. - * - * \return Number of found arguments. - */ -INT IIS_ScanCmdl(INT argc, TEXTCHAR* argv[], const TEXTCHAR* pReqArgs, ...); - -#ifdef __cplusplus -} -#endif - -/** - * Reads a text file, assembles argc and argv parameters for each text line - * and calls the given function for each set of argc, argv parameters. - * - * \param param_filename Name of text file that should be parsed. - * \param pFunction Pointer to function that should be called for every text line found. - * - * \return 0 on success, 1 on failure. - */ -INT IIS_ProcessCmdlList(const TEXTCHAR* param_filename, int (*pFunction)(int, TEXTCHAR**)); - - -#endif /* __PARSER_H */ diff --git a/libSYS/include/conv_string.h b/libSYS/include/conv_string.h deleted file mode 100644 index 0409dc0..0000000 --- a/libSYS/include/conv_string.h +++ /dev/null @@ -1,136 +0,0 @@ - -/* ----------------------------------------------------------------------------------------------------------- -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. - - 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. - -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: - -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 -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. - -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." - -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. - -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. - -5. CONTACT INFORMATION - -Fraunhofer Institute for Integrated Circuits IIS -Attention: Audio and Multimedia Departments - FDK AAC LL -Am Wolfsmantel 33 -91058 Erlangen, Germany - -www.iis.fraunhofer.de/amm -amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ - -/************************** Fraunhofer IIS FDK SysLib ********************** - - Author(s): - -******************************************************************************/ - -/** \file conv_string.h - * \brief String conversion functions. - */ - -#ifndef _CONV_STRING_H -#define _CONV_STRING_H - - - -#include "genericStds.h" - -#ifdef __cplusplus -extern "C" -{ -#endif - -/** - * \brief Convert a bitbuffer to a hex string. - * \param string Hex string. - * \param charBuf Input buffer that has to be converted. - * \param charBufLength Size of the input buffer. - * \return Error code. - */ -INT charBuf2HexString(char *string, UCHAR *charBuf, INT charBufLength); - -/** - * \brief Convert a hex string to bits. - * \param string Hex string that has to be converted. - * \param charBuf Output buffer holding the bits, will be filled up with zeros. - * \param charBufLength Size of the output buffer. - * \return Error code. - */ -INT hexString2CharBuf(const char *string, UCHAR *charBuf, UINT charBufLength); - -/** - * \brief Convert a character representing a hex sign to the appropriate value. - * \param c Character that has to be converted. - * \return Converted value (value between 0 and 15), if 16, an error has occured. - */ -UCHAR hexChar2Dec(const char c); - -#ifdef __cplusplus -} -#endif - - -#endif /* _CONV_STRING_H */ diff --git a/libSYS/include/genericStds.h b/libSYS/include/genericStds.h index fe4dc36..8828ba7 100644 --- a/libSYS/include/genericStds.h +++ b/libSYS/include/genericStds.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,40 +90,34 @@ Am Wolfsmantel 33 www.iis.fraunhofer.de/amm amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ +----------------------------------------------------------------------------- */ -/************************** Fraunhofer IIS FDK SysLib ********************** +/************************* System integration library ************************** Author(s): -******************************************************************************/ + Description: + +*******************************************************************************/ /** \file genericStds.h - \brief Generic Run-Time Support function wrappers and heap allocation monitoring. + \brief Generic Run-Time Support function wrappers and heap allocation + monitoring. */ -#if !defined(__GENERICSTDS_H__) -#define __GENERICSTDS_H__ +#if !defined(GENERICSTDS_H) +#define GENERICSTDS_H #include "machine_type.h" - -/* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */ -#if defined(DEBUG) || defined(FDK_DEBUG) -//#define MEMORY_MEASUREMENT -#endif - #ifndef M_PI - #define M_PI 3.14159265358979323846 /*! Pi. Only used in example projects. */ +#define M_PI 3.14159265358979323846 /*!< Pi. Only used in example projects. */ #endif - -/* #define _CRT_SECURE_NO_DEPRECATE */ - - /** - * Identifiers for various memory locations. They are used along with memory allocation - * functions like FDKcalloc_L() to specify the requested memory's location. + * Identifiers for various memory locations. They are used along with memory + * allocation functions like FDKcalloc_L() to specify the requested memory's + * location. */ typedef enum { /* Internal */ @@ -128,104 +133,247 @@ typedef enum { } MEMORY_SECTION; - -/** - * The H_ prefix indicates header file version, the C_* prefix indicates the corresponding - * object version. +/*! \addtogroup SYSLIB_MEMORY_MACROS FDK memory macros * - * Declaring memory areas requires to specify a unique name and a data type. Use the H_ macro - * for this purpose inside a header file. + * The \c H_ prefix indicates that the macro is to be used in a header file, the + * \c C_ prefix indicates that the macro is to be used in a source file. * - * For defining a memory area your require additionally one or two sizes, depending if the - * memory should be organized into one or two dimensions. + * Declaring memory areas requires to specify a unique name and a data type. * - * The macros containing the keyword AALLOC instead of ALLOC also do take care of returning - * aligned memory addresses (beyond the natural alignment of its type). The preprocesor macro - * ::ALIGNMENT_DEFAULT indicates the aligment to be used (this is hardware specific). + * For defining a memory area you require additionally one or two sizes, + * depending if the memory should be organized into one or two dimensions. * - * The _L suffix indicates that the memory will be located in a specific section. This is - * useful to allocate critical memory section into fast internal SRAM for example. + * The macros containing the keyword \c AALLOC instead of \c ALLOC additionally + * take care of returning aligned memory addresses (beyond the natural alignment + * of its type). The preprocesor macro + * ::ALIGNMENT_DEFAULT indicates the aligment to be used (this is hardware + * specific). * + * The \c _L suffix indicates that the memory will be located in a specific + * section. This is useful to allocate critical memory section into fast + * internal SRAM for example. + * + * @{ */ -#define H_ALLOC_MEM(name,type) type * Get ## name(int n=0); void Free ## name(type** p); \ - UINT GetRequiredMem ## name(void); - -/** See #H_ALLOC_MEM for description. */ -#define H_ALLOC_MEM_OVERLAY(name,type) type * Get ## name(int n=0); void Free ## name(type** p); \ - UINT GetRequiredMem ## name(void); - - - /** See #H_ALLOC_MEM for description. */ - #define C_ALLOC_MEM(name,type,num) \ - type * Get ## name(int n) { FDK_ASSERT((n) == 0); return ((type*)FDKcalloc(num, sizeof(type))); } \ - void Free ## name(type** p) { if (p != NULL) { FDKfree(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((num) * sizeof(type)); } - - /** See #H_ALLOC_MEM for description. */ - #define C_ALLOC_MEM_STATIC(name,type,num) \ - static type * Get ## name(int n) { FDK_ASSERT((n) == 0); return ((type*)FDKcalloc(num, sizeof(type))); } \ - static void Free ## name(type** p) { if (p != NULL) { FDKfree(*p); *p=NULL; } } \ - static UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((num) * sizeof(type)); } - - /** See #H_ALLOC_MEM for description. */ - #define C_ALLOC_MEM2(name,type,n1,n2) \ - type * Get ## name (int n) { FDK_ASSERT((n) < (n2)); return ((type*)FDKcalloc(n1, sizeof(type))); } \ - void Free ## name(type** p) { if (p != NULL) { FDKfree(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((n1) * sizeof(type)) * (n2); } - - /** See #H_ALLOC_MEM for description. */ - #define C_AALLOC_MEM(name,type,num) \ - type * Get ## name(int n) { FDK_ASSERT((n) == 0); return ((type*)FDKaalloc((num)*sizeof(type), ALIGNMENT_DEFAULT)); } \ - void Free ## name(type** p) { if (p != NULL) { FDKafree(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((num) * sizeof(type) + ALIGNMENT_DEFAULT + sizeof(void *)); } - - /** See #H_ALLOC_MEM for description. */ - #define C_AALLOC_MEM2(name,type,n1,n2) \ - type * Get ## name (int n) { FDK_ASSERT((n) < (n2)); return ((type*)FDKaalloc((n1)*sizeof(type), ALIGNMENT_DEFAULT)); } \ - void Free ## name(type** p) { if (p != NULL) { FDKafree(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((n1) * sizeof(type) + ALIGNMENT_DEFAULT + sizeof(void *)) * (n2); } - - /** See #H_ALLOC_MEM for description. */ - #define C_ALLOC_MEM_L(name,type,num,s) \ - type * Get ## name(int n) { FDK_ASSERT((n) == 0); return ((type*)FDKcalloc_L(num, sizeof(type), s)); } \ - void Free ## name(type** p) { if (p != NULL) { FDKfree_L(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((num) * sizeof(type)); } - - /** See #H_ALLOC_MEM for description. */ - #define C_ALLOC_MEM2_L(name,type,n1,n2,s) \ - type * Get ## name (int n) { FDK_ASSERT((n) < (n2)); return (type*)FDKcalloc_L(n1, sizeof(type), s); } \ - void Free ## name(type** p) { if (p != NULL) { FDKfree_L(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((n1) * sizeof(type)) * (n2); } - - /** See #H_ALLOC_MEM for description. */ - #define C_AALLOC_MEM_L(name,type,num,s) \ - type * Get ## name(int n) { FDK_ASSERT((n) == 0); return ((type*)FDKaalloc_L((num)*sizeof(type), ALIGNMENT_DEFAULT, s)); } \ - void Free ## name(type** p) { if (p != NULL) { FDKafree_L(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((num) * sizeof(type) + ALIGNMENT_DEFAULT + sizeof(void *)); } - - /** See #H_ALLOC_MEM for description. */ - #define C_AALLOC_MEM2_L(name,type,n1,n2,s) \ - type * Get ## name (int n) { FDK_ASSERT((n) < (n2)); return ((type*)FDKaalloc_L((n1)*sizeof(type), ALIGNMENT_DEFAULT, s)); } \ - void Free ## name(type** p) { if (p != NULL) { FDKafree_L(*p); *p=NULL; } } \ - UINT GetRequiredMem ## name(void) { return ALGN_SIZE_EXTRES((n1) * sizeof(type) + ALIGNMENT_DEFAULT + sizeof(void *)) * (n2); } - -/** See #H_ALLOC_MEM_OVERLAY for description. */ - - - #define C_ALLOC_MEM_OVERLAY(name,type,num,sect,tag) C_AALLOC_MEM_L(name,type,num,sect) - - - #define C_AALLOC_SCRATCH_START(name,type,n) \ - type _ ## name[(n)+(ALIGNMENT_DEFAULT+sizeof(type)-1)]; \ - type * name = (type*)ALIGN_PTR(_ ## name); \ - - #define C_ALLOC_SCRATCH_START(name,type,n) \ - type name[n]; - - #define C_AALLOC_SCRATCH_END(name,type,n) - #define C_ALLOC_SCRATCH_END(name,type,n) - +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define H_ALLOC_MEM(name, type) \ + type *Get##name(int n = 0); \ + void Free##name(type **p); \ + UINT GetRequiredMem##name(void); + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define H_ALLOC_MEM_OVERLAY(name, type) \ + type *Get##name(int n = 0); \ + void Free##name(type **p); \ + UINT GetRequiredMem##name(void); + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_MEM(name, type, num) \ + type *Get##name(int n) { \ + FDK_ASSERT((n) == 0); \ + return ((type *)FDKcalloc(num, sizeof(type))); \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKfree(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((num) * sizeof(type)); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_MEM2(name, type, n1, n2) \ + type *Get##name(int n) { \ + FDK_ASSERT((n) < (n2)); \ + return ((type *)FDKcalloc(n1, sizeof(type))); \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKfree(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((n1) * sizeof(type)) * (n2); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_MEM(name, type, num) \ + type *Get##name(int n) { \ + type *ap; \ + FDK_ASSERT((n) == 0); \ + ap = ((type *)FDKaalloc((num) * sizeof(type), ALIGNMENT_DEFAULT)); \ + return ap; \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKafree(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((num) * sizeof(type) + ALIGNMENT_DEFAULT + \ + sizeof(void *)); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_MEM2(name, type, n1, n2) \ + type *Get##name(int n) { \ + type *ap; \ + FDK_ASSERT((n) < (n2)); \ + ap = ((type *)FDKaalloc((n1) * sizeof(type), ALIGNMENT_DEFAULT)); \ + return ap; \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKafree(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((n1) * sizeof(type) + ALIGNMENT_DEFAULT + \ + sizeof(void *)) * \ + (n2); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_MEM_L(name, type, num, s) \ + type *Get##name(int n) { \ + FDK_ASSERT((n) == 0); \ + return ((type *)FDKcalloc_L(num, sizeof(type), s)); \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKfree_L(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((num) * sizeof(type)); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_MEM2_L(name, type, n1, n2, s) \ + type *Get##name(int n) { \ + FDK_ASSERT((n) < (n2)); \ + return (type *)FDKcalloc_L(n1, sizeof(type), s); \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKfree_L(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((n1) * sizeof(type)) * (n2); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_MEM_L(name, type, num, s) \ + type *Get##name(int n) { \ + type *ap; \ + FDK_ASSERT((n) == 0); \ + ap = ((type *)FDKaalloc_L((num) * sizeof(type), ALIGNMENT_DEFAULT, s)); \ + return ap; \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKafree_L(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((num) * sizeof(type) + ALIGNMENT_DEFAULT + \ + sizeof(void *)); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_MEM2_L(name, type, n1, n2, s) \ + type *Get##name(int n) { \ + type *ap; \ + FDK_ASSERT((n) < (n2)); \ + ap = ((type *)FDKaalloc_L((n1) * sizeof(type), ALIGNMENT_DEFAULT, s)); \ + return ap; \ + } \ + void Free##name(type **p) { \ + if (p != NULL) { \ + FDKafree_L(*p); \ + *p = NULL; \ + } \ + } \ + UINT GetRequiredMem##name(void) { \ + return ALGN_SIZE_EXTRES((n1) * sizeof(type) + ALIGNMENT_DEFAULT + \ + sizeof(void *)) * \ + (n2); \ + } + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_MEM_OVERLAY(name, type, num, sect, tag) \ + C_AALLOC_MEM_L(name, type, num, sect) + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_SCRATCH_START(name, type, n) \ + type _##name[(n) + (ALIGNMENT_DEFAULT + sizeof(type) - 1)]; \ + type *name = (type *)ALIGN_PTR(_##name); \ + C_ALLOC_ALIGNED_REGISTER(name, (n) * sizeof(type)); + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_SCRATCH_START(name, type, n) type name[n]; + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_SCRATCH_END(name, type, n) C_ALLOC_ALIGNED_UNREGISTER(name); +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_ALLOC_SCRATCH_END(name, type, n) + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_STACK_START(name, type, n) \ + type _##name[(n) + (ALIGNMENT_DEFAULT + sizeof(type) - 1)]; \ + type *name = (type *)ALIGN_PTR(_##name); \ + C_ALLOC_ALIGNED_REGISTER(name, (n) * sizeof(type)); + +/** See \ref SYSLIB_MEMORY_MACROS for description. */ +#define C_AALLOC_STACK_END(name, type, n) C_ALLOC_ALIGNED_UNREGISTER(name); + +/*! @} */ + +#define C_ALLOC_ALIGNED_REGISTER(x, size) +#define C_ALLOC_ALIGNED_UNREGISTER(x) +#define C_ALLOC_ALIGNED_CHECK(x) +#define C_ALLOC_ALIGNED_CHECK2(x, y) +#define FDK_showBacktrace(a, b) + +/*! \addtogroup SYSLIB_EXITCODES Unified exit codes + * Exit codes to be used as return values of FDK software test and + * demonstration applications. Not as return values of product modules and/or + * libraries. + * @{ + */ +#define FDK_EXITCODE_OK 0 /*!< Successful termination. No errors. */ +#define FDK_EXITCODE_USAGE \ + 64 /*!< The command/application was used incorrectly, e.g. with the wrong \ + number of arguments, a bad flag, a bad syntax in a parameter, or \ + whatever. */ +#define FDK_EXITCODE_DATAERROR \ + 65 /*!< The input data was incorrect in some way. This should only be used \ + for user data and not system files. */ +#define FDK_EXITCODE_NOINPUT \ + 66 /*!< An input file (not a system file) did not exist or was not readable. \ + */ +#define FDK_EXITCODE_UNAVAILABLE \ + 69 /*!< A service is unavailable. This can occur if a support program or \ + file does not exist. This can also be used as a catchall message when \ + something you wanted to do doesn't work, but you don't know why. */ +#define FDK_EXITCODE_SOFTWARE \ + 70 /*!< An internal software error has been detected. This should be limited \ + to non- operating system related errors as possible. */ +#define FDK_EXITCODE_CANTCREATE \ + 73 /*!< A (user specified) output file cannot be created. */ +#define FDK_EXITCODE_IOERROR \ + 74 /*!< An error occurred while doing I/O on some file. */ +/*! @} */ /*-------------------------------------------- * Runtime support declarations @@ -234,57 +382,52 @@ typedef enum { extern "C" { #endif -/** printf() using stdout. If ::ARCH_WA_FLUSH_CONSOLE defined, a flush is done additionally after printf(). */ -void FDKprintf ( const char* szFmt, ...); +void FDKprintf(const char *szFmt, ...); -/** printf() using stderr. If ::ARCH_WA_FLUSH_CONSOLE defined, a flush is done additionally after printf(). */ -void FDKprintfErr ( const char* szFmt, ...); +void FDKprintfErr(const char *szFmt, ...); /** Wrapper for <stdio.h>'s getchar(). */ int FDKgetchar(void); -INT FDKfprintf(void *stream, const char *format, ...); -INT FDKsprintf(char *str, const char *format, ...); +INT FDKfprintf(void *stream, const char *format, ...); +INT FDKsprintf(char *str, const char *format, ...); - - -const char *FDKstrchr(const char *s, INT c); +char *FDKstrchr(char *s, INT c); const char *FDKstrstr(const char *haystack, const char *needle); char *FDKstrcpy(char *dest, const char *src); char *FDKstrncpy(char *dest, const char *src, const UINT n); -#define FDK_MAX_OVERLAYS 8 /**< Maximum number of memory overlays. */ - +#define FDK_MAX_OVERLAYS 8 /**< Maximum number of memory overlays. */ -void *FDKcalloc (const UINT n, const UINT size); -void *FDKmalloc (const UINT size); -void FDKfree (void *ptr); +void *FDKcalloc(const UINT n, const UINT size); +void *FDKmalloc(const UINT size); +void FDKfree(void *ptr); /** - * Allocate and clear an aligned memory area. Use FDKafree() instead of FDKfree() for these memory areas. + * Allocate and clear an aligned memory area. Use FDKafree() instead of + * FDKfree() for these memory areas. * * \param size Size of requested memory in bytes. * \param alignment Alignment of requested memory in bytes. * \return Pointer to allocated memory. */ -void *FDKaalloc (const UINT size, const UINT alignment); +void *FDKaalloc(const UINT size, const UINT alignment); /** * Free an aligned memory area. * * \param ptr Pointer to be freed. - * \return void */ -void FDKafree (void *ptr); - +void FDKafree(void *ptr); /** * Allocate memory in a specific memory section. * Requests can be made for internal or external memory. If internal memory is - * requested, FDKcalloc_L() first tries to use L1 memory, which sizes are defined - * by ::DATA_L1_A_SIZE and ::DATA_L1_B_SIZE. If no L1 memory is available, then - * FDKcalloc_L() tries to use L2 memory. If that fails as well, the requested - * memory is allocated at an extern location using the fallback FDKcalloc(). + * requested, FDKcalloc_L() first tries to use L1 memory, which sizes are + * defined by ::DATA_L1_A_SIZE and ::DATA_L1_B_SIZE. If no L1 memory is + * available, then FDKcalloc_L() tries to use L2 memory. If that fails as well, + * the requested memory is allocated at an extern location using the fallback + * FDKcalloc(). * * \param n See MSDN documentation on calloc(). * \param size See MSDN documentation on calloc(). @@ -302,21 +445,20 @@ void *FDKaalloc_L(const UINT size, const UINT alignment, MEMORY_SECTION s); /** * Free memory that was allocated in a specific memory section. */ -void FDKfree_L(void *ptr); +void FDKfree_L(void *ptr); /** * Free aligned memory that was allocated in a specific memory section. */ -void FDKafree_L(void *ptr); - +void FDKafree_L(void *ptr); /** * Copy memory. Source and destination memory must not overlap. * Either use implementation from a Standard Library, or, if no Standard Library * is available, a generic implementation. - * The define ::USE_BUILTIN_MEM_FUNCTIONS in genericStds.cpp controls what to use. - * The function arguments correspond to the standard memcpy(). Please see MSDN - * documentation for details on how to use it. + * The define ::USE_BUILTIN_MEM_FUNCTIONS in genericStds.cpp controls what to + * use. The function arguments correspond to the standard memcpy(). Please see + * MSDN documentation for details on how to use it. */ void FDKmemcpy(void *dst, const void *src, const UINT size); @@ -324,20 +466,20 @@ void FDKmemcpy(void *dst, const void *src, const UINT size); * Copy memory. Source and destination memory are allowed to overlap. * Either use implementation from a Standard Library, or, if no Standard Library * is available, a generic implementation. - * The define ::USE_BUILTIN_MEM_FUNCTIONS in genericStds.cpp controls what to use. - * The function arguments correspond to the standard memmove(). Please see MSDN - * documentation for details on how to use it. -*/ + * The define ::USE_BUILTIN_MEM_FUNCTIONS in genericStds.cpp controls what to + * use. The function arguments correspond to the standard memmove(). Please see + * MSDN documentation for details on how to use it. + */ void FDKmemmove(void *dst, const void *src, const UINT size); /** * Clear memory. * Either use implementation from a Standard Library, or, if no Standard Library * is available, a generic implementation. - * The define ::USE_BUILTIN_MEM_FUNCTIONS in genericStds.cpp controls what to use. - * The function arguments correspond to the standard memclear(). Please see MSDN - * documentation for details on how to use it. -*/ + * The define ::USE_BUILTIN_MEM_FUNCTIONS in genericStds.cpp controls what to + * use. The function arguments correspond to the standard memclear(). Please see + * MSDN documentation for details on how to use it. + */ void FDKmemclear(void *memPtr, const UINT size); /** @@ -348,45 +490,18 @@ void FDKmemclear(void *memPtr, const UINT size); void FDKmemset(void *memPtr, const INT value, const UINT size); /* Compare function wrappers */ -INT FDKmemcmp(const void *s1, const void *s2, const UINT size); -INT FDKstrcmp(const char *s1, const char *s2); -INT FDKstrncmp(const char *s1, const char *s2, const UINT size); +INT FDKmemcmp(const void *s1, const void *s2, const UINT size); +INT FDKstrcmp(const char *s1, const char *s2); +INT FDKstrncmp(const char *s1, const char *s2, const UINT size); -UINT FDKstrlen(const char *s); +UINT FDKstrlen(const char *s); -#define FDKmax(a,b) ( (a) > (b) ? (a):(b)) -#define FDKmin(a,b) ( (a) < (b) ? (a):(b)) +#define FDKmax(a, b) ((a) > (b) ? (a) : (b)) +#define FDKmin(a, b) ((a) < (b) ? (a) : (b)) #define FDK_INT_MAX ((INT)0x7FFFFFFF) #define FDK_INT_MIN ((INT)0x80000000) -/* Math function wrappers. Only intended for compatibility, not to be highly optimized. */ -/* Used for debugging, dev code .. */ - -INT FDKabs(INT j); -double FDKfabs(double x); -double FDKpow(double x, double y); -double FDKsqrt(double x); -double FDKatan(double x); -double FDKlog(double x); -double FDKsin(double x); -double FDKcos(double x); -double FDKexp(double x); -#define FDKlog2(a) (FDKlog(a)*1.442695041) /* log(2.0) = 1.442695041 */ -#define FDKlog10(a) (FDKlog(a)*0.434294482) /* 1.0/log(10.0) = 0.434294482 */ -double FDKatan2(double y, double x); -double FDKacos(double x); -double FDKtan(double x); -double FDKfloor(double x); -double FDKceil(double x); -INT FDKatoi(const char *nptr); -long FDKatol(const char *nptr); -float FDKatof(const char *nptr); -/* LONG LONG FDKatoll(const char *nptr); */ -/* LONG LONG FDKatoq(const char *nptr); */ - - - /* FILE I/O */ /*! @@ -394,15 +509,7 @@ float FDKatof(const char *nptr); * * \return 1 if platform is little endian, non-1 if platform is big endian. */ -#ifdef __cplusplus -inline -#else -static -#endif -int IS_LITTLE_ENDIAN(void) { - int __dummy = 1; - return ( *( (UCHAR*)(&(__dummy) ) ) ); -} +int IS_LITTLE_ENDIAN(void); /*! * Convert input value to little endian format. @@ -410,11 +517,7 @@ int IS_LITTLE_ENDIAN(void) { * \param val Value to be converted. It may be in both big or little endian. * \return Value in little endian format. */ -#define TO_LITTLE_ENDIAN(val) \ - ( (IS_LITTLE_ENDIAN()) ? \ - (val) \ - : ( (((val) & 0xff) << 24) || (((val) & 0xff00)<< 8) || (((val) & 0xff0000)>>8) || (((val) & 0xff000000) >> 24) ) ) - +UINT TO_LITTLE_ENDIAN(UINT val); /*! * \fn FDKFILE *FDKfopen(const char *filename, const char *mode); @@ -427,7 +530,7 @@ int IS_LITTLE_ENDIAN(void) { * Standard ftell() wrapper. * \fn INT FDKfflush(FDKFILE *fp); * Standard fflush() wrapper. - * \fn UINT FDKfwrite(void *ptrf, INT size, UINT nmemb, FDKFILE *fp); + * \fn UINT FDKfwrite(const void *ptrf, INT size, UINT nmemb, FDKFILE *fp); * Standard fwrite() wrapper. * \fn UINT FDKfread(void *dst, INT size, UINT nmemb, FDKFILE *fp); * Standard fread() wrapper. @@ -440,25 +543,27 @@ INT FDKfclose(FDKFILE *FP); INT FDKfseek(FDKFILE *FP, LONG OFFSET, int WHENCE); INT FDKftell(FDKFILE *FP); INT FDKfflush(FDKFILE *fp); -UINT FDKfwrite(void *ptrf, INT size, UINT nmemb, FDKFILE *fp); +UINT FDKfwrite(const void *ptrf, INT size, UINT nmemb, FDKFILE *fp); UINT FDKfread(void *dst, INT size, UINT nmemb, FDKFILE *fp); -char* FDKfgets(void *dst, INT size, FDKFILE *fp); +char *FDKfgets(void *dst, INT size, FDKFILE *fp); void FDKrewind(FDKFILE *fp); INT FDKfeof(FDKFILE *fp); /** - * \brief Write each member in little endian order. Convert automatically to host endianess. + * \brief Write each member in little endian order. Convert automatically + * to host endianess. * \param ptrf Pointer to memory where to read data from. * \param size Size of each item to be written. * \param nmemb Number of items to be written. * \param fp File pointer of type FDKFILE. * \return Number of items read on success and fread() error on failure. */ -UINT FDKfwrite_EL(void *ptrf, INT size, UINT nmemb, FDKFILE *fp); +UINT FDKfwrite_EL(const void *ptrf, INT size, UINT nmemb, FDKFILE *fp); /** - * \brief Read variable of size "size" as little endian. Convert automatically to host endianess. - * 4-byte alignment is enforced for 24 bit data, at 32 bit full scale. + * \brief Read variable of size "size" as little endian. Convert + * automatically to host endianess. 4-byte alignment is enforced for 24 bit + * data, at 32 bit full scale. * \param dst Pointer to memory where to store data into. * \param size Size of each item to be read. * \param nmemb Number of items to be read. @@ -467,7 +572,6 @@ UINT FDKfwrite_EL(void *ptrf, INT size, UINT nmemb, FDKFILE *fp); */ UINT FDKfread_EL(void *dst, INT size, UINT nmemb, FDKFILE *fp); - /** * \brief Print FDK software disclaimer. */ @@ -477,4 +581,4 @@ void FDKprintDisclaimer(void); } #endif -#endif /* __GENERICSTDS_H__ */ +#endif /* GENERICSTDS_H */ diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h index b328953..be8de37 100644 --- a/libSYS/include/machine_type.h +++ b/libSYS/include/machine_type.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,129 +90,146 @@ Am Wolfsmantel 33 www.iis.fraunhofer.de/amm amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ +----------------------------------------------------------------------------- */ -/************************** Fraunhofer IIS FDK SysLib ********************** +/************************* System integration library ************************** Author(s): -******************************************************************************/ + Description: + +*******************************************************************************/ /** \file machine_type.h * \brief Type defines for various processors and compiler tools. */ -#if !defined(__MACHINE_TYPE_H__) -#define __MACHINE_TYPE_H__ - - -/* Library calling convention spec. __cdecl and friends might be added here as required. */ - #define LINKSPEC_H - #define LINKSPEC_CPP +#if !defined(MACHINE_TYPE_H) +#define MACHINE_TYPE_H +#include <stddef.h> /* Needed to define size_t */ -/** - * collate all corresponding compiler specific macros to detect a debug build, and set the DEBUG macro if that is the case. - */ -#if defined(_DEBUG) -#define DEBUG +#if defined(__ANDROID__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 4) && \ + (__GNUC_GNU_INLINE__ == 1) +typedef unsigned long long uint64_t; +#include <sys/types.h> #endif +/* Library calling convention spec. __cdecl and friends might be added here as + * required. */ +#define LINKSPEC_H +#define LINKSPEC_CPP /* for doxygen the following docu parts must be separated */ /** \var SCHAR - * Data type representing at least 1 byte signed integer on all supported platforms. + * Data type representing at least 1 byte signed integer on all supported + * platforms. */ /** \var UCHAR - * Data type representing at least 1 byte unsigned integer on all supported platforms. + * Data type representing at least 1 byte unsigned integer on all + * supported platforms. */ /** \var INT - * Data type representing at least 4 byte signed integer on all supported platforms. + * Data type representing at least 4 byte signed integer on all supported + * platforms. */ /** \var UINT - * Data type representing at least 4 byte unsigned integer on all supported platforms. + * Data type representing at least 4 byte unsigned integer on all + * supported platforms. */ /** \var LONG - * Data type representing 4 byte signed integer on all supported platforms. + * Data type representing 4 byte signed integer on all supported + * platforms. */ /** \var ULONG - * Data type representing 4 byte unsigned integer on all supported platforms. + * Data type representing 4 byte unsigned integer on all supported + * platforms. */ /** \var SHORT - * Data type representing 2 byte signed integer on all supported platforms. + * Data type representing 2 byte signed integer on all supported + * platforms. */ /** \var USHORT - * Data type representing 2 byte unsigned integer on all supported platforms. + * Data type representing 2 byte unsigned integer on all supported + * platforms. */ /** \var INT64 - * Data type representing 8 byte signed integer on all supported platforms. + * Data type representing 8 byte signed integer on all supported + * platforms. */ /** \var UINT64 - * Data type representing 8 byte unsigned integer on all supported platforms. + * Data type representing 8 byte unsigned integer on all supported + * platforms. */ /** \def SHORT_BITS - * Number of bits the data type short represents. sizeof() is not suited to get this info, - * because a byte is not always defined as 8 bits. + * Number of bits the data type short represents. sizeof() is not suited + * to get this info, because a byte is not always defined as 8 bits. */ /** \def CHAR_BITS - * Number of bits the data type char represents. sizeof() is not suited to get this info, - * because a byte is not always defined as 8 bits. + * Number of bits the data type char represents. sizeof() is not suited + * to get this info, because a byte is not always defined as 8 bits. */ /** \var INT_PCM * Data type representing the width of input and output PCM samples. */ - - typedef signed int INT; - typedef unsigned int UINT; +typedef signed int INT; +typedef unsigned int UINT; #ifdef __LP64__ - /* force FDK long-datatypes to 4 byte */ - /* jdr: Use defines to avoid type alias problems on 64 bit machines. */ - #define LONG INT - #define ULONG UINT -#else /* __LP64__ */ - typedef signed long LONG; - typedef unsigned long ULONG; -#endif /* __LP64__ */ - typedef signed short SHORT; - typedef unsigned short USHORT; - typedef signed char SCHAR; - typedef unsigned char UCHAR; - - #define SHORT_BITS 16 - #define CHAR_BITS 8 - +/* force FDK long-datatypes to 4 byte */ +/* Use defines to avoid type alias problems on 64 bit machines. */ +#define LONG INT +#define ULONG UINT +#else /* __LP64__ */ +typedef signed long LONG; +typedef unsigned long ULONG; +#endif /* __LP64__ */ +typedef signed short SHORT; +typedef unsigned short USHORT; +typedef signed char SCHAR; +typedef unsigned char UCHAR; + +#define SHORT_BITS 16 +#define CHAR_BITS 8 /* Define 64 bit base integer type. */ #ifdef _MSC_VER - typedef __int64 INT64; - typedef unsigned __int64 UINT64; +typedef __int64 INT64; +typedef unsigned __int64 UINT64; #else - typedef long long INT64; - typedef unsigned long long UINT64; +typedef long long INT64; +typedef unsigned long long UINT64; #endif #ifndef NULL - #ifdef __cplusplus - #define NULL 0 - #else - #define NULL ((void *)0) - #endif +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif +#endif + +#if ((defined(__i686__) || defined(__i586__) || defined(__i386__) || \ + defined(__x86_64__)) || \ + (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)))) && \ + !defined(FDK_ASSERT_ENABLE) +#define FDK_ASSERT_ENABLE #endif -/* Assert is functional on x86 PC's and also when debugging is turned on. */ -#if defined(DEBUG) || defined(__i686__) || defined(__i586__) || defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(FDK_DEBUG) || defined(FDK_ASSERT_ENABLE) - #include <assert.h> - #define FDK_ASSERT(x) assert(x) +#if defined(FDK_ASSERT_ENABLE) +#include <assert.h> +#define FDK_ASSERT(x) assert(x) #else - #define FDK_ASSERT(ignore) +#define FDK_ASSERT(ignore) #endif - typedef SHORT INT_PCM; - #define WAV_BITS 16 - #define SAMPLE_BITS 16 - #define SAMPLE_MAX (((LONG)1<<(SAMPLE_BITS-1))-1) - #define SAMPLE_MIN (~SAMPLE_MAX) +typedef SHORT INT_PCM; +#define MAXVAL_PCM MAXVAL_SGL +#define MINVAL_PCM MINVAL_SGL +#define WAV_BITS 16 +#define SAMPLE_BITS 16 +#define SAMPLE_MAX ((INT_PCM)(((ULONG)1 << (SAMPLE_BITS - 1)) - 1)) +#define SAMPLE_MIN (~SAMPLE_MAX) /*! * \def RAM_ALIGN @@ -211,46 +239,56 @@ amm-info@iis.fraunhofer.de int myArray[16]; \endcode - Note, that not all platforms support this mechanism. For example with TI compilers - a preprocessor pragma is used, but to do something like + Note, that not all platforms support this mechanism. For example with TI +compilers a preprocessor pragma is used, but to do something like \code #define RAM_ALIGN #pragma DATA_ALIGN(x) - \encode + \endcode - would require the preprocessor to process this line twice to fully resolve it. Hence, - a fully platform-independant way to use alignment is not supported. + would require the preprocessor to process this line twice to fully resolve +it. Hence, a fully platform-independant way to use alignment is not supported. * \def ALIGNMENT_DEFAULT * Default alignment in bytes. */ -#if defined(__GNUC__) /* cppp replaced: elif */ - #define ALIGNMENT_DEFAULT 8 - #define RAM_ALIGN __attribute__((aligned(ALIGNMENT_DEFAULT))) + +#define ALIGNMENT_DEFAULT 8 + +/* RAM_ALIGN keyword causes memory alignment of global variables. */ +#if defined(_MSC_VER) +#define RAM_ALIGN __declspec(align(ALIGNMENT_DEFAULT)) +#elif defined(__GNUC__) +#define RAM_ALIGN __attribute__((aligned(ALIGNMENT_DEFAULT))) #else - #define ALIGNMENT_DEFAULT 8 - #define RAM_ALIGN +#define RAM_ALIGN #endif - /*! -* \def RESTRICT -* The restrict keyword is supported by some platforms and RESTRICT maps to -* either the corresponding keyword on each platform or to void if the -* compiler does not provide such feature. -* -* \def WORD_ALIGNED(x) -* Tells the compiler that pointer x is WORD aligned. -* At the moment only supported by TI compilers. -* -* \def DWORD_ALIGNED(x) -* Tells the compiler that pointer x is DWORD aligned. -* At the moment only supported by TI compilers. -*/ - #define RESTRICT - #define WORD_ALIGNED(x) - #define DWORD_ALIGNED(x) - + * \def RESTRICT + * The restrict keyword is supported by some platforms and RESTRICT maps + * to either the corresponding keyword on each platform or to void if the + * compiler does not provide such feature. It tells the compiler that a + * pointer points to memory that does not overlap with other memories pointed to + * by other pointers. If this keyword is used and the assumption of no + * overlap is not true the resulting code might crash. + * + * \def WORD_ALIGNED(x) + * Tells the compiler that pointer x is 16 bit aligned. It does not cause + * the address itself to be aligned, but serves as a hint to the optimizer. The + * alignment of the pointer must be guarranteed, if not the code might + * crash. + * + * \def DWORD_ALIGNED(x) + * Tells the compiler that pointer x is 32 bit aligned. It does not cause + * the address itself to be aligned, but serves as a hint to the optimizer. The + * alignment of the pointer must be guarranteed, if not the code might + * crash. + * + */ +#define RESTRICT +#define WORD_ALIGNED(x) C_ALLOC_ALIGNED_CHECK2((const void *)(x), 2); +#define DWORD_ALIGNED(x) C_ALLOC_ALIGNED_CHECK2((const void *)(x), 4); /*----------------------------------------------------------------------------------- * ALIGN_SIZE @@ -263,46 +301,43 @@ amm-info@iis.fraunhofer.de * - ALIGN_SIZE(8) returns 8 * - ALIGN_SIZE(9) returns 16 */ -#define ALIGN_SIZE(a) ((a)+ (((INT)ALIGNMENT_DEFAULT - ((INT)(a) & (ALIGNMENT_DEFAULT-1)) ) & (ALIGNMENT_DEFAULT-1))) +#define ALIGN_SIZE(a) \ + ((a) + (((INT)ALIGNMENT_DEFAULT - ((size_t)(a) & (ALIGNMENT_DEFAULT - 1))) & \ + (ALIGNMENT_DEFAULT - 1))) -/*----------------------------------------------------------------------------------- - * ALIGN_PTR - * cast (a) to width of pointer - *-----------------------------------------------------------------------------------*/ /*! * \brief This macro aligns a given address depending on ::ALIGNMENT_DEFAULT. */ -#define ALIGN_PTR(a) ( (unsigned char*)(a) + (((INT)ALIGNMENT_DEFAULT - ((INT)(UINT64)(a) & (ALIGNMENT_DEFAULT-1)) ) & (ALIGNMENT_DEFAULT-1)) ) - - /* Alignment macro for libSYS heap implementation */ -#define ALIGNMENT_EXTRES ( ALIGNMENT_DEFAULT ) -#define ALGN_SIZE_EXTRES(a) ((a)+ (((INT)ALIGNMENT_EXTRES - ((INT)(a) & (ALIGNMENT_EXTRES-1)) ) & (ALIGNMENT_EXTRES-1))) - +#define ALIGN_PTR(a) \ + ((void *)((unsigned char *)(a) + \ + ((((INT)ALIGNMENT_DEFAULT - \ + ((size_t)(a) & (ALIGNMENT_DEFAULT - 1))) & \ + (ALIGNMENT_DEFAULT - 1))))) + +/* Alignment macro for libSYS heap implementation */ +#define ALIGNMENT_EXTRES (ALIGNMENT_DEFAULT) +#define ALGN_SIZE_EXTRES(a) \ + ((a) + (((INT)ALIGNMENT_EXTRES - ((INT)(a) & (ALIGNMENT_EXTRES - 1))) & \ + (ALIGNMENT_EXTRES - 1))) /*! - * \def FORCEINLINE - * Sometimes compiler do not do what they are told to do, and in case of inlining some - * additional command might be necessary depending on the platform. + * \def FDK_FORCEINLINE + * Sometimes compiler do not do what they are told to do, and in case of + * inlining some additional command might be necessary depending on the + * platform. * * \def FDK_INLINE * Defines how the compiler is told to inline stuff. */ -#ifdef DEBUG -#undef FORCEINLINE -#define FORCEINLINE +#ifndef FDK_FORCEINLINE +#if defined(__GNUC__) && !defined(__SDE_MIPS__) +#define FDK_FORCEINLINE inline __attribute((always_inline)) #else -#ifndef FORCEINLINE - #if defined(__GNUC__) /* cppp replaced: elif */ - #define FORCEINLINE __attribute((always_inline)) - #else - #define FORCEINLINE - #endif +#define FDK_FORCEINLINE inline #endif #endif - /* for all other platforms */ - #define FDK_INLINE inline - +#define FDK_INLINE static inline /*! * \def LNK_SECTION_DATA_L1 @@ -329,29 +364,28 @@ amm-info@iis.fraunhofer.de /************************************************** * Code Section macros **************************************************/ - #define LNK_SECTION_CODE_L1 - #define LNK_SECTION_CODE_L2 - #define LNK_SECTION_INITCODE +#define LNK_SECTION_CODE_L1 +#define LNK_SECTION_CODE_L2 +#define LNK_SECTION_INITCODE /* Memory section macros. */ - /* default fall back */ - #define LNK_SECTION_DATA_L1 - #define LNK_SECTION_DATA_L2 - #define LNK_SECTION_CONSTDATA - #define LNK_SECTION_CONSTDATA_L1 - - #define LNK_SECTION_L1_DATA_A - #define LNK_SECTION_L1_DATA_B +/* default fall back */ +#define LNK_SECTION_DATA_L1 +#define LNK_SECTION_DATA_L2 +#define LNK_SECTION_CONSTDATA +#define LNK_SECTION_CONSTDATA_L1 +#define LNK_SECTION_L1_DATA_A +#define LNK_SECTION_L1_DATA_B #ifdef _MSC_VER - /* - * Sometimes certain features are excluded from compilation and therefore the warning 4065 may occur: - * "switch statement contains 'default' but no 'case' labels" - * We consider this warning irrelevant and disable it. - */ - #pragma warning( disable : 4065 ) +/* + * Sometimes certain features are excluded from compilation and therefore the + * warning 4065 may occur: "switch statement contains 'default' but no 'case' + * labels" We consider this warning irrelevant and disable it. + */ +#pragma warning(disable : 4065) #endif -#endif /* __MACHINE_TYPE_H__ */ +#endif /* MACHINE_TYPE_H */ diff --git a/libSYS/include/syslib_channelMapDescr.h b/libSYS/include/syslib_channelMapDescr.h new file mode 100644 index 0000000..1c5737a --- /dev/null +++ b/libSYS/include/syslib_channelMapDescr.h @@ -0,0 +1,196 @@ +/* ----------------------------------------------------------------------------- +Software License for The Fraunhofer FDK AAC Codec Library for Android + +© 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. + +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: + +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 +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. + +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." + +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. + +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. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info@iis.fraunhofer.de +----------------------------------------------------------------------------- */ + +/************************* System integration library ************************** + + Author(s): Thomas Dietzen + + Description: + +*******************************************************************************/ + +/** \file syslib_channelMapDescr.h + * \brief Function and structure declarations for the channel map descriptor implementation. + */ + +#ifndef SYSLIB_CHANNELMAPDESCR_H +#define SYSLIB_CHANNELMAPDESCR_H + +#include "machine_type.h" + +/** + * \brief Contains information needed for a single channel map. + */ +typedef struct { + const UCHAR* + pChannelMap; /*!< Actual channel mapping for one single configuration. */ + UCHAR numChannels; /*!< The number of channels for the channel map which is + the maximum used channel index+1. */ +} CHANNEL_MAP_INFO; + +/** + * \brief This is the main data struct. It contains the mapping for all + * channel configurations such as administration information. + * + * CAUTION: Do not access this structure directly from a algorithm specific + * library. Always use one of the API access functions below! + */ +typedef struct { + const CHANNEL_MAP_INFO* pMapInfoTab; /*!< Table of channel maps. */ + UINT mapInfoTabLen; /*!< Length of the channel map table array. */ + UINT fPassThrough; /*!< Flag that defines whether the specified mapping shall + be applied (value: 0) or the input just gets passed + through (MPEG mapping). */ +} FDK_channelMapDescr; + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \brief Initialize a given channel map descriptor. + * + * \param pMapDescr Pointer to a channel map descriptor to be initialized. + * \param pMapInfoTab Table of channel maps to initizalize the descriptor + with. + * If a NULL pointer is given a default table for + WAV-like mapping will be used. + * \param mapInfoTabLen Length of the channel map table array (pMapInfoTab). + If a zero length is given a default table for WAV-like mapping will be used. + * \param fPassThrough If the flag is set the reordering (given by + pMapInfoTab) will be bypassed. + */ +void FDK_chMapDescr_init(FDK_channelMapDescr* const pMapDescr, + const CHANNEL_MAP_INFO* const pMapInfoTab, + const UINT mapInfoTabLen, const UINT fPassThrough); + +/** + * \brief Change the channel reordering state of a given channel map + * descriptor. + * + * \param pMapDescr Pointer to a (initialized) channel map descriptor. + * \param fPassThrough If the flag is set the reordering (given by + * pMapInfoTab) will be bypassed. + * \return Value unequal to zero if set operation was not + * successful. And zero on success. + */ +int FDK_chMapDescr_setPassThrough(FDK_channelMapDescr* const pMapDescr, + UINT fPassThrough); + +/** + * \brief Get the mapping value for a specific channel and map index. + * + * \param pMapDescr Pointer to channel map descriptor. + * \param chIdx Channel index. + * \param mapIdx Mapping index (corresponding to the channel configuration + * index). + * \return Mapping value. + */ +UCHAR FDK_chMapDescr_getMapValue(const FDK_channelMapDescr* const pMapDescr, + const UCHAR chIdx, const UINT mapIdx); + +/** + * \brief Evaluate whether channel map descriptor is reasonable or not. + * + * \param pMapDescr Pointer to channel map descriptor. + * \return Value unequal to zero if descriptor is valid, otherwise + * zero. + */ +int FDK_chMapDescr_isValid(const FDK_channelMapDescr* const pMapDescr); + +#ifdef __cplusplus +} +#endif + +#endif /* !defined(SYSLIB_CHANNELMAPDESCR_H) */ diff --git a/libSYS/include/wav_file.h b/libSYS/include/wav_file.h deleted file mode 100644 index 2bc43b2..0000000 --- a/libSYS/include/wav_file.h +++ /dev/null @@ -1,233 +0,0 @@ - -/* ----------------------------------------------------------------------------------------------------------- -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. - - 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. - -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: - -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 -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. - -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." - -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. - -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. - -5. CONTACT INFORMATION - -Fraunhofer Institute for Integrated Circuits IIS -Attention: Audio and Multimedia Departments - FDK AAC LL -Am Wolfsmantel 33 -91058 Erlangen, Germany - -www.iis.fraunhofer.de/amm -amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ - -/************************** Fraunhofer IIS FDK SysLib ********************** - - Author(s): Eric Allamanche - -******************************************************************************/ - -/** \file wav_file.h - * \brief Rudimentary WAVE file read/write support. - * - * The WAVE file reader/writer is intented to be used in the codec's example - * framework for easily getting started with encoding/decoding. Therefore - * it serves mainly for helping quickly understand how a codec's API actually - * works. - * Being a WAVE file reader/writer with very basic functionality, it may not be - * able to read WAVE files that come with unusual configurations. - * Details on how to use the interface functions can be found in every - * (encoder/decoder) example framework. - */ - -#ifndef __WAV_FILE_H__ -#define __WAV_FILE_H__ - - - -#include "genericStds.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define SPEAKER_FRONT_LEFT 0x1 -#define SPEAKER_FRONT_RIGHT 0x2 -#define SPEAKER_FRONT_CENTER 0x4 -#define SPEAKER_LOW_FREQUENCY 0x8 -#define SPEAKER_BACK_LEFT 0x10 -#define SPEAKER_BACK_RIGHT 0x20 -#define SPEAKER_FRONT_LEFT_OF_CENTER 0x40 -#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80 -#define SPEAKER_BACK_CENTER 0x100 -#define SPEAKER_SIDE_LEFT 0x200 -#define SPEAKER_SIDE_RIGHT 0x400 -#define SPEAKER_TOP_CENTER 0x800 -#define SPEAKER_TOP_FRONT_LEFT 0x1000 -#define SPEAKER_TOP_FRONT_CENTER 0x2000 -#define SPEAKER_TOP_FRONT_RIGHT 0x4000 -#define SPEAKER_TOP_BACK_LEFT 0x8000 -#define SPEAKER_TOP_BACK_CENTER 0x10000 -#define SPEAKER_TOP_BACK_RIGHT 0x20000 -#define SPEAKER_RESERVED 0x80000000 - -/*! - * RIFF WAVE file struct. - * For details see WAVE file format documentation (for example at http://www.wotsit.org). - */ -typedef struct WAV_HEADER -{ - char riffType[4]; - UINT riffSize; - char waveType[4]; - char formatType[4]; - UINT formatSize; - USHORT compressionCode; - USHORT numChannels; - UINT sampleRate; - UINT bytesPerSecond; - USHORT blockAlign; - USHORT bitsPerSample; - char dataType[4]; - UINT dataSize; -} WAV_HEADER; - -struct WAV -{ - WAV_HEADER header; - FDKFILE *fp; - UINT channelMask; -}; - -typedef struct WAV *HANDLE_WAV; - -/** - * \brief Open a WAV file handle for reading. - * - * \param pWav Pointer to a memory location, where a WAV handle is returned. - * \param filename File name to be opened. - * - * \return 0 on success and non-zero on failure. - */ -INT WAV_InputOpen (HANDLE_WAV *pWav, const char *filename); - -/** - * \brief Read samples from a WAVE file. The samples are automatically re-ordered to the - * native host endianess and scaled to full scale of the INT_PCM type, from - * whatever BPS the WAVE file had specified in its header data. - * - * \param wav Handle of WAV file. - * \param sampleBuffer Pointer to store audio data. - * \param numSamples Desired number of samples to read. - * \param nBufBits Size in bit of each audio sample of sampleBuffer. - * - * \return Number of samples actually read. - */ -INT WAV_InputRead (HANDLE_WAV wav, void *sampleBuffer, UINT numSamples, int nBufBits); - -/** - * \brief Close a WAV file reading handle. - * \param pWav Pointer to a WAV file reading handle. - * \return void - */ -void WAV_InputClose(HANDLE_WAV *pWav); - -/** - * \brief Open WAV output/writer handle. - * - * \param pWav Pointer to WAV handle to be returned. - * \param outputFilename File name of the file to be written to. - * \param sampleRate Desired samplerate of the resulting WAV file. - * \param numChannels Desired number of audio channels of the resulting WAV file. - * \param bitsPerSample Desired number of bits per audio sample of the resulting WAV file. - * - * \return 0: ok; -1: error - */ -INT WAV_OutputOpen(HANDLE_WAV *pWav, const char *outputFilename, INT sampleRate, INT numChannels, INT bitsPerSample); - -/** - * \brief Write data to WAV file asociated to WAV handle. - * - * \param wav Handle of WAV file - * \param sampleBuffer Pointer to audio samples, right justified integer values. - * \param numberOfSamples The number of individual audio sample valuesto be written. - * \param nBufBits Size in bits of each audio sample in sampleBuffer. - * \param nSigBits Amount of significant bits of each nBufBits in sampleBuffer. - * - * \return 0: ok; -1: error - */ -INT WAV_OutputWrite(HANDLE_WAV wav, void *sampleBuffer, UINT numberOfSamples, int nBufBits, int nSigBits); - -/** - * \brief Close WAV output handle. - * \param pWav Pointer to WAV handle. *pWav is set to NULL. - * \return void - */ -void WAV_OutputClose(HANDLE_WAV *pWav); - -#ifdef __cplusplus -} -#endif - - -#endif /* __WAV_FILE_H__ */ |