diff options
Diffstat (limited to 'libSYS/src')
| -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 |
11 files changed, 488 insertions, 2547 deletions
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; -} - |