- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10742 - freeswitch/trunk/conf
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: brian Date: Fri Dec 12 15:52:52 2008 New Revision: 10742 Log: update docs Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Dec 12 15:52:52 2008 @@ -33,6 +33,8 @@ speex@8000h@20i - Speex 8kHz using 20ms ptime. speex@16000h@20i - Speex 16kHz using 20ms ptime. speex@32000h@20i - Speex 32kHz using 20ms ptime. + G7221@16000h - G722.1 16kHz (aka Siren 7) + G7221@32000h - G722.1C 32kHz (aka Siren 14) GSM@40i - GSM 8kHz using 40ms ptime. (GSM is done in multiples of 20, Default is 20ms) G722 - G722 16kHz using default 20ms ptime. (multiples of 10) PCMU - G711 8kHz ulaw using default 20ms ptime. (multiples of 10)

1 0

[commit] r10741 - freeswitch/trunk/libs/libteletone/src
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: mikej Date: Fri Dec 12 14:45:34 2008 New Revision: 10741 Log: LBTEL-1 Build error "array subscript is above array bounds" Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Fri Dec 12 14:45:34 2008 @@ -221,7 +221,7 @@ wait = (ts->tmp_wait > -1) ? ts->tmp_wait : ts->wait; if (map->freqs[0] > 0) { - for (freqlen = 0; map->freqs[freqlen] && freqlen < TELETONE_MAX_TONES; freqlen++) { + for (freqlen = 0; freqlen < TELETONE_MAX_TONES && map->freqs[freqlen]; freqlen++) { teletone_dds_state_set_tone(&tones[freqlen], map->freqs[freqlen], ts->rate, 0); teletone_dds_state_set_tx_level(&tones[freqlen], vol); } @@ -243,7 +243,7 @@ if (nvol <= TELETONE_VOL_DB_MAX && nvol >= TELETONE_VOL_DB_MIN) { vol = nvol; - for (j = 0; map->freqs[j] && j < TELETONE_MAX_TONES; j++) { + for (j = 0; j < TELETONE_MAX_TONES && map->freqs[j]; j++) { teletone_dds_state_set_tx_level(&tones[j], vol); } dc = 0;

1 0

[commit] r10740 - freeswitch/trunk/build
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: brian Date: Fri Dec 12 14:09:39 2008 New Revision: 10740 Log: w00t Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Dec 12 14:09:39 2008 @@ -37,7 +37,6 @@ #endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_loopback -#endpoints/mod_woomera #endpoints/mod_alsa #endpoints/mod_opal #../../libs/openzap/mod_openzap

1 0

[commit] r10739 - freeswitch/trunk/conf/autoload_configs unsupported/mod_woomera
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: brian Date: Fri Dec 12 13:51:20 2008 New Revision: 10739 Log: unsupported Removed: freeswitch/trunk/conf/autoload_configs/woomera.conf.xml Changes in other areas also in this revision: Added: unsupported/mod_woomera/woomera.conf.xml - copied unchanged from r10738, /freeswitch/trunk/conf/autoload_configs/woomera.conf.xml

1 0

[commit] r10738 - freeswitch/trunk/src/mod/endpoints/mod_woomera unsupported/mod_woomera
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: brian Date: Fri Dec 12 12:51:58 2008 New Revision: 10738 Log: unsupported Removed: freeswitch/trunk/src/mod/endpoints/mod_woomera/ Changes in other areas also in this revision: Added: unsupported/mod_woomera/ - copied from r10737, /freeswitch/trunk/src/mod/endpoints/mod_woomera/

1 0

[commit] r10737 - in freeswitch/trunk: libs/win32/libmp3lame libs/win32/libshout w32/Library
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: mikej Date: Fri Dec 12 12:15:58 2008 New Revision: 10737 Log: don't rebuild libshout and mod_shout on every build Added: freeswitch/trunk/libs/win32/libmp3lame/config.h Modified: freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj freeswitch/trunk/libs/win32/libshout/ (props changed) freeswitch/trunk/libs/win32/libshout/libshout.vcproj freeswitch/trunk/w32/Library/ (props changed) Added: freeswitch/trunk/libs/win32/libmp3lame/config.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/libmp3lame/config.h Fri Dec 12 12:15:58 2008 @@ -0,0 +1,120 @@ +/* The number of bytes in a double. */ +#define SIZEOF_DOUBLE 8 + +/* The number of bytes in a float. */ +#define SIZEOF_FLOAT 4 + +/* The number of bytes in a int. */ +#define SIZEOF_INT 4 + +/* The number of bytes in a long. */ +#define SIZEOF_LONG 4 + +/* The number of bytes in a long double. */ +#define SIZEOF_LONG_DOUBLE 12 + +/* The number of bytes in a short. */ +#define SIZEOF_SHORT 2 + +/* The number of bytes in a unsigned int. */ +#define SIZEOF_UNSIGNED_INT 4 + +/* The number of bytes in a unsigned long. */ +#define SIZEOF_UNSIGNED_LONG 4 + +/* The number of bytes in a unsigned short. */ +#define SIZEOF_UNSIGNED_SHORT 2 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS + +/* Define if you have the <errno.h> header file. */ +#define HAVE_ERRNO_H + +/* Define if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H + +/* Define if you have the <limits.h> header file. */ +#define HAVE_LIMITS_H + +/* Name of package */ +#define PACKAGE "lame" + +/* Version number of package */ +#define VERSION "3.97" + +/* Define if compiler has function prototypes */ +#define PROTOTYPES 1 + +/* enable VBR bitrate histogram */ +#define BRHIST 1 + +/* IEEE754 compatible machine */ +#define TAKEHIRO_IEEE754_HACK 1 + +/* faster log implementation with less but enough precission */ +#define USE_FAST_LOG 1 + +#define HAVE_STRCHR +#define HAVE_MEMCPY + +#if defined(_MSC_VER) || defined(__BORLANDC__) +#pragma warning( disable : 4305 ) + typedef __int8 int8_t; + typedef __int16 int16_t; + typedef __int32 int32_t; + typedef __int64 int64_t; + + typedef unsigned __int8 uint8_t; + typedef unsigned __int16 uint16_t; + typedef unsigned __int32 uint32_t; + typedef unsigned __int64 uint64_t; + + typedef float float32_t; + typedef double float64_t; +#elif defined (__GNUC__) +#define __int8_t_defined +#define uint8_t unsigned char +#define uint16_t unsigned short +#define uint32_t unsigned int +#define uint64_t unsigned long long + +#define int8_t signed char +#define int16_t signed short +#define int32_t signed int +#define int64_t signed long long +#endif + +typedef long double ieee854_float80_t; +typedef double ieee754_float64_t; +typedef float ieee754_float32_t; + +#ifdef HAVE_MPGLIB +# define DECODE_ON_THE_FLY 1 +#endif + +#ifdef LAME_ACM +/* memory hacking for driver purposes */ +#define calloc(x,y) acm_Calloc(x,y) +#define free(x) acm_Free(x) +#define malloc(x) acm_Malloc(x) + +#include <stddef.h> +void *acm_Calloc( size_t num, size_t size ); +void *acm_Malloc( size_t size ); +void acm_Free( void * mem); +#endif /* LAME_ACM */ + +#define LAME_LIBRARY_BUILD + + +#ifdef HAVE_NASM + #if (defined(__ICL) && (__ICL >= 450)) + #define HAVE_XMMINTRIN_H + #elif defined(_MSC_VER) + #include <malloc.h> + #ifdef _mm_malloc + #define HAVE_XMMINTRIN_H + #endif + #endif +#endif Modified: freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj (original) +++ freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj Fri Dec 12 12:15:58 2008 @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GAy /QIfdiv /QI0f" Optimization="2" - AdditionalIncludeDirectories=""..\..\lame-3.97","..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="0" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""..\..\lame-3.97","..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" PreprocessorDefinitions="_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" RuntimeLibrary="1" PrecompiledHeaderFile=".\Debug/libmp3lame_vc6.pch" @@ -655,30 +655,6 @@ > </File> <File - RelativePath="..\..\lame-3.97\configMS.h" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Performing Custom Build Step on $(InputName)" - CommandLine="copy ..\..\lame-3.97\configMS.h ..\..\lame-3.97\config.h
" - Outputs="..\config.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Performing Custom Build Step on $(InputName)" - CommandLine="copy ..\..\lame-3.97\configMS.h ..\..\lame-3.97\config.h
" - Outputs="..\config.h" - /> - </FileConfiguration> - </File> - <File RelativePath="..\..\lame-3.97\libmp3lame\encoder.h" > </File> Modified: freeswitch/trunk/libs/win32/libshout/libshout.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/libshout/libshout.vcproj (original) +++ freeswitch/trunk/libs/win32/libshout/libshout.vcproj Fri Dec 12 12:15:58 2008 @@ -20,8 +20,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > <Tool @@ -44,14 +42,13 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".\,..\..\libshout-2.2.2\src,..\..\libshout-2.2.2\include,..\..\libogg-1.1.3\include,..\..\pthreads-w32-2-7-0-release,..\..\libshout-2.2.2\win32\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32;VERSION=\"2.0.0\";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_LIB;_WIN32;VERSION=\"2.0.0\";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" - PrecompiledHeaderFile="$(ConfigurationName)/libshout.pch" - AssemblerListingLocation=".$(ConfigurationName)" - ObjectFile=".\Release/" - ProgramDataBaseFileName="$(ConfigurationName)" + AssemblerListingLocation=".\Static_Release/" + ObjectFile=".\Static_Release/" + ProgramDataBaseFileName=".\Static_Release/" WarningLevel="0" SuppressStartupBanner="true" /> @@ -68,9 +65,8 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)\libshout.lib" + OutputFile="$(OutDir)/libshout.lib" SuppressStartupBanner="true" - IgnoreAllDefaultLibraries="true" /> <Tool Name="VCALinkTool" @@ -80,8 +76,6 @@ /> <Tool Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(ConfigurationName)/libshout.bsc" /> <Tool Name="VCFxCopTool" @@ -95,8 +89,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > <Tool @@ -122,10 +114,9 @@ MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - PrecompiledHeaderFile=".\Debug/libshout.pch" - AssemblerListingLocation="$(ConfigurationName)" - ObjectFile=".\Debug/" - ProgramDataBaseFileName="$(ConfigurationName)" + AssemblerListingLocation=".\Static_Debug/" + ObjectFile=".\Static_Debug/" + ProgramDataBaseFileName=".\Static_Debug/" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -143,9 +134,8 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)\libshout.lib" + OutputFile="$(OutDir)/libshout.lib" SuppressStartupBanner="true" - IgnoreAllDefaultLibraries="true" /> <Tool Name="VCALinkTool" @@ -155,8 +145,6 @@ /> <Tool Name="VCBscMakeTool" - SuppressStartupBanner="true" - OutputFile="$(ConfigurationName)/libshout.bsc" /> <Tool Name="VCFxCopTool" @@ -176,24 +164,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\avl\avl.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\avl\avl.h" @@ -202,24 +172,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\httpp\httpp.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\httpp\httpp.h" @@ -228,68 +180,14 @@ <File RelativePath="..\..\libshout-2.2.2\src\mp3.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\ogg.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\net\resolver.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\net\resolver.h" @@ -298,24 +196,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\shout.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\shout_ogg.h" @@ -328,24 +208,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\net\sock.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\net\sock.h" @@ -354,24 +216,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\thread\thread.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\thread\thread.h" @@ -380,24 +224,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\timing\timing.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\timing\timing.h" @@ -406,24 +232,6 @@ <File RelativePath="..\..\libshout-2.2.2\src\util.c" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\libshout-2.2.2\src\util.h"

1 0

[commit] r10736 - freeswitch/trunk/build
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: anthm Date: Fri Dec 12 11:47:13 2008 New Revision: 10736 Log: edit default file to include mod_opal Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Dec 12 11:47:13 2008 @@ -39,6 +39,7 @@ endpoints/mod_loopback #endpoints/mod_woomera #endpoints/mod_alsa +#endpoints/mod_opal #../../libs/openzap/mod_openzap #event_handlers/mod_event_multicast event_handlers/mod_event_socket

1 0

[commit] r10735 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_opal
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: anthm Date: Fri Dec 12 11:45:44 2008 New Revision: 10735 Log: move config Added: freeswitch/trunk/conf/autoload_configs/opal.conf.xml - copied unchanged from r10734, /freeswitch/trunk/src/mod/endpoints/mod_opal/opal.conf.xml Removed: freeswitch/trunk/src/mod/endpoints/mod_opal/opal.conf.xml

1 0

[commit] r10734 - experimental/mod_opal freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: anthm Date: Fri Dec 12 11:44:23 2008 New Revision: 10734 Log: move mod_opal into trunk still needs some work still needs some FUNDING Added: freeswitch/trunk/src/mod/endpoints/mod_opal/ - copied from r10733, /experimental/mod_opal/ Changes in other areas also in this revision: Removed: experimental/mod_opal/

1 0

[commit] r10733 - freeswitch/trunk/src/mod/applications/mod_vmd
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: ericdc Date: Fri Dec 12 11:07:53 2008 New Revision: 10733 Log: Added even more documentation. This should look good with doxygen. Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c (original) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c Fri Dec 12 11:07:53 2008 @@ -50,34 +50,38 @@ #define ISNAN(x) ((x)== NAN) #endif -/*! Number of points for beep detection */ +/*! Number of points for beep detection. */ #define POINTS 32 -/*! Number of valid points required for beep detection */ +/*! Number of valid points required for beep detection. */ #define VALID 22 -/*! Maximum number of invalid points to declare beep has stopped */ +/*! Maximum number of invalid points to declare beep has stopped. */ #define MAX_CHIRP 22 -/*! Minimum time for a beep */ +/*! Minimum time for a beep. */ #define MIN_TIME 8000 -/*! Minimum amplitude of the signal */ +/*! Minimum amplitude of the signal. */ #define MIN_AMPL 0.10 -/*! Minimum beep frequency */ +/*! Minimum beep frequency. */ #define MIN_FREQ (600) -/*! Maximum beep frequency */ +/*! Maximum beep frequency. */ #define MAX_FREQ (1100) -/*! \brief \f$\psi{(x)}\f$ function for amplitude calculation +/*! \brief Helper for amplitude calculation * - * \f$\psi{(x)} = {x^2_1} - {x_2} {x_0}\f$ + * The function is defined as \f$\psi{(x)} = {x^2_1} - {x_2} {x_0}\f$ + * + * @author Eric des Courtis + * @param x An array of 3 or more samples. + * @return The value of \f$\psi{(x)}\f$. */ #define PSI(x) (x[1]*x[1]-x[2]*x[0]) -/*! Sample rate NOTE: this should be dynamic in the future */ +/*! Sample rate NOTE: this should be dynamic in the future. */ #define F (8000) /*! \brief Conversion of frequency to Hz @@ -86,7 +90,7 @@ */ #define TO_HZ(f) ((F * f) / (2.0 * M_PI)) -/* Number of points in discreet energy separation */ +/* Number of points in discreet energy separation. */ #define P (5) /* Maximum signed value of int16_t @@ -96,22 +100,22 @@ * DEPRECATED */ #define ADJUST_MAX (65536) -/*! Discreet energy separation tolerance to error */ +/*! Discreet energy separation tolerance to error. */ #define TOLERANCE (0.20) -/*! Maximum value within tolerance */ +/*! Maximum value within tolerance. */ #define TOLERANCE_T(m) (m + (m * TOLERANCE)) -/*! Minimum value within tolerance */ +/*! Minimum value within tolerance. */ #define TOLERANCE_B(m) (m - (m * TOLERANCE)) -/*! Syntax of the API call */ +/*! Syntax of the API call. */ #define VMD_SYNTAX "<uuid> <command>" -/*! Number of expected parameters in api call */ +/*! Number of expected parameters in api call. */ #define VMD_PARAMS 2 -/*! FreeSWITCH CUSTOM event type */ +/*! FreeSWITCH CUSTOM event type. */ #define VMD_EVENT_BEEP "vmd::beep" /* Prototypes */ @@ -122,7 +126,7 @@ SWITCH_MODULE_DEFINITION(mod_vmd, mod_vmd_load, NULL, NULL); SWITCH_STANDARD_APP(vmd_start_function); -/*! Type that holds state information about the beep */ +/*! Type that holds state information about the beep. */ typedef enum vmd_state { BEEP_DETECTED, BEEP_NOT_DETECTED } vmd_state_t; @@ -133,28 +137,30 @@ double ampl; } vmd_point_t; -/*! Type that holds codec information */ +/*! Type that holds codec information. */ typedef struct vmd_codec_info { + /*! The sampling rate of the audio stream. */ int rate; + /*! The number of channels. */ int channels; } vmd_codec_info_t; -/*! Type that holds session information pertinent to the vmd module */ +/*! Type that holds session information pertinent to the vmd module. */ typedef struct vmd_session_info { - /*! State of the session */ + /*! State of the session. */ vmd_state_t state; - /*! Snapshot of DESA samples */ + /*! Snapshot of DESA samples. */ vmd_point_t points[POINTS]; - /*! Internal FreeSWITCH session */ + /*! Internal FreeSWITCH session. */ switch_core_session_t *session; - /*! Codec information for the session */ + /*! Codec information for the session. */ vmd_codec_info_t vmd_codec; - /*! Current position in the snapshot */ + /*! Current position in the snapshot. */ unsigned int pos; - /*! Frequency aproximation of a detected beep */ + /*! Frequency aproximation of a detected beep. */ double beep_freq; - /*! A count of how long a distinct beep was detected by - * by the discreet energy separation algorithm */ + /*! A count of how long a distinct beep was detected + * by the discreet energy separation algorithm. */ switch_size_t timestamp; } vmd_session_info_t; @@ -171,6 +177,14 @@ #define PRINT2(a, b) do{ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, a, b); }while(0) */ +/*! \brief The callback function that is called when new audio data becomes available + * + * @author Eric des Courtis + * @param bug A reference to the media bug. + * @param user_data The session information for this call. + * @param type The switch callback type. + * @return The success or failure of the function. + */ static switch_bool_t vmd_callback(switch_media_bug_t * bug, void *user_data, switch_abc_type_t type) { vmd_session_info_t *vmd_info; @@ -207,7 +221,13 @@ return SWITCH_TRUE; } -/*! Process and convert data to be used by the find_beep() function */ +/*! \brief Process and convert data to be used by the find_beep() function + * + * @author Eric des Courtis + * @param vmd_info The session information associated with the call. + * @param frame The audio data. + * @return The success or failure of the function. + */ static switch_bool_t process_data(vmd_session_info_t * vmd_info, switch_frame_t * frame) { uint32_t i; @@ -259,7 +279,13 @@ return SWITCH_TRUE; } -/*! Find voicemail beep in the audio stream */ +/*! \brief Find voicemail beep in the audio stream + * + * @author Eric des Courtis + * @param vmd_info The session information associated with the call. + * @param frame The audio data. + * @return The success or failure of the function. + */ static void find_beep(vmd_session_info_t * vmd_info, switch_frame_t * frame) { int i; @@ -354,7 +380,12 @@ } } -/*! Find the median of an array of doubles */ +/*! \brief Find the median of an array of doubles + * + * @param m Array of frequency samples. + * @param n Number of samples in the array. + * @return The median. + */ static double median(double *m, int n) { int i; @@ -418,7 +449,14 @@ return mingtguess; } -/*! Convert many points for Signed L16 to relative floating point */ +/*! \brief Convert many points for Signed L16 to relative floating point + * + * @author Eric des Courtis + * @param i_pts Array of P 16 bit integer audio samples. + * @param d_pts Array of P double floating point audio samples. + * @param max The maximum value in the entire audio frame. + * @return Nothing. + */ static void convert_pts(int16_t * i_pts, double *d_pts, int16_t max) { int i; @@ -430,7 +468,11 @@ /*! \brief Amplitude estimator for DESA-2 * - * \f$A = \sqrt{\frac{\psi{(x)}}{\sin{\Omega^2}}}\f$ + * The function is defined as \f$A = \sqrt{\frac{\psi{(x)}}{\sin{\Omega^2}}}\f$ + * + * @author Eric des Courtis + * @param x An array of 5 evenly spaced audio samples \f$x_0, x_1, x_2, x_3, x_4\f$. + * @return The estimated amplitude. */ double ampl_estimator(double *x) { @@ -444,14 +486,15 @@ /*! \brief The DESA-2 algorithm * - * \f$\frac{1}{2}\arccos{\frac{{{x^2_2} - + * The function is defined as \f$f = \frac{1}{2}\arccos{\frac{{{x^2_2} - * {x_0}{x_4}} - {{x^2_1} - * {x_0}{x_2}} - {{x^2_3} - * {x_2}{x_4}}} * {{2}({x^2_2} - {x_1}{x_3})}}\f$ * - * @param x an array for 5 evenly spaced audio samples \f$x_0, x_1, x_2, x_3, x_4\f$ - * @return a frequency estimate + * @author Eric des Courtis + * @param x An array for 5 evenly spaced audio samples \f$x_0, x_1, x_2, x_3, x_4\f$. + * @return A frequency estimate. */ double freq_estimator(double *x) { @@ -463,9 +506,10 @@ ); } -/*! FreeSWITCH module loading function +/*! \brief FreeSWITCH module loading function * - * @return load success or failure + * @author Eric des Courtis + * @return Load success or failure. */ SWITCH_MODULE_LOAD_FUNCTION(mod_vmd_load) { @@ -484,9 +528,11 @@ return SWITCH_STATUS_SUCCESS; } -/*! FreeSWITCH application handler function +/*! \brief FreeSWITCH application handler function. + * This handles calls made from applications such as LUA and the dialplan * - * @return success or failure + * @author Eric des Courtis + * @return Success or failure of the function. */ SWITCH_STANDARD_APP(vmd_start_function) { @@ -544,7 +590,11 @@ } -/*! Called when the system shuts down */ +/*! \brief Called when the module shuts down + * + * @author Eric des Courtis + * @return The success or failure of the function. + */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_vmd_shutdown) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Voicemail detection disabled\n"); @@ -552,7 +602,13 @@ return SWITCH_STATUS_SUCCESS; } -/*! FreeSWITCH API handler function */ +/*! \brief FreeSWITCH API handler function. + * This function handles API calls such as the ones from mod_event_socket and in some cases + * scripts such as LUA scripts. + * + * @author Eric des Courtis + * @return The success or failure of the function. + */ SWITCH_STANDARD_API(vmd_api_main) { switch_core_session_t *vmd_session;

1 0