diff options
author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-02-26 20:17:00 +0100 |
---|---|---|
committer | Jean-Michel Trivi <jmtrivi@google.com> | 2018-04-19 11:21:15 -0700 |
commit | 6cfabd35363c3ef5e3b209b867169a500b3ccc3c (patch) | |
tree | 01c0a19f2735e8b5d2407555fe992d4230d089eb /libSYS/src/genericStds.cpp | |
parent | 6288a1e34c4dede4c2806beb1736ece6580558c7 (diff) | |
download | fdk-aac-6cfabd35363c3ef5e3b209b867169a500b3ccc3c.tar.gz fdk-aac-6cfabd35363c3ef5e3b209b867169a500b3ccc3c.tar.bz2 fdk-aac-6cfabd35363c3ef5e3b209b867169a500b3ccc3c.zip |
Upgrade to FDKv2
Bug: 71430241
Test: CTS DecoderTest and DecoderTestAacDrc
original-Change-Id: Iaa20f749b8a04d553b20247cfe1a8930ebbabe30
Apply clang-format also on header files.
original-Change-Id: I14de1ef16bbc79ec0283e745f98356a10efeb2e4
Fixes for MPEG-D DRC
original-Change-Id: If1de2d74bbbac84b3f67de3b88b83f6a23b8a15c
Catch unsupported tw_mdct at an early stage
original-Change-Id: Ied9dd00d754162a0e3ca1ae3e6b854315d818afe
Fixing PVC transition frames
original-Change-Id: Ib75725abe39252806c32d71176308f2c03547a4e
Move qmf bands sanity check
original-Change-Id: Iab540c3013c174d9490d2ae100a4576f51d8dbc4
Initialize scaling variable
original-Change-Id: I3c4087101b70e998c71c1689b122b0d7762e0f9e
Add 16 qmf band configuration to getSlotNrgHQ()
original-Change-Id: I49a5d30f703a1b126ff163df9656db2540df21f1
Always apply byte alignment at the end of the AudioMuxElement
original-Change-Id: I42d560287506d65d4c3de8bfe3eb9a4ebeb4efc7
Setup SBR element only if no parse error exists
original-Change-Id: I1915b73704bc80ab882b9173d6bec59cbd073676
Additional array index check in HCR
original-Change-Id: I18cc6e501ea683b5009f1bbee26de8ddd04d8267
Fix fade-in index selection in concealment module
original-Change-Id: Ibf802ed6ed8c05e9257e1f3b6d0ac1162e9b81c1
Enable explicit backward compatible parser for AAC_LD
original-Change-Id: I27e9c678dcb5d40ed760a6d1e06609563d02482d
Skip spatial specific config in explicit backward compatible ASC
original-Change-Id: Iff7cc365561319e886090cedf30533f562ea4d6e
Update flags description in decoder API
original-Change-Id: I9a5b4f8da76bb652f5580cbd3ba9760425c43830
Add QMF domain reset function
original-Change-Id: I4f89a8a2c0277d18103380134e4ed86996e9d8d6
DRC upgrade v2.1.0
original-Change-Id: I5731c0540139dab220094cd978ef42099fc45b74
Fix integer overflow in sqrtFixp_lookup()
original-Change-Id: I429a6f0d19aa2cc957e0f181066f0ca73968c914
Fix integer overflow in invSqrtNorm2()
original-Change-Id: I84de5cbf9fb3adeb611db203fe492fabf4eb6155
Fix integer overflow in GenerateRandomVector()
original-Change-Id: I3118a641008bd9484d479e5b0b1ee2b5d7d44d74
Fix integer overflow in adjustTimeSlot_EldGrid()
original-Change-Id: I29d503c247c5c8282349b79df940416a512fb9d5
Fix integer overflow in FDKsbrEnc_codeEnvelope()
original-Change-Id: I6b34b61ebb9d525b0c651ed08de2befc1f801449
Follow-up on: Fix integer overflow in adjustTimeSlot_EldGrid()
original-Change-Id: I6f8f578cc7089e5eb7c7b93e580b72ca35ad689a
Fix integer overflow in get_pk_v2()
original-Change-Id: I63375bed40d45867f6eeaa72b20b1f33e815938c
Fix integer overflow in Syn_filt_zero()
original-Change-Id: Ie0c02fdfbe03988f9d3b20d10cd9fe4c002d1279
Fix integer overflow in CFac_CalcFacSignal()
original-Change-Id: Id2d767c40066c591b51768e978eb8af3b803f0c5
Fix integer overflow in FDKaacEnc_FDKaacEnc_calcPeNoAH()
original-Change-Id: Idcbd0f4a51ae2550ed106aa6f3d678d1f9724841
Fix integer overflow in sbrDecoder_calculateGainVec()
original-Change-Id: I7081bcbe29c5cede9821b38d93de07c7add2d507
Fix integer overflow in CLpc_SynthesisLattice()
original-Change-Id: I4a95ddc18de150102352d4a1845f06094764c881
Fix integer overflow in Pred_Lt4()
original-Change-Id: I4dbd012b2de7d07c3e70a47b92e3bfae8dbc750a
Fix integer overflow in FDKsbrEnc_InitSbrFastTransientDetector()
original-Change-Id: I788cbec1a4a00f44c2f3a72ad7a4afa219807d04
Fix unsigned integer overflow in FDKaacEnc_WriteBitstream()
original-Change-Id: I68fc75166e7d2cd5cd45b18dbe3d8c2a92f1822a
Fix unsigned integer overflow in FDK_MetadataEnc_Init()
original-Change-Id: Ie8d025f9bcdb2442c704bd196e61065c03c10af4
Fix overflow in pseudo random number generators
original-Change-Id: I3e2551ee01356297ca14e3788436ede80bd5513c
Fix unsigned integer overflow in sbrDecoder_Parse()
original-Change-Id: I3f231b2f437e9c37db4d5b964164686710eee971
Fix unsigned integer overflow in longsub()
original-Change-Id: I73c2bc50415cac26f1f5a29e125bbe75f9180a6e
Fix unsigned integer overflow in CAacDecoder_DecodeFrame()
original-Change-Id: Ifce2db4b1454b46fa5f887e9d383f1cc43b291e4
Fix overflow at CLpdChannelStream_Read()
original-Change-Id: Idb9d822ce3a4272e4794b643644f5434e2d4bf3f
Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD()
original-Change-Id: I1ccf77c0015684b85534c5eb97162740a870b71c
Fix unsigned integer overflow in UsacConfig_Parse()
original-Change-Id: Ie6d27f84b6ae7eef092ecbff4447941c77864d9f
Fix unsigned integer overflow in aacDecoder_drcParse()
original-Change-Id: I713f28e883eea3d70b6fa56a7b8f8c22bcf66ca0
Fix unsigned integer overflow in aacDecoder_drcReadCompression()
original-Change-Id: Ia34dfeb88c4705c558bce34314f584965cafcf7a
Fix unsigned integer overflow in CDataStreamElement_Read()
original-Change-Id: Iae896cc1d11f0a893d21be6aa90bd3e60a2c25f0
Fix unsigned integer overflow in transportDec_AdjustEndOfAccessUnit()
original-Change-Id: I64cf29a153ee784bb4a16fdc088baabebc0007dc
Fix unsigned integer overflow in transportDec_GetAuBitsRemaining()
original-Change-Id: I975b3420faa9c16a041874ba0db82e92035962e4
Fix unsigned integer overflow in extractExtendedData()
original-Change-Id: I2a59eb09e2053cfb58dfb75fcecfad6b85a80a8f
Fix signed integer overflow in CAacDecoder_ExtPayloadParse()
original-Change-Id: I4ad5ca4e3b83b5d964f1c2f8c5e7b17c477c7929
Fix unsigned integer overflow in CAacDecoder_DecodeFrame()
original-Change-Id: I29a39df77d45c52a0c9c5c83c1ba81f8d0f25090
Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()
original-Change-Id: I8fb194ffc073a3432a380845be71036a272d388f
Fix signed integer overflow in _interpolateDrcGain()
original-Change-Id: I879ec9ab14005069a7c47faf80e8bc6e03d22e60
Fix unsigned integer overflow in FDKreadBits()
original-Change-Id: I1f47a6a8037ff70375aa8844947d5681bb4287ad
Fix unsigned integer overflow in FDKbyteAlign()
original-Change-Id: Id5f3a11a0c9e50fc6f76ed6c572dbd4e9f2af766
Fix unsigned integer overflow in FDK_get32()
original-Change-Id: I9d33b8e97e3d38cbb80629cb859266ca0acdce96
Fix unsigned integer overflow in FDK_pushBack()
original-Change-Id: Ic87f899bc8c6acf7a377a8ca7f3ba74c3a1e1c19
Fix unsigned integer overflow in FDK_pushForward()
original-Change-Id: I3b754382f6776a34be1602e66694ede8e0b8effc
Fix unsigned integer overflow in ReadPsData()
original-Change-Id: I25361664ba8139e32bbbef2ca8c106a606ce9c37
Fix signed integer overflow in E_UTIL_residu()
original-Change-Id: I8c3abd1f437ee869caa8fb5903ce7d3d641b6aad
REVERT: Follow-up on: Integer overflow in CLpc_SynthesisLattice().
original-Change-Id: I3d340099acb0414795c8dfbe6362bc0a8f045f9b
Follow-up on: Fix integer overflow in CLpc_SynthesisLattice()
original-Change-Id: I4aedb8b3a187064e9f4d985175aa55bb99cc7590
Follow-up on: Fix unsigned integer overflow in aacDecoder_drcParse()
original-Change-Id: I2aa2e13916213bf52a67e8b0518e7bf7e57fb37d
Fix integer overflow in acelp
original-Change-Id: Ie6390c136d84055f8b728aefbe4ebef6e029dc77
Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()
original-Change-Id: I391ffd97ddb0b2c184cba76139bfb356a3b4d2e2
Adjust concealment default settings
original-Change-Id: I6a95db935a327c47df348030bcceafcb29f54b21
Saturate estimatedStartPos
original-Change-Id: I27be2085e0ae83ec9501409f65e003f6bcba1ab6
Negative shift exponent in _interpolateDrcGain()
original-Change-Id: I18edb26b26d002aafd5e633d4914960f7a359c29
Negative shift exponent in calculateICC()
original-Change-Id: I3dcd2ae98d2eb70ee0d59750863cbb2a6f4f8aba
Too large shift exponent in FDK_put()
original-Change-Id: Ib7d9aaa434d2d8de4a13b720ca0464b31ca9b671
Too large shift exponent in CalcInvLdData()
original-Change-Id: I43e6e78d4cd12daeb1dcd5d82d1798bdc2550262
Member access within null pointer of type SBR_CHANNEL
original-Change-Id: Idc5e4ea8997810376d2f36bbdf628923b135b097
Member access within null pointer of type CpePersistentData
original-Change-Id: Ib6c91cb0d37882768e5baf63324e429589de0d9d
Member access within null pointer FDKaacEnc_psyMain()
original-Change-Id: I7729b7f4479970531d9dc823abff63ca52e01997
Member access within null pointer FDKaacEnc_GetPnsParam()
original-Change-Id: I9aa3b9f3456ae2e0f7483dbd5b3dde95fc62da39
Member access within null pointer FDKsbrEnc_EnvEncodeFrame()
original-Change-Id: I67936f90ea714e90b3e81bc0dd1472cc713eb23a
Add HCR sanity check
original-Change-Id: I6c1d9732ebcf6af12f50b7641400752f74be39f7
Fix memory issue for HBE edge case with 8:3 SBR
original-Change-Id: I11ea58a61e69fbe8bf75034b640baee3011e63e9
Additional SBR parametrization sanity check for ELD
original-Change-Id: Ie26026fbfe174c2c7b3691f6218b5ce63e322140
Add MPEG-D DRC channel layout check
original-Change-Id: Iea70a74f171b227cce636a9eac4ba662777a2f72
Additional out-of-bounds checks in MPEG-D DRC
original-Change-Id: Ife4a8c3452c6fde8a0a09e941154a39a769777d4
Change-Id: Ic63cb2f628720f54fe9b572b0cb528e2599c624e
Diffstat (limited to 'libSYS/src/genericStds.cpp')
-rw-r--r-- | libSYS/src/genericStds.cpp | 485 |
1 files changed, 204 insertions, 281 deletions
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"); } - |