diff options
Diffstat (limited to 'libSYS')
| -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 | ||||
| -rw-r--r-- | libSYS/src/cmdl_parser.cpp | 581 | ||||
| -rw-r--r-- | libSYS/src/conv_string.cpp | 179 | ||||
| -rw-r--r-- | libSYS/src/genericStds.cpp | 485 | ||||
| -rw-r--r-- | libSYS/src/linux/FDK_stackload_linux.cpp | 90 | ||||
| -rw-r--r-- | libSYS/src/linux/audio_linux.cpp | 90 | ||||
| -rw-r--r-- | libSYS/src/linux/coresup_linux.cpp | 90 | ||||
| -rw-r--r-- | libSYS/src/linux/genericStds_linux.cpp | 294 | ||||
| -rw-r--r-- | libSYS/src/linux/uart_linux.cpp | 90 | ||||
| -rw-r--r-- | libSYS/src/mips/genericStds_mips.cpp | 292 | ||||
| -rw-r--r-- | libSYS/src/syslib_channelMapDescr.cpp | 284 | ||||
| -rw-r--r-- | libSYS/src/wav_file.cpp | 560 |
19 files changed, 1849 insertions, 4090 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__ */ diff --git a/libSYS/src/cmdl_parser.cpp b/libSYS/src/cmdl_parser.cpp deleted file mode 100644 index 24ec0d5..0000000 --- a/libSYS/src/cmdl_parser.cpp +++ /dev/null @@ -1,581 +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 - -******************************************************************************/ - - - -#define _CRT_SECURE_NO_WARNINGS - -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <ctype.h> - -#include "cmdl_parser.h" -#include "genericStds.h" - - - -/************************ interface ************************/ - -static INT GetArgFromString(INT argc, TEXTCHAR* argv[], TEXTCHAR* search_string, TEXTCHAR type, TEXTCHAR* found_string , INT* switches_used); -static void RemoveWhiteSpace(const TEXTCHAR* pReqArgs, TEXTCHAR* Removed); -static INT CheckArg(TEXTCHAR* arg, TEXTCHAR* str, UINT numArgs, TEXTCHAR type, TEXTCHAR* current_str); -static INT CheckForUnusedSwitches(INT argc, /*TEXTCHAR* argv[],*/ INT* switches_used); -static INT ParseString(TEXTCHAR* str, INT*, TEXTCHAR*, TEXTCHAR*); -static void GetNumberOfArgs(TEXTCHAR* str, INT* nArgs); - -static -void removeQuotes(char *str) -{ - if (str[0] == '"') { - FDKstrcpy(str, str+1); - str[FDKstrlen(str)-1] = 0; - } -} - - -/********************** implementation *********************/ - -INT IIS_ScanCmdl(INT argc, TEXTCHAR* argv[], const TEXTCHAR* str, ...) -{ - INT i = 0; - INT found_and_set = 0; - INT nArgs = 0; - INT* switches_used = 0; - INT* b_str_opt = 0; - TEXTCHAR* s_str = 0; - TEXTCHAR* c_str_type = 0; - TEXTCHAR* str_clean = 0; - - va_list ap; - - if (argc == 0 || argc == 1) - { - FDKprintf("No command line arguments\n"); - goto bail; - } - - str_clean = (TEXTCHAR*) FDKcalloc((unsigned int)_tcslen(str), sizeof(TEXTCHAR)); - if (str_clean == NULL) { - FDKprintf("Error allocating memory line %d, file %s\n", __LINE__, __FILE__); - return 0; - } - - RemoveWhiteSpace(str, str_clean ); - GetNumberOfArgs(str_clean, &nArgs); - - b_str_opt = (INT*) FDKcalloc(nArgs, sizeof(INT)); - s_str = (TEXTCHAR*) FDKcalloc(nArgs*CMDL_MAX_ARGC, sizeof(TEXTCHAR) ); - c_str_type = (TEXTCHAR*) FDKcalloc(nArgs, sizeof(TEXTCHAR)); - switches_used = (INT*) FDKcalloc(argc, sizeof(INT)); - - if (b_str_opt == NULL || s_str == NULL || c_str_type == NULL || switches_used == NULL) { - FDKprintf("Error allocating memory line %d, file %s\n", __LINE__, __FILE__); - goto bail; - } - - if ( ParseString( str_clean, b_str_opt, s_str, c_str_type )) { - goto bail; - } - - va_start(ap, str); - - for ( i = 0; i < nArgs; i++ ) - { - TEXTCHAR arg[CMDL_MAX_STRLEN] = {L'\0'}; - TEXTCHAR* p_arg = arg; - TEXTCHAR* current_str = &(s_str[i*CMDL_MAX_ARGC]); - - if (GetArgFromString(argc, argv, current_str, c_str_type[i], arg, switches_used ) - && !b_str_opt[i] ) - { -#ifdef _UNICODE - _ftprintf(stderr, _TEXT("\n\nError: Parsing argument for required switch '%ls'.\n" ), current_str); -#else - _ftprintf(stderr, _TEXT("\n\nError: Parsing argument for required switch '%s'.\n" ), current_str); -#endif - found_and_set = 0; - goto bail; - } - if (CheckArg(p_arg, s_str, nArgs, c_str_type[i], current_str)) - { - goto bail; - } - - switch (c_str_type[i] ) - { - case 's': - { - TEXTCHAR* tmp; - tmp = va_arg(ap, TEXTCHAR*); - - if ( arg[0] == '\0' ) - break; - - _tcsncpy( tmp, arg, CMDL_MAX_STRLEN ); - /* Remove quotes. Windows Mobile Workaround. */ - removeQuotes(tmp); - found_and_set++; - break; - } - case 'd': - { - INT* tmp = va_arg(ap, INT*); - - if ( arg[0] == '\0' ) - break; - - *tmp = _tcstol(arg, NULL, 0); - found_and_set++; - break; - } - case 'c': - { - char* tmp = va_arg(ap, char*); - - if ( arg[0] == '\0' ) - break; - - *tmp = *arg; - found_and_set++; - break; - } - case 'u': - { - UCHAR* tmp = va_arg(ap, UCHAR*); - - if ( arg[0] == '\0' ) - break; - - *tmp = _tstoi(arg); - found_and_set++; - break; - } - case 'f': - { - float* tmp = (float*) va_arg( ap,double*); - - if ( arg[0] == '\0' ) - break; - - *tmp = (float) _tstof(arg); - found_and_set++; - break; - } - case 'y': // support 'data type double' - { - double* tmp = (double*) va_arg( ap,double*); - // use sscanf instead _tstof because of gcc - //_tstof(arg,"%lf",tmp); // '%lf' reads as double - *tmp = _tstof(arg); // '%lf' reads as double - found_and_set++; - break; - } - case '1': - { - - INT* tmp = va_arg( ap, INT*); - - if ( arg[0] == '\0' ) - break; - - *tmp = 1; - found_and_set++; - break; - } - - default: - FDKprintfErr("Bug: unsupported data identifier \"%c\"\n", c_str_type[i]); - break; - - } - - } - - va_end(ap); - - CheckForUnusedSwitches(argc, /*argv,*/ switches_used); - -bail: - if (b_str_opt) FDKfree(b_str_opt); - if (s_str) FDKfree(s_str); - if (c_str_type) FDKfree(c_str_type); - if (str_clean) FDKfree(str_clean); - if (switches_used) FDKfree(switches_used); - - return found_and_set; -} - - -void GetNumberOfArgs(TEXTCHAR* str, INT* nArgs) -{ - UINT i = 0; - for ( i = 0; i < _tcslen(str); ++i ) - { - if ( str[i] == '%') - *nArgs+= 1; - } - -} - -INT ParseString(TEXTCHAR* str, INT* b_str_opt, TEXTCHAR* s_str, TEXTCHAR* c_str_type ) -{ - UINT i = 0; - INT argCounter = 0; - - TEXTCHAR* str_start = 0; - TEXTCHAR* str_stop = 0; - - - str_start = str; - str_stop = str_start; - - for ( i = 0; i < _tcslen(str) - 1; ++i ) - { - if ( str[i] == '%' ) /* We have an Argument */ - { - if ( argCounter ) - { - if ( b_str_opt[argCounter-1] ) - str_start = str_stop + 3; - - else - str_start = str_stop + 2; - } - - /* Save Argument type */ - c_str_type[argCounter] = str[i+1]; - - if ( *str_start == '(' ) /* Optional Argument */ - { - b_str_opt[argCounter] = 1; - str_start++; - } - - /* Save Argument */ - str[i] = '\0'; - - _tcsncpy(&(s_str[argCounter*CMDL_MAX_ARGC]), str_start, CMDL_MAX_ARGC ); - - str[i] = '%'; - - str_stop = &(str[i]); - - if ( b_str_opt[argCounter] ) - { - if ( i+2 > ( _tcslen(str) -1 )) - { - _ftprintf(stderr,_TEXT("\n\nInternal Parser Error: Strlen Problem\n") ); - return 1; - } - if ( str[i+2] != ')' ) - { - _ftprintf(stderr,_TEXT("\n\nInternal Parser Error: Missing bracket ')'\n") ); - return 1; - } - - } - - - argCounter++; - } - - - } - - return 0; - } - - - - -void RemoveWhiteSpace(const TEXTCHAR* pReqArgs, TEXTCHAR* pRemoved) -{ - UINT i = 0; - INT k = 0; - UINT len = (UINT)_tcslen(pReqArgs); - - - for ( i = 0; i < len; ++i ) - { - - if ( pReqArgs[i] != ' ' ) - { - pRemoved[k] = pReqArgs[i]; - k++; - } - } -} - - -INT GetArgFromString(INT argc, TEXTCHAR* argv[], TEXTCHAR* search_string, TEXTCHAR type, TEXTCHAR* found_string, INT* sw_used ) -{ - INT i = 0; - - for (i = 1; i < argc; ++i ) { - if ( !_tcscmp(search_string, argv[i]) ) /* Strings are equal */ - { - if ( type == '1' ) /* Switch without argument */ - { - _tcsncpy( found_string, _TEXT("1"), 1); - sw_used[i] = 1; - return 0; - - } - - if ( i == (argc - 1)) /* We have %s or %d but are finished*/ - return 1; - - if ( _tcslen(argv[i+1]) > CMDL_MAX_STRLEN ) - { -#ifdef _UNICODE - _ftprintf (stderr,_TEXT("Warning: Ignoring argument for switch '%ls'. "), search_string ); -#else - _ftprintf (stderr,_TEXT("Warning: Ignoring argument for switch '%s'. "), search_string ); -#endif - _ftprintf (stderr,_TEXT("Argument is too LONG.\n") ); - return 1; - } - else - { - _tcsncpy( found_string, argv[i+1], CMDL_MAX_STRLEN); - sw_used[i] = 1; - sw_used[i+1] = 1; - return 0; - } - } - } - return 1; -} - - - -INT CheckArg(TEXTCHAR* arg, TEXTCHAR* str, UINT numArgs, TEXTCHAR type, TEXTCHAR* cur_str) -{ - UINT i = 0; - - /* No argument given-> return */ - if (arg[0] == '\0') - return 0; - - - /* Check if arg is switch */ - for ( i = 0; i < numArgs; ++i ) - { - if (!_tcscmp(arg, &(str[i*CMDL_MAX_ARGC]))) - { -#ifdef _UNICODE - _ftprintf(stderr, _TEXT("\n\nError: Argument '%ls' for switch '%ls' is not valid \n" ), arg, cur_str ); -#else - _ftprintf(stderr, _TEXT("\n\nError: Argument '%s' for switch '%s' is not valid \n" ), arg, cur_str ); -#endif - return 1; - } - - } - /* Check if type is %d but a string is given */ - - for ( i = 0; i < _tcslen(arg); ++i ) - { - if ( (type == 'd') && !_istdigit(arg[i]) && arg[i] != 'x' && arg[i] != '-') - { -#ifdef _UNICODE - _ftprintf(stderr, _TEXT("\n\nError: Argument '%ls' for switch '%ls' is not a valid number.\n" ), arg, cur_str); -#else - _ftprintf(stderr, _TEXT("\n\nError: Argument '%s' for switch '%s' is not a valid number.\n" ), arg, cur_str); -#endif - return 1; - } - } - - - return 0; -} - - -INT CheckForUnusedSwitches(INT argc, /*TEXTCHAR* argv[],*/ INT* switches_used) -{ - INT i = 0; - - for( i = 1; i < argc; ++i ) - { - if ( !switches_used[i] ) - { - ++i; - } - } - - return 0; -} - - - -static char line[CMDL_MAX_STRLEN*CMDL_MAX_ARGC]; -static char *argv_ptr[CMDL_MAX_ARGC]; -#ifdef CMDFILE_PREFIX -static char tmp[256]; /* this array is used to store the prefix and the filepath/name */ -#endif - -int IIS_ProcessCmdlList(const char* param_filename, int (*pFunction)(int, TEXTCHAR**)) -{ - /* static to reduce required stack size */ - - FDKFILE *config_fp; - int argc; - char *line_ptr; - -#ifdef CMDFILE_PREFIX - FDKstrcpy(tmp, CMDFILE_PREFIX); - FDKstrcpy(tmp+FDKstrlen(CMDFILE_PREFIX), param_filename); - /* Open the file with command lines */ - config_fp = FDKfopen(tmp, "r"); -#else - /* Open the file with command lines */ - config_fp = FDKfopen(param_filename, "r"); -#endif - - if(config_fp == NULL) - { -#ifdef CMDFILE_PREFIX - FDKprintf("\ncould not open config file %s", tmp); -#else - FDKprintf("\ncould not open config file %s", param_filename); -#endif - return 1; - } - - /* Obtain a command line from config file */ - while (FDKfgets(line, CMDL_MAX_STRLEN*CMDL_MAX_ARGC, config_fp) != NULL) - { - argc = 1; - - /* Eat \n */ - line_ptr = (char*)FDKstrchr(line, '\n'); - if (line_ptr != NULL) - *line_ptr = ' '; - - line_ptr = line; - - /* Scan the line and put the command line params into argv */ - do { - /* Skip consecutive blanks. */ - while (*line_ptr == ' ' && line_ptr < line+CMDL_MAX_STRLEN) - line_ptr++; - /* Assign argument. */ - argv_ptr[argc] = line_ptr; - /* Get pointer to next blank. */ - line_ptr = (char*)FDKstrchr(line_ptr, ' '); - /* */ - if (line_ptr != NULL) { - /* Null terminate */ - *line_ptr = 0; - /* Skip former blank (now null character) */ - line_ptr++; - /* Advance argument counter */ - } - argc++; - } while ( line_ptr != NULL && argc < CMDL_MAX_ARGC); - - /* call "would be main()" */ - if (argc > 2 && *argv_ptr[1] != '#' && FDKstrlen(argv_ptr[1])>1) - { - int retval; - - retval = (*pFunction)(argc, argv_ptr); - - FDKprintf("main returned %d\n", retval); - } - } - - FDKfclose(config_fp); - return 0; -} - diff --git a/libSYS/src/conv_string.cpp b/libSYS/src/conv_string.cpp deleted file mode 100644 index 28cbc83..0000000 --- a/libSYS/src/conv_string.cpp +++ /dev/null @@ -1,179 +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: string conversion functions - -******************************************************************************/ - - - -#include "genericStds.h" -#include "conv_string.h" - -INT charBuf2HexString(char *string, UCHAR *charBuf, INT charBufLength) -{ - INT i; - UCHAR c1, c2; - - /* sanity checks */ - /* check array length */ - if (charBufLength == 0) { - return -1; - } - - /* define hex string Table */ - UCHAR hexSymb[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; - - /* calculate corresponding hex string from charBuffer */ - for (i=0;i<charBufLength;i++) { - c1 = ((charBuf[i])>>4)&0x0f; /* upper nibble */ - c2 = (charBuf[i])&0x0f; /* lower nibble */ - - string[i*2] = hexSymb[c1]; /* convert to string */ - string[i*2+1] = hexSymb[c2]; /* convert to string */ - } - - /* terminate string */ - string[charBufLength<<1]='\0'; - - return 0; - -} - -INT hexString2CharBuf(const char *string, UCHAR *charBuf, UINT charBufLength) -{ - UINT i, k = 0; - UCHAR hNibble, lNibble; - - /* sanity checks */ - if (string[0] == '\0') { - return -1; /* invalid string size */ - } - - if (charBufLength<=0){ - return -2; /* invalid buffer size */ - } - - /* convert to hex characters to corresponding 8bit value */ - for (i=0;(string[i]!='\0')&&((i>>1)<charBufLength);i+=2) { - k = i>>1; - hNibble = hexChar2Dec(string[i]); - lNibble = hexChar2Dec(string[i+1]); - if ((hNibble == 16) || (lNibble == 16)) { - return -3; /* invalid character */ - } - charBuf[k] = ((hNibble<<4)&0xf0) + lNibble; - } - - /* check if last character was string terminator */ - if ((string[i-2]!=0) && (string[i]!=0)) { - return -1; /* invalid string size */ - } - - /* fill charBuffer with zeros */ - for (i=k+1;i<charBufLength;i++) { - charBuf[i] = 0; - } - - return 0; - -} - -UCHAR hexChar2Dec(const char c) -{ - INT r = 0; - if ((c >= '0') && (c <= '9')) - r = c-'0'; - else if ((c >= 'a') && (c <= 'f')) - r = c-'a'+10; - else if ((c >= 'A') && (c <= 'F')) - r = c-'A'+10; - else - r = 16; /* invalid hex character */ - - return (UCHAR)r; -} - diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp index 89c422c..f98d0a9 100644 --- a/libSYS/src/genericStds.cpp +++ b/libSYS/src/genericStds.cpp @@ -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,27 +90,30 @@ Am Wolfsmantel 33 www.iis.fraunhofer.de/amm amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ +----------------------------------------------------------------------------- */ -/************************** Fraunhofer IIS FDK SysLib ********************** +/************************* System integration library ************************** Author(s): + Description: - Generic memory, stdio, string, etc. function wrappers or - builtins. + builtins. - OS dependant function wrappers. -******************************************************************************/ +*******************************************************************************/ +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS +#endif -#include <math.h> +#define __GENERICSTDS_CPP__ #include "genericStds.h" /* library info */ -#define SYS_LIB_VL0 1 -#define SYS_LIB_VL1 3 -#define SYS_LIB_VL2 8 +#define SYS_LIB_VL0 2 +#define SYS_LIB_VL1 0 +#define SYS_LIB_VL2 0 #define SYS_LIB_TITLE "System Integration Library" #ifdef __ANDROID__ #define SYS_LIB_BUILD_DATE "" @@ -109,69 +123,47 @@ amm-info@iis.fraunhofer.de #define SYS_LIB_BUILD_TIME __TIME__ #endif - #include <stdlib.h> - #include <stdio.h> - #include <string.h> - #include <stdarg.h> - +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdarg.h> /*************************************************************** * memory allocation monitoring variables ***************************************************************/ - /* Include OS/System specific implementations. */ -#if defined(__linux__) && !defined(__ANDROID__) /* cppp replaced: elif */ - #include "linux/genericStds_linux.cpp" -#endif - -#if !(defined(USE_BUILTIN_STRING_FUNCTIONS) || defined(__SYMBIAN32__)) #include <string.h> #include <stdlib.h> #include <stdio.h> -#ifndef FUNCTION_FDKprintf -void FDKprintf( const char* szFmt, ...) { +void FDKprintf(const char *szFmt, ...) { va_list ap; va_start(ap, szFmt); vprintf(szFmt, ap); va_end(ap); -#ifdef ARCH_WA_FLUSH_CONSOLE - fflush(stdout); -#endif } -#endif -#ifndef FUNCTION_FDKprintfErr -void FDKprintfErr( const char* szFmt, ...) { +void FDKprintfErr(const char *szFmt, ...) { va_list ap; va_start(ap, szFmt); -#if defined(ARCH_WA_SLOWCON) - vprintf(szFmt, ap); -#else vfprintf(stderr, szFmt, ap); -#endif va_end(ap); -#ifdef ARCH_WA_FLUSH_CONSOLE - fflush(stderr); -#endif } -#endif int FDKgetchar(void) { return getchar(); } -INT FDKfprintf(FDKFILE *stream, const char *format, ...) { +INT FDKfprintf(FDKFILE *stream, const char *format, ...) { INT chars = 0; va_list ap; va_start(ap, format); - chars += vfprintf((FILE*)stream, format, ap); + chars += vfprintf((FILE *)stream, format, ap); va_end(ap); return chars; } -#ifndef FUNCTION_FDKsprintf -INT FDKsprintf(char *str, const char *format, ...) { +INT FDKsprintf(char *str, const char *format, ...) { INT chars = 0; va_list ap; va_start(ap, format); @@ -179,256 +171,198 @@ INT FDKsprintf(char *str, const char *format, ...) { va_end(ap); return chars; } -#endif - -#else - -void FDKprintf( const char* szFmt, ...) { /* stub! */; } -void FDKprintfErr( const char* szFmt, ...) { /* stub! */; } -INT FDKfprintf(FILE *stream, const char *format, ...) { /*stub ! */; } -INT FDKsprintf(char *str, const char *format, ...) { /* stub! */; } - -#endif /************************************************************************************************/ +/************************************************************************************************/ -const char *FDKstrchr(const char *s, INT c) { return strchr(s, c); } -const char *FDKstrstr(const char *haystack, const char *needle) { return strstr(haystack, needle); } -#ifndef FUNCTION_FDKstrcpy -char *FDKstrcpy(char *dest, const char *src) { return strcpy(dest, src); } -#endif -char *FDKstrncpy(char *dest, const char *src, UINT n) { return strncpy(dest, src, n); } +char *FDKstrchr(char *s, INT c) { return strchr(s, c); } +const char *FDKstrstr(const char *haystack, const char *needle) { + return strstr(haystack, needle); +} +char *FDKstrcpy(char *dest, const char *src) { return strcpy(dest, src); } +char *FDKstrncpy(char *dest, const char *src, UINT n) { + return strncpy(dest, src, n); +} /************************************************************************* * DYNAMIC MEMORY management (heap) *************************************************************************/ -#ifndef FUNCTION_FDKcalloc -void *FDKcalloc (const UINT n, const UINT size) -{ - void* ptr; +void *FDKcalloc(const UINT n, const UINT size) { + void *ptr; ptr = calloc(n, size); return ptr; } -#endif -#ifndef FUNCTION_FDKmalloc -void *FDKmalloc (const UINT size) -{ - void* ptr; +void *FDKmalloc(const UINT size) { + void *ptr; ptr = malloc(size); return ptr; } -#endif -#ifndef FUNCTION_FDKfree -void FDKfree (void *ptr) -{ - /* FDKprintf("f, heapSize: %d\n", heapSizeCurr); */ - free((INT*)ptr); -} -#endif +void FDKfree(void *ptr) { free((INT *)ptr); } -#ifndef FUNCTION_FDKaalloc -void *FDKaalloc(const UINT size, const UINT alignment) -{ - void *addr, *result=NULL; - addr = FDKcalloc(1, size + alignment + sizeof(void*)); /* Malloc and clear memory. */ +void *FDKaalloc(const UINT size, const UINT alignment) { + void *addr, *result = NULL; + addr = FDKcalloc(1, size + alignment + + (UINT)sizeof(void *)); /* Malloc and clear memory. */ - if (addr!=NULL) - { - result = ALIGN_PTR((unsigned char*)addr + sizeof(void*)); /* Get aligned memory base address. */ - *(((void**)result) - 1) = addr; /* Save malloc'ed memory pointer. */ + if (addr != NULL) { + result = ALIGN_PTR((unsigned char *)addr + + sizeof(void *)); /* Get aligned memory base address. */ + *(((void **)result) - 1) = addr; /* Save malloc'ed memory pointer. */ + C_ALLOC_ALIGNED_REGISTER(result, size); } - return result; /* Return aligned address. */ + return result; /* Return aligned address. */ } -#endif -#ifndef FUNCTION_FDKafree -void FDKafree (void *ptr) -{ +void FDKafree(void *ptr) { void *addr; - addr = *(((void**)ptr)-1); /* Get pointer to malloc'ed memory. */ - FDKfree(addr); /* Free malloc'ed memory area. */ -} -#endif + addr = *(((void **)ptr) - 1); /* Get pointer to malloc'ed memory. */ + C_ALLOC_ALIGNED_UNREGISTER(ptr); -#ifndef FUNCTION_FDKcalloc_L + FDKfree(addr); /* Free malloc'ed memory area. */ +} /*--------------------------------------------------------------------------* * DATA MEMORY L1/L2 (fallback) *--------------------------------------------------------------------------*/ - - /*--------------------------------------------------------------------------* * FDKcalloc_L *--------------------------------------------------------------------------*/ -void *FDKcalloc_L(const UINT dim, const UINT size, MEMORY_SECTION s) -{ - int a_size; - - if (s == SECT_DATA_EXTERN) - goto fallback; - - a_size = ((dim*size+3)&0xfffffffc); /* force 4 byte alignment (1111 .... 1111 1100) */ - - - - - - //printf("Warning, out of internal memory\n"); - -fallback: +void *FDKcalloc_L(const UINT dim, const UINT size, MEMORY_SECTION s) { return FDKcalloc(dim, size); } -#endif /* FUNCTION_FDKcalloc_L */ -#ifndef FUNCTION_FDKfree_L -void FDKfree_L (void *p) -{ +void FDKfree_L(void *p) { FDKfree(p); } - FDKfree(p); -} -#endif /* FUNCTION_FDKfree_L */ - -#ifndef FUNCTION_FDKaalloc_L -void *FDKaalloc_L(const UINT size, const UINT alignment, MEMORY_SECTION s) -{ - void *addr, *result=NULL; - addr = FDKcalloc_L(1, size + alignment + sizeof(void*), s); /* Malloc and clear memory. */ - - if (addr!=NULL) - { - result = ALIGN_PTR((unsigned char *)addr + sizeof(void*)); /* Get aligned memory base address. */ - *(((void**)result) - 1) = addr; /* Save malloc'ed memory pointer. */ +void *FDKaalloc_L(const UINT size, const UINT alignment, MEMORY_SECTION s) { + void *addr, *result = NULL; + addr = FDKcalloc_L(1, size + alignment + (UINT)sizeof(void *), + s); /* Malloc and clear memory. */ + + if (addr != NULL) { + result = ALIGN_PTR((unsigned char *)addr + + sizeof(void *)); /* Get aligned memory base address. */ + *(((void **)result) - 1) = addr; /* Save malloc'ed memory pointer. */ + C_ALLOC_ALIGNED_REGISTER(result, size); } - return result; /* Return aligned address. */ + return result; /* Return aligned address. */ } -#endif -#ifndef FUNCTION_FDKafree_L -void FDKafree_L (void *ptr) -{ +void FDKafree_L(void *ptr) { void *addr; - addr = *(((void**)ptr)-1); /* Get pointer to malloc'ed memory. */ - FDKfree_L(addr); /* Free malloc'ed memory area. */ -} -#endif + addr = *(((void **)ptr) - 1); /* Get pointer to malloc'ed memory. */ + C_ALLOC_ALIGNED_UNREGISTER(ptr); + FDKfree_L(addr); /* Free malloc'ed memory area. */ +} /*--------------------------------------------------------------------------------------- * FUNCTION: FDKmemcpy * DESCRIPTION: - copies memory from "src" to "dst" with length "size" bytes * - compiled with FDK_DEBUG will give you warnings *---------------------------------------------------------------------------------------*/ -void FDKmemcpy(void *dst, const void *src, const UINT size) -{ +void FDKmemcpy(void *dst, const void *src, const UINT size) { + /* -- check for overlapping memory areas -- */ + FDK_ASSERT(((const unsigned char *)dst - (const unsigned char *)src) >= + (ptrdiff_t)size || + ((const unsigned char *)src - (const unsigned char *)dst) >= + (ptrdiff_t)size); /* do the copy */ memcpy(dst, src, size); } -void FDKmemmove(void *dst, const void *src, const UINT size) { memmove(dst, src, size); } -void FDKmemset(void *memPtr, const INT value, const UINT size) { memset(memPtr, value, size); } -void FDKmemclear(void *memPtr, const UINT size) { FDKmemset(memPtr,0,size); } -UINT FDKstrlen(const char *s) { return (UINT)strlen(s); } +void FDKmemmove(void *dst, const void *src, const UINT size) { + memmove(dst, src, size); +} -/* Compare function wrappers */ -INT FDKmemcmp(const void *s1, const void *s2, const UINT size) { return memcmp(s1, s2, size); } -INT FDKstrcmp(const char *s1, const char *s2) { return strcmp(s1, s2); } -INT FDKstrncmp(const char *s1, const char *s2, const UINT size) { return strncmp(s1, s2, size); } +void FDKmemset(void *memPtr, const INT value, const UINT size) { + memset(memPtr, value, size); +} +void FDKmemclear(void *memPtr, const UINT size) { FDKmemset(memPtr, 0, size); } -/* Math function wrappers. Only intended for compatibility, not to be highly optimized. */ +UINT FDKstrlen(const char *s) { return (UINT)strlen(s); } -INT FDKabs(INT j) { return abs(j); } -double FDKfabs(double x) { return fabs(x); } -double FDKpow(double x, double y) { return pow(x,y); } -double FDKsqrt(double x) { return sqrt(x); } -double FDKatan(double x) { return atan(x); } -double FDKlog(double x) { return log(x); } -double FDKsin(double x) { return sin(x); } -double FDKcos(double x) { return cos(x); } -double FDKexp(double x) { return exp(x); } -double FDKatan2(double y, double x) { return atan2(y, x); } -double FDKacos(double x) { return acos(x); } -double FDKtan(double x) { return tan(x); } -double FDKfloor(double x) { return floor(x); } -double FDKceil(double x) { return ceil(x); } +/* Compare function wrappers */ +INT FDKmemcmp(const void *s1, const void *s2, const UINT size) { + return memcmp(s1, s2, size); +} +INT FDKstrcmp(const char *s1, const char *s2) { return strcmp(s1, s2); } +INT FDKstrncmp(const char *s1, const char *s2, const UINT size) { + return strncmp(s1, s2, size); +} -INT FDKatoi(const char *nptr) { return atoi(nptr); } -long FDKatol(const char *nptr) { return atol(nptr); } -float FDKatof(const char *nptr) { return (float)atof(nptr); } +int IS_LITTLE_ENDIAN(void) { + int __dummy = 1; + return (*((UCHAR *)(&(__dummy)))); +} +UINT TO_LITTLE_ENDIAN(UINT val) { + return IS_LITTLE_ENDIAN() + ? val + : (((val & 0xff) << 24) | ((val & 0xff00) << 8) | + ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24)); +} /* ==================== FILE I/O ====================== */ -#if !defined(FUNCTION_FDKfopen) -FDKFILE *FDKfopen(const char *filename, const char *mode) { return fopen(filename, mode); } -#endif -#if !defined(FUNCTION_FDKfclose) -INT FDKfclose(FDKFILE *fp) { return fclose((FILE*)fp);} -#endif -#if !defined(FUNCTION_FDKfseek) -INT FDKfseek(FDKFILE *fp, LONG OFFSET, int WHENCE) { return fseek((FILE*)fp, OFFSET, WHENCE);} -#endif -#if !defined(FUNCTION_FDKftell) -INT FDKftell(FDKFILE *fp) { return ftell((FILE*)fp); } -#endif -#if !defined(FUNCTION_FDKfflush) -INT FDKfflush(FDKFILE *fp) { return fflush((FILE*)fp); } -#endif +FDKFILE *FDKfopen(const char *filename, const char *mode) { + return fopen(filename, mode); +} +INT FDKfclose(FDKFILE *fp) { return fclose((FILE *)fp); } +INT FDKfseek(FDKFILE *fp, LONG OFFSET, int WHENCE) { + return fseek((FILE *)fp, OFFSET, WHENCE); +} +INT FDKftell(FDKFILE *fp) { return ftell((FILE *)fp); } +INT FDKfflush(FDKFILE *fp) { return fflush((FILE *)fp); } const INT FDKSEEK_SET = SEEK_SET; const INT FDKSEEK_CUR = SEEK_CUR; const INT FDKSEEK_END = SEEK_END; -#if !defined(FUNCTION_FDKfwrite) -UINT FDKfwrite(void *ptrf, INT size, UINT nmemb, FDKFILE *fp) { return fwrite(ptrf, size, nmemb, (FILE*)fp); } -#endif -#if !defined(FUNCTION_FDKfread) -UINT FDKfread(void *dst, INT size, UINT nmemb, FDKFILE *fp) { return fread(dst, size, nmemb, (FILE*)fp); } -#endif -#if !defined(FUNCTION_FDKfgets) -char* FDKfgets(void *dst, INT size, FDKFILE *fp) { return fgets((char *)dst, size, (FILE*)fp); } -#endif -#if !defined(FUNCTION_FDKrewind) -void FDKrewind(FDKFILE *fp) { FDKfseek((FILE*)fp,0,FDKSEEK_SET); } -#endif - - -UINT FDKfwrite_EL(void *ptrf, INT size, UINT nmemb, FDKFILE *fp) { +UINT FDKfwrite(const void *ptrf, INT size, UINT nmemb, FDKFILE *fp) { + return (UINT)fwrite(ptrf, size, nmemb, (FILE *)fp); +} +UINT FDKfread(void *dst, INT size, UINT nmemb, FDKFILE *fp) { + return (UINT)fread(dst, size, nmemb, (FILE *)fp); +} +char *FDKfgets(void *dst, INT size, FDKFILE *fp) { + return fgets((char *)dst, size, (FILE *)fp); +} +void FDKrewind(FDKFILE *fp) { FDKfseek((FILE *)fp, 0, FDKSEEK_SET); } - if (IS_LITTLE_ENDIAN()) { - FDKfwrite(ptrf, size, nmemb, fp); - } else { - UINT n; - INT s; +UINT FDKfwrite_EL(const void *ptrf, INT size, UINT nmemb, FDKFILE *fp) { + if (IS_LITTLE_ENDIAN()) { + FDKfwrite(ptrf, size, nmemb, fp); + } else { + UINT n; + INT s; - UCHAR *ptr = (UCHAR*) ptrf; + const UCHAR *ptr = (const UCHAR *)ptrf; - for (n=0; n<nmemb; n++) { - for (s=size-1; s>=0; s--) { - //FDKprintf("char = %c\n", (char)*(ptr+s)); - FDKfwrite(ptr + s, 1, 1, fp); - } - ptr = ptr + size; + for (n = 0; n < nmemb; n++) { + for (s = size - 1; s >= 0; s--) { + FDKfwrite(ptr + s, 1, 1, fp); } + ptr = ptr + size; } - return nmemb; + } + return nmemb; } - UINT FDKfread_EL(void *dst, INT size, UINT nmemb, FDKFILE *fp) { UINT n, s0, s1, err; UCHAR tmp, *ptr; @@ -436,9 +370,8 @@ UINT FDKfread_EL(void *dst, INT size, UINT nmemb, FDKFILE *fp) { /* Enforce alignment of 24 bit data. */ if (size == 3) { - ptr = (UCHAR*)dst; - err = 0; - for (n=0; n<nmemb; n++) { + ptr = (UCHAR *)dst; + for (n = 0; n < nmemb; n++) { if ((err = FDKfread(tmp24, 1, 3, fp)) != 3) { return err; } @@ -460,9 +393,9 @@ UINT FDKfread_EL(void *dst, INT size, UINT nmemb, FDKFILE *fp) { } } if (!IS_LITTLE_ENDIAN() && size > 1) { - ptr = (UCHAR*)dst; - for (n=0; n<nmemb; n++) { - for (s0=0, s1=size-1; s0 < s1; s0++, s1--) { + ptr = (UCHAR *)dst; + for (n = 0; n < nmemb; n++) { + for (s0 = 0, s1 = size - 1; s0 < s1; s0++, s1--) { tmp = ptr[s0]; ptr[s0] = ptr[s1]; ptr[s1] = tmp; @@ -473,24 +406,14 @@ UINT FDKfread_EL(void *dst, INT size, UINT nmemb, FDKFILE *fp) { return err; } -INT FDKfeof(FDKFILE *fp) { return feof((FILE*)fp); } +INT FDKfeof(FDKFILE *fp) { return feof((FILE *)fp); } /* Global initialization/cleanup */ -#if defined(_DEBUG) && defined(_WIN32) && !defined(_WIN32_WCE) - #define _CRTDBG_MAP_ALLOC - #include <crtdbg.h> -#endif - - - - -void FDKprintDisclaimer(void) -{ +void FDKprintDisclaimer(void) { FDKprintf( - "This program is protected by copyright law and international treaties.\n" \ - "Any reproduction or distribution of this program, or any portion\n" \ - "of it, may result in severe civil and criminal penalties, and will be\n" \ - "prosecuted to the maximum extent possible under law.\n\n"); + "This program is protected by copyright law and international treaties.\n" + "Any reproduction or distribution of this program, or any portion\n" + "of it, may result in severe civil and criminal penalties, and will be\n" + "prosecuted to the maximum extent possible under law.\n\n"); } - diff --git a/libSYS/src/linux/FDK_stackload_linux.cpp b/libSYS/src/linux/FDK_stackload_linux.cpp deleted file mode 100644 index 82fa9ab..0000000 --- a/libSYS/src/linux/FDK_stackload_linux.cpp +++ /dev/null @@ -1,90 +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): Manuel Jander - Description: Stack consumption information gathering. - -******************************************************************************/ - diff --git a/libSYS/src/linux/audio_linux.cpp b/libSYS/src/linux/audio_linux.cpp deleted file mode 100644 index 835b27b..0000000 --- a/libSYS/src/linux/audio_linux.cpp +++ /dev/null @@ -1,90 +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 - Description: Audio support - -******************************************************************************/ - diff --git a/libSYS/src/linux/coresup_linux.cpp b/libSYS/src/linux/coresup_linux.cpp deleted file mode 100644 index 9e6fa85..0000000 --- a/libSYS/src/linux/coresup_linux.cpp +++ /dev/null @@ -1,90 +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): Manuel Jander - Description: System support routines - -******************************************************************************/ - diff --git a/libSYS/src/linux/genericStds_linux.cpp b/libSYS/src/linux/genericStds_linux.cpp deleted file mode 100644 index da375c0..0000000 --- a/libSYS/src/linux/genericStds_linux.cpp +++ /dev/null @@ -1,294 +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): Manuel Jander - Description: Linux genericStds (mostly kernel SRAM driver bindings) - -******************************************************************************/ - - -/* - * NOTE: it makes only sense to enable this if you also have the corresponding - * GNU/Linux kernel driver to access fast SRAM. - */ -#if defined(__arm__) /* || defined(__mips__) */ - -/** - * EABI static linking problem workaround - * - * These function are normally present in libc.a but - * apparently can be linked only statically. - * While using C++ (iisisoff) that is a problem, - * because it wont work (static global constructors - * cause problems with static linked programs). - * So the workaround is to include those functions here, - * because libSYS.a is linked statically, and libc can be - * linked dynamically as usual. - * - * Add more EABI functions here if you get unresolved - * symbols of EABI functions. - */ -#include <string.h> - -#ifdef __cplusplus -extern "C" { -#endif -void __aeabi_memcpy(void *dest, void *src, int size) -{ - memcpy(dest, src, size); -} -void __aeabi_memcpy4(void *dest, void *src, int size) -{ - memcpy(dest, src, size); -} -void __aeabi_memmove4(void *dest, void *src, int size) -{ - memmove(dest, src, size); -} -void __aeabi_memclr(void *ptr, int size) -{ - memset(ptr, 0, size); -} -void __aeabi_memclr4(void *ptr, int size) -{ - memset(ptr, 0, size); -} -#ifdef __cplusplus -} -#endif - -/* Include Linux kernel config, or set ARCH and processor macros directly */ -/* -#define CONFIG_ARCH_MXC -#define CONFIG_ARCH_MX25 -*/ - -#if defined(CONFIG_ARCH_OMAP3) -#define KERNEL_SRAM_SIZE 65536 -#elif defined(CONFIG_ARCH_MX31) -#define KERNEL_SRAM_SIZE 16384 -#elif defined(CONFIG_ARCH_MX25) -#define KERNEL_SRAM_SIZE 131072 -#elif defined(CONFIG_ARCH_MX35) -#define KERNEL_SRAM_SIZE 131072 -#else -#define KERNEL_SRAM_SIZE 0 -#endif - -#if (KERNEL_SRAM_SIZE > 0) -#define KERNEL_SCRATCH_SIZE (4096) -#define FDK_SCRATCHBUF_SIZE (KERNEL_SCRATCH_SIZE/sizeof(INT)) -#define DATA_L1_A_SIZE (KERNEL_SRAM_SIZE-KERNEL_SCRATCH_SIZE) - -#define RESOURCE_scratchBuffer -#define FUNCTION_FDKprolog -#define FUNCTION_FDKepilog - -static unsigned char *L1_DATA_A=NULL; -static unsigned char *_a=NULL; - - -#ifdef RESOURCE_scratchBuffer -static INT *__scratchBuffer; -static unsigned char *__pScratchBuffer = NULL; -#endif - - -#ifdef __linux__ - -#include <stdio.h> -#include <sys/mman.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> - -static int fd; -static inline void * getSram(void) -{ - unsigned long *ptr = NULL; - - /* Open driver */ - fd = open("/dev/sram", 0); - if (fd < 0) - { - printf("Unable to open /dev/sram. Fallback to malloc\n"); - /* Signal "no sram driver at use". */ - fd = -1; - /* Return malloced pointer (fallback) */ - return FDKaalloc(KERNEL_SRAM_SIZE, 8); - } - - /* Get memory mapped into CPU (virtual) address space */ - ptr = (unsigned long *)mmap(NULL, KERNEL_SRAM_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if(ptr == MAP_FAILED) - { - printf("Unable to mmap(). Fallback to malloc\n"); - /* Give up on the sram driver */ - close(fd); - /* Signal "no sram driver at use". */ - fd = -1; - /* Return malloced pointer (fallback) */ - ptr = (unsigned long *)FDKaalloc(KERNEL_SRAM_SIZE, 8); - } - - - /* Return pointer to sram */ - return (void*)ptr; -} - -static inline void freeSram(void* ptr) -{ - /* Check if sram driver is being used. */ - if (fd == -1) - { - FDKafree(ptr); - return; - } - - /* Unmap memory */ - munmap(ptr, KERNEL_SRAM_SIZE); - /* Close driver */ - close(fd); - - return; -} - -#else - -static inline void * getSram(void) -{ - return FDKaalloc(KERNEL_SRAM_SIZE, 8); -} -static inline void * freeSram(void* ptr) -{ - FDKafree(ptr); -} - -#endif - - -#ifdef FUNCTION_FDKprolog -void FDKprolog(void) -{ - unsigned char *addr = (unsigned char*)getSram(); - - - if (addr == NULL) - { - printf("SRAM allocation failed ! This is fatal.\n"); - exit(-1); - } - -#ifdef RESOURCE_scratchBuffer - __scratchBuffer = (INT*) ( addr + (KERNEL_SRAM_SIZE-KERNEL_SCRATCH_SIZE) ); - __pScratchBuffer = addr + (KERNEL_SRAM_SIZE); -#endif - - printf("SRAM @ 0x%08x\n", (unsigned int) addr); - atexit(FDKepilog); - - FDKprolog_generic(); -} -#endif - -#ifdef FUNCTION_FDKepilog -void FDKepilog(void) -{ - /* Because of atexit(), make sure to call this only once */ - if (L1_DATA_A != NULL) - { - freeSram(L1_DATA_A); - L1_DATA_A = NULL; - - FDKepilog_generic(); - } -} -#endif - -#endif /* KERNEL_SRAM > 0 */ - -#endif /* ifdef __arm__ */ - diff --git a/libSYS/src/linux/uart_linux.cpp b/libSYS/src/linux/uart_linux.cpp deleted file mode 100644 index dee5694..0000000 --- a/libSYS/src/linux/uart_linux.cpp +++ /dev/null @@ -1,90 +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 - Description: UART support - -******************************************************************************/ - diff --git a/libSYS/src/mips/genericStds_mips.cpp b/libSYS/src/mips/genericStds_mips.cpp deleted file mode 100644 index e08ec48..0000000 --- a/libSYS/src/mips/genericStds_mips.cpp +++ /dev/null @@ -1,292 +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): Manuel Jander - Description: - -******************************************************************************/ - -#define RESOURCE_scratchBuffer -#define FUNCTION_FDKprolog -#define FUNCTION_FDKepilog - -#define MIPS_VIRTUAL_START (0x80000000) -/* value below is defined in simulator config (MipsMemIntf-{24KE,4KE}.cfg) */ -#define MIPS_SDE_SCRATCHPAD (0x00058000) - -//#define MIPS_SRAM_SIZE (32768) -#define MIPS_SRAM_SIZE (4096) - -#define MIPS_SCRATCH_SIZE (4096) -#define DATA_L1_A_SIZE (MIPS_SRAM_SIZE-MIPS_SCRATCH_SIZE) - - - - -#ifdef RESOURCE_scratchBuffer -#define FDK_SCRATCHBUF_SIZE 1024 -static LONG *___scratchBuffer = NULL; -static LONG *__scratchBuffer = NULL; -static unsigned char *__pScratchBuffer = NULL; -#endif - - -#ifdef __linux__ - -#include <stdio.h> -#include <sys/mman.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> - -static int fd; -static inline void * getSram(void) -{ - unsigned long *ptr = NULL; - - /* Open driver */ - fd = open("/dev/sram", 0); - if (fd < 0) - { - printf("Unable to access sram. Fallback to malloc\n"); - /* Signal "no sram driver at use". */ - fd = -1; - /* Return malloced pointer (fallback) */ - return malloc(MIPS_SRAM_SIZE); - } - - /* Get memory mapped into CPU (virtual) address space */ - ptr = (unsigned long *)mmap(NULL, MIPS_SRAM_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if(ptr == MAP_FAILED) - { - printf("Unable to access sram. Fallback to malloc\n"); - /* Give up on the sram driver */ - close(fd); - /* Signal "no sram driver at use". */ - fd = -1; - /* Return malloced pointer (fallback) */ - ptr = (unsigned long *)malloc(MIPS_SRAM_SIZE); - } - - - /* Return pointer to sram */ - return (void*)ptr; -} - -static inline void freeSram(void* ptr) -{ - /* Check if sram driver is being used. */ - if (fd == -1) - { - free(ptr); - return; - } - - /* Unmap memory */ - munmap(ptr, MIPS_SRAM_SIZE); - /* Close driver */ - close(fd); - - return; -} - -#elif defined(__SDE_MIPS__) - -#include <stdio.h> -#include <mips/cpu.h> - -static int hasISPRAM, hasDSPRAM; - -static inline void * getSram(void) -{ - void *addr; - unsigned int Config; - - Config = mips_getconfig(); - hasISPRAM = (Config >> 24) & 1; - hasDSPRAM = (Config >> 23) & 1; - - FDKprintf("Config ISP/DSP: %d/%d\n", hasISPRAM, hasDSPRAM); - - if (hasDSPRAM) { - long paddr, laddr; - - FDKprintf("wrong\n"); - paddr = MIPS_SDE_SCRATCHPAD; - /* Fixed mapping of kseg0: 0x80000000-0x9fffffff virtual => 0x00000000-0x1fffffff physical */ - laddr = MIPS_VIRTUAL_START + MIPS_SDE_SCRATCHPAD; - addr = (void*)(laddr); - } else { - FDKprintf("ok\n"); - addr = malloc(MIPS_SRAM_SIZE); - FDKprintf("addr %d\n", (int)addr); - } - return addr; -} -static inline void freeSram(void* ptr) -{ - if (!hasDSPRAM) { - free(ptr); - } -} - -#else - -static inline void * getSram(void) -{ - return malloc(MIPS_SRAM_SIZE); -} -static inline void freeSram(void* ptr) -{ - free(ptr); -} - -#endif - - -#ifdef FUNCTION_FDKprolog -void FDKprolog(void) -{ - unsigned char *addr; - -#ifdef _MIPS_ARCH_MIPS32R2 - unsigned status; - asm volatile("mfc0 %0, $12, 0;\n" : "=r" (status)); - status |= (1 << 24); - asm volatile("mtc0 %0, $12, 0;\n" :: "r" (status)); -#endif - - addr = (unsigned char*)getSram(); - if (addr == NULL) { - FDKprintfErr("SRAM allocation failed ! This is fatal.\n"); - exit(-1); - } else { - FDKprintf("SRAM @ 0x%08x, size = 0x%x\n", (unsigned int) addr, MIPS_SRAM_SIZE); - } - - -#ifdef RESOURCE_scratchBuffer - ___scratchBuffer = (LONG*)(addr + MIPS_SRAM_SIZE - MIPS_SCRATCH_SIZE); -#endif - - atexit(FDKepilog); - - FDKprolog_generic(); -} -#endif - -#ifdef FUNCTION_FDKepilog -void FDKepilog(void) -{ - -#ifdef _MIPS_ARCH_MIPS32R2 - unsigned status; - asm volatile("mfc0 %0, $12, 0;\n" : "=r" (status)); - status &= ~(1 << 24); - asm volatile("mtc0 %0, $12, 0;\n" :: "r" (status)); -#endif - - FDKepilog_generic(); -} -#endif - - -#if !defined(__linux__) - -#define FUNCTION_FDKclock - -#ifndef MIPS_CPU_CLK -#define MIPS_CPU_CLK 100000000 -#endif - -INT FDKclock(void) { - INT clk; - - asm volatile ("mfc0 %0,$9 " : "=r" (clk)); - return clk; -} - -#endif /* !defined(__linux__) */ diff --git a/libSYS/src/syslib_channelMapDescr.cpp b/libSYS/src/syslib_channelMapDescr.cpp new file mode 100644 index 0000000..e011f25 --- /dev/null +++ b/libSYS/src/syslib_channelMapDescr.cpp @@ -0,0 +1,284 @@ +/* ----------------------------------------------------------------------------- +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.cpp + * \brief Implementation of routines that handle the channel map descriptor. + */ + +#include "syslib_channelMapDescr.h" + +#define DFLT_CH_MAP_TAB_LEN \ + (15) /* Length of the default channel map info table. */ + +/** + * \brief The following arrays provide a channel map for each channel config (0 + * to 14). + * + * The i-th channel will be mapped to the postion a[i-1]+1 + * with i>0 and a[] is one of the following mapping arrays. + */ +static const UCHAR mapFallback[] = {0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23}; +static const UCHAR mapCfg1[] = {0, 1}; +static const UCHAR mapCfg2[] = {0, 1}; +static const UCHAR mapCfg3[] = {2, 0, 1}; +static const UCHAR mapCfg4[] = {2, 0, 1, 3}; +static const UCHAR mapCfg5[] = {2, 0, 1, 3, 4}; +static const UCHAR mapCfg6[] = {2, 0, 1, 4, 5, 3}; +static const UCHAR mapCfg7[] = {2, 6, 7, 0, 1, 4, 5, 3}; +static const UCHAR mapCfg11[] = {2, 0, 1, 4, 5, 6, 3}; +static const UCHAR mapCfg12[] = {2, 0, 1, 6, 7, 4, 5, 3}; +static const UCHAR mapCfg13[] = {2, 6, 7, 0, 1, 10, 11, 4, + 5, 8, 3, 9, 14, 12, 13, 18, + 19, 15, 16, 17, 20, 21, 22, 23}; +static const UCHAR mapCfg14[] = {2, 0, 1, 4, 5, 3, 6, 7}; + +/** + * \brief Default table comprising channel map information for each channel + * config (0 to 14). + */ +static const CHANNEL_MAP_INFO mapInfoTabDflt[DFLT_CH_MAP_TAB_LEN] = + {/* chCfg, map, numCh */ + /* 0 */ {mapFallback, 24}, + /* 1 */ {mapCfg1, 2}, + /* 2 */ {mapCfg2, 2}, + /* 3 */ {mapCfg3, 3}, + /* 4 */ {mapCfg4, 4}, + /* 5 */ {mapCfg5, 5}, + /* 6 */ {mapCfg6, 6}, + /* 7 */ {mapCfg7, 8}, + /* 8 */ {mapFallback, 24}, + /* 9 */ {mapFallback, 24}, + /* 10 */ {mapFallback, 24}, + /* 11 */ {mapCfg11, 7}, + /* 12 */ {mapCfg12, 8}, + /* 13 */ {mapCfg13, 24}, + /* 14 */ {mapCfg14, 8}}; + +/** + * Get the mapping value for a specific channel and map index. + */ +UCHAR FDK_chMapDescr_getMapValue(const FDK_channelMapDescr* const pMapDescr, + const UCHAR chIdx, const UINT mapIdx) { + UCHAR mapValue = chIdx; /* Pass through by default. */ + + FDK_ASSERT(pMapDescr != NULL); + + if ((pMapDescr->fPassThrough == 0) && (pMapDescr->pMapInfoTab != NULL) && + (pMapDescr->mapInfoTabLen > mapIdx)) { /* Nest sanity check to avoid + possible memory access + violation. */ + if (chIdx < pMapDescr->pMapInfoTab[mapIdx].numChannels) { + mapValue = pMapDescr->pMapInfoTab[mapIdx].pChannelMap[chIdx]; + } + } + return mapValue; +} + +/** + * \brief Evaluate whether single channel map is reasonable or not. + * + * \param pMapInfo Pointer to channel map. + * \return Value unequal to zero if map is valid, otherwise zero. + */ +static int fdk_chMapDescr_isValidMap(const CHANNEL_MAP_INFO* const pMapInfo) { + int result = 1; + UINT i; + + if (pMapInfo == NULL) { + result = 0; + } else { + UINT numChannels = pMapInfo->numChannels; + + /* Check for all map values if they are inside the range 0 to numChannels-1 + * and unique. */ + if (numChannels < 32) { /* Optimized version for less than 32 channels. + Needs only one loop. */ + UINT mappedChMask = 0x0; + for (i = 0; i < numChannels; i += 1) { + mappedChMask |= 1 << pMapInfo->pChannelMap[i]; + } + if (mappedChMask != (((UINT)1 << numChannels) - 1)) { + result = 0; + } + } else { /* General case that can handle all number of channels but needs + one more loop. */ + for (i = 0; (i < numChannels) && result; i += 1) { + UINT j; + UCHAR value0 = pMapInfo->pChannelMap[i]; + + if (value0 > numChannels - 1) { /* out of range? */ + result = 0; + } + for (j = numChannels - 1; (j > i) && result; j -= 1) { + if (value0 == pMapInfo->pChannelMap[j]) { /* not unique */ + result = 0; + } + } + } + } + } + + return result; +} + +/** + * Evaluate whether channel map descriptor is reasonable or not. + */ +int FDK_chMapDescr_isValid(const FDK_channelMapDescr* const pMapDescr) { + int result = 0; + UINT i; + + if (pMapDescr != NULL) { + result = 1; + for (i = 0; (i < pMapDescr->mapInfoTabLen) && result; i += 1) { + if (!fdk_chMapDescr_isValidMap(&pMapDescr->pMapInfoTab[i])) { + result = 0; + } + } + } + return result; +} + +/** + * Initialize the complete channel map descriptor. + */ +void FDK_chMapDescr_init(FDK_channelMapDescr* const pMapDescr, + const CHANNEL_MAP_INFO* const pMapInfoTab, + const UINT mapInfoTabLen, const UINT fPassThrough) { + if (pMapDescr != NULL) { + int useDefaultTab = 1; + + pMapDescr->fPassThrough = (fPassThrough == 0) ? 0 : 1; + + if ((pMapInfoTab != NULL) && (mapInfoTabLen > 0)) { + /* Set the valid custom mapping table. */ + pMapDescr->pMapInfoTab = pMapInfoTab; + pMapDescr->mapInfoTabLen = mapInfoTabLen; + /* Validate the complete descriptor. */ + useDefaultTab = (FDK_chMapDescr_isValid(pMapDescr) == 0) ? 1 : 0; + } + if (useDefaultTab != 0) { + /* Set default table. */ + pMapDescr->pMapInfoTab = mapInfoTabDflt; + pMapDescr->mapInfoTabLen = DFLT_CH_MAP_TAB_LEN; + } + } +} + +/** + * Set channel mapping bypass flag in a given channel map descriptor. + */ +int FDK_chMapDescr_setPassThrough(FDK_channelMapDescr* const pMapDescr, + UINT fPassThrough) { + int err = 1; + + if (pMapDescr != NULL) { + if ((pMapDescr->pMapInfoTab != NULL) && (pMapDescr->mapInfoTabLen > 0)) { + pMapDescr->fPassThrough = (fPassThrough == 0) ? 0 : 1; + err = 0; + } + } + + return err; +} diff --git a/libSYS/src/wav_file.cpp b/libSYS/src/wav_file.cpp deleted file mode 100644 index 58bcfaa..0000000 --- a/libSYS/src/wav_file.cpp +++ /dev/null @@ -1,560 +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 - Description: a rudimentary wav file interface - -******************************************************************************/ - - - -#include "wav_file.h" -#include "genericStds.h" - - -static INT_PCM ulaw2pcm (UCHAR ulawbyte); - -/*! - * - * \brief Read header from a WAVEfile. Host endianess is handled accordingly. - * \wav->fp filepointer of type FILE*. - * \wavinfo SWavInfo struct where the decoded header info is stored into. - * \return 0 on success and non-zero on failure. - * - */ -INT WAV_InputOpen (HANDLE_WAV *pWav, const char *filename) -{ - HANDLE_WAV wav = (HANDLE_WAV)FDKcalloc(1, sizeof(struct WAV)); - INT offset; - - if (wav == NULL) { - FDKprintfErr("WAV_InputOpen(): Unable to allocate WAV struct.\n"); - goto error; - } - - wav->fp = FDKfopen(filename, "rb"); - if (wav->fp == NULL) { - FDKprintfErr("WAV_InputOpen(): Unable to open wav file. %s\n", filename); - goto error; - } - - /* read RIFF-chunk */ - if (FDKfread(&(wav->header.riffType), 1, 4, wav->fp) != 4) { - FDKprintfErr("WAV_InputOpen(): couldn't read RIFF_ID\n"); - goto error; /* bad error "couldn't read RIFF_ID" */ - } - if (FDKstrncmp("RIFF", wav->header.riffType, 4)) { - FDKprintfErr("WAV_InputOpen(): RIFF descriptor not found.\n") ; - goto error; - } - - /* Read RIFF size. Ignored. */ - FDKfread_EL(&(wav->header.riffSize), 4, 1, wav->fp); - - /* read WAVE-chunk */ - if (FDKfread(&wav->header.waveType, 1, 4, wav->fp) !=4) { - FDKprintfErr("WAV_InputOpen(): couldn't read format\n"); - goto error; /* bad error "couldn't read format" */ - } - if (FDKstrncmp("WAVE", wav->header.waveType, 4)) { - FDKprintfErr("WAV_InputOpen(): WAVE chunk ID not found.\n") ; - goto error; - } - - /* read format-chunk */ - if (FDKfread(&(wav->header.formatType), 1, 4, wav->fp) != 4) { - FDKprintfErr("WAV_InputOpen(): couldn't read format_ID\n"); - goto error; /* bad error "couldn't read format_ID" */ - } - if (FDKstrncmp("fmt", wav->header.formatType, 3)) { - FDKprintfErr("WAV_InputOpen(): fmt chunk format not found.\n") ; - goto error; - } - - - FDKfread_EL(&wav->header.formatSize, 4, 1, wav->fp); /* should be 16 for PCM-format (uncompressed) */ - - - /* read info */ - FDKfread_EL(&(wav->header.compressionCode), 2, 1, wav->fp); - FDKfread_EL(&(wav->header.numChannels), 2, 1, wav->fp); - FDKfread_EL(&(wav->header.sampleRate), 4, 1, wav->fp); - FDKfread_EL(&(wav->header.bytesPerSecond), 4, 1, wav->fp); - FDKfread_EL(&(wav->header.blockAlign), 2, 1, wav->fp); - FDKfread_EL(&(wav->header.bitsPerSample), 2, 1, wav->fp); - - offset = wav->header.formatSize - 16; - - /* Wave format extensible */ - if (wav->header.compressionCode == 0xFFFE) { - static const UCHAR guidPCM[16] = { - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, - 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 - }; - USHORT extraFormatBytes, validBitsPerSample; - UCHAR guid[16]; - INT i; - - /* read extra bytes */ - FDKfread_EL(&(extraFormatBytes), 2, 1, wav->fp); - offset -= 2; - - if (extraFormatBytes >= 22) { - FDKfread_EL(&(validBitsPerSample), 2, 1, wav->fp); - FDKfread_EL(&(wav->channelMask), 4, 1, wav->fp); - FDKfread_EL(&(guid), 16, 1, wav->fp); - - /* check for PCM GUID */ - for (i = 0; i < 16; i++) if (guid[i] != guidPCM[i]) break; - if (i == 16) wav->header.compressionCode = 0x01; - - offset -= 22; - } - } - - /* Skip rest of fmt header if any. */ - for (;offset > 0; offset--) { - FDKfread(&wav->header.formatSize, 1, 1, wav->fp); - } - - do { - /* Read data chunk ID */ - if (FDKfread(wav->header.dataType, 1, 4, wav->fp) != 4) { - FDKprintfErr("WAV_InputOpen(): Unable to read data chunk ID.\n"); - FDKfree(wav); - goto error; - } - - /* Read chunk length. */ - FDKfread_EL(&offset, 4, 1, wav->fp); - - /* Check for data chunk signature. */ - if (FDKstrncmp("data", wav->header.dataType, 4) == 0) { - wav->header.dataSize = offset; - break; - } - /* Jump over non data chunk. */ - for (;offset > 0; offset--) { - FDKfread(&(wav->header.dataSize), 1, 1, wav->fp); - } - } while (!FDKfeof(wav->fp)); - - /* return success */ - *pWav = wav; - return 0; - - /* Error path */ -error: - - if (wav) { - if (wav->fp) { - FDKfclose(wav->fp); - wav->fp = NULL; - } - FDKfree(wav); - } - - *pWav = NULL; - - return -1; -} - -/*! - * - * \brief Read samples from a WAVEfile. The samples are automatically reorder to the native - * host endianess and scaled to full scale of the INT_PCM type, from whatever bps the WAVEfile - * had specified in its haader data. - * - * \wav HANDLE_WAV of the wav file. - * \buffer Pointer to store read data. - * \numSamples Desired number of samples to read. - * \nBits sample size in bits to be used for the buffer - * - * \return Number of samples actually read. - * - */ - -INT WAV_InputRead (HANDLE_WAV wav, void *buffer, UINT numSamples, int nBits) -{ - UINT result = 0 ; - UINT i; - SCHAR *bptr = (SCHAR*)buffer; - LONG *lptr = (LONG*)buffer; - SHORT *sptr = (SHORT*)buffer; - - switch (wav->header.compressionCode) - { - case 0x01: /* PCM uncompressed */ - if (nBits == wav->header.bitsPerSample) { - result = FDKfread_EL(buffer, wav->header.bitsPerSample >> 3, numSamples, wav->fp) ; - } else { - result = 0; - for (i=0; i<numSamples; i++) - { - LONG tmp = 0; - result += FDKfread_EL(&tmp, wav->header.bitsPerSample >> 3, 1, wav->fp) ; - - /* Move read bits to lower bits of LONG. */ - if ( !IS_LITTLE_ENDIAN() && wav->header.bitsPerSample != 24 && wav->header.bitsPerSample < 32) { - tmp >>= (32-wav->header.bitsPerSample); - } - - /* Full scale */ - if (wav->header.bitsPerSample > nBits) - tmp >>= (wav->header.bitsPerSample-nBits); - else - tmp <<= (nBits-wav->header.bitsPerSample); - - if (nBits == 8) - *bptr++ = (SCHAR) tmp; - if (nBits == 16) - *sptr++ = (SHORT) tmp; - if (nBits == 32) - *lptr++ = (LONG) tmp; - } - } - break; - - case 0x07: /* u-Law compression */ - for (i=0; i<numSamples; i++) { - result += FDKfread(&(bptr[i<<1]), 1, 1, wav->fp) ; - sptr[i] = ulaw2pcm(bptr[i<<1]) ; - } - break ; - - default: - FDKprintf("WAV_InputRead(): unsupported data-compression!!") ; - break ; - } - return result ; -} - -void WAV_InputClose(HANDLE_WAV *pWav) -{ - HANDLE_WAV wav = *pWav; - - if (wav != NULL) { - if (wav->fp != NULL) { - FDKfclose(wav->fp); - wav->fp = NULL; - } - if (wav) { - FDKfree(wav); - } - } - *pWav = NULL; -} - -/* conversion of u-law to linear coding */ -static INT_PCM ulaw2pcm (UCHAR ulawbyte) -{ - static const INT exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 } ; - INT sign, exponent, mantissa, sample ; - - ulawbyte = (UCHAR)~ulawbyte ; - sign = (ulawbyte & 0x80) ; - exponent = (ulawbyte >> 4) & 0x07 ; - mantissa = ulawbyte & 0x0F ; - - sample = exp_lut[exponent] + (mantissa << (exponent + 3)) ; - if (sign != 0) - sample = -sample ; - - return (INT_PCM)sample ; -} - -/************** Writer ***********************/ - -static UINT LittleEndian32(UINT v) -{ - if (IS_LITTLE_ENDIAN()) - return v ; - else - return (v & 0x000000FF) << 24 | (v & 0x0000FF00) << 8 | (v & 0x00FF0000) >> 8 | (v & 0xFF000000) >> 24; -} - -static SHORT LittleEndian16(SHORT v) -{ - if (IS_LITTLE_ENDIAN()) - return v; - else - return (SHORT)(((v << 8) & 0xFF00) | ((v >> 8) & 0x00FF)); -} - -static USHORT Unpack(USHORT v) -{ - if (IS_LITTLE_ENDIAN()) - return v; - else - return (SHORT)(((v << 8) & 0xFF00) | ((v >> 8) & 0x00FF)); -} - -/** - * WAV_OutputOpen - * \brief Open WAV output/writer handle - * \param pWav pointer to WAV handle to be returned - * \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 value: 0: ok - * -1: error - */ -INT WAV_OutputOpen(HANDLE_WAV *pWav, const char *outputFilename, INT sampleRate, INT numChannels, INT bitsPerSample) -{ - HANDLE_WAV wav = (HANDLE_WAV)FDKcalloc(1, sizeof(struct WAV)); - UINT size = 0; - - if (wav == NULL) { - FDKprintfErr("WAV_OutputOpen(): Unable to allocate WAV struct.\n"); - goto bail; - } - - if (bitsPerSample != 16 && bitsPerSample != 24 && bitsPerSample != 32) - { - FDKprintfErr("WAV_OutputOpen(): Invalid argument (bitsPerSample).\n"); - goto bail; - } - - wav->fp = FDKfopen(outputFilename, "wb"); - if (wav->fp == NULL) - { - FDKprintfErr("WAV_OutputOpen(): unable to create file %s\n", outputFilename); - goto bail; - } - - FDKstrcpy(wav->header.riffType, "RIFF"); - wav->header.riffSize = LittleEndian32(0x7fffffff); /* in case fseek() doesn't work later in WAV_OutputClose() */ - FDKstrcpy(wav->header.waveType, "WAVE"); - - FDKstrcpy(wav->header.formatType, "fmt "); - wav->header.formatSize = LittleEndian32(16); - - wav->header.compressionCode = LittleEndian16(0x01); - wav->header.bitsPerSample = LittleEndian16((SHORT)bitsPerSample); - wav->header.numChannels = LittleEndian16((SHORT)numChannels); - wav->header.blockAlign = LittleEndian16((SHORT)(numChannels * (bitsPerSample >> 3))); - wav->header.sampleRate = LittleEndian32(sampleRate); - wav->header.bytesPerSecond = LittleEndian32(sampleRate * wav->header.blockAlign); - FDKstrcpy(wav->header.dataType, "data"); - wav->header.dataSize = LittleEndian32(0x7fffffff - 36); - - - size = sizeof(WAV_HEADER); - if (FDKfwrite(&wav->header, 1, size, wav->fp) != size) - { - FDKprintfErr("WAV_OutputOpen(): error writing to output file %s\n", outputFilename); - goto bail; - } - - - wav->header.dataSize = wav->header.riffSize = 0; - - *pWav = wav; - - return 0; - -bail: - if (wav) { - if (wav->fp) { - FDKfclose(wav->fp); - } - FDKfree(wav); - } - - pWav = NULL; - - return -1; -} - - -/** - * WAV_OutputWrite - * \brief Write data to WAV file asociated to WAV handle - * - * \param wav handle of wave file - * \param sampleBuffer pointer to audio samples, right justified integer values - * \param nBufBits size in bits of each audio sample in sampleBuffer - * \param nSigBits amount of significant bits of each nBufBits in sampleBuffer - * - * \return value: 0: ok - * -1: error - */ -INT WAV_OutputWrite(HANDLE_WAV wav, void *sampleBuffer, UINT numberOfSamples, int nBufBits, int nSigBits) -{ - SCHAR *bptr = (SCHAR*)sampleBuffer; - SHORT *sptr = (SHORT*)sampleBuffer; - LONG *lptr = (LONG*)sampleBuffer; - LONG tmp; - - int bps = Unpack(wav->header.bitsPerSample); - UINT i; - - /* Pack samples if required */ - if (bps == nBufBits && bps == nSigBits) { - if (FDKfwrite_EL(sampleBuffer, (bps>>3), numberOfSamples, wav->fp) != numberOfSamples) - { - FDKprintfErr("WAV_OutputWrite(): error: unable to write to file %d\n", wav->fp); - return -1; - } - } else { - for (i=0; i<numberOfSamples; i++) - { - int result; - int shift; - - switch (nBufBits) { - case 8: tmp = *bptr++; break; - case 16: tmp = *sptr++; break; - case 32: tmp = *lptr++; break; - default: return -1; - } - /* Adapt sample size */ - shift = (nBufBits-nSigBits)-(32-bps); - - /* Correct alignment difference between 32 bit data buffer "tmp" and 24 bits to be written. */ - if ( !IS_LITTLE_ENDIAN() && bps == 24) { - shift += 8; - } - - if (shift < 0) - tmp >>= -shift; - else - tmp <<= shift; - - /* Write sample */ - result=FDKfwrite_EL(&tmp, bps>>3, 1, wav->fp); - if (result <= 0) { - FDKprintfErr("WAV_OutputWrite(): error: unable to write to file %d\n", wav->fp); - return -1; - } - } - } - - wav->header.dataSize += (numberOfSamples * (bps>>3)); - return 0; -} - - -/** - * WAV_OutputClose - * \brief Close WAV Output handle - * \param pWav pointer to WAV handle. *pWav is set to NULL. - */ -void WAV_OutputClose(HANDLE_WAV *pWav) -{ - HANDLE_WAV wav = *pWav; - UINT size = 0; - - if ( wav == NULL ) { - return; - } - - wav->header.dataSize = LittleEndian32(wav->header.dataSize); - wav->header.riffSize = LittleEndian32(wav->header.dataSize + 36); - - if (wav->fp != NULL) - { - if (FDKfseek(wav->fp, 0, FDKSEEK_SET)) { - FDKprintf("WAV_OutputClose(): fseek() failed.\n"); - } - - size = sizeof(WAV_HEADER); - if (FDKfwrite(&wav->header.riffType, 1, size, wav->fp) != size) - { - FDKprintfErr("WAV_OutputClose(): unable to write header\n"); - } - - if (FDKfclose(wav->fp)) - { - FDKprintfErr("WAV_OutputClose(): unable to close wav file\n"); - } - wav->fp = NULL; - } - - FDKfree(wav); - *pWav = NULL; -} - |