- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11600 - in freeswitch/trunk/libs/spandsp: . config spandsp-sim spandsp-sim/spandsp src src/msvc src/spandsp src/spandsp/private
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 11:40:52 2009 New Revision: 11600 Log: update to snapshot spandsp-20090131 Added: freeswitch/trunk/libs/spandsp/config/ax_check_export_capability.m4 Modified: freeswitch/trunk/libs/spandsp/config-h.in freeswitch/trunk/libs/spandsp/config/ax_c99_features.m4 freeswitch/trunk/libs/spandsp/config/ax_compiler_vendor.m4 freeswitch/trunk/libs/spandsp/configure.ac freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c freeswitch/trunk/libs/spandsp/src/complex_filters.c freeswitch/trunk/libs/spandsp/src/dtmf.c freeswitch/trunk/libs/spandsp/src/hdlc.c freeswitch/trunk/libs/spandsp/src/libspandsp.dsp freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.foot freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.head freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head freeswitch/trunk/libs/spandsp/src/noise.c freeswitch/trunk/libs/spandsp/src/queue.c freeswitch/trunk/libs/spandsp/src/spandsp.h.in freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h freeswitch/trunk/libs/spandsp/src/spandsp/async.h freeswitch/trunk/libs/spandsp/src/spandsp/at_interpreter.h freeswitch/trunk/libs/spandsp/src/spandsp/awgn.h freeswitch/trunk/libs/spandsp/src/spandsp/bell_r2_mf.h freeswitch/trunk/libs/spandsp/src/spandsp/bert.h freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h freeswitch/trunk/libs/spandsp/src/spandsp/complex_filters.h freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_float.h freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_int.h freeswitch/trunk/libs/spandsp/src/spandsp/crc.h freeswitch/trunk/libs/spandsp/src/spandsp/dds.h freeswitch/trunk/libs/spandsp/src/spandsp/dtmf.h freeswitch/trunk/libs/spandsp/src/spandsp/echo.h freeswitch/trunk/libs/spandsp/src/spandsp/fax.h freeswitch/trunk/libs/spandsp/src/spandsp/fax_modems.h freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h freeswitch/trunk/libs/spandsp/src/spandsp/g711.h freeswitch/trunk/libs/spandsp/src/spandsp/g722.h freeswitch/trunk/libs/spandsp/src/spandsp/g726.h freeswitch/trunk/libs/spandsp/src/spandsp/gsm0610.h freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h freeswitch/trunk/libs/spandsp/src/spandsp/ima_adpcm.h freeswitch/trunk/libs/spandsp/src/spandsp/logging.h freeswitch/trunk/libs/spandsp/src/spandsp/lpc10.h freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h freeswitch/trunk/libs/spandsp/src/spandsp/modem_echo.h freeswitch/trunk/libs/spandsp/src/spandsp/noise.h freeswitch/trunk/libs/spandsp/src/spandsp/oki_adpcm.h freeswitch/trunk/libs/spandsp/src/spandsp/playout.h freeswitch/trunk/libs/spandsp/src/spandsp/plc.h freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h freeswitch/trunk/libs/spandsp/src/spandsp/private/hdlc.h freeswitch/trunk/libs/spandsp/src/spandsp/private/queue.h freeswitch/trunk/libs/spandsp/src/spandsp/queue.h freeswitch/trunk/libs/spandsp/src/spandsp/schedule.h freeswitch/trunk/libs/spandsp/src/spandsp/sig_tone.h freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_rx.h freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_tx.h freeswitch/trunk/libs/spandsp/src/spandsp/t30.h freeswitch/trunk/libs/spandsp/src/spandsp/t30_api.h freeswitch/trunk/libs/spandsp/src/spandsp/t30_logging.h freeswitch/trunk/libs/spandsp/src/spandsp/t31.h freeswitch/trunk/libs/spandsp/src/spandsp/t35.h freeswitch/trunk/libs/spandsp/src/spandsp/t38_core.h freeswitch/trunk/libs/spandsp/src/spandsp/t38_gateway.h freeswitch/trunk/libs/spandsp/src/spandsp/t38_non_ecm_buffer.h freeswitch/trunk/libs/spandsp/src/spandsp/t38_terminal.h freeswitch/trunk/libs/spandsp/src/spandsp/t4.h freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h freeswitch/trunk/libs/spandsp/src/spandsp/time_scale.h freeswitch/trunk/libs/spandsp/src/spandsp/tone_detect.h freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h freeswitch/trunk/libs/spandsp/src/spandsp/v42.h freeswitch/trunk/libs/spandsp/src/spandsp/v42bis.h freeswitch/trunk/libs/spandsp/src/spandsp/v8.h freeswitch/trunk/libs/spandsp/src/spandsp/vector_float.h freeswitch/trunk/libs/spandsp/src/spandsp/vector_int.h freeswitch/trunk/libs/spandsp/src/spandsp/version.h freeswitch/trunk/libs/spandsp/src/t30.c freeswitch/trunk/libs/spandsp/src/t4.c Modified: freeswitch/trunk/libs/spandsp/config-h.in ============================================================================== --- freeswitch/trunk/libs/spandsp/config-h.in (original) +++ freeswitch/trunk/libs/spandsp/config-h.in Mon Feb 2 11:40:52 2009 @@ -254,6 +254,9 @@ /* Do not expect a misaligned memory access to work correctly */ #undef SPANDSP_MISALIGNED_ACCESS_FAILS +/* Use the library symbol export capability of the compiler */ +#undef SPANDSP_USE_EXPORT_CAPABILITY + /* Enable fixed point processing, where possible, instead of floating point */ #undef SPANDSP_USE_FIXED_POINT Modified: freeswitch/trunk/libs/spandsp/config/ax_c99_features.m4 ============================================================================== --- freeswitch/trunk/libs/spandsp/config/ax_c99_features.m4 (original) +++ freeswitch/trunk/libs/spandsp/config/ax_c99_features.m4 Mon Feb 2 11:40:52 2009 @@ -11,7 +11,7 @@ # provided "as is" without express or implied warranty. AC_DEFUN([AX_C99_FLEXIBLE_ARRAY], -[AC_CACHE_CHECK(C99 struct flexible array support, +[AC_CACHE_CHECK(if have C99 struct flexible array support, ac_cv_c99_flexible_array, # Initialize to unknown Added: freeswitch/trunk/libs/spandsp/config/ax_check_export_capability.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/config/ax_check_export_capability.m4 Mon Feb 2 11:40:52 2009 @@ -0,0 +1,61 @@ +# @synopsis AX_CHECK_EXPORT_CAPABILITY +# +# Does the compiler support the exporting of library symbols? +# @version 1.0 Jan 31 2009 +# @author Steve Underwood +# +# Permission to use, copy, modify, distribute, and sell this file for any +# purpose is hereby granted without fee, provided that the above copyright +# and this permission notice appear in all copies. No representations are +# made about the suitability of this software for any purpose. It is +# provided "as is" without express or implied warranty. + +AC_DEFUN([AX_CHECK_EXPORT_CAPABILITY], +[AC_CACHE_CHECK([if $1 supports library symbol export], + ac_cv_symbol_export_capability, + +[# Initialize to unknown +ac_cv_symbol_export_capability="no" + +case "${ax_cv_c_compiler_vendor}" in +gnu) + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -fvisibility=hidden" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [int foo __attribute__ ((visibility("default")));], + [;] + )], + + [AC_MSG_RESULT([yes]) + COMP_VENDOR_CFLAGS="-fvisibility=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1 $COMP_VENDOR_CFLAGS" + COMP_VENDOR_CXXFLAGS="-fvisibility=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1 $COMP_VENDOR_CXXFLAGS" + ac_cv_symbol_export_capability="yes"], + + [AC_MSG_RESULT([no])] + ) + CFLAGS="${save_CFLAGS}" + ;; + +sun) + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -xldscope=hidden" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [int foo __attribute__ ((visibility("default")));], + [;] + )], + + [AC_MSG_RESULT([yes]) + COMP_VENDOR_CFLAGS="-xldscope=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1 $COMP_VENDOR_CFLAGS" + COMP_VENDOR_CXXFLAGS="-xldscope=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1 $COMP_VENDOR_CXXFLAGS" + ac_cv_symbol_export_capability="yes"], + + [AC_MSG_RESULT([no])] + ) + CFLAGS="${save_CFLAGS}" + ;; + +esac]) +AS_IF([test AS_VAR_GET(ac_cv_symbol_export_capability) = yes], [$2], [$3])[]dnl +]) # AX_CHECK_EXPORT_CAPABILITY Modified: freeswitch/trunk/libs/spandsp/config/ax_compiler_vendor.m4 ============================================================================== --- freeswitch/trunk/libs/spandsp/config/ax_compiler_vendor.m4 (original) +++ freeswitch/trunk/libs/spandsp/config/ax_compiler_vendor.m4 Mon Feb 2 11:40:52 2009 @@ -49,8 +49,7 @@ # special exception to the GPL to apply to your modified version as well. AC_DEFUN([AX_COMPILER_VENDOR], -[ -AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, +[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown # note: don't check for gcc first since some other compilers define __GNUC__ for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do Modified: freeswitch/trunk/libs/spandsp/configure.ac ============================================================================== --- freeswitch/trunk/libs/spandsp/configure.ac (original) +++ freeswitch/trunk/libs/spandsp/configure.ac Mon Feb 2 11:40:52 2009 @@ -16,7 +16,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# $Id: configure.ac,v 1.64 2009/01/17 08:16:08 steveu Exp $ +# $Id: configure.ac,v 1.65 2009/01/31 08:48:10 steveu Exp $ # @start 1 @@ -27,6 +27,7 @@ m4_include(config/ax_fixed_point_machine.m4) m4_include(config/ax_misaligned_access_fails.m4) m4_include(config/ax_c99_features.m4) +m4_include(config/ax_check_export_capability.m4) SPANDSP_MAJOR_VERSION=0 SPANDSP_MINOR_VERSION=0 @@ -283,9 +284,14 @@ AC_LANG([C]) fi +AX_CHECK_EXPORT_CAPABILITY([$host], + [AC_DEFINE([SPANDSP_USE_EXPORT_CAPABILITY], [1], [Use the library symbol export capability of the compiler]) + SPANDSP_USE_EXPORT_CAPABILITY="#define SPANDSP_USE_EXPORT_CAPABILITY 1"], + [SPANDSP_USE_EXPORT_CAPABILITY="#undef SPANDSP_USE_EXPORT_CAPABILITY"]) + case "${ax_cv_c_compiler_vendor}" in gnu) - COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes" + COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" if test "$enable_sse5" = "yes" ; then COMP_VENDOR_CFLAGS="-msse5 $COMP_VENDOR_CFLAGS" fi @@ -320,7 +326,7 @@ esac ;; sun) - COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -errwarn=%all -xvpara" + COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -errwarn=%all -xvpara $COMP_VENDOR_CFLAGS" if test "$enable_sse3" = "yes" ; then COMP_VENDOR_CFLAGS="-native -fast $COMP_VENDOR_CFLAGS" fi @@ -336,7 +342,7 @@ COMP_VENDOR_LDFLAGS= ;; *) - COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes" + COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" COMP_VENDOR_LDFLAGS= ;; esac @@ -407,6 +413,7 @@ AC_SUBST(TESTLIBS) AC_SUBST(SPANDSP_USE_FIXED_POINT) AC_SUBST(SPANDSP_MISALIGNED_ACCESS_FAILS) +AC_SUBST(SPANDSP_USE_EXPORT_CAPABILITY) AC_SUBST(INSERT_INTTYPES_HEADER) AC_SUBST(INSERT_STDINT_HEADER) AC_SUBST(INSERT_TGMATH_HEADER) Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c ============================================================================== --- freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c (original) +++ freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: g1050.c,v 1.11 2009/01/16 15:13:16 steveu Exp $ + * $Id: g1050.c,v 1.12 2009/01/31 08:48:10 steveu Exp $ */ #if defined(HAVE_CONFIG_H) @@ -1070,10 +1070,10 @@ } /*- End of function --------------------------------------------------------*/ -g1050_state_t *g1050_init(int model, - int speed_pattern, - int packet_size, - int packet_rate) +SPAN_DECLARE(g1050_state_t) *g1050_init(int model, + int speed_pattern, + int packet_size, + int packet_rate) { g1050_state_t *s; g1050_constants_t *constants; @@ -1169,7 +1169,7 @@ } /*- End of function --------------------------------------------------------*/ -void g1050_dump_parms(int model, int speed_pattern) +SPAN_DECLARE(void) g1050_dump_parms(int model, int speed_pattern) { g1050_channel_speeds_t *sp; g1050_model_t *mo; @@ -1189,7 +1189,7 @@ } /*- End of function --------------------------------------------------------*/ -int g1050_put(g1050_state_t *s, const uint8_t buf[], int len, int seq_no, double departure_time) +SPAN_DECLARE(int) g1050_put(g1050_state_t *s, const uint8_t buf[], int len, int seq_no, double departure_time) { g1050_queue_element_t *element; g1050_queue_element_t *e; @@ -1247,7 +1247,7 @@ } /*- End of function --------------------------------------------------------*/ -int g1050_get(g1050_state_t *s, uint8_t buf[], int max_len, double current_time, int *seq_no, double *departure_time, double *arrival_time) +SPAN_DECLARE(int) g1050_get(g1050_state_t *s, uint8_t buf[], int max_len, double current_time, int *seq_no, double *departure_time, double *arrival_time) { int len; g1050_queue_element_t *element; @@ -1295,7 +1295,7 @@ } /*- End of function --------------------------------------------------------*/ -void g1050_queue_dump(g1050_state_t *s) +SPAN_DECLARE(void) g1050_queue_dump(g1050_state_t *s) { g1050_queue_element_t *e; Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h ============================================================================== --- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h (original) +++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: g1050.h,v 1.9 2009/01/16 15:13:16 steveu Exp $ + * $Id: g1050.h,v 1.10 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -269,26 +269,26 @@ { #endif -g1050_state_t *g1050_init(int model, - int speed_pattern, - int packet_size, - int packet_rate); +SPAN_DECLARE(g1050_state_t) *g1050_init(int model, + int speed_pattern, + int packet_size, + int packet_rate); void g1050_dump_parms(int model, int speed_pattern); -int g1050_put(g1050_state_t *s, - const uint8_t buf[], - int len, - int seq_no, - double departure_time); - -int g1050_get(g1050_state_t *s, - uint8_t buf[], - int max_len, - double current_time, - int *seq_no, - double *departure_time, - double *arrival_time); +SPAN_DECLARE(int) g1050_put(g1050_state_t *s, + const uint8_t buf[], + int len, + int seq_no, + double departure_time); + +SPAN_DECLARE(int) g1050_get(g1050_state_t *s, + uint8_t buf[], + int max_len, + double current_time, + int *seq_no, + double *departure_time, + double *arrival_time); void g1050_queue_dump(g1050_state_t *s); Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h ============================================================================== --- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h (original) +++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: line_model.h,v 1.4 2009/01/07 13:28:10 steveu Exp $ + * $Id: line_model.h,v 1.5 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -132,38 +132,38 @@ { #endif -void both_ways_line_model(both_ways_line_model_state_t *s, - int16_t output1[], - const int16_t input1[], - int16_t output2[], - const int16_t input2[], - int samples); +SPAN_DECLARE(void) both_ways_line_model(both_ways_line_model_state_t *s, + int16_t output1[], + const int16_t input1[], + int16_t output2[], + const int16_t input2[], + int samples); -void both_ways_line_model_set_dc(both_ways_line_model_state_t *s, float dc1, float dc2); +SPAN_DECLARE(void) both_ways_line_model_set_dc(both_ways_line_model_state_t *s, float dc1, float dc2); -void both_ways_line_model_set_mains_pickup(both_ways_line_model_state_t *s, int f, float level1, float level2); +SPAN_DECLARE(void) both_ways_line_model_set_mains_pickup(both_ways_line_model_state_t *s, int f, float level1, float level2); -both_ways_line_model_state_t *both_ways_line_model_init(int model1, - float noise1, - int model2, - float noise2, - int codec, - int rbs_pattern); +SPAN_DECLARE(both_ways_line_model_state_t) *both_ways_line_model_init(int model1, + float noise1, + int model2, + float noise2, + int codec, + int rbs_pattern); -int both_ways_line_model_release(both_ways_line_model_state_t *s); +SPAN_DECLARE(int) both_ways_line_model_release(both_ways_line_model_state_t *s); -void one_way_line_model(one_way_line_model_state_t *s, - int16_t output[], - const int16_t input[], - int samples); +SPAN_DECLARE(void) one_way_line_model(one_way_line_model_state_t *s, + int16_t output[], + const int16_t input[], + int samples); -void one_way_line_model_set_dc(one_way_line_model_state_t *s, float dc); +SPAN_DECLARE(void) one_way_line_model_set_dc(one_way_line_model_state_t *s, float dc); -void one_way_line_model_set_mains_pickup(one_way_line_model_state_t *s, int f, float level); +SPAN_DECLARE(void) one_way_line_model_set_mains_pickup(one_way_line_model_state_t *s, int f, float level); -one_way_line_model_state_t *one_way_line_model_init(int model, float noise, int codec, int rbs_pattern); +SPAN_DECLARE(one_way_line_model_state_t) *one_way_line_model_init(int model, float noise, int codec, int rbs_pattern); -int one_way_line_model_release(one_way_line_model_state_t *s); +SPAN_DECLARE(int) one_way_line_model_release(one_way_line_model_state_t *s); #ifdef __cplusplus } Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h ============================================================================== --- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h (original) +++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: rfc2198_sim.h,v 1.4 2008/09/09 16:13:12 steveu Exp $ + * $Id: rfc2198_sim.h,v 1.5 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -69,25 +69,25 @@ { #endif -rfc2198_sim_state_t *rfc2198_sim_init(int model, - int speed_pattern, - int packet_size, - int packet_rate, - int redundancy_depth); - -int rfc2198_sim_put(rfc2198_sim_state_t *s, - const uint8_t buf[], - int len, - int seq_no, - double departure_time); - -int rfc2198_sim_get(rfc2198_sim_state_t *s, - uint8_t buf[], - int max_len, - double current_time, - int *seq_no, - double *departure_time, - double *arrival_time); +SPAN_DECLARE(rfc2198_sim_state_t) *rfc2198_sim_init(int model, + int speed_pattern, + int packet_size, + int packet_rate, + int redundancy_depth); + +SPAN_DECLARE(int) rfc2198_sim_put(rfc2198_sim_state_t *s, + const uint8_t buf[], + int len, + int seq_no, + double departure_time); + +SPAN_DECLARE(int) rfc2198_sim_get(rfc2198_sim_state_t *s, + uint8_t buf[], + int max_len, + double current_time, + int *seq_no, + double *departure_time, + double *arrival_time); #ifdef __cplusplus } Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h ============================================================================== --- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h (original) +++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: test_utils.h,v 1.6 2009/01/07 13:28:10 steveu Exp $ + * $Id: test_utils.h,v 1.7 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -51,25 +51,25 @@ extern "C" { #endif -complexify_state_t *complexify_init(void); +SPAN_DECLARE(complexify_state_t) *complexify_init(void); -void complexify_release(complexify_state_t *s); +SPAN_DECLARE(void) complexify_release(complexify_state_t *s); -complexf_t complexify(complexify_state_t *s, int16_t amp); +SPAN_DECLARE(complexf_t) complexify(complexify_state_t *s, int16_t amp); -void fft(complex_t data[], int len); +SPAN_DECLARE(void) fft(complex_t data[], int len); -void ifft(complex_t data[], int len); +SPAN_DECLARE(void) ifft(complex_t data[], int len); -codec_munge_state_t *codec_munge_init(int codec, int info); +SPAN_DECLARE(codec_munge_state_t) *codec_munge_init(int codec, int info); -void codec_munge_release(codec_munge_state_t *s); +SPAN_DECLARE(void) codec_munge_release(codec_munge_state_t *s); -void codec_munge(codec_munge_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(void) codec_munge(codec_munge_state_t *s, int16_t amp[], int len); -AFfilehandle afOpenFile_telephony_read(const char *name, int channels); +SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_read(const char *name, int channels); -AFfilehandle afOpenFile_telephony_write(const char *name, int channels); +SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_write(const char *name, int channels); #ifdef __cplusplus } Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c ============================================================================== --- freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c (original) +++ freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: test_utils.c,v 1.10 2008/11/30 10:17:30 steveu Exp $ + * $Id: test_utils.c,v 1.11 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -72,7 +72,7 @@ static complex_t icircle[MAX_FFT_LEN/2]; static int icircle_init = FALSE; -complexify_state_t *complexify_init(void) +SPAN_DECLARE(complexify_state_t) *complexify_init(void) { complexify_state_t *s; int i; @@ -87,13 +87,13 @@ } /*- End of function --------------------------------------------------------*/ -void complexify_release(complexify_state_t *s) +SPAN_DECLARE(void) complexify_release(complexify_state_t *s) { free(s); } /*- End of function --------------------------------------------------------*/ -complexf_t complexify(complexify_state_t *s, int16_t amp) +SPAN_DECLARE(complexf_t) complexify(complexify_state_t *s, int16_t amp) { #define HILBERT_GAIN 1.569546344 static const float hilbert_coeffs[] = @@ -221,7 +221,7 @@ } /*- End of function --------------------------------------------------------*/ -void fft(complex_t data[], int len) +SPAN_DECLARE(void) fft(complex_t data[], int len) { int i; double x; @@ -241,7 +241,7 @@ } /*- End of function --------------------------------------------------------*/ -void ifft(complex_t data[], int len) +SPAN_DECLARE(void) ifft(complex_t data[], int len) { int i; double x; @@ -261,7 +261,7 @@ } /*- End of function --------------------------------------------------------*/ -codec_munge_state_t *codec_munge_init(int codec, int info) +SPAN_DECLARE(codec_munge_state_t) *codec_munge_init(int codec, int info) { codec_munge_state_t *s; @@ -300,13 +300,13 @@ } /*- End of function --------------------------------------------------------*/ -void codec_munge_release(codec_munge_state_t *s) +SPAN_DECLARE(void) codec_munge_release(codec_munge_state_t *s) { free(s); } /*- End of function --------------------------------------------------------*/ -void codec_munge(codec_munge_state_t *s, int16_t amp[], int len) +SPAN_DECLARE(void) codec_munge(codec_munge_state_t *s, int16_t amp[], int len) { uint8_t law; uint8_t adpcmdata[160]; @@ -351,7 +351,7 @@ } /*- End of function --------------------------------------------------------*/ -AFfilehandle afOpenFile_telephony_read(const char *name, int channels) +SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_read(const char *name, int channels) { float x; AFfilehandle handle; @@ -381,7 +381,7 @@ } /*- End of function --------------------------------------------------------*/ -AFfilehandle afOpenFile_telephony_write(const char *name, int channels) +SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_write(const char *name, int channels) { AFfilesetup setup; AFfilehandle handle; Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Mon Feb 2 11:40:52 2009 @@ -16,7 +16,7 @@ ## License along with this program; if not, write to the Free Software ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -## $Id: Makefile.am,v 1.118 2009/01/30 05:35:18 steveu Exp $ +## $Id: Makefile.am,v 1.121 2009/01/31 12:24:11 steveu Exp $ AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) @@ -33,8 +33,8 @@ msvc/inttypes.h \ msvc/tgmath.h \ msvc/unistd.h \ + msvc/spandsp.h \ msvc/sys/time.h \ - msvc/spandsp.def \ msvc/msvcproj.head \ msvc/msvcproj.foot \ msvc/vc8proj.head \ @@ -434,6 +434,15 @@ done; \ cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT) ) +$(srcdir)/msvc/spandsp.h: spandsp.h.in + echo "creating $(srcdir)/msvc/spandsp.h" + @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@INSERT_INTTYPES_HEADER\@/#include <inttypes.h>/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/msvc/spandsp.h + spandsp/version.h: NOWDATE=`date --utc +"%Y%m%d"` ; \ NOWTIME=`date --utc +"%H%M%S"` ; \ Modified: freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c (original) +++ freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: bell_r2_mf.c,v 1.35 2009/01/29 18:30:14 steveu Exp $ + * $Id: bell_r2_mf.c,v 1.36 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -300,7 +300,7 @@ } /*- End of function --------------------------------------------------------*/ -size_t bell_mf_tx_put(bell_mf_tx_state_t *s, const char *digits, int len) +int bell_mf_tx_put(bell_mf_tx_state_t *s, const char *digits, int len) { size_t space; @@ -313,7 +313,7 @@ return 0; } if ((space = queue_free_space(&s->queue.queue)) < (size_t) len) - return len - space; + return len - (int) space; if (queue_write(&s->queue.queue, (const uint8_t *) digits, len) >= 0) return 0; return -1; Modified: freeswitch/trunk/libs/spandsp/src/complex_filters.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/complex_filters.c (original) +++ freeswitch/trunk/libs/spandsp/src/complex_filters.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: complex_filters.c,v 1.14 2009/01/05 13:48:31 steveu Exp $ + * $Id: complex_filters.c,v 1.15 2009/01/31 08:48:10 steveu Exp $ */ #if defined(HAVE_CONFIG_H) @@ -33,6 +33,7 @@ #include <stdio.h> #include <inttypes.h> +#include "spandsp/telephony.h" #include "spandsp/complex.h" #include "spandsp/complex_filters.h" Modified: freeswitch/trunk/libs/spandsp/src/dtmf.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/dtmf.c (original) +++ freeswitch/trunk/libs/spandsp/src/dtmf.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: dtmf.c,v 1.48 2009/01/29 18:30:14 steveu Exp $ + * $Id: dtmf.c,v 1.49 2009/01/31 08:48:10 steveu Exp $ */ /*! \file dtmf.h */ @@ -473,7 +473,7 @@ } /*- End of function --------------------------------------------------------*/ -size_t dtmf_tx_put(dtmf_tx_state_t *s, const char *digits, int len) +int dtmf_tx_put(dtmf_tx_state_t *s, const char *digits, int len) { size_t space; @@ -486,7 +486,7 @@ return 0; } if ((space = queue_free_space(&s->queue.queue)) < (size_t) len) - return len - space; + return len - (int) space; if (queue_write(&s->queue.queue, (const uint8_t *) digits, len) >= 0) return 0; return -1; Modified: freeswitch/trunk/libs/spandsp/src/hdlc.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/hdlc.c (original) +++ freeswitch/trunk/libs/spandsp/src/hdlc.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: hdlc.c,v 1.66 2009/01/30 07:19:25 steveu Exp $ + * $Id: hdlc.c,v 1.68 2009/01/31 09:47:59 steveu Exp $ */ /*! \file */ @@ -138,7 +138,7 @@ /* We may have a frame, or we may have back to back flags */ if (s->len) { - if (s->num_bits == 7 && s->len >= s->crc_bytes && s->len <= s->max_frame_len) + if (s->num_bits == 7 && s->len >= (size_t) s->crc_bytes && s->len <= s->max_frame_len) { if ((s->crc_bytes == 2 && crc_itu16_check(s->buffer, s->len)) || @@ -166,7 +166,7 @@ { /* Don't let the length go below zero, or it will be confused with one of the special conditions. */ - if (s->len >= s->crc_bytes) + if (s->len >= (size_t) s->crc_bytes) s->len -= s->crc_bytes; else s->len = 0; @@ -452,7 +452,7 @@ } s->pos = HDLC_MAXFRAME_LEN; } - else if (s->pos == HDLC_MAXFRAME_LEN + s->crc_bytes) + else if (s->pos == (size_t) (HDLC_MAXFRAME_LEN + s->crc_bytes)) { /* Finish off the current byte with some flag bits. If we are at the start of a byte we need a at least one whole byte of flag to ensure Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.dsp ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.dsp (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.dsp Mon Feb 2 11:40:52 2009 @@ -1,95 +1,95 @@ -# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=spandsp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "spandsp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "spandsp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll" - -!ELSEIF "$(CFG)" == "spandsp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c -# SUBTRACT CPP /WX /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "spandsp - Win32 Release" -# Name "spandsp - Win32 Debug" +# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=spandsp - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "spandsp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "spandsp - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll" + +!ELSEIF "$(CFG)" == "spandsp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c +# SUBTRACT CPP /WX /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "spandsp - Win32 Release" +# Name "spandsp - Win32 Debug" # Begin Group "Source Files" # Begin Source File @@ -898,10 +898,10 @@ SOURCE=.\spandsp.h # End Source File # End Group - -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project + +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj Mon Feb 2 11:40:52 2009 @@ -64,7 +64,6 @@ <Tool Name="VCLinkerTool" LinkIncremental="2" - ModuleDefinitionFile="./msvc/spandsp.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -138,7 +137,6 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" - ModuleDefinitionFile="./msvc/spandsp.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -178,826 +176,208 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - <File - RelativePath="adsi.c" - > - </File> - <File - RelativePath="async.c" - > - </File> - <File - RelativePath="at_interpreter.c" - > - </File> - <File - RelativePath="awgn.c" - > - </File> - <File - RelativePath="bell_r2_mf.c" - > - </File> - <File - RelativePath="bert.c" - > - </File> - <File - RelativePath="bit_operations.c" - > - </File> - <File - RelativePath="bitstream.c" - > - </File> - <File - RelativePath="complex_filters.c" - > - </File> - <File - RelativePath="complex_vector_float.c" - > - </File> - <File - RelativePath="complex_vector_int.c" - > - </File> - <File - RelativePath="crc.c" - > - </File> - <File - RelativePath="dds_float.c" - > - </File> - <File - RelativePath="dds_int.c" - > - </File> - <File - RelativePath="dtmf.c" - > - </File> - <File - RelativePath="echo.c" - > - </File> - <File - RelativePath="fax.c" - > - </File> - <File - RelativePath="fsk.c" - > - </File> - <File - RelativePath="g711.c" - > - </File> - <File - RelativePath="g722.c" - > - </File> - <File - RelativePath="g726.c" - > - </File> - <File - RelativePath=".\msvc\gettimeofday.c" - > - </File> - <File - RelativePath="gsm0610_decode.c" - > - </File> - <File - RelativePath="gsm0610_encode.c" - > - </File> - <File - RelativePath="gsm0610_long_term.c" - > - </File> - <File - RelativePath="gsm0610_lpc.c" - > - </File> - <File - RelativePath="gsm0610_preprocess.c" - > - </File> - <File - RelativePath="gsm0610_rpe.c" - > - </File> - <File - RelativePath="gsm0610_short_term.c" - > - </File> - <File - RelativePath="hdlc.c" - > - </File> - <File - RelativePath="ima_adpcm.c" - > - </File> - <File - RelativePath="logging.c" - > - </File> - <File - RelativePath="lpc10_analyse.c" - > - </File> - <File - RelativePath="lpc10_decode.c" - > - </File> - <File - RelativePath="lpc10_encode.c" - > - </File> - <File - RelativePath="lpc10_placev.c" - > - </File> - <File - RelativePath="lpc10_voicing.c" - > - </File> - <File - RelativePath="modem_connect_tones.c" - > - </File> - <File - RelativePath="modem_echo.c" - > - </File> - <File - RelativePath="noise.c" - > - </File> - <File - RelativePath="oki_adpcm.c" - > - </File> - <File - RelativePath="playout.c" - > - </File> - <File - RelativePath="plc.c" - > - </File> - <File - RelativePath="power_meter.c" - > - </File> - <File - RelativePath="queue.c" - > - </File> - <File - RelativePath="schedule.c" - > - </File> - <File - RelativePath="sig_tone.c" - > - </File> - <File - RelativePath="silence_gen.c" - > - </File> - <File - RelativePath="super_tone_rx.c" - > - </File> - <File - RelativePath="super_tone_tx.c" - > - </File> - <File - RelativePath="t30.c" - > - </File> - <File - RelativePath="t30_api.c" - > - </File> - <File - RelativePath="t30_logging.c" - > - </File> - <File - RelativePath="t31.c" - > - </File> - <File - RelativePath="t35.c" - > - </File> - <File - RelativePath="t38_core.c" - > - </File> - <File - RelativePath="t38_gateway.c" - > - </File> - <File - RelativePath="t38_non_ecm_buffer.c" - > - </File> - <File - RelativePath="t38_terminal.c" - > - </File> - <File - RelativePath="t4.c" - > - </File> - <File - RelativePath="testcpuid.c" - > - </File> - <File - RelativePath="time_scale.c" - > - </File> - <File - RelativePath="tone_detect.c" - > - </File> - <File - RelativePath="tone_generate.c" - > - </File> - <File - RelativePath="v17rx.c" - > - </File> - <File - RelativePath="v17tx.c" - > - </File> - <File - RelativePath="v22bis_rx.c" - > - </File> - <File - RelativePath="v22bis_tx.c" - > - </File> - <File - RelativePath="v27ter_rx.c" - > - </File> - <File - RelativePath="v27ter_tx.c" - > - </File> - <File - RelativePath="v29rx.c" - > - </File> - <File - RelativePath="v29tx.c" - > - </File> - <File - RelativePath="v42.c" - > - </File> - <File - RelativePath="v42bis.c" - > - </File> - <File - RelativePath="v8.c" - > - </File> - <File - RelativePath="vector_float.c" - > - </File> - <File - RelativePath="vector_int.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - > - <File - RelativePath="spandsp.h" - > - </File> - <File - RelativePath="spandsp/adsi.h" - > - </File> - <File - RelativePath="spandsp/arctan2.h" - > - </File> - <File - RelativePath="spandsp/async.h" - > - </File> - <File - RelativePath="spandsp/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/awgn.h" - > - </File> - <File - RelativePath="spandsp/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/bert.h" - > - </File> - <File - RelativePath="spandsp/biquad.h" - > - </File> - <File - RelativePath="spandsp/bit_operations.h" - > - </File> - <File - RelativePath="spandsp/bitstream.h" - > - </File> - <File - RelativePath="spandsp/complex.h" - > - </File> - <File - RelativePath="spandsp/complex_filters.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_float.h" - > - </File> - <File - RelativePath="spandsp/complex_vector_int.h" - > - </File> - <File - RelativePath="spandsp/crc.h" - > - </File> - <File - RelativePath="spandsp/dc_restore.h" - > - </File> - <File - RelativePath="spandsp/dds.h" - > - </File> - <File - RelativePath="spandsp/dtmf.h" - > - </File> - <File - RelativePath="spandsp/echo.h" - > - </File> - <File - RelativePath="spandsp/expose.h" - > - </File> - <File - RelativePath="spandsp/fax.h" - > - </File> - <File - RelativePath="spandsp/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/fir.h" - > - </File> - <File - RelativePath="spandsp/fsk.h" - > - </File> - <File - RelativePath="spandsp/g168models.h" - > - </File> - <File - RelativePath="spandsp/g711.h" - > - </File> - <File - RelativePath="spandsp/g722.h" - > - </File> - <File - RelativePath="spandsp/g726.h" - > - </File> - <File - RelativePath="spandsp/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/hdlc.h" - > - </File> - <File - RelativePath="spandsp/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/logging.h" - > - </File> - <File - RelativePath="spandsp/lpc10.h" - > - </File> - <File - RelativePath="spandsp/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/modem_echo.h" - > - </File> - <File - RelativePath="spandsp/noise.h" - > - </File> - <File - RelativePath="spandsp/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/playout.h" - > - </File> - <File - RelativePath="spandsp/plc.h" - > - </File> - <File - RelativePath="spandsp/power_meter.h" - > - </File> - <File - RelativePath="spandsp/private/adsi.h" - > - </File> - <File - RelativePath="spandsp/private/async.h" - > - </File> - <File - RelativePath="spandsp/private/at_interpreter.h" - > - </File> - <File - RelativePath="spandsp/private/awgn.h" - > - </File> - <File - RelativePath="spandsp/private/bell_r2_mf.h" - > - </File> - <File - RelativePath="spandsp/private/bert.h" - > - </File> - <File - RelativePath="spandsp/private/bitstream.h" - > - </File> - <File - RelativePath="spandsp/private/dtmf.h" - > - </File> - <File - RelativePath="spandsp/private/fax.h" - > - </File> - <File - RelativePath="spandsp/private/fax_modems.h" - > - </File> - <File - RelativePath="spandsp/private/fsk.h" - > - </File> - <File - RelativePath="spandsp/private/g711.h" - > - </File> - <File - RelativePath="spandsp/private/g722.h" - > - </File> - <File - RelativePath="spandsp/private/g726.h" - > - </File> - <File - RelativePath="spandsp/private/gsm0610.h" - > - </File> - <File - RelativePath="spandsp/private/hdlc.h" - > - </File> - <File - RelativePath="spandsp/private/ima_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/logging.h" - > - </File> - <File - RelativePath="spandsp/private/lpc10.h" - > - </File> - <File - RelativePath="spandsp/private/modem_connect_tones.h" - > - </File> - <File - RelativePath="spandsp/private/noise.h" - > - </File> - <File - RelativePath="spandsp/private/oki_adpcm.h" - > - </File> - <File - RelativePath="spandsp/private/queue.h" - > - </File> - <File - RelativePath="spandsp/private/schedule.h" - > - </File> - <File - RelativePath="spandsp/private/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/private/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/private/t30.h" - > - </File> - <File - RelativePath="spandsp/private/t31.h" - > - </File> - <File - RelativePath="spandsp/private/t38_core.h" - > - </File> - <File - RelativePath="spandsp/private/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/private/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/private/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/private/t4.h" - > - </File> - <File - RelativePath="spandsp/private/time_scale.h" - > - </File> - <File - RelativePath="spandsp/private/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/private/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/private/v17rx.h" - > - </File> - <File - RelativePath="spandsp/private/v17tx.h" - > - </File> - <File - RelativePath="spandsp/private/v22bis.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/private/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/private/v29rx.h" - > - </File> - <File - RelativePath="spandsp/private/v29tx.h" - > - </File> - <File - RelativePath="spandsp/private/v42.h" - > - </File> - <File - RelativePath="spandsp/private/v42bis.h" - > - </File> - <File - RelativePath="spandsp/private/v8.h" - > - </File> - <File - RelativePath="spandsp/queue.h" - > - </File> - <File - RelativePath="spandsp/saturated.h" - > - </File> - <File - RelativePath="spandsp/schedule.h" - > - </File> - <File - RelativePath="spandsp/sig_tone.h" - > - </File> - <File - RelativePath="spandsp/silence_gen.h" - > - </File> - <File - RelativePath="spandsp/super_tone_rx.h" - > - </File> - <File - RelativePath="spandsp/super_tone_tx.h" - > - </File> - <File - RelativePath="spandsp/t30.h" - > - </File> - <File - RelativePath="spandsp/t30_api.h" - > - </File> - <File - RelativePath="spandsp/t30_fcf.h" - > - </File> - <File - RelativePath="spandsp/t30_logging.h" - > - </File> - <File - RelativePath="spandsp/t31.h" - > - </File> - <File - RelativePath="spandsp/t35.h" - > - </File> - <File - RelativePath="spandsp/t38_core.h" - > - </File> - <File - RelativePath="spandsp/t38_gateway.h" - > - </File> - <File - RelativePath="spandsp/t38_non_ecm_buffer.h" - > - </File> - <File - RelativePath="spandsp/t38_terminal.h" - > - </File> - <File - RelativePath="spandsp/t4.h" - > - </File> - <File - RelativePath="spandsp/telephony.h" - > - </File> - <File - RelativePath="spandsp/time_scale.h" - > - </File> - <File - RelativePath="spandsp/timing.h" - > - </File> - <File - RelativePath="spandsp/tone_detect.h" - > - </File> - <File - RelativePath="spandsp/tone_generate.h" - > - </File> - <File - RelativePath="spandsp/v17rx.h" - > - </File> - <File - RelativePath="spandsp/v17tx.h" - > - </File> - <File - RelativePath="spandsp/v22bis.h" - > - </File> - <File - RelativePath="spandsp/v27ter_rx.h" - > - </File> - <File - RelativePath="spandsp/v27ter_tx.h" - > - </File> - <File - RelativePath="spandsp/v29rx.h" - > - </File> - <File - RelativePath="spandsp/v29tx.h" - > - </File> - <File - RelativePath="spandsp/v42.h" - > - </File> - <File - RelativePath="spandsp/v42bis.h" - > - </File> - <File - RelativePath="spandsp/v8.h" - > - </File> - <File - RelativePath="spandsp/vector_float.h" - > - </File> - <File - RelativePath="spandsp/vector_int.h" - > - </File> - <File - RelativePath="spandsp/version.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - <File - RelativePath=".\msvc\spandsp.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<File RelativePath="adsi.c"></File> +<File RelativePath="async.c"></File> +<File RelativePath="at_interpreter.c"></File> +<File RelativePath="awgn.c"></File> +<File RelativePath="bell_r2_mf.c"></File> +<File RelativePath="bert.c"></File> +<File RelativePath="bit_operations.c"></File> +<File RelativePath="bitstream.c"></File> +<File RelativePath="complex_filters.c"></File> +<File RelativePath="complex_vector_float.c"></File> +<File RelativePath="complex_vector_int.c"></File> +<File RelativePath="crc.c"></File> +<File RelativePath="dds_float.c"></File> +<File RelativePath="dds_int.c"></File> +<File RelativePath="dtmf.c"></File> +<File RelativePath="echo.c"></File> +<File RelativePath="fax.c"></File> +<File RelativePath="fsk.c"></File> +<File RelativePath="g711.c"></File> +<File RelativePath="g722.c"></File> +<File RelativePath="g726.c"></File> +<File RelativePath="gsm0610_decode.c"></File> +<File RelativePath="gsm0610_encode.c"></File> +<File RelativePath="gsm0610_long_term.c"></File> +<File RelativePath="gsm0610_lpc.c"></File> +<File RelativePath="gsm0610_preprocess.c"></File> +<File RelativePath="gsm0610_rpe.c"></File> +<File RelativePath="gsm0610_short_term.c"></File> +<File RelativePath="hdlc.c"></File> +<File RelativePath="ima_adpcm.c"></File> +<File RelativePath="logging.c"></File> +<File RelativePath="lpc10_analyse.c"></File> +<File RelativePath="lpc10_decode.c"></File> +<File RelativePath="lpc10_encode.c"></File> +<File RelativePath="lpc10_placev.c"></File> +<File RelativePath="lpc10_voicing.c"></File> +<File RelativePath="modem_echo.c"></File> +<File RelativePath="modem_connect_tones.c"></File> +<File RelativePath="noise.c"></File> +<File RelativePath="oki_adpcm.c"></File> +<File RelativePath="playout.c"></File> +<File RelativePath="plc.c"></File> +<File RelativePath="power_meter.c"></File> +<File RelativePath="queue.c"></File> +<File RelativePath="schedule.c"></File> +<File RelativePath="sig_tone.c"></File> +<File RelativePath="silence_gen.c"></File> +<File RelativePath="super_tone_rx.c"></File> +<File RelativePath="super_tone_tx.c"></File> +<File RelativePath="t4.c"></File> +<File RelativePath="t30.c"></File> +<File RelativePath="t30_api.c"></File> +<File RelativePath="t30_logging.c"></File> +<File RelativePath="t31.c"></File> +<File RelativePath="t35.c"></File> +<File RelativePath="t38_core.c"></File> +<File RelativePath="t38_gateway.c"></File> +<File RelativePath="t38_non_ecm_buffer.c"></File> +<File RelativePath="t38_terminal.c"></File> +<File RelativePath="testcpuid.c"></File> +<File RelativePath="time_scale.c"></File> +<File RelativePath="tone_detect.c"></File> +<File RelativePath="tone_generate.c"></File> +<File RelativePath="v17rx.c"></File> +<File RelativePath="v17tx.c"></File> +<File RelativePath="v22bis_rx.c"></File> +<File RelativePath="v22bis_tx.c"></File> +<File RelativePath="v27ter_rx.c"></File> +<File RelativePath="v27ter_tx.c"></File> +<File RelativePath="v29rx.c"></File> +<File RelativePath="v29tx.c"></File> +<File RelativePath="v42.c"></File> +<File RelativePath="v42bis.c"></File> +<File RelativePath="v8.c"></File> +<File RelativePath="vector_float.c"></File> +<File RelativePath="vector_int.c"></File> +<File RelativePath=".\msvc\gettimeofday.c"></File> +</Filter><Filter Name="Header Files"> +<File RelativePath="spandsp/adsi.h"></File> +<File RelativePath="spandsp/async.h"></File> +<File RelativePath="spandsp/arctan2.h"></File> +<File RelativePath="spandsp/at_interpreter.h"></File> +<File RelativePath="spandsp/awgn.h"></File> +<File RelativePath="spandsp/bell_r2_mf.h"></File> +<File RelativePath="spandsp/bert.h"></File> +<File RelativePath="spandsp/biquad.h"></File> +<File RelativePath="spandsp/bit_operations.h"></File> +<File RelativePath="spandsp/bitstream.h"></File> +<File RelativePath="spandsp/crc.h"></File> +<File RelativePath="spandsp/complex.h"></File> +<File RelativePath="spandsp/complex_filters.h"></File> +<File RelativePath="spandsp/complex_vector_float.h"></File> +<File RelativePath="spandsp/complex_vector_int.h"></File> +<File RelativePath="spandsp/dc_restore.h"></File> +<File RelativePath="spandsp/dds.h"></File> +<File RelativePath="spandsp/dtmf.h"></File> +<File RelativePath="spandsp/echo.h"></File> +<File RelativePath="spandsp/fax.h"></File> +<File RelativePath="spandsp/fax_modems.h"></File> +<File RelativePath="spandsp/fir.h"></File> +<File RelativePath="spandsp/fsk.h"></File> +<File RelativePath="spandsp/g168models.h"></File> +<File RelativePath="spandsp/g711.h"></File> +<File RelativePath="spandsp/g722.h"></File> +<File RelativePath="spandsp/g726.h"></File> +<File RelativePath="spandsp/gsm0610.h"></File> +<File RelativePath="spandsp/hdlc.h"></File> +<File RelativePath="spandsp/ima_adpcm.h"></File> +<File RelativePath="spandsp/logging.h"></File> +<File RelativePath="spandsp/lpc10.h"></File> +<File RelativePath="spandsp/modem_echo.h"></File> +<File RelativePath="spandsp/modem_connect_tones.h"></File> +<File RelativePath="spandsp/noise.h"></File> +<File RelativePath="spandsp/oki_adpcm.h"></File> +<File RelativePath="spandsp/playout.h"></File> +<File RelativePath="spandsp/plc.h"></File> +<File RelativePath="spandsp/power_meter.h"></File> +<File RelativePath="spandsp/queue.h"></File> +<File RelativePath="spandsp/saturated.h"></File> +<File RelativePath="spandsp/schedule.h"></File> +<File RelativePath="spandsp/sig_tone.h"></File> +<File RelativePath="spandsp/silence_gen.h"></File> +<File RelativePath="spandsp/super_tone_rx.h"></File> +<File RelativePath="spandsp/super_tone_tx.h"></File> +<File RelativePath="spandsp/t4.h"></File> +<File RelativePath="spandsp/t30.h"></File> +<File RelativePath="spandsp/t30_api.h"></File> +<File RelativePath="spandsp/t30_fcf.h"></File> +<File RelativePath="spandsp/t30_logging.h"></File> +<File RelativePath="spandsp/t31.h"></File> +<File RelativePath="spandsp/t35.h"></File> +<File RelativePath="spandsp/t38_core.h"></File> +<File RelativePath="spandsp/t38_gateway.h"></File> +<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/t38_terminal.h"></File> +<File RelativePath="spandsp/telephony.h"></File> +<File RelativePath="spandsp/time_scale.h"></File> +<File RelativePath="spandsp/timing.h"></File> +<File RelativePath="spandsp/tone_detect.h"></File> +<File RelativePath="spandsp/tone_generate.h"></File> +<File RelativePath="spandsp/v17rx.h"></File> +<File RelativePath="spandsp/v17tx.h"></File> +<File RelativePath="spandsp/v22bis.h"></File> +<File RelativePath="spandsp/v27ter_rx.h"></File> +<File RelativePath="spandsp/v27ter_tx.h"></File> +<File RelativePath="spandsp/v29rx.h"></File> +<File RelativePath="spandsp/v29tx.h"></File> +<File RelativePath="spandsp/v42.h"></File> +<File RelativePath="spandsp/v42bis.h"></File> +<File RelativePath="spandsp/v8.h"></File> +<File RelativePath="spandsp/vector_float.h"></File> +<File RelativePath="spandsp/vector_int.h"></File> +<File RelativePath="spandsp/version.h"></File> +<File RelativePath="spandsp/private/adsi.h"></File> +<File RelativePath="spandsp/private/async.h"></File> +<File RelativePath="spandsp/private/at_interpreter.h"></File> +<File RelativePath="spandsp/private/awgn.h"></File> +<File RelativePath="spandsp/private/bell_r2_mf.h"></File> +<File RelativePath="spandsp/private/bert.h"></File> +<File RelativePath="spandsp/private/bitstream.h"></File> +<File RelativePath="spandsp/private/dtmf.h"></File> +<File RelativePath="spandsp/private/fax.h"></File> +<File RelativePath="spandsp/private/fax_modems.h"></File> +<File RelativePath="spandsp/private/fsk.h"></File> +<File RelativePath="spandsp/private/g711.h"></File> +<File RelativePath="spandsp/private/g722.h"></File> +<File RelativePath="spandsp/private/g726.h"></File> +<File RelativePath="spandsp/private/gsm0610.h"></File> +<File RelativePath="spandsp/private/hdlc.h"></File> +<File RelativePath="spandsp/private/ima_adpcm.h"></File> +<File RelativePath="spandsp/private/logging.h"></File> +<File RelativePath="spandsp/private/lpc10.h"></File> +<File RelativePath="spandsp/private/modem_connect_tones.h"></File> +<File RelativePath="spandsp/private/noise.h"></File> +<File RelativePath="spandsp/private/oki_adpcm.h"></File> +<File RelativePath="spandsp/private/queue.h"></File> +<File RelativePath="spandsp/private/schedule.h"></File> +<File RelativePath="spandsp/private/sig_tone.h"></File> +<File RelativePath="spandsp/private/super_tone_rx.h"></File> +<File RelativePath="spandsp/private/super_tone_tx.h"></File> +<File RelativePath="spandsp/private/t30.h"></File> +<File RelativePath="spandsp/private/t31.h"></File> +<File RelativePath="spandsp/private/t38_core.h"></File> +<File RelativePath="spandsp/private/t38_gateway.h"></File> +<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/private/t38_terminal.h"></File> +<File RelativePath="spandsp/private/t4.h"></File> +<File RelativePath="spandsp/private/time_scale.h"></File> +<File RelativePath="spandsp/private/tone_detect.h"></File> +<File RelativePath="spandsp/private/tone_generate.h"></File> +<File RelativePath="spandsp/private/v17rx.h"></File> +<File RelativePath="spandsp/private/v17tx.h"></File> +<File RelativePath="spandsp/private/v22bis.h"></File> +<File RelativePath="spandsp/private/v27ter_rx.h"></File> +<File RelativePath="spandsp/private/v27ter_tx.h"></File> +<File RelativePath="spandsp/private/v29rx.h"></File> +<File RelativePath="spandsp/private/v29tx.h"></File> +<File RelativePath="spandsp/private/v42.h"></File> +<File RelativePath="spandsp/private/v42bis.h"></File> +<File RelativePath="spandsp/private/v8.h"></File> +<File RelativePath="spandsp/expose.h"></File> +<File RelativePath="spandsp.h"></File> + </Filter> <Filter + Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> + </Files> <Globals> </Globals> </VisualStudioProject> Modified: freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.foot Mon Feb 2 11:40:52 2009 @@ -1,7 +1,7 @@ - -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project + +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Modified: freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/msvcproj.head Mon Feb 2 11:40:52 2009 @@ -1,92 +1,92 @@ -# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=spandsp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "spandsp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "spandsp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll" - -!ELSEIF "$(CFG)" == "spandsp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c -# SUBTRACT CPP /WX /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "spandsp - Win32 Release" -# Name "spandsp - Win32 Debug" +# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=spandsp - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "spandsp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "spandsp - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll" + +!ELSEIF "$(CFG)" == "spandsp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c +# SUBTRACT CPP /WX /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept +# SUBTRACT LINK32 /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "spandsp - Win32 Release" +# Name "spandsp - Win32 Debug" Modified: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: spandsp.h.in,v 1.14 2009/01/07 13:31:53 steveu Exp $ + * $Id: spandsp.h.in,v 1.15 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -33,6 +33,8 @@ #undef SPANDSP_USE_FIXED_POINT #undef SPANDSP_MISALIGNED_ACCESS_FAILS +#define SPANDSP_USE_EXPORT_CAPABILITY 1 + #include <stdlib.h> #include <inttypes.h> #include <string.h> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.foot Mon Feb 2 11:40:52 2009 @@ -5,10 +5,6 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> - <File - RelativePath=".\msvc\spandsp.def" - > - </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head Mon Feb 2 11:40:52 2009 @@ -64,7 +64,6 @@ <Tool Name="VCLinkerTool" LinkIncremental="2" - ModuleDefinitionFile="./msvc/spandsp.def" GenerateDebugInformation="true" SubSystem="2" RandomizedBaseAddress="1" @@ -138,7 +137,6 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" - ModuleDefinitionFile="./msvc/spandsp.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" Modified: freeswitch/trunk/libs/spandsp/src/noise.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/noise.c (original) +++ freeswitch/trunk/libs/spandsp/src/noise.c Mon Feb 2 11:40:52 2009 @@ -23,7 +23,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: noise.c,v 1.28 2009/01/28 03:41:27 steveu Exp $ + * $Id: noise.c,v 1.29 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -113,4 +113,11 @@ return s; } /*- End of function --------------------------------------------------------*/ + +int noise_free(noise_state_t *s) +{ + free(s); + return 0; +} +/*- End of function --------------------------------------------------------*/ /*- End of file ------------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/queue.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/queue.c (original) +++ freeswitch/trunk/libs/spandsp/src/queue.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: queue.c,v 1.26 2009/01/29 01:41:06 steveu Exp $ + * $Id: queue.c,v 1.27 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -39,7 +39,8 @@ #include <inttypes.h> #include <sys/types.h> -#define FULLY_DEFINE_QUEUE_STATE_T +#define SPANDSP_FULLY_DEFINE_QUEUE_STATE_T +#include "spandsp/telephony.h" #include "spandsp/queue.h" #include "spandsp/private/queue.h" Modified: freeswitch/trunk/libs/spandsp/src/spandsp.h.in ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp.h.in (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp.h.in Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: spandsp.h.in,v 1.14 2009/01/07 13:31:53 steveu Exp $ + * $Id: spandsp.h.in,v 1.15 2009/01/31 08:48:10 steveu Exp $ */ /*! \file */ @@ -33,6 +33,8 @@ @SPANDSP_USE_FIXED_POINT@ @SPANDSP_MISALIGNED_ACCESS_FAILS@ +@SPANDSP_USE_EXPORT_CAPABILITY@ + #include <stdlib.h> @INSERT_INTTYPES_HEADER@ #include <string.h> Modified: freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: adsi.h,v 1.33 2008/10/13 14:19:18 steveu Exp $ + * $Id: adsi.h,v 1.34 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -392,9 +392,9 @@ \param user_data An opaque pointer for the callback routine. \return A pointer to the initialised context, or NULL if there was a problem. */ -adsi_rx_state_t *adsi_rx_init(adsi_rx_state_t *s, int standard, put_msg_func_t put_msg, void *user_data); +SPAN_DECLARE(adsi_rx_state_t) *adsi_rx_init(adsi_rx_state_t *s, int standard, put_msg_func_t put_msg, void *user_data); -int adsi_rx_free(adsi_rx_state_t *s); +SPAN_DECLARE(int) adsi_rx_free(adsi_rx_state_t *s); /*! \brief Receive a chunk of ADSI audio. \param s The ADSI receive context. @@ -402,16 +402,16 @@ \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int adsi_rx(adsi_rx_state_t *s, const int16_t *amp, int len); +SPAN_DECLARE(int) adsi_rx(adsi_rx_state_t *s, const int16_t *amp, int len); /*! \brief Initialise an ADSI transmit context. \param s The ADSI transmit context. \param standard The code for the ADSI standard to be used. \return A pointer to the initialised context, or NULL if there was a problem. */ -adsi_tx_state_t *adsi_tx_init(adsi_tx_state_t *s, int standard); +SPAN_DECLARE(adsi_tx_state_t) *adsi_tx_init(adsi_tx_state_t *s, int standard); -int adsi_tx_free(adsi_tx_state_t *s); +SPAN_DECLARE(int) adsi_tx_free(adsi_tx_state_t *s); /*! \brief Adjust the preamble associated with an ADSI transmit context. \param s The ADSI transmit context. @@ -420,11 +420,11 @@ \param postamble_ones_len The number of bits of continuous one after a message. \param stop_bits The number of stop bits per character. */ -void adsi_tx_set_preamble(adsi_tx_state_t *s, - int preamble_len, - int preamble_ones_len, - int postamble_ones_len, - int stop_bits); +SPAN_DECLARE(void) adsi_tx_set_preamble(adsi_tx_state_t *s, + int preamble_len, + int preamble_ones_len, + int postamble_ones_len, + int stop_bits); /*! \brief Generate a block of ADSI audio samples. \param s The ADSI transmit context. @@ -432,12 +432,12 @@ \param max_len The number of samples to be generated. \return The number of samples actually generated. */ -int adsi_tx(adsi_tx_state_t *s, int16_t *amp, int max_len); +SPAN_DECLARE(int) adsi_tx(adsi_tx_state_t *s, int16_t *amp, int max_len); /*! \brief Request generation of an ADSI alert tone. \param s The ADSI transmit context. */ -void adsi_tx_send_alert_tone(adsi_tx_state_t *s); +SPAN_DECLARE(void) adsi_tx_send_alert_tone(adsi_tx_state_t *s); /*! \brief Put a message into the input buffer of an ADSI transmit context. \param s The ADSI transmit context. @@ -447,7 +447,7 @@ in the transmitter, this function will return zero, as it will not successfully add the message to the buffer. */ -int adsi_tx_put_message(adsi_tx_state_t *s, const uint8_t *msg, int len); +SPAN_DECLARE(int) adsi_tx_put_message(adsi_tx_state_t *s, const uint8_t *msg, int len); /*! \brief Get a field from an ADSI message. \param s The ADSI receive context. @@ -458,7 +458,7 @@ \param field_body Pointer to the body of the field. \param field_len The length of the field, or -1 for no more fields, or -2 for message structure corrupt. */ -int adsi_next_field(adsi_rx_state_t *s, const uint8_t *msg, int msg_len, int pos, uint8_t *field_type, uint8_t const **field_body, int *field_len); +SPAN_DECLARE(int) adsi_next_field(adsi_rx_state_t *s, const uint8_t *msg, int msg_len, int pos, uint8_t *field_type, uint8_t const **field_body, int *field_len); /*! \brief Insert the header or a field into an ADSI message. \param s The ADSI transmit context. @@ -468,13 +468,13 @@ \param field_body Pointer to the body of the new field. \param field_len The length of the new field. */ -int adsi_add_field(adsi_tx_state_t *s, uint8_t *msg, int len, uint8_t field_type, uint8_t const *field_body, int field_len); +SPAN_DECLARE(int) adsi_add_field(adsi_tx_state_t *s, uint8_t *msg, int len, uint8_t field_type, uint8_t const *field_body, int field_len); /*! \brief Return a short name for an ADSI standard \param standard The code for the standard. \return A pointer to the name. */ -const char *adsi_standard_to_str(int standard); +SPAN_DECLARE(const char) *adsi_standard_to_str(int standard); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/async.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/async.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/async.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: async.h,v 1.19 2008/11/30 10:17:31 steveu Exp $ + * $Id: async.h,v 1.20 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -138,7 +138,7 @@ \brief Convert a signal status to a short text description. \param status The modem signal status. \return A pointer to the description. */ -const char *signal_status_to_str(int status); +SPAN_DECLARE(const char) *signal_status_to_str(int status); /*! Initialise an asynchronous data transmit context. \brief Initialise an asynchronous data transmit context. @@ -150,19 +150,19 @@ \param get_byte The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. \return A pointer to the initialised context, or NULL if there was a problem. */ -async_tx_state_t *async_tx_init(async_tx_state_t *s, - int data_bits, - int parity_bits, - int stop_bits, - int use_v14, - get_byte_func_t get_byte, - void *user_data); +SPAN_DECLARE(async_tx_state_t) *async_tx_init(async_tx_state_t *s, + int data_bits, + int parity_bits, + int stop_bits, + int use_v14, + get_byte_func_t get_byte, + void *user_data); /*! Get the next bit of a transmitted serial bit stream. \brief Get the next bit of a transmitted serial bit stream. \param user_data An opaque point which must point to a transmitter context. \return the next bit, or PUTBIT_END_OF_DATA to indicate the data stream has ended. */ -int async_tx_get_bit(void *user_data); +SPAN_DECLARE(int) async_tx_get_bit(void *user_data); /*! Initialise an asynchronous data receiver context. \brief Initialise an asynchronous data receiver context. @@ -174,13 +174,13 @@ \param put_byte The callback routine used to put the received data. \param user_data An opaque pointer. \return A pointer to the initialised context, or NULL if there was a problem. */ -async_rx_state_t *async_rx_init(async_rx_state_t *s, - int data_bits, - int parity_bits, - int stop_bits, - int use_v14, - put_byte_func_t put_byte, - void *user_data); +SPAN_DECLARE(async_rx_state_t) *async_rx_init(async_rx_state_t *s, + int data_bits, + int parity_bits, + int stop_bits, + int use_v14, + put_byte_func_t put_byte, + void *user_data); /*! Accept a bit from a received serial bit stream \brief Accept a bit from a received serial bit stream @@ -191,7 +191,7 @@ - SIG_STATUS_TRAINING_SUCCEEDED - SIG_STATUS_TRAINING_FAILED - SIG_STATUS_END_OF_DATA */ -void async_rx_put_bit(void *user_data, int bit); +SPAN_DECLARE(void) async_rx_put_bit(void *user_data, int bit); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/at_interpreter.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/at_interpreter.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/at_interpreter.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: at_interpreter.h,v 1.20 2008/11/30 05:43:37 steveu Exp $ + * $Id: at_interpreter.h,v 1.21 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -138,32 +138,32 @@ { #endif -void at_set_at_rx_mode(at_state_t *s, int new_mode); +SPAN_DECLARE(void) at_set_at_rx_mode(at_state_t *s, int new_mode); -void at_put_response(at_state_t *s, const char *t); +SPAN_DECLARE(void) at_put_response(at_state_t *s, const char *t); -void at_put_numeric_response(at_state_t *s, int val); +SPAN_DECLARE(void) at_put_numeric_response(at_state_t *s, int val); -void at_put_response_code(at_state_t *s, int code); +SPAN_DECLARE(void) at_put_response_code(at_state_t *s, int code); -void at_reset_call_info(at_state_t *s); +SPAN_DECLARE(void) at_reset_call_info(at_state_t *s); /*! Set the call information for an AT interpreter. \brief Set the call information for an AT interpreter. \param s The AT interpreter context. \param id . \param value . */ -void at_set_call_info(at_state_t *s, char const *id, char const *value); +SPAN_DECLARE(void) at_set_call_info(at_state_t *s, char const *id, char const *value); -void at_display_call_info(at_state_t *s); +SPAN_DECLARE(void) at_display_call_info(at_state_t *s); -int at_modem_control(at_state_t *s, int op, const char *num); +SPAN_DECLARE(int) at_modem_control(at_state_t *s, int op, const char *num); -void at_call_event(at_state_t *s, int event); +SPAN_DECLARE(void) at_call_event(at_state_t *s, int event); -void at_interpreter(at_state_t *s, const char *cmd, int len); +SPAN_DECLARE(void) at_interpreter(at_state_t *s, const char *cmd, int len); -void at_set_class1_handler(at_state_t *s, at_class1_handler_t handler, void *user_data); +SPAN_DECLARE(void) at_set_class1_handler(at_state_t *s, at_class1_handler_t handler, void *user_data); /*! Initialise an AT interpreter context. \brief Initialise an AT interpreter context. @@ -173,17 +173,17 @@ \param modem_control_handler x. \param modem_control_user_data x. \return A pointer to the AT context, or NULL if there was a problem. */ -at_state_t *at_init(at_state_t *s, - at_tx_handler_t *at_tx_handler, - void *at_tx_user_data, - at_modem_control_handler_t *modem_control_handler, - void *modem_control_user_data); +SPAN_DECLARE(at_state_t) *at_init(at_state_t *s, + at_tx_handler_t *at_tx_handler, + void *at_tx_user_data, + at_modem_control_handler_t *modem_control_handler, + void *modem_control_user_data); /*! Free an AT interpreter context. \brief Free an AT interpreter context. \param s The AT context. \return 0 for OK */ -int at_free(at_state_t *s); +SPAN_DECLARE(int) at_free(at_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/awgn.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/awgn.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/awgn.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: awgn.h,v 1.15 2008/11/30 12:38:27 steveu Exp $ + * $Id: awgn.h,v 1.16 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -78,11 +78,11 @@ { #endif -awgn_state_t *awgn_init_dbm0(awgn_state_t *s, int idum, float level); +SPAN_DECLARE(awgn_state_t) *awgn_init_dbm0(awgn_state_t *s, int idum, float level); -awgn_state_t *awgn_init_dbov(awgn_state_t *s, int idum, float level); +SPAN_DECLARE(awgn_state_t) *awgn_init_dbov(awgn_state_t *s, int idum, float level); -int16_t awgn(awgn_state_t *s); +SPAN_DECLARE(int16_t) awgn(awgn_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/bell_r2_mf.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/bell_r2_mf.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/bell_r2_mf.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: bell_r2_mf.h,v 1.21 2008/10/13 14:19:18 steveu Exp $ + * $Id: bell_r2_mf.h,v 1.22 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -136,7 +136,7 @@ \param max_samples The required number of generated samples. \return The number of samples actually generated. This may be less than max_samples if the input buffer empties. */ -int bell_mf_tx(bell_mf_tx_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE(int) bell_mf_tx(bell_mf_tx_state_t *s, int16_t amp[], int max_samples); /*! \brief Put a string of digits in a Bell MF generator's input buffer. \param s The Bell MF generator context. @@ -145,42 +145,42 @@ assumed to be a NULL terminated string. \return The number of digits actually added. This may be less than the length of the digit string, if the buffer fills up. */ -size_t bell_mf_tx_put(bell_mf_tx_state_t *s, const char *digits, int len); +SPAN_DECLARE(int) bell_mf_tx_put(bell_mf_tx_state_t *s, const char *digits, int len); /*! \brief Initialise a Bell MF generator context. \param s The Bell MF generator context. \return A pointer to the Bell MF generator context.*/ -bell_mf_tx_state_t *bell_mf_tx_init(bell_mf_tx_state_t *s); +SPAN_DECLARE(bell_mf_tx_state_t) *bell_mf_tx_init(bell_mf_tx_state_t *s); /*! \brief Free a Bell MF generator context. \param s The Bell MF generator context. \return 0 for OK, else -1. */ -int bell_mf_tx_free(bell_mf_tx_state_t *s); +SPAN_DECLARE(int) bell_mf_tx_free(bell_mf_tx_state_t *s); /*! \brief Generate a block of R2 MF tones. \param s The R2 MF generator context. \param amp The buffer for the generated signal. \param samples The required number of generated samples. \return The number of samples actually generated. */ -int r2_mf_tx(r2_mf_tx_state_t *s, int16_t amp[], int samples); +SPAN_DECLARE(int) r2_mf_tx(r2_mf_tx_state_t *s, int16_t amp[], int samples); /*! \brief Generate a block of R2 MF tones. \param s The R2 MF generator context. \param digit The digit to be generated. \return 0 for OK, or -1 for a bad request. */ -int r2_mf_tx_put(r2_mf_tx_state_t *s, char digit); +SPAN_DECLARE(int) r2_mf_tx_put(r2_mf_tx_state_t *s, char digit); /*! \brief Initialise an R2 MF tone generator context. \param s The R2 MF generator context. \param fwd TRUE if the context is for forward signals. FALSE if the context is for backward signals. \return A pointer to the MFC/R2 generator context.*/ -r2_mf_tx_state_t *r2_mf_tx_init(r2_mf_tx_state_t *s, int fwd); +SPAN_DECLARE(r2_mf_tx_state_t) *r2_mf_tx_init(r2_mf_tx_state_t *s, int fwd); /*! \brief Free an R2 MF tone generator context. \param s The R2 MF tone generator context. \return 0 for OK, else -1. */ -int r2_mf_tx_free(r2_mf_tx_state_t *s); +SPAN_DECLARE(int) r2_mf_tx_free(r2_mf_tx_state_t *s); /*! Process a block of received Bell MF audio samples. \brief Process a block of received Bell MF audio samples. @@ -188,14 +188,14 @@ \param amp The audio sample buffer. \param samples The number of samples in the buffer. \return The number of samples unprocessed. */ -int bell_mf_rx(bell_mf_rx_state_t *s, const int16_t amp[], int samples); +SPAN_DECLARE(int) bell_mf_rx(bell_mf_rx_state_t *s, const int16_t amp[], int samples); /*! \brief Get a string of digits from a Bell MF receiver's output buffer. \param s The Bell MF receiver context. \param buf The buffer for the received digits. \param max The maximum number of digits to be returned, \return The number of digits actually returned. */ -size_t bell_mf_rx_get(bell_mf_rx_state_t *s, char *buf, int max); +SPAN_DECLARE(size_t) bell_mf_rx_get(bell_mf_rx_state_t *s, char *buf, int max); /*! \brief Initialise a Bell MF receiver context. \param s The Bell MF receiver context. @@ -205,14 +205,14 @@ \param user_data An opaque pointer which is associated with the context, and supplied in callbacks. \return A pointer to the Bell MF receiver context.*/ -bell_mf_rx_state_t *bell_mf_rx_init(bell_mf_rx_state_t *s, - digits_rx_callback_t callback, - void *user_data); +SPAN_DECLARE(bell_mf_rx_state_t) *bell_mf_rx_init(bell_mf_rx_state_t *s, + digits_rx_callback_t callback, + void *user_data); /*! \brief Free a Bell MF receiver context. \param s The Bell MF receiver context. \return 0 for OK, else -1. */ -int bell_mf_rx_free(bell_mf_rx_state_t *s); +SPAN_DECLARE(int) bell_mf_rx_free(bell_mf_rx_state_t *s); /*! Process a block of received R2 MF audio samples. \brief Process a block of received R2 MF audio samples. @@ -220,12 +220,12 @@ \param amp The audio sample buffer. \param samples The number of samples in the buffer. \return The number of samples unprocessed. */ -int r2_mf_rx(r2_mf_rx_state_t *s, const int16_t amp[], int samples); +SPAN_DECLARE(int) r2_mf_rx(r2_mf_rx_state_t *s, const int16_t amp[], int samples); /*! \brief Get the current digit from an R2 MF receiver. \param s The R2 MF receiver context. \return The number digits being received. */ -int r2_mf_rx_get(r2_mf_rx_state_t *s); +SPAN_DECLARE(int) r2_mf_rx_get(r2_mf_rx_state_t *s); /*! \brief Initialise an R2 MF receiver context. \param s The R2 MF receiver context. @@ -237,15 +237,15 @@ \param user_data An opaque pointer which is associated with the context, and supplied in callbacks. \return A pointer to the R2 MF receiver context. */ -r2_mf_rx_state_t *r2_mf_rx_init(r2_mf_rx_state_t *s, - int fwd, - tone_report_func_t callback, - void *user_data); +SPAN_DECLARE(r2_mf_rx_state_t) *r2_mf_rx_init(r2_mf_rx_state_t *s, + int fwd, + tone_report_func_t callback, + void *user_data); /*! \brief Free an R2 MF receiver context. \param s The R2 MF receiver context. \return 0 for OK, else -1. */ -int r2_mf_rx_free(r2_mf_rx_state_t *s); +SPAN_DECLARE(int) r2_mf_rx_free(r2_mf_rx_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/bert.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/bert.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/bert.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: bert.h,v 1.20 2008/11/30 12:38:27 steveu Exp $ + * $Id: bert.h,v 1.21 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_BERT_H_) @@ -116,7 +116,7 @@ /*! Return a short description of a BERT event. \param event The event type. \return A pointer to a short text string describing the event. */ -const char *bert_event_to_str(int event); +SPAN_DECLARE(const char) *bert_event_to_str(int event); /*! Initialise a BERT context. \param s The BERT context. @@ -125,30 +125,30 @@ \param resync_len ??? \param resync_percent The percentage of bad bits which will cause a resync. \return The BERT context. */ -bert_state_t *bert_init(bert_state_t *s, int limit, int pattern, int resync_len, int resync_percent); +SPAN_DECLARE(bert_state_t) *bert_init(bert_state_t *s, int limit, int pattern, int resync_len, int resync_percent); /*! Get the next bit of the BERT sequence from the generator. \param s The BERT context. \return The bit. */ -int bert_get_bit(bert_state_t *s); +SPAN_DECLARE(int) bert_get_bit(bert_state_t *s); /*! Put the next bit of the BERT sequence to the analyser. \param s The BERT context. \param bit The bit. */ -void bert_put_bit(bert_state_t *s, int bit); +SPAN_DECLARE(void) bert_put_bit(bert_state_t *s, int bit); /*! Set the callback function for reporting the test status. \param s The BERT context. \param freq The required frequency of regular reports. \param reporter The callback function. \param user_data An opaque pointer passed to the reporter routine. */ -void bert_set_report(bert_state_t *s, int freq, bert_report_func_t reporter, void *user_data); +SPAN_DECLARE(void) bert_set_report(bert_state_t *s, int freq, bert_report_func_t reporter, void *user_data); /*! Get the results of the BERT. \param s The BERT context. \param results The results. \return The size of the result structure. */ -int bert_result(bert_state_t *s, bert_results_t *results); +SPAN_DECLARE(int) bert_result(bert_state_t *s, bert_results_t *results); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: bit_operations.h,v 1.23 2008/10/13 23:41:40 steveu Exp $ + * $Id: bit_operations.h,v 1.24 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -167,45 +167,45 @@ /*! \brief Bit reverse a 16 bit word. \param data The word to be reversed. \return The bit reversed version of data. */ -uint16_t bit_reverse16(uint16_t data); +SPAN_DECLARE(uint16_t) bit_reverse16(uint16_t data); /*! \brief Bit reverse a 32 bit word. \param data The word to be reversed. \return The bit reversed version of data. */ -uint32_t bit_reverse32(uint32_t data); +SPAN_DECLARE(uint32_t) bit_reverse32(uint32_t data); /*! \brief Bit reverse each of the four bytes in a 32 bit word. \param data The word to be reversed. \return The bit reversed version of data. */ -uint32_t bit_reverse_4bytes(uint32_t data); +SPAN_DECLARE(uint32_t) bit_reverse_4bytes(uint32_t data); #if defined(__x86_64__) /*! \brief Bit reverse each of the eight bytes in a 64 bit word. \param data The word to be reversed. \return The bit reversed version of data. */ -uint64_t bit_reverse_8bytes(uint64_t data); +SPAN_DECLARE(uint64_t) bit_reverse_8bytes(uint64_t data); #endif /*! \brief Bit reverse each bytes in a buffer. \param to The buffer to place the reversed data in. \param from The buffer containing the data to be reversed. \param len The length of the data in the buffer. */ -void bit_reverse(uint8_t to[], const uint8_t from[], int len); +SPAN_DECLARE(void) bit_reverse(uint8_t to[], const uint8_t from[], int len); /*! \brief Find the number of set bits in a 32 bit word. \param x The word to be searched. \return The number of set bits. */ -int one_bits32(uint32_t x); +SPAN_DECLARE(int) one_bits32(uint32_t x); /*! \brief Create a mask as wide as the number in a 32 bit word. \param x The word to be searched. \return The mask. */ -uint32_t make_mask32(uint32_t x); +SPAN_DECLARE(uint32_t) make_mask32(uint32_t x); /*! \brief Create a mask as wide as the number in a 16 bit word. \param x The word to be searched. \return The mask. */ -uint16_t make_mask16(uint16_t x); +SPAN_DECLARE(uint16_t) make_mask16(uint16_t x); /*! \brief Find the least significant one in a word, and return a word with just that bit set. Modified: freeswitch/trunk/libs/spandsp/src/spandsp/complex_filters.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/complex_filters.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/complex_filters.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: complex_filters.h,v 1.12 2008/04/17 14:27:00 steveu Exp $ + * $Id: complex_filters.h,v 1.13 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_COMPLEX_FILTERS_H_) @@ -35,23 +35,23 @@ /*! Filter state */ typedef struct { - int nz; - int np; - filter_step_func_t fsf; + int nz; + int np; + filter_step_func_t fsf; } fspec_t; struct filter_s { - fspec_t *fs; - float sum; - int ptr; /* for moving average filters only */ - float v[]; + fspec_t *fs; + float sum; + int ptr; /* Only for moving average filters */ + float v[]; }; typedef struct { - filter_t *ref; - filter_t *imf; + filter_t *ref; + filter_t *imf; } cfilter_t; #if defined(__cplusplus) @@ -59,13 +59,13 @@ { #endif -filter_t *filter_create(fspec_t *fs); -void filter_delete(filter_t *fi); -float filter_step(filter_t *fi, float x); - -cfilter_t *cfilter_create(fspec_t *fs); -void cfilter_delete(cfilter_t *cfi); -complexf_t cfilter_step(cfilter_t *cfi, const complexf_t *z); +SPAN_DECLARE(filter_t) *filter_create(fspec_t *fs); +SPAN_DECLARE(void) filter_delete(filter_t *fi); +SPAN_DECLARE(float) filter_step(filter_t *fi, float x); + +SPAN_DECLARE(cfilter_t) *cfilter_create(fspec_t *fs); +SPAN_DECLARE(void) cfilter_delete(cfilter_t *cfi); +SPAN_DECLARE(complexf_t) cfilter_step(cfilter_t *cfi, const complexf_t *z); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_float.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_float.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_float.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: complex_vector_float.h,v 1.11 2008/10/09 13:25:19 steveu Exp $ + * $Id: complex_vector_float.h,v 1.12 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_COMPLEX_VECTOR_FLOAT_H_) @@ -120,9 +120,9 @@ /*- End of function --------------------------------------------------------*/ #endif -void cvec_mulf(complexf_t z[], const complexf_t x[], const complexf_t y[], int n); +SPAN_DECLARE(void) cvec_mulf(complexf_t z[], const complexf_t x[], const complexf_t y[], int n); -void cvec_mul(complex_t z[], const complex_t x[], const complex_t y[], int n); +SPAN_DECLARE(void) cvec_mul(complex_t z[], const complex_t x[], const complex_t y[], int n); #if defined(HAVE_LONG_DOUBLE) void cvec_mull(complexl_t z[], const complexl_t x[], const complexl_t y[], int n); @@ -133,14 +133,14 @@ \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -complexf_t cvec_dot_prodf(const complexf_t x[], const complexf_t y[], int n); +SPAN_DECLARE(complexf_t) cvec_dot_prodf(const complexf_t x[], const complexf_t y[], int n); /*! \brief Find the dot product of two complex double vectors. \param x The first vector. \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -complex_t cvec_dot_prod(const complex_t x[], const complex_t y[], int n); +SPAN_DECLARE(complex_t) cvec_dot_prod(const complex_t x[], const complex_t y[], int n); #if defined(HAVE_LONG_DOUBLE) /*! \brief Find the dot product of two complex long double vectors. @@ -148,7 +148,7 @@ \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -complexl_t cvec_dot_prodl(const complexl_t x[], const complexl_t y[], int n); +SPAN_DECLARE(complexl_t) cvec_dot_prodl(const complexl_t x[], const complexl_t y[], int n); #endif /*! \brief Find the dot product of two complex float vectors, where the first is a circular buffer @@ -158,11 +158,11 @@ \param n The number of elements in the vectors. \param pos The starting position in the x vector. \return The dot product of the two vectors. */ -complexf_t cvec_circular_dot_prodf(const complexf_t x[], const complexf_t y[], int n, int pos); +SPAN_DECLARE(complexf_t) cvec_circular_dot_prodf(const complexf_t x[], const complexf_t y[], int n, int pos); -void cvec_lmsf(const complexf_t x[], complexf_t y[], int n, const complexf_t *error); +SPAN_DECLARE(void) cvec_lmsf(const complexf_t x[], complexf_t y[], int n, const complexf_t *error); -void cvec_circular_lmsf(const complexf_t x[], complexf_t y[], int n, int pos, const complexf_t *error); +SPAN_DECLARE(void) cvec_circular_lmsf(const complexf_t x[], complexf_t y[], int n, int pos, const complexf_t *error); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_int.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_int.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/complex_vector_int.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: complex_vector_int.h,v 1.3 2008/09/18 13:16:49 steveu Exp $ + * $Id: complex_vector_int.h,v 1.4 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_COMPLEX_VECTOR_INT_H_) @@ -101,14 +101,14 @@ \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -complexi32_t cvec_dot_prodi16(const complexi16_t x[], const complexi16_t y[], int n); +SPAN_DECLARE(complexi32_t) cvec_dot_prodi16(const complexi16_t x[], const complexi16_t y[], int n); /*! \brief Find the dot product of two complex int32_t vectors. \param x The first vector. \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -complexi32_t cvec_dot_prodi32(const complexi32_t x[], const complexi32_t y[], int n); +SPAN_DECLARE(complexi32_t) cvec_dot_prodi32(const complexi32_t x[], const complexi32_t y[], int n); /*! \brief Find the dot product of two complex int16_t vectors, where the first is a circular buffer with an offset for the starting position. @@ -117,11 +117,11 @@ \param n The number of elements in the vectors. \param pos The starting position in the x vector. \return The dot product of the two vectors. */ -complexi32_t cvec_circular_dot_prodi16(const complexi16_t x[], const complexi16_t y[], int n, int pos); +SPAN_DECLARE(complexi32_t) cvec_circular_dot_prodi16(const complexi16_t x[], const complexi16_t y[], int n, int pos); -void cvec_lmsi16(const complexi16_t x[], complexi16_t y[], int n, const complexi16_t *error); +SPAN_DECLARE(void) cvec_lmsi16(const complexi16_t x[], complexi16_t y[], int n, const complexi16_t *error); -void cvec_circular_lmsi16(const complexi16_t x[], complexi16_t y[], int n, int pos, const complexi16_t *error); +SPAN_DECLARE(void) cvec_circular_lmsi16(const complexi16_t x[], complexi16_t y[], int n, int pos, const complexi16_t *error); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/crc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/crc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/crc.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: crc.h,v 1.4 2008/04/17 14:27:00 steveu Exp $ + * $Id: crc.h,v 1.5 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -49,7 +49,7 @@ the application). It is previous returned CRC value for the continuation of a block. \return The CRC value. */ -uint32_t crc_itu32_calc(const uint8_t *buf, int len, uint32_t crc); +SPAN_DECLARE(uint32_t) crc_itu32_calc(const uint8_t *buf, int len, uint32_t crc); /*! \brief Append an ITU/CCITT CRC-32 value to a frame. \param buf The buffer containing the frame. This must be at least 2 bytes longer than @@ -57,14 +57,14 @@ \param len The length of the frame. \return The new length of the frame. */ -int crc_itu32_append(uint8_t *buf, int len); +SPAN_DECLARE(int) crc_itu32_append(uint8_t *buf, int len); /*! \brief Check the ITU/CCITT CRC-32 value in a frame. \param buf The buffer containing the frame. \param len The length of the frame. \return TRUE if the CRC is OK, else FALSE. */ -int crc_itu32_check(const uint8_t *buf, int len); +SPAN_DECLARE(int) crc_itu32_check(const uint8_t *buf, int len); /*! \brief Calculate the ITU/CCITT CRC-16 value in buffer. \param buf The buffer containing the data. @@ -73,7 +73,7 @@ the application). It is previous returned CRC value for the continuation of a block. \return The CRC value. */ -uint16_t crc_itu16_calc(const uint8_t *buf, int len, uint16_t crc); +SPAN_DECLARE(uint16_t) crc_itu16_calc(const uint8_t *buf, int len, uint16_t crc); /*! \brief Append an ITU/CCITT CRC-16 value to a frame. \param buf The buffer containing the frame. This must be at least 2 bytes longer than @@ -81,14 +81,14 @@ \param len The length of the frame. \return The new length of the frame. */ -int crc_itu16_append(uint8_t *buf, int len); +SPAN_DECLARE(int) crc_itu16_append(uint8_t *buf, int len); /*! \brief Check the ITU/CCITT CRC-16 value in a frame. \param buf The buffer containing the frame. \param len The length of the frame. \return TRUE if the CRC is OK, else FALSE. */ -int crc_itu16_check(const uint8_t *buf, int len); +SPAN_DECLARE(int) crc_itu16_check(const uint8_t *buf, int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/dds.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/dds.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/dds.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: dds.h,v 1.22 2009/01/29 01:41:06 steveu Exp $ + * $Id: dds.h,v 1.23 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -39,57 +39,57 @@ \param frequency The desired frequency, in Hz. \return The phase rate which while achieve the desired frequency. */ -int32_t dds_phase_rate(float frequency); +SPAN_DECLARE(int32_t) dds_phase_rate(float frequency); /*! \brief Find the frequency, in Hz, equivalent to a phase rate. \param phase_rate The phase rate. \return The equivalent frequency, in Hz. */ -float dds_frequency(int32_t phase_rate); +SPAN_DECLARE(float) dds_frequency(int32_t phase_rate); /*! \brief Find the scaling factor needed to achieve a specified level in dBm0. \param level The desired signal level, in dBm0. \return The scaling factor. */ -int16_t dds_scaling_dbm0(float level); +SPAN_DECLARE(int16_t) dds_scaling_dbm0(float level); /*! \brief Find the scaling factor needed to achieve a specified level in dBmov. \param level The desired signal level, in dBmov. \return The scaling factor. */ -int16_t dds_scaling_dbov(float level); +SPAN_DECLARE(int16_t) dds_scaling_dbov(float level); /*! \brief Find the amplitude for a particular phase. \param phase The desired phase 32 bit phase. \return The signal amplitude. */ -int16_t dds_lookup(uint32_t phase); +SPAN_DECLARE(int16_t) dds_lookup(uint32_t phase); /*! \brief Find the amplitude for a particular phase offset from an accumulated phase. \param phase_acc The accumulated phase. \param phase_offset The phase offset. \return The signal amplitude. */ -int16_t dds_offset(uint32_t phase_acc, int32_t phase_offset); +SPAN_DECLARE(int16_t) dds_offset(uint32_t phase_acc, int32_t phase_offset); /*! \brief Advance the phase, without returning any new signal sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. */ -void dds_advance(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(void) dds_advance(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Generate an integer tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The signal amplitude, between -32767 and 32767. */ -int16_t dds(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(int16_t) dds(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Lookup the integer value of a specified phase. \param phase The phase accumulator value to be looked up. \return The signal amplitude, between -32767 and 32767. */ -int16_t dds_lookup(uint32_t phase); +SPAN_DECLARE(int16_t) dds_lookup(uint32_t phase); /*! \brief Generate an integer tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -98,20 +98,20 @@ \param phase The phase offset. \return The signal amplitude, between -32767 and 32767. */ -int16_t dds_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); +SPAN_DECLARE(int16_t) dds_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); /*! \brief Lookup the complex integer value of a specified phase. \param phase The phase accumulator value to be looked up. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi_t dds_lookup_complexi(uint32_t phase); +SPAN_DECLARE(complexi_t) dds_lookup_complexi(uint32_t phase); /*! \brief Generate a complex integer tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi_t dds_complexi(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(complexi_t) dds_complexi(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Generate a complex integer tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -120,21 +120,21 @@ \param phase The phase offset. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi_t dds_complexi_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); +SPAN_DECLARE(complexi_t) dds_complexi_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); /*! \brief Generate a complex 16 bit integer tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi16_t dds_lookup_complexi16(uint32_t phase); +SPAN_DECLARE(complexi16_t) dds_lookup_complexi16(uint32_t phase); /*! \brief Generate a complex 16 bit integer tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi16_t dds_complexi16(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(complexi16_t) dds_complexi16(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Generate a complex 16bit integer tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -143,7 +143,7 @@ \param phase The phase offset. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi16_t dds_complexi16_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); +SPAN_DECLARE(complexi16_t) dds_complexi16_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); /*! \brief Generate a complex 32 bit integer tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -152,21 +152,21 @@ \param phase The phase offset. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi32_t dds_complexi32_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); +SPAN_DECLARE(complexi32_t) dds_complexi32_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); /*! \brief Generate a complex 32 bit integer tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi32_t dds_lookup_complexi32(uint32_t phase); +SPAN_DECLARE(complexi32_t) dds_lookup_complexi32(uint32_t phase); /*! \brief Generate a complex 32 bit integer tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi32_t dds_complexi32(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(complexi32_t) dds_complexi32(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Generate a complex 32 bit integer tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -175,50 +175,50 @@ \param phase The phase offset. \return The complex signal amplitude, between (-32767, -32767) and (32767, 32767). */ -complexi32_t dds_complexi32_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); +SPAN_DECLARE(complexi32_t) dds_complexi32_mod(uint32_t *phase_acc, int32_t phase_rate, int16_t scale, int32_t phase); /*! \brief Find the phase rate equivalent to a frequency, in Hz. \param frequency The frequency, in Hz. \return The equivalent phase rate. */ -int32_t dds_phase_ratef(float frequency); +SPAN_DECLARE(int32_t) dds_phase_ratef(float frequency); /*! \brief Find the frequency, in Hz, equivalent to a phase rate. \param phase_rate The phase rate. \return The equivalent frequency, in Hz. */ -float dds_frequencyf(int32_t phase_rate); +SPAN_DECLARE(float) dds_frequencyf(int32_t phase_rate); /*! \brief Find the scaling factor equivalent to a dBm0 value. \param level The signal level in dBm0. \return The equivalent scaling factor. */ -float dds_scaling_dbm0f(float level); +SPAN_DECLARE(float) dds_scaling_dbm0f(float level); /*! \brief Find the scaling factor equivalent to a dBmov value. \param level The signal level in dBmov. \return The equivalent scaling factor. */ -float dds_scaling_dbovf(float level); +SPAN_DECLARE(float) dds_scaling_dbovf(float level); /*! \brief Advance the phase, without returning any new signal sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. */ -void dds_advancef(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(void) dds_advancef(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Generate a floating point tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The signal amplitude, between -1.0 and 1.0. */ -float ddsf(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(float) ddsf(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Lookup the floating point value of a specified phase. \param phase The phase accumulator value to be looked up. \return The signal amplitude, between -1.0 and 1.0. */ -float dds_lookupf(uint32_t phase); +SPAN_DECLARE(float) dds_lookupf(uint32_t phase); /*! \brief Generate a floating point tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -227,20 +227,20 @@ \param phase The phase offset. \return The signal amplitude, between -1.0 and 1.0. */ -float dds_modf(uint32_t *phase_acc, int32_t phase_rate, float scale, int32_t phase); +SPAN_DECLARE(float) dds_modf(uint32_t *phase_acc, int32_t phase_rate, float scale, int32_t phase); /*! \brief Generate a complex floating point tone sample. \param phase_acc A pointer to a phase accumulator value. \param phase_rate The phase increment to be applied. \return The complex signal amplitude, between (-1.0, -1.0) and (1.0, 1.0). */ -complexf_t dds_complexf(uint32_t *phase_acc, int32_t phase_rate); +SPAN_DECLARE(complexf_t) dds_complexf(uint32_t *phase_acc, int32_t phase_rate); /*! \brief Lookup the complex value of a specified phase. \param phase The phase accumulator value to be looked up. \return The complex signal amplitude, between (-1.0, -1.0) and (1.0, 1.0). */ -complexf_t dds_lookup_complexf(uint32_t phase_acc); +SPAN_DECLARE(complexf_t) dds_lookup_complexf(uint32_t phase_acc); /*! \brief Generate a complex floating point tone sample, with modulation. \param phase_acc A pointer to a phase accumulator value. @@ -249,7 +249,7 @@ \param phase The phase offset. \return The complex signal amplitude, between (-1.0, -1.0) and (1.0, 1.0). */ -complexf_t dds_complex_modf(uint32_t *phase_acc, int32_t phase_rate, float scale, int32_t phase); +SPAN_DECLARE(complexf_t) dds_complex_modf(uint32_t *phase_acc, int32_t phase_rate, float scale, int32_t phase); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/dtmf.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/dtmf.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/dtmf.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: dtmf.h,v 1.29 2008/10/13 13:14:00 steveu Exp $ + * $Id: dtmf.h,v 1.30 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_DTMF_H_) @@ -99,7 +99,7 @@ \param max_samples The required number of generated samples. \return The number of samples actually generated. This may be less than max_samples if the input buffer empties. */ -int dtmf_tx(dtmf_tx_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE(int) dtmf_tx(dtmf_tx_state_t *s, int16_t amp[], int max_samples); /*! \brief Put a string of digits in a DTMF generator's input buffer. \param s The DTMF generator context. @@ -108,29 +108,29 @@ assumed to be a NULL terminated string. \return The number of digits actually added. This may be less than the length of the digit string, if the buffer fills up. */ -size_t dtmf_tx_put(dtmf_tx_state_t *s, const char *digits, int len); +SPAN_DECLARE(int) dtmf_tx_put(dtmf_tx_state_t *s, const char *digits, int len); /*! \brief Change the transmit level for a DTMF tone generator context. \param s The DTMF generator context. \param level The level of the low tone, in dBm0. \param twist The twist, in dB. */ -void dtmf_tx_set_level(dtmf_tx_state_t *s, int level, int twist); +SPAN_DECLARE(void) dtmf_tx_set_level(dtmf_tx_state_t *s, int level, int twist); /*! \brief Change the transmit on and off time for a DTMF tone generator context. \param s The DTMF generator context. \param on-time The on time, in ms. \param off_time The off time, in ms. */ -void dtmf_tx_set_timing(dtmf_tx_state_t *s, int on_time, int off_time); +SPAN_DECLARE(void) dtmf_tx_set_timing(dtmf_tx_state_t *s, int on_time, int off_time); /*! \brief Initialise a DTMF tone generator context. \param s The DTMF generator context. \return A pointer to the DTMF generator context. */ -dtmf_tx_state_t *dtmf_tx_init(dtmf_tx_state_t *s); +SPAN_DECLARE(dtmf_tx_state_t) *dtmf_tx_init(dtmf_tx_state_t *s); /*! \brief Free a DTMF tone generator context. \param s The DTMF tone generator context. \return 0 for OK, else -1. */ -int dtmf_tx_free(dtmf_tx_state_t *s); +SPAN_DECLARE(int) dtmf_tx_free(dtmf_tx_state_t *s); /*! Set a optional realtime callback for a DTMF receiver context. This function is called immediately a confirmed state change occurs in the received DTMF. It @@ -141,9 +141,9 @@ \param callback Callback routine used to report the start and end of digits. \param user_data An opaque pointer which is associated with the context, and supplied in callbacks. */ -void dtmf_rx_set_realtime_callback(dtmf_rx_state_t *s, - tone_report_func_t callback, - void *user_data); +SPAN_DECLARE(void) dtmf_rx_set_realtime_callback(dtmf_rx_state_t *s, + tone_report_func_t callback, + void *user_data); /*! \brief Adjust a DTMF receiver context. \param s The DTMF receiver context. @@ -153,11 +153,11 @@ \param reverse_twist Acceptable reverse twist, in dB. < 0 to leave unchanged. \param threshold The minimum acceptable tone level for detection, in dBm0. <= -99 to leave unchanged. */ -void dtmf_rx_parms(dtmf_rx_state_t *s, - int filter_dialtone, - int twist, - int reverse_twist, - int threshold); +SPAN_DECLARE(void) dtmf_rx_parms(dtmf_rx_state_t *s, + int filter_dialtone, + int twist, + int reverse_twist, + int threshold); /*! Process a block of received DTMF audio samples. \brief Process a block of received DTMF audio samples. @@ -165,7 +165,7 @@ \param amp The audio sample buffer. \param samples The number of samples in the buffer. \return The number of samples unprocessed. */ -int dtmf_rx(dtmf_rx_state_t *s, const int16_t amp[], int samples); +SPAN_DECLARE(int) dtmf_rx(dtmf_rx_state_t *s, const int16_t amp[], int samples); /*! Get the status of DTMF detection during processing of the last audio chunk. @@ -174,14 +174,14 @@ \param s The DTMF receiver context. \return The current digit status. Either 'x' for a "maybe" condition, or the digit being detected. */ -int dtmf_rx_status(dtmf_rx_state_t *s); +SPAN_DECLARE(int) dtmf_rx_status(dtmf_rx_state_t *s); /*! \brief Get a string of digits from a DTMF receiver's output buffer. \param s The DTMF receiver context. \param digits The buffer for the received digits. \param max The maximum number of digits to be returned, \return The number of digits actually returned. */ -size_t dtmf_rx_get(dtmf_rx_state_t *s, char *digits, int max); +SPAN_DECLARE(size_t) dtmf_rx_get(dtmf_rx_state_t *s, char *digits, int max); /*! \brief Initialise a DTMF receiver context. \param s The DTMF receiver context. @@ -191,14 +191,14 @@ \param user_data An opaque pointer which is associated with the context, and supplied in callbacks. \return A pointer to the DTMF receiver context. */ -dtmf_rx_state_t *dtmf_rx_init(dtmf_rx_state_t *s, - digits_rx_callback_t callback, - void *user_data); +SPAN_DECLARE(dtmf_rx_state_t) *dtmf_rx_init(dtmf_rx_state_t *s, + digits_rx_callback_t callback, + void *user_data); /*! \brief Free a DTMF receiver context. \param s The DTMF receiver context. \return 0 for OK, else -1. */ -int dtmf_rx_free(dtmf_rx_state_t *s); +SPAN_DECLARE(int) dtmf_rx_free(dtmf_rx_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/echo.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/echo.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/echo.h Mon Feb 2 11:40:52 2009 @@ -24,7 +24,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: echo.h,v 1.16 2008/09/04 14:40:05 steveu Exp $ + * $Id: echo.h,v 1.17 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -196,23 +196,23 @@ \param len The length of the canceller, in samples. \return The new canceller context, or NULL if the canceller could not be created. */ -echo_can_state_t *echo_can_create(int len, int adaption_mode); +SPAN_DECLARE(echo_can_state_t) *echo_can_create(int len, int adaption_mode); /*! Free a voice echo canceller context. \param ec The echo canceller context. */ -void echo_can_free(echo_can_state_t *ec); +SPAN_DECLARE(void) echo_can_free(echo_can_state_t *ec); /*! Flush (reinitialise) a voice echo canceller context. \param ec The echo canceller context. */ -void echo_can_flush(echo_can_state_t *ec); +SPAN_DECLARE(void) echo_can_flush(echo_can_state_t *ec); /*! Set the adaption mode of a voice echo canceller context. \param ec The echo canceller context. \param adaption_mode The mode. */ -void echo_can_adaption_mode(echo_can_state_t *ec, int adaption_mode); +SPAN_DECLARE(void) echo_can_adaption_mode(echo_can_state_t *ec, int adaption_mode); /*! Process a sample through a voice echo canceller. \param ec The echo canceller context. @@ -220,16 +220,16 @@ \param rx The received audio sample. \return The clean (echo cancelled) received sample. */ -int16_t echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t rx); +SPAN_DECLARE(int16_t) echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t rx); /*! Process to high pass filter the tx signal. \param ec The echo canceller context. \param tx The transmitted auio sample. \return The HP filtered transmit sample, send this to your D/A. */ -int16_t echo_can_hpf_tx(echo_can_state_t *ec, int16_t tx); +SPAN_DECLARE(int16_t) echo_can_hpf_tx(echo_can_state_t *ec, int16_t tx); -void echo_can_snapshot(echo_can_state_t *ec); +SPAN_DECLARE(void) echo_can_snapshot(echo_can_state_t *ec); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fax.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fax.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fax.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: fax.h,v 1.36 2008/10/13 13:14:00 steveu Exp $ + * $Id: fax.h,v 1.37 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -52,7 +52,7 @@ \return The number of samples unprocessed. This should only be non-zero if the software has reached the end of the FAX call. */ -int fax_rx(fax_state_t *s, int16_t *amp, int len); +SPAN_DECLARE(int) fax_rx(fax_state_t *s, int16_t *amp, int len); /*! Apply T.30 transmit processing to generate a block of audio samples. \brief Apply T.30 transmit processing to generate a block of audio samples. @@ -62,7 +62,7 @@ \return The number of samples actually generated. This will be zero when there is nothing to send. */ -int fax_tx(fax_state_t *s, int16_t *amp, int max_len); +SPAN_DECLARE(int) fax_tx(fax_state_t *s, int16_t *amp, int max_len); /*! Select whether silent audio will be sent when FAX transmit is idle. \brief Select whether silent audio will be sent when FAX transmit is idle. @@ -71,28 +71,28 @@ idle. FALSE to transmit zero length audio when the FAX transmitter is idle. The default behaviour is FALSE. */ -void fax_set_transmit_on_idle(fax_state_t *s, int transmit_on_idle); +SPAN_DECLARE(void) fax_set_transmit_on_idle(fax_state_t *s, int transmit_on_idle); /*! Select whether talker echo protection tone will be sent for the image modems. \brief Select whether TEP will be sent for the image modems. \param s The FAX context. \param use_tep TRUE if TEP should be sent. */ -void fax_set_tep_mode(fax_state_t *s, int use_tep); +SPAN_DECLARE(void) fax_set_tep_mode(fax_state_t *s, int use_tep); /*! Get a pointer to the T.30 engine associated with a FAX context. \brief Get a pointer to the T.30 engine associated with a FAX context. \param s The FAX context. \return A pointer to the T.30 context, or NULL. */ -t30_state_t *fax_get_t30_state(fax_state_t *s); +SPAN_DECLARE(t30_state_t) *fax_get_t30_state(fax_state_t *s); /*! Get a pointer to the logging context associated with a FAX context. \brief Get a pointer to the logging context associated with a FAX context. \param s The FAX context. \return A pointer to the logging context, or NULL. */ -logging_state_t *fax_get_logging_state(fax_state_t *s); +SPAN_DECLARE(logging_state_t) *fax_get_logging_state(fax_state_t *s); /*! Initialise a FAX context. \brief Initialise a FAX context. @@ -101,19 +101,19 @@ context is for an answering party. \return A pointer to the FAX context, or NULL if there was a problem. */ -fax_state_t *fax_init(fax_state_t *s, int calling_party); +SPAN_DECLARE(fax_state_t) *fax_init(fax_state_t *s, int calling_party); /*! Release a FAX context. \brief Release a FAX context. \param s The FAX context. \return 0 for OK, else -1. */ -int fax_release(fax_state_t *s); +SPAN_DECLARE(int) fax_release(fax_state_t *s); /*! Free a FAX context. \brief Free a FAX context. \param s The FAX context. \return 0 for OK, else -1. */ -int fax_free(fax_state_t *s); +SPAN_DECLARE(int) fax_free(fax_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fax_modems.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fax_modems.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fax_modems.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: fax_modems.h,v 1.6 2008/10/13 13:14:00 steveu Exp $ + * $Id: fax_modems.h,v 1.7 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -41,10 +41,10 @@ #endif /* N.B. the following are currently a work in progress */ -int fax_modems_v17_v21_rx(void *user_data, const int16_t amp[], int len); -int fax_modems_v27ter_v21_rx(void *user_data, const int16_t amp[], int len); -int fax_modems_v29_v21_rx(void *user_data, const int16_t amp[], int len); -fax_modems_state_t *fax_modems_init(fax_modems_state_t *s, void *user_data); +SPAN_DECLARE(int) fax_modems_v17_v21_rx(void *user_data, const int16_t amp[], int len); +SPAN_DECLARE(int) fax_modems_v27ter_v21_rx(void *user_data, const int16_t amp[], int len); +SPAN_DECLARE(int) fax_modems_v29_v21_rx(void *user_data, const int16_t amp[], int len); +SPAN_DECLARE(fax_modems_state_t) *fax_modems_init(fax_modems_state_t *s, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: fsk.h,v 1.33 2009/01/29 18:30:14 steveu Exp $ + * $Id: fsk.h,v 1.34 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -114,7 +114,7 @@ FSK_WEITBRECHT /* Used for TDD (Telecom Device for the Deaf) */ }; -extern const fsk_spec_t preset_fsk_specs[]; +SPAN_DECLARE_DATA extern const fsk_spec_t preset_fsk_specs[]; /*! FSK modem transmit descriptor. This defines the state of a single working @@ -143,25 +143,25 @@ \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. \return A pointer to the modem context, or NULL if there was a problem. */ -fsk_tx_state_t *fsk_tx_init(fsk_tx_state_t *s, - const fsk_spec_t *spec, - get_bit_func_t get_bit, - void *user_data); +SPAN_DECLARE(fsk_tx_state_t) *fsk_tx_init(fsk_tx_state_t *s, + const fsk_spec_t *spec, + get_bit_func_t get_bit, + void *user_data); /*! Adjust an FSK modem transmit context's power output. \brief Adjust an FSK modem transmit context's power output. \param s The modem context. \param power The power level, in dBm0 */ -void fsk_tx_power(fsk_tx_state_t *s, float power); +SPAN_DECLARE(void) fsk_tx_power(fsk_tx_state_t *s, float power); -void fsk_tx_set_get_bit(fsk_tx_state_t *s, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(void) fsk_tx_set_get_bit(fsk_tx_state_t *s, get_bit_func_t get_bit, void *user_data); /*! Change the modem status report function associated with an FSK modem transmit context. \brief Change the modem status report function associated with an FSK modem transmit context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void fsk_tx_set_modem_status_handler(fsk_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) fsk_tx_set_modem_status_handler(fsk_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); /*! Generate a block of FSK modem audio samples. \brief Generate a block of FSK modem audio samples. @@ -170,18 +170,18 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -int fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) fsk_tx(fsk_tx_state_t *s, int16_t amp[], int len); /*! Get the current received signal power. \param s The modem context. \return The signal power, in dBm0. */ -float fsk_rx_signal_power(fsk_rx_state_t *s); +SPAN_DECLARE(float) fsk_rx_signal_power(fsk_rx_state_t *s); /*! Adjust an FSK modem receive context's carrier detect power threshold. \brief Adjust an FSK modem receive context's carrier detect power threshold. \param s The modem context. \param cutoff The power level, in dBm0 */ -void fsk_rx_signal_cutoff(fsk_rx_state_t *s, float cutoff); +SPAN_DECLARE(void) fsk_rx_signal_cutoff(fsk_rx_state_t *s, float cutoff); /*! Initialise an FSK modem receive context. \brief Initialise an FSK modem receive context. @@ -191,11 +191,11 @@ \param put_bit The callback routine used to put the received data. \param user_data An opaque pointer. \return A pointer to the modem context, or NULL if there was a problem. */ -fsk_rx_state_t *fsk_rx_init(fsk_rx_state_t *s, - const fsk_spec_t *spec, - int sync_mode, - put_bit_func_t put_bit, - void *user_data); +SPAN_DECLARE(fsk_rx_state_t) *fsk_rx_init(fsk_rx_state_t *s, + const fsk_spec_t *spec, + int sync_mode, + put_bit_func_t put_bit, + void *user_data); /*! Process a block of received FSK modem audio samples. \brief Process a block of received FSK modem audio samples. @@ -204,16 +204,16 @@ \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int fsk_rx(fsk_rx_state_t *s, const int16_t *amp, int len); +SPAN_DECLARE(int) fsk_rx(fsk_rx_state_t *s, const int16_t *amp, int len); -void fsk_rx_set_put_bit(fsk_rx_state_t *s, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(void) fsk_rx_set_put_bit(fsk_rx_state_t *s, put_bit_func_t put_bit, void *user_data); /*! Change the modem status report function associated with an FSK modem receive context. \brief Change the modem status report function associated with an FSK modem receive context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void fsk_rx_set_modem_status_handler(fsk_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) fsk_rx_set_modem_status_handler(fsk_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/g711.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/g711.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/g711.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: g711.h,v 1.15 2008/11/30 10:17:31 steveu Exp $ + * $Id: g711.h,v 1.16 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -251,39 +251,39 @@ \param alaw The A-law sample to transcode. \return The best matching u-law value. */ -uint8_t alaw_to_ulaw(uint8_t alaw); +SPAN_DECLARE(uint8_t) alaw_to_ulaw(uint8_t alaw); /*! \brief Transcode from u-law to A-law, using the procedure defined in G.711. \param ulaw The u-law sample to transcode. \return The best matching A-law value. */ -uint8_t ulaw_to_alaw(uint8_t ulaw); +SPAN_DECLARE(uint8_t) ulaw_to_alaw(uint8_t ulaw); -int g711_decode(g711_state_t *s, - int16_t amp[], - const uint8_t g711_data[], - int g711_bytes); - -int g711_encode(g711_state_t *s, - uint8_t g711_data[], - const int16_t amp[], - int len); - -int g711_transcode(g711_state_t *s, - uint8_t g711_out[], - const uint8_t g711_in[], - int g711_bytes); +SPAN_DECLARE(int) g711_decode(g711_state_t *s, + int16_t amp[], + const uint8_t g711_data[], + int g711_bytes); + +SPAN_DECLARE(int) g711_encode(g711_state_t *s, + uint8_t g711_data[], + const int16_t amp[], + int len); + +SPAN_DECLARE(int) g711_transcode(g711_state_t *s, + uint8_t g711_out[], + const uint8_t g711_in[], + int g711_bytes); /*! Initialise a G.711 encode or decode context. \param s The G.711 context. \param mode The G.711 mode. \return A pointer to the G.711 context, or NULL for error. */ -g711_state_t *g711_init(g711_state_t *s, int mode); +SPAN_DECLARE(g711_state_t) *g711_init(g711_state_t *s, int mode); /*! Free a G.711 encode or decode context. \param s The G.711 context. \return 0 for OK. */ -int g711_release(g711_state_t *s); +SPAN_DECLARE(int) g711_release(g711_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/g722.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/g722.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/g722.h Mon Feb 2 11:40:52 2009 @@ -28,7 +28,7 @@ * Computer Science, Speech Group * Chengxiang Lu and Alex Hauptmann * - * $Id: g722.h,v 1.22 2008/10/13 13:14:00 steveu Exp $ + * $Id: g722.h,v 1.23 2009/01/31 08:48:11 steveu Exp $ */ @@ -71,9 +71,9 @@ The valid rates are 64000, 56000 and 48000. \param options \return A pointer to the G.722 encode context, or NULL for error. */ -g722_encode_state_t *g722_encode_init(g722_encode_state_t *s, int rate, int options); +SPAN_DECLARE(g722_encode_state_t) *g722_encode_init(g722_encode_state_t *s, int rate, int options); -int g722_encode_release(g722_encode_state_t *s); +SPAN_DECLARE(int) g722_encode_release(g722_encode_state_t *s); /*! Encode a buffer of linear PCM data to G.722 \param s The G.722 context. @@ -81,7 +81,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of bytes of G.722 data produced. */ -int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[], int len); +SPAN_DECLARE(int) g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[], int len); /*! Initialise an G.722 decode context. \param s The G.722 decode context. @@ -89,9 +89,9 @@ The valid rates are 64000, 56000 and 48000. \param options \return A pointer to the G.722 decode context, or NULL for error. */ -g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int options); +SPAN_DECLARE(g722_decode_state_t) *g722_decode_init(g722_decode_state_t *s, int rate, int options); -int g722_decode_release(g722_decode_state_t *s); +SPAN_DECLARE(int) g722_decode_release(g722_decode_state_t *s); /*! Decode a buffer of G.722 data to linear PCM. \param s The G.722 context. @@ -99,7 +99,7 @@ \param g722_data \param len \return The number of samples returned. */ -int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[], int len); +SPAN_DECLARE(int) g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/g726.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/g726.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/g726.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: g726.h,v 1.22 2008/10/13 13:14:00 steveu Exp $ + * $Id: g726.h,v 1.23 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -77,12 +77,12 @@ \param ext_coding The coding used outside G.726. \param packing One of the G.726_PACKING_xxx options. \return A pointer to the G.726 context, or NULL for error. */ -g726_state_t *g726_init(g726_state_t *s, int bit_rate, int ext_coding, int packing); +SPAN_DECLARE(g726_state_t) *g726_init(g726_state_t *s, int bit_rate, int ext_coding, int packing); /*! Free a G.726 encode or decode context. \param s The G.726 context. \return 0 for OK. */ -int g726_release(g726_state_t *s); +SPAN_DECLARE(int) g726_release(g726_state_t *s); /*! Decode a buffer of G.726 ADPCM data to linear PCM, a-law or u-law. \param s The G.726 context. @@ -90,10 +90,10 @@ \param g726_data \param g726_bytes \return The number of samples returned. */ -int g726_decode(g726_state_t *s, - int16_t amp[], - const uint8_t g726_data[], - int g726_bytes); +SPAN_DECLARE(int) g726_decode(g726_state_t *s, + int16_t amp[], + const uint8_t g726_data[], + int g726_bytes); /*! Encode a buffer of linear PCM data to G.726 ADPCM. \param s The G.726 context. @@ -101,10 +101,10 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of bytes of G.726 data produced. */ -int g726_encode(g726_state_t *s, - uint8_t g726_data[], - const int16_t amp[], - int len); +SPAN_DECLARE(int) g726_encode(g726_state_t *s, + uint8_t g726_data[], + const int16_t amp[], + int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/gsm0610.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/gsm0610.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/gsm0610.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: gsm0610.h,v 1.18 2008/11/15 14:17:46 steveu Exp $ + * $Id: gsm0610.h,v 1.19 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_GSM0610_H_) @@ -83,18 +83,18 @@ \param s The GSM 06.10 context \param packing One of the GSM0610_PACKING_xxx options. \return A pointer to the GSM 06.10 context, or NULL for error. */ -gsm0610_state_t *gsm0610_init(gsm0610_state_t *s, int packing); +SPAN_DECLARE(gsm0610_state_t) *gsm0610_init(gsm0610_state_t *s, int packing); /*! Release a GSM 06.10 encode or decode context. \param s The GSM 06.10 context \return 0 for success, else -1. */ -int gsm0610_release(gsm0610_state_t *s); +SPAN_DECLARE(int) gsm0610_release(gsm0610_state_t *s); /*! Set the packing format for a GSM 06.10 encode or decode context. \param s The GSM 06.10 context \param packing One of the GSM0610_PACKING_xxx options. \return 0 for success, else -1. */ -int gsm0610_set_packing(gsm0610_state_t *s, int packing); +SPAN_DECLARE(int) gsm0610_set_packing(gsm0610_state_t *s, int packing); /*! Encode a buffer of linear PCM data to GSM 06.10. \param s The GSM 06.10 context. @@ -102,7 +102,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of bytes of GSM 06.10 data produced. */ -int gsm0610_encode(gsm0610_state_t *s, uint8_t code[], const int16_t amp[], int len); +SPAN_DECLARE(int) gsm0610_encode(gsm0610_state_t *s, uint8_t code[], const int16_t amp[], int len); /*! Decode a buffer of GSM 06.10 data to linear PCM. \param s The GSM 06.10 context. @@ -110,35 +110,35 @@ \param code The GSM 06.10 data. \param len The number of bytes of GSM 06.10 data to be decoded. \return The number of samples returned. */ -int gsm0610_decode(gsm0610_state_t *s, int16_t amp[], const uint8_t code[], int len); +SPAN_DECLARE(int) gsm0610_decode(gsm0610_state_t *s, int16_t amp[], const uint8_t code[], int len); -int gsm0610_pack_none(uint8_t c[], const gsm0610_frame_t *s); +SPAN_DECLARE(int) gsm0610_pack_none(uint8_t c[], const gsm0610_frame_t *s); /*! Pack a pair of GSM 06.10 frames in the format used for wave files (wave type 49). \param c The buffer for the packed data. This must be at least 65 bytes long. \param s A pointer to the frames to be packed. \return The number of bytes generated. */ -int gsm0610_pack_wav49(uint8_t c[], const gsm0610_frame_t *s); +SPAN_DECLARE(int) gsm0610_pack_wav49(uint8_t c[], const gsm0610_frame_t *s); /*! Pack a GSM 06.10 frames in the format used for VoIP. \param c The buffer for the packed data. This must be at least 33 bytes long. \param s A pointer to the frame to be packed. \return The number of bytes generated. */ -int gsm0610_pack_voip(uint8_t c[], const gsm0610_frame_t *s); +SPAN_DECLARE(int) gsm0610_pack_voip(uint8_t c[], const gsm0610_frame_t *s); -int gsm0610_unpack_none(gsm0610_frame_t *s, const uint8_t c[]); +SPAN_DECLARE(int) gsm0610_unpack_none(gsm0610_frame_t *s, const uint8_t c[]); /*! Unpack a pair of GSM 06.10 frames from the format used for wave files (wave type 49). \param s A pointer to a buffer into which the frames will be packed. \param c The buffer containing the data to be unpacked. This must be at least 65 bytes long. \return The number of bytes absorbed. */ -int gsm0610_unpack_wav49(gsm0610_frame_t *s, const uint8_t c[]); +SPAN_DECLARE(int) gsm0610_unpack_wav49(gsm0610_frame_t *s, const uint8_t c[]); /*! Unpack a GSM 06.10 frame from the format used for VoIP. \param s A pointer to a buffer into which the frame will be packed. \param c The buffer containing the data to be unpacked. This must be at least 33 bytes long. \return The number of bytes absorbed. */ -int gsm0610_unpack_voip(gsm0610_frame_t *s, const uint8_t c[]); +SPAN_DECLARE(int) gsm0610_unpack_voip(gsm0610_frame_t *s, const uint8_t c[]); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: hdlc.h,v 1.40 2008/11/30 05:43:37 steveu Exp $ + * $Id: hdlc.h,v 1.41 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -94,51 +94,52 @@ \param user_data An opaque parameter for the callback routine. \return A pointer to the HDLC receiver context. */ -hdlc_rx_state_t *hdlc_rx_init(hdlc_rx_state_t *s, - int crc32, - int report_bad_frames, - int framing_ok_threshold, - hdlc_frame_handler_t handler, - void *user_data); +SPAN_DECLARE(hdlc_rx_state_t) *hdlc_rx_init(hdlc_rx_state_t *s, + int crc32, + int report_bad_frames, + int framing_ok_threshold, + hdlc_frame_handler_t handler, + void *user_data); /*! \brief Set the maximum frame length for an HDLC receiver context. \param s A pointer to an HDLC receiver context. \param max_len The maximum permitted length of a frame. */ -void hdlc_rx_set_max_frame_len(hdlc_rx_state_t *s, size_t max_len); +SPAN_DECLARE(void) hdlc_rx_set_max_frame_len(hdlc_rx_state_t *s, size_t max_len); /*! \brief Set the octet counting report interval. \param s A pointer to an HDLC receiver context. \param interval The interval, in octets. */ -void hdlc_rx_set_octet_counting_report_interval(hdlc_rx_state_t *s, int interval); +SPAN_DECLARE(void) hdlc_rx_set_octet_counting_report_interval(hdlc_rx_state_t *s, + int interval); /*! \brief Get the current receive statistics. \param s A pointer to an HDLC receiver context. \param t A pointer to the buffer for the statistics. \return 0 for OK, else -1. */ -int hdlc_rx_get_stats(hdlc_rx_state_t *s, - hdlc_rx_stats_t *t); +SPAN_DECLARE(int) hdlc_rx_get_stats(hdlc_rx_state_t *s, + hdlc_rx_stats_t *t); /*! \brief Put a single bit of data to an HDLC receiver. \param s A pointer to an HDLC receiver context. \param new_bit The bit. */ -void hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); +SPAN_DECLARE(void) hdlc_rx_put_bit(hdlc_rx_state_t *s, int new_bit); /*! \brief Put a byte of data to an HDLC receiver. \param s A pointer to an HDLC receiver context. \param new_byte The byte of data. */ -void hdlc_rx_put_byte(hdlc_rx_state_t *s, int new_byte); +SPAN_DECLARE(void) hdlc_rx_put_byte(hdlc_rx_state_t *s, int new_byte); /*! \brief Put a series of bytes of data to an HDLC receiver. \param s A pointer to an HDLC receiver context. \param buf The buffer of data. \param len The length of the data in the buffer. */ -void hdlc_rx_put(hdlc_rx_state_t *s, const uint8_t buf[], int len); +SPAN_DECLARE(void) hdlc_rx_put(hdlc_rx_state_t *s, const uint8_t buf[], int len); /*! \brief Initialise an HDLC transmitter context. \param s A pointer to an HDLC transmitter context. @@ -149,18 +150,18 @@ \param user_data An opaque parameter for the callback routine. \return A pointer to the HDLC transmitter context. */ -hdlc_tx_state_t *hdlc_tx_init(hdlc_tx_state_t *s, - int crc32, - int inter_frame_flags, - int progressive, - hdlc_underflow_handler_t handler, - void *user_data); +SPAN_DECLARE(hdlc_tx_state_t) *hdlc_tx_init(hdlc_tx_state_t *s, + int crc32, + int inter_frame_flags, + int progressive, + hdlc_underflow_handler_t handler, + void *user_data); /*! \brief Set the maximum frame length for an HDLC transmitter context. \param s A pointer to an HDLC transmitter context. \param max_len The maximum length. */ -void hdlc_tx_set_max_frame_len(hdlc_tx_state_t *s, size_t max_len); +SPAN_DECLARE(void) hdlc_tx_set_max_frame_len(hdlc_tx_state_t *s, size_t max_len); /*! \brief Transmit a frame. \param s A pointer to an HDLC transmitter context. @@ -168,13 +169,13 @@ \param len The length of the frame to be transmitted. \return 0 if the frame was accepted for transmission, else -1. */ -int hdlc_tx_frame(hdlc_tx_state_t *s, const uint8_t *frame, size_t len); +SPAN_DECLARE(int) hdlc_tx_frame(hdlc_tx_state_t *s, const uint8_t *frame, size_t len); /*! \brief Corrupt the frame currently being transmitted, by giving it the wrong CRC. \param s A pointer to an HDLC transmitter context. \return 0 if the frame was corrupted, else -1. */ -int hdlc_tx_corrupt_frame(hdlc_tx_state_t *s); +SPAN_DECLARE(int) hdlc_tx_corrupt_frame(hdlc_tx_state_t *s); /*! \brief Transmit a specified quantity of flag octets, typically as a preamble. \param s A pointer to an HDLC transmitter context. @@ -183,25 +184,25 @@ drained. \return 0 if the flags were accepted for transmission, else -1. */ -int hdlc_tx_flags(hdlc_tx_state_t *s, int len); +SPAN_DECLARE(int) hdlc_tx_flags(hdlc_tx_state_t *s, int len); /*! \brief Send an abort. \param s A pointer to an HDLC transmitter context. \return 0 if the frame was aborted, else -1. */ -int hdlc_tx_abort(hdlc_tx_state_t *s); +SPAN_DECLARE(int) hdlc_tx_abort(hdlc_tx_state_t *s); /*! \brief Get the next bit for transmission. \param s A pointer to an HDLC transmitter context. \return The next bit for transmission. */ -int hdlc_tx_get_bit(hdlc_tx_state_t *s); +SPAN_DECLARE(int) hdlc_tx_get_bit(hdlc_tx_state_t *s); /*! \brief Get the next byte for transmission. \param s A pointer to an HDLC transmitter context. \return The next byte for transmission. */ -int hdlc_tx_get_byte(hdlc_tx_state_t *s); +SPAN_DECLARE(int) hdlc_tx_get_byte(hdlc_tx_state_t *s); /*! \brief Get the next sequence of bytes for transmission. \param s A pointer to an HDLC transmitter context. @@ -209,7 +210,7 @@ \param max_len The number of bytes to get. \return The number of bytes actually got. */ -int hdlc_tx_get(hdlc_tx_state_t *s, uint8_t buf[], size_t max_len); +SPAN_DECLARE(int) hdlc_tx_get(hdlc_tx_state_t *s, uint8_t buf[], size_t max_len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/ima_adpcm.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/ima_adpcm.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/ima_adpcm.h Mon Feb 2 11:40:52 2009 @@ -26,7 +26,7 @@ * Based on a bit from here, a bit from there, eye of toad, * ear of bat, etc - plus, of course, my own 2 cents. * - * $Id: ima_adpcm.h,v 1.21 2008/11/30 10:17:31 steveu Exp $ + * $Id: ima_adpcm.h,v 1.22 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -73,12 +73,14 @@ zero sample samples means treat each encode or decode operation as a chunk. \return A pointer to the IMA ADPCM context, or NULL for error. */ -ima_adpcm_state_t *ima_adpcm_init(ima_adpcm_state_t *s, int variant, int chunk_size); +SPAN_DECLARE(ima_adpcm_state_t) *ima_adpcm_init(ima_adpcm_state_t *s, + int variant, + int chunk_size); /*! Free an IMA ADPCM encode or decode context. \param s The IMA ADPCM context. \return 0 for OK. */ -int ima_adpcm_release(ima_adpcm_state_t *s); +SPAN_DECLARE(int) ima_adpcm_release(ima_adpcm_state_t *s); /*! Encode a buffer of linear PCM data to IMA ADPCM. \param s The IMA ADPCM context. @@ -86,10 +88,10 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of bytes of IMA ADPCM data produced. */ -int ima_adpcm_encode(ima_adpcm_state_t *s, - uint8_t ima_data[], - const int16_t amp[], - int len); +SPAN_DECLARE(int) ima_adpcm_encode(ima_adpcm_state_t *s, + uint8_t ima_data[], + const int16_t amp[], + int len); /*! Decode a buffer of IMA ADPCM data to linear PCM. \param s The IMA ADPCM context. @@ -97,10 +99,10 @@ \param ima_data \param ima_bytes \return The number of samples returned. */ -int ima_adpcm_decode(ima_adpcm_state_t *s, - int16_t amp[], - const uint8_t ima_data[], - int ima_bytes); +SPAN_DECLARE(int) ima_adpcm_decode(ima_adpcm_state_t *s, + int16_t amp[], + const uint8_t ima_data[], + int ima_bytes); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/logging.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/logging.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/logging.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: logging.h,v 1.17 2008/11/30 13:44:35 steveu Exp $ + * $Id: logging.h,v 1.18 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -87,7 +87,7 @@ \param level The severity level to be tested. \return TRUE if logging is enable, else FALSE. */ -int span_log_test(logging_state_t *s, int level); +SPAN_DECLARE(int) span_log_test(logging_state_t *s, int level); /*! Generate a log entry. \brief Generate a log entry. @@ -96,7 +96,7 @@ \param format ??? \return 0 if no output generated, else 1. */ -int span_log(logging_state_t *s, int level, const char *format, ...); +SPAN_DECLARE(int) span_log(logging_state_t *s, int level, const char *format, ...); /*! Generate a log entry displaying the contents of a buffer. \brief Generate a log entry displaying the contents of a buffer @@ -107,27 +107,27 @@ \param len The length of buf. \return 0 if no output generated, else 1. */ -int span_log_buf(logging_state_t *s, int level, const char *tag, const uint8_t *buf, int len); +SPAN_DECLARE(int) span_log_buf(logging_state_t *s, int level, const char *tag, const uint8_t *buf, int len); -int span_log_init(logging_state_t *s, int level, const char *tag); +SPAN_DECLARE(int) span_log_init(logging_state_t *s, int level, const char *tag); -int span_log_set_level(logging_state_t *s, int level); +SPAN_DECLARE(int) span_log_set_level(logging_state_t *s, int level); -int span_log_set_tag(logging_state_t *s, const char *tag); +SPAN_DECLARE(int) span_log_set_tag(logging_state_t *s, const char *tag); -int span_log_set_protocol(logging_state_t *s, const char *protocol); +SPAN_DECLARE(int) span_log_set_protocol(logging_state_t *s, const char *protocol); -int span_log_set_sample_rate(logging_state_t *s, int samples_per_second); +SPAN_DECLARE(int) span_log_set_sample_rate(logging_state_t *s, int samples_per_second); -int span_log_bump_samples(logging_state_t *s, int samples); +SPAN_DECLARE(int) span_log_bump_samples(logging_state_t *s, int samples); -void span_log_set_message_handler(logging_state_t *s, message_handler_func_t func); +SPAN_DECLARE(void) span_log_set_message_handler(logging_state_t *s, message_handler_func_t func); -void span_log_set_error_handler(logging_state_t *s, error_handler_func_t func); +SPAN_DECLARE(void) span_log_set_error_handler(logging_state_t *s, error_handler_func_t func); -void span_set_message_handler(message_handler_func_t func); +SPAN_DECLARE(void) span_set_message_handler(message_handler_func_t func); -void span_set_error_handler(error_handler_func_t func); +SPAN_DECLARE(void) span_set_error_handler(error_handler_func_t func); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/lpc10.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/lpc10.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/lpc10.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: lpc10.h,v 1.18 2008/11/30 05:43:37 steveu Exp $ + * $Id: lpc10.h,v 1.19 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_LPC10_H_) @@ -74,9 +74,9 @@ \param s The LPC10e context \param error_correction ??? \return A pointer to the LPC10e context, or NULL for error. */ -lpc10_encode_state_t *lpc10_encode_init(lpc10_encode_state_t *s, int error_correction); +SPAN_DECLARE(lpc10_encode_state_t) *lpc10_encode_init(lpc10_encode_state_t *s, int error_correction); -int lpc10_encode_release(lpc10_encode_state_t *s); +SPAN_DECLARE(int) lpc10_encode_release(lpc10_encode_state_t *s); /*! Encode a buffer of linear PCM data to LPC10e. \param s The LPC10e context. @@ -85,15 +85,15 @@ \param len The number of samples in the buffer. This must be a multiple of 180, as this is the number of samples on a frame. \return The number of bytes of LPC10e data produced. */ -int lpc10_encode(lpc10_encode_state_t *s, uint8_t code[], const int16_t amp[], int len); +SPAN_DECLARE(int) lpc10_encode(lpc10_encode_state_t *s, uint8_t code[], const int16_t amp[], int len); /*! Initialise an LPC10e decode context. \param s The LPC10e context \param error_correction ??? \return A pointer to the LPC10e context, or NULL for error. */ -lpc10_decode_state_t *lpc10_decode_init(lpc10_decode_state_t *st, int error_correction); +SPAN_DECLARE(lpc10_decode_state_t) *lpc10_decode_init(lpc10_decode_state_t *st, int error_correction); -int lpc10_decode_release(lpc10_decode_state_t *s); +SPAN_DECLARE(int) lpc10_decode_release(lpc10_decode_state_t *s); /*! Decode a buffer of LPC10e data to linear PCM. \param s The LPC10e context. @@ -102,7 +102,7 @@ \param len The number of bytes of LPC10e data to be decoded. This must be a multiple of 7, as each frame is packed into 7 bytes. \return The number of samples returned. */ -int lpc10_decode(lpc10_decode_state_t *s, int16_t amp[], const uint8_t code[], int len); +SPAN_DECLARE(int) lpc10_decode(lpc10_decode_state_t *s, int16_t amp[], const uint8_t code[], int len); #if defined(__cplusplus) Modified: freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h Mon Feb 2 11:40:52 2009 @@ -24,7 +24,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: modem_connect_tones.h,v 1.19 2008/10/13 13:14:00 steveu Exp $ + * $Id: modem_connect_tones.h,v 1.20 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -104,14 +104,14 @@ /*! \brief Initialise an instance of the modem connect tones generator. \param s The context. */ -modem_connect_tones_tx_state_t *modem_connect_tones_tx_init(modem_connect_tones_tx_state_t *s, - int tone_type); +SPAN_DECLARE(modem_connect_tones_tx_state_t) *modem_connect_tones_tx_init(modem_connect_tones_tx_state_t *s, + int tone_type); /*! \brief Free an instance of the modem connect tones generator. \param s The context. \return 0 for OK, else -1. */ -int modem_connect_tones_tx_free(modem_connect_tones_tx_state_t *s); +SPAN_DECLARE(int) modem_connect_tones_tx_free(modem_connect_tones_tx_state_t *s); /*! \brief Generate a block of modem connect tones samples. \param s The context. @@ -119,9 +119,9 @@ \param len The number of samples to generate. \return The number of samples generated. */ -int modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, - int16_t amp[], - int len); +SPAN_DECLARE(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s, + int16_t amp[], + int len); /*! \brief Process a block of samples through an instance of the modem connect tones detector. @@ -130,15 +130,15 @@ \param len The number of samples in the array. \return The number of unprocessed samples. */ -int modem_connect_tones_rx(modem_connect_tones_rx_state_t *s, - const int16_t amp[], - int len); +SPAN_DECLARE(int) modem_connect_tones_rx(modem_connect_tones_rx_state_t *s, + const int16_t amp[], + int len); /*! \brief Test if a modem_connect tone has been detected. \param s The context. \return TRUE if tone is detected, else FALSE. */ -int modem_connect_tones_rx_get(modem_connect_tones_rx_state_t *s); +SPAN_DECLARE(int) modem_connect_tones_rx_get(modem_connect_tones_rx_state_t *s); /*! \brief Initialise an instance of the modem connect tones detector. \param s The context. @@ -147,17 +147,17 @@ \param user_data An opaque pointer passed to the callback routine, \return A pointer to the context. */ -modem_connect_tones_rx_state_t *modem_connect_tones_rx_init(modem_connect_tones_rx_state_t *s, - int tone_type, - tone_report_func_t tone_callback, - void *user_data); +SPAN_DECLARE(modem_connect_tones_rx_state_t) *modem_connect_tones_rx_init(modem_connect_tones_rx_state_t *s, + int tone_type, + tone_report_func_t tone_callback, + void *user_data); /*! \brief Free an instance of the modem connect tones detector. \param s The context. \return 0 for OK, else -1. */ -int modem_connect_tones_rx_free(modem_connect_tones_rx_state_t *s); +SPAN_DECLARE(int) modem_connect_tones_rx_free(modem_connect_tones_rx_state_t *s); -const char *modem_connect_tone_to_str(int tone); +SPAN_DECLARE(const char) *modem_connect_tone_to_str(int tone); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/modem_echo.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/modem_echo.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/modem_echo.h Mon Feb 2 11:40:52 2009 @@ -25,7 +25,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: modem_echo.h,v 1.11 2008/04/17 14:27:00 steveu Exp $ + * $Id: modem_echo.h,v 1.12 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -110,23 +110,23 @@ \param len The length of the canceller, in samples. eturn The new canceller context, or NULL if the canceller could not be created. */ -modem_echo_can_state_t *modem_echo_can_create(int len); +SPAN_DECLARE(modem_echo_can_state_t) *modem_echo_can_create(int len); /*! Free a modem echo canceller context. \param ec The echo canceller context. */ -void modem_echo_can_free(modem_echo_can_state_t *ec); +SPAN_DECLARE(void) modem_echo_can_free(modem_echo_can_state_t *ec); /*! Flush (reinitialise) a modem echo canceller context. \param ec The echo canceller context. */ -void modem_echo_can_flush(modem_echo_can_state_t *ec); +SPAN_DECLARE(void) modem_echo_can_flush(modem_echo_can_state_t *ec); /*! Set the adaption mode of a modem echo canceller context. \param ec The echo canceller context. \param adapt The mode. */ -void modem_echo_can_adaption_mode(modem_echo_can_state_t *ec, int adapt); +SPAN_DECLARE(void) modem_echo_can_adaption_mode(modem_echo_can_state_t *ec, int adapt); /*! Process a sample through a modem echo canceller. \param ec The echo canceller context. @@ -134,7 +134,7 @@ \param rx The received audio sample. eturn The clean (echo cancelled) received sample. */ -int16_t modem_echo_can_update(modem_echo_can_state_t *ec, int16_t tx, int16_t rx); +SPAN_DECLARE(int16_t) modem_echo_can_update(modem_echo_can_state_t *ec, int16_t tx, int16_t rx); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/noise.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/noise.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/noise.h Mon Feb 2 11:40:52 2009 @@ -23,7 +23,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: noise.h,v 1.14 2008/11/30 12:38:27 steveu Exp $ + * $Id: noise.h,v 1.15 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -108,16 +108,18 @@ generation to be adjusted. \return A pointer to the noise generator context. */ -noise_state_t *noise_init_dbm0(noise_state_t *s, int seed, float level, int class_of_noise, int quality); +SPAN_DECLARE(noise_state_t) *noise_init_dbm0(noise_state_t *s, int seed, float level, int class_of_noise, int quality); -noise_state_t *noise_init_dbov(noise_state_t *s, int seed, float level, int class_of_noise, int quality); +SPAN_DECLARE(noise_state_t) *noise_init_dbov(noise_state_t *s, int seed, float level, int class_of_noise, int quality); + +SPAN_DECLARE(int) noise_free(noise_state_t *s); /*! Generate a sample of audio noise. \brief Generate a sample of audio noise. \param s The noise generator context. \return The generated sample. */ -int16_t noise(noise_state_t *s); +SPAN_DECLARE(int16_t) noise(noise_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/oki_adpcm.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/oki_adpcm.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/oki_adpcm.h Mon Feb 2 11:40:52 2009 @@ -23,7 +23,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: oki_adpcm.h,v 1.21 2008/11/30 10:17:31 steveu Exp $ + * $Id: oki_adpcm.h,v 1.22 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -61,12 +61,13 @@ \param bit_rate The required bit rate for the ADPCM data. The valid rates are 24000 and 32000. \return A pointer to the Oki ADPCM context, or NULL for error. */ -oki_adpcm_state_t *oki_adpcm_init(oki_adpcm_state_t *s, int bit_rate); +SPAN_DECLARE(oki_adpcm_state_t) *oki_adpcm_init(oki_adpcm_state_t *s, + int bit_rate); /*! Free an Oki ADPCM encode or decode context. \param s The Oki ADPCM context. \return 0 for OK. */ -int oki_adpcm_release(oki_adpcm_state_t *s); +SPAN_DECLARE(int) oki_adpcm_release(oki_adpcm_state_t *s); /*! Decode a buffer of Oki ADPCM data to linear PCM. \param s The Oki ADPCM context. @@ -74,10 +75,10 @@ \param oki_data \param oki_bytes \return The number of samples returned. */ -int oki_adpcm_decode(oki_adpcm_state_t *s, - int16_t amp[], - const uint8_t oki_data[], - int oki_bytes); +SPAN_DECLARE(int) oki_adpcm_decode(oki_adpcm_state_t *s, + int16_t amp[], + const uint8_t oki_data[], + int oki_bytes); /*! Encode a buffer of linear PCM data to Oki ADPCM. \param s The Oki ADPCM context. @@ -85,10 +86,10 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of bytes of Oki ADPCM data produced. */ -int oki_adpcm_encode(oki_adpcm_state_t *s, - uint8_t oki_data[], - const int16_t amp[], - int len); +SPAN_DECLARE(int) oki_adpcm_encode(oki_adpcm_state_t *s, + uint8_t oki_data[], + const int16_t amp[], + int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/playout.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/playout.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/playout.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: playout.h,v 1.11 2008/04/17 14:27:00 steveu Exp $ + * $Id: playout.h,v 1.12 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_PLAYOUT_H_) @@ -147,7 +147,7 @@ \return One of PLAYOUT_OK: Frame queued OK. PLAYOUT_ERROR: Some problem occured - e.g. out of memory. */ -int playout_put(playout_state_t *s, void *data, int type, timestamp_t sender_len, timestamp_t sender_stamp, timestamp_t receiver_stamp); +SPAN_DECLARE(int) playout_put(playout_state_t *s, void *data, int type, timestamp_t sender_len, timestamp_t sender_stamp, timestamp_t receiver_stamp); /*! Get the next frame. \param s The play-out context. @@ -162,36 +162,36 @@ this time (either we need to grow, or there was a lost frame). PLAYOUT_EMPTY: The buffer is empty. */ -int playout_get(playout_state_t *s, playout_frame_t *frame, timestamp_t sender_stamp); +SPAN_DECLARE(int) playout_get(playout_state_t *s, playout_frame_t *frame, timestamp_t sender_stamp); /*! Unconditionally get the first buffered frame. This may be used to clear out the queue, and free all its contents, before the context is freed. \param s The play-out context. \return The frame, or NULL is the queue is empty. */ -playout_frame_t *playout_get_unconditional(playout_state_t *s); +SPAN_DECLARE(playout_frame_t) *playout_get_unconditional(playout_state_t *s); /*! Find the current length of the buffer. \param s The play-out context. \return The length of the buffer. */ -timestamp_t playout_current_length(playout_state_t *s); +SPAN_DECLARE(timestamp_t) playout_current_length(playout_state_t *s); /*! Find the time at which the next queued frame is due to play. Note: This value may change backwards as freshly received out of order frames are added to the buffer. \param s The play-out context. \return The next timestamp. */ -timestamp_t playout_next_due(playout_state_t *s); +SPAN_DECLARE(timestamp_t) playout_next_due(playout_state_t *s); /*! Create a new instance of play-out buffering. \param min_length Minimum length of the buffer, in samples. \param max_length Maximum length of the buffer, in samples. If this equals min_length, static length buffering is used. \return The new context */ -playout_state_t *playout_new(int min_length, int max_length); +SPAN_DECLARE(playout_state_t) *playout_new(int min_length, int max_length); /*! Destroy an instance of play-out buffering. \param s The play-out context to be destroyed */ -void playout_free(playout_state_t *s); +SPAN_DECLARE(void) playout_free(playout_state_t *s); /*! Reset an instance of play-out buffering. NOTE: The buffer should be empty before you call this function, otherwise @@ -200,7 +200,7 @@ \param min_length Minimum length of the buffer, in samples. \param max_length Maximum length of the buffer, in samples. If this equals min_length, static length buffering is used. */ -void playout_restart(playout_state_t *s, int min_length, int max_length); +SPAN_DECLARE(void) playout_restart(playout_state_t *s, int min_length, int max_length); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/plc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/plc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/plc.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: plc.h,v 1.18 2008/04/17 14:27:00 steveu Exp $ + * $Id: plc.h,v 1.19 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -139,7 +139,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of samples in the buffer. */ -int plc_rx(plc_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) plc_rx(plc_state_t *s, int16_t amp[], int len); /*! Fill-in a block of missing audio samples. \brief Fill-in a block of missing audio samples. @@ -147,18 +147,18 @@ \param amp The audio sample buffer. \param len The number of samples to be synthesised. \return The number of samples synthesized. */ -int plc_fillin(plc_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) plc_fillin(plc_state_t *s, int16_t amp[], int len); /*! Initialise a packet loss concealer context. \brief Initialise a PLC context. \param s The packet loss concealer context. \return A pointer to the the packet loss concealer context. */ -plc_state_t *plc_init(plc_state_t *s); +SPAN_DECLARE(plc_state_t) *plc_init(plc_state_t *s); /*! Free a packet loss concealer context. \param s The packet loss concealer context. \return 0 for OK. */ -int plc_free(plc_state_t *s); +SPAN_DECLARE(int) plc_free(plc_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: power_meter.h,v 1.15 2008/04/17 14:27:00 steveu Exp $ + * $Id: power_meter.h,v 1.16 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_POWER_METER_H_) @@ -66,51 +66,51 @@ \param s The power meter context. \param shift The shift to be used by the IIR filter. \return The power meter context. */ -power_meter_t *power_meter_init(power_meter_t *s, int shift); +SPAN_DECLARE(power_meter_t) *power_meter_init(power_meter_t *s, int shift); /*! Change the damping factor of a power meter context. \brief Change the damping factor of a power meter context. \param s The power meter context. \param shift The new shift to be used by the IIR filter. \return The power meter context. */ -power_meter_t *power_meter_damping(power_meter_t *s, int shift); +SPAN_DECLARE(power_meter_t) *power_meter_damping(power_meter_t *s, int shift); /*! Update a power meter. \brief Update a power meter. \param s The power meter context. \param amp The amplitude of the new audio sample. \return The current power meter reading. */ -int32_t power_meter_update(power_meter_t *s, int16_t amp); +SPAN_DECLARE(int32_t) power_meter_update(power_meter_t *s, int16_t amp); /*! Get the current power meter reading. \brief Get the current power meter reading. \param s The power meter context. \return The current power meter reading. */ -int32_t power_meter_current(power_meter_t *s); +SPAN_DECLARE(int32_t) power_meter_current(power_meter_t *s); /*! Get the current power meter reading, in dBm0. \brief Get the current power meter reading, in dBm0. \param s The power meter context. \return The current power meter reading, in dBm0. */ -float power_meter_current_dbm0(power_meter_t *s); +SPAN_DECLARE(float) power_meter_current_dbm0(power_meter_t *s); /*! Get the current power meter reading, in dBOv. \brief Get the current power meter reading, in dBOv. \param s The power meter context. \return The current power meter reading, in dBOv. */ -float power_meter_current_dbov(power_meter_t *s); +SPAN_DECLARE(float) power_meter_current_dbov(power_meter_t *s); /*! Get the power meter reading which represents a specified power level in dBm0. \brief Get the current power meter reading, in dBm0. \param level A power level, in dB0m. \return The equivalent power meter reading. */ -int32_t power_meter_level_dbm0(float level); +SPAN_DECLARE(int32_t) power_meter_level_dbm0(float level); /*! Get the power meter reading which represents a specified power level in dBOv. \brief Get the current power meter reading, in dBOv. \param level A power level, in dBOv. \return The equivalent power meter reading. */ -int32_t power_meter_level_dbov(float level); +SPAN_DECLARE(int32_t) power_meter_level_dbov(float level); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/private/hdlc.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/private/hdlc.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/private/hdlc.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: hdlc.h,v 1.1 2008/11/30 05:43:37 steveu Exp $ + * $Id: hdlc.h,v 1.2 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_PRIVATE_HDLC_H_) @@ -119,7 +119,7 @@ /*! \brief The length of the message in the buffer. */ size_t len; /*! \brief The current send position within the buffer. */ - int pos; + size_t pos; /*! \brief The running CRC, as data fills the frame buffer. */ uint32_t crc; Modified: freeswitch/trunk/libs/spandsp/src/spandsp/private/queue.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/private/queue.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/private/queue.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: queue.h,v 1.1 2008/11/30 13:08:42 steveu Exp $ + * $Id: queue.h,v 1.2 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_PRIVATE_QUEUE_H_) @@ -42,7 +42,7 @@ volatile int iptr; /*! \brief The buffer output pointer. */ volatile int optr; -#if defined(FULLY_DEFINE_QUEUE_STATE_T) +#if defined(SPANDSP_FULLY_DEFINE_QUEUE_STATE_T) /*! \brief The data buffer, sized at the time the structure is created. */ uint8_t data[]; #endif Modified: freeswitch/trunk/libs/spandsp/src/spandsp/queue.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/queue.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/queue.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: queue.h,v 1.18 2008/11/30 13:08:42 steveu Exp $ + * $Id: queue.h,v 1.19 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -66,24 +66,24 @@ \brief Check if a queue is empty. \param s The queue context. \return TRUE if empty, else FALSE. */ -int queue_empty(queue_state_t *s); +SPAN_DECLARE(int) queue_empty(queue_state_t *s); /*! Check the available free space in a queue's buffer. \brief Check available free space. \param s The queue context. \return The number of bytes of free space. */ -int queue_free_space(queue_state_t *s); +SPAN_DECLARE(int) queue_free_space(queue_state_t *s); /*! Check the contents of a queue. \brief Check the contents of a queue. \param s The queue context. \return The number of bytes in the queue. */ -int queue_contents(queue_state_t *s); +SPAN_DECLARE(int) queue_contents(queue_state_t *s); /*! Flush the contents of a queue. \brief Flush the contents of a queue. \param s The queue context. */ -void queue_flush(queue_state_t *s); +SPAN_DECLARE(void) queue_flush(queue_state_t *s); /*! Copy bytes from a queue. This is similar to queue_read, but the data remains in the queue. @@ -92,7 +92,7 @@ \param buf The buffer into which the bytes will be read. \param len The length of the buffer. \return the number of bytes returned. */ -int queue_view(queue_state_t *s, uint8_t *buf, int len); +SPAN_DECLARE(int) queue_view(queue_state_t *s, uint8_t *buf, int len); /*! Read bytes from a queue. \brief Read bytes from a queue. @@ -100,13 +100,13 @@ \param buf The buffer into which the bytes will be read. \param len The length of the buffer. \return the number of bytes returned. */ -int queue_read(queue_state_t *s, uint8_t *buf, int len); +SPAN_DECLARE(int) queue_read(queue_state_t *s, uint8_t *buf, int len); /*! Read a byte from a queue. \brief Read a byte from a queue. \param s The queue context. \return the byte, or -1 if the queue is empty. */ -int queue_read_byte(queue_state_t *s); +SPAN_DECLARE(int) queue_read_byte(queue_state_t *s); /*! Write bytes to a queue. \brief Write bytes to a queue. @@ -114,21 +114,21 @@ \param buf The buffer containing the bytes to be written. \param len The length of the buffer. \return the number of bytes actually written. */ -int queue_write(queue_state_t *s, const uint8_t *buf, int len); +SPAN_DECLARE(int) queue_write(queue_state_t *s, const uint8_t *buf, int len); /*! Write a byte to a queue. \brief Write a byte to a queue. \param s The queue context. \param byte The byte to be written. \return the number of bytes actually written. */ -int queue_write_byte(queue_state_t *s, uint8_t byte); +SPAN_DECLARE(int) queue_write_byte(queue_state_t *s, uint8_t byte); /*! Test the length of the message at the head of a queue. \brief Test message length. \param s The queue context. \return The length of the next message, in byte. If there are no messages in the queue, -1 is returned. */ -int queue_state_test_msg(queue_state_t *s); +SPAN_DECLARE(int) queue_state_test_msg(queue_state_t *s); /*! Read a message from a queue. If the message is longer than the buffer provided, only the first len bytes of the message will be returned. The @@ -139,7 +139,7 @@ \param len The length of the buffer. \return The number of bytes returned. If there are no messages in the queue, -1 is returned. */ -int queue_read_msg(queue_state_t *s, uint8_t *buf, int len); +SPAN_DECLARE(int) queue_read_msg(queue_state_t *s, uint8_t *buf, int len); /*! Write a message to a queue. \brief Write a message to a queue. @@ -147,7 +147,7 @@ \param buf The buffer from which the message will be written. \param len The length of the message. \return The number of bytes actually written. */ -int queue_write_msg(queue_state_t *s, const uint8_t *buf, int len); +SPAN_DECLARE(int) queue_write_msg(queue_state_t *s, const uint8_t *buf, int len); /*! Initialise a queue. \brief Initialise a queue. @@ -158,13 +158,13 @@ \param flags Flags controlling the operation of the queue. Valid flags are QUEUE_READ_ATOMIC and QUEUE_WRITE_ATOMIC. \return A pointer to the context if OK, else NULL. */ -queue_state_t *queue_init(queue_state_t *s, int len, int flags); +SPAN_DECLARE(queue_state_t) *queue_init(queue_state_t *s, int len, int flags); /*! Delete a queue. \brief Delete a queue. \param s The queue context. \return 0 if deleted OK, else -1. */ -int queue_free(queue_state_t *s); +SPAN_DECLARE(int) queue_free(queue_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/schedule.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/schedule.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/schedule.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: schedule.h,v 1.17 2008/11/30 05:43:37 steveu Exp $ + * $Id: schedule.h,v 1.18 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -51,15 +51,15 @@ { #endif -uint64_t span_schedule_next(span_sched_state_t *s); -uint64_t span_schedule_time(span_sched_state_t *s); +SPAN_DECLARE(uint64_t) span_schedule_next(span_sched_state_t *s); +SPAN_DECLARE(uint64_t) span_schedule_time(span_sched_state_t *s); -int span_schedule_event(span_sched_state_t *s, int us, span_sched_callback_func_t function, void *user_data); -void span_schedule_update(span_sched_state_t *s, int us); -void span_schedule_del(span_sched_state_t *s, int id); +SPAN_DECLARE(int) span_schedule_event(span_sched_state_t *s, int us, span_sched_callback_func_t function, void *user_data); +SPAN_DECLARE(void) span_schedule_update(span_sched_state_t *s, int us); +SPAN_DECLARE(void) span_schedule_del(span_sched_state_t *s, int id); -span_sched_state_t *span_schedule_init(span_sched_state_t *s); -int span_schedule_release(span_sched_state_t *s); +SPAN_DECLARE(span_sched_state_t) *span_schedule_init(span_sched_state_t *s); +SPAN_DECLARE(int) span_schedule_release(span_sched_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/sig_tone.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/sig_tone.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/sig_tone.h Mon Feb 2 11:40:52 2009 @@ -23,7 +23,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: sig_tone.h,v 1.15 2008/11/30 13:08:42 steveu Exp $ + * $Id: sig_tone.h,v 1.16 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -104,7 +104,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int sig_tone_rx(sig_tone_rx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) sig_tone_rx(sig_tone_rx_state_t *s, int16_t amp[], int len); /*! Initialise a signaling tone receiver context. \brief Initialise a signaling tone context. @@ -113,7 +113,7 @@ \param sig_update Callback function to handle signaling updates. \param user_data An opaque pointer. \return A pointer to the signalling tone context, or NULL if there was a problem. */ -sig_tone_rx_state_t *sig_tone_rx_init(sig_tone_rx_state_t *s, int tone_type, sig_tone_func_t sig_update, void *user_data); +SPAN_DECLARE(sig_tone_rx_state_t) *sig_tone_rx_init(sig_tone_rx_state_t *s, int tone_type, sig_tone_func_t sig_update, void *user_data); /*! Generate a block of signaling tone audio samples. \brief Generate a block of signaling tone audio samples. @@ -121,13 +121,13 @@ \param amp The audio sample buffer. \param len The number of samples to be generated. \return The number of samples actually generated. */ -int sig_tone_tx(sig_tone_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) sig_tone_tx(sig_tone_tx_state_t *s, int16_t amp[], int len); /*! Set the tone mode. \brief Set the tone mode. \param s The signaling tone context. \param mode The new mode for the transmitted tones. */ -void sig_tone_tx_set_mode(sig_tone_tx_state_t *s, int mode); +SPAN_DECLARE(void) sig_tone_tx_set_mode(sig_tone_tx_state_t *s, int mode); /*! Initialise a signaling tone transmitter context. \brief Initialise a signaling tone context. @@ -136,7 +136,7 @@ \param sig_update Callback function to handle signaling updates. \param user_data An opaque pointer. \return A pointer to the signalling tone context, or NULL if there was a problem. */ -sig_tone_tx_state_t *sig_tone_tx_init(sig_tone_tx_state_t *s, int tone_type, sig_tone_func_t sig_update, void *user_data); +SPAN_DECLARE(sig_tone_tx_state_t) *sig_tone_tx_init(sig_tone_tx_state_t *s, int tone_type, sig_tone_func_t sig_update, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: silence_gen.h,v 1.12 2008/07/26 04:53:00 steveu Exp $ + * $Id: silence_gen.h,v 1.13 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_SILENCE_GEN_H_) @@ -52,20 +52,20 @@ \return The number of samples actually generated. This will be zero when there is nothing to send. */ -int silence_gen(silence_gen_state_t *s, int16_t *amp, int max_len); +SPAN_DECLARE(int) silence_gen(silence_gen_state_t *s, int16_t *amp, int max_len); /*! Set a silence generator context to output continuous silence. \brief Set a silence generator context to output continuous silence. \param s The silence generator context. */ -void silence_gen_always(silence_gen_state_t *s); +SPAN_DECLARE(void) silence_gen_always(silence_gen_state_t *s); /*! Set a silence generator context to output a specified period of silence. \brief Set a silence generator context to output a specified period of silence. \param s The silence generator context. \param silent_samples The number of samples to be generated. */ -void silence_gen_set(silence_gen_state_t *s, int silent_samples); +SPAN_DECLARE(void) silence_gen_set(silence_gen_state_t *s, int silent_samples); /*! Alter the period of a silence generator context by a specified amount. \brief Alter the period of a silence generator context by a specified amount. @@ -74,28 +74,28 @@ increases the duration. A negative number reduces it. The duration is prevented from going negative. */ -void silence_gen_alter(silence_gen_state_t *s, int silent_samples); +SPAN_DECLARE(void) silence_gen_alter(silence_gen_state_t *s, int silent_samples); /*! Find how long a silence generator context has to run. \brief Find how long a silence generator context has to run. \param s The silence generator context. \return The number of samples remaining. */ -int silence_gen_remainder(silence_gen_state_t *s); +SPAN_DECLARE(int) silence_gen_remainder(silence_gen_state_t *s); /*! Find the total silence generated to date by a silence generator context. \brief Find the total silence generated to date. \param s The silence generator context. \return The number of samples generated. */ -int silence_gen_generated(silence_gen_state_t *s); +SPAN_DECLARE(int) silence_gen_generated(silence_gen_state_t *s); /*! Change the status reporting function associated with a silence generator context. \brief Change the status reporting function associated with a silence generator context. \param s The silence generator context. \param handler The callback routine used to report status changes. \param user_data An opaque pointer. */ -void silence_gen_status_handler(silence_gen_state_t *s, modem_tx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) silence_gen_status_handler(silence_gen_state_t *s, modem_tx_status_func_t handler, void *user_data); /*! Initialise a timed silence generator context. \brief Initialise a timed silence generator context. @@ -103,7 +103,7 @@ \param silent_samples The initial number of samples to set the silence to. \return A pointer to the silence generator context. */ -silence_gen_state_t *silence_gen_init(silence_gen_state_t *s, int silent_samples); +SPAN_DECLARE(silence_gen_state_t) *silence_gen_init(silence_gen_state_t *s, int silent_samples); /* The following dummy routines, to absorb data, don't really have a proper home, so they have been put here. */ @@ -117,7 +117,7 @@ \param len The length of the signal buffer \return 0. */ -int span_dummy_rx(void *user_data, const int16_t amp[], int len); +SPAN_DECLARE(int) span_dummy_rx(void *user_data, const int16_t amp[], int len); /*! A dummy routine to use as a signal modifier callback, when we aren't really trying to process the signal. It just returns without affecting @@ -128,7 +128,7 @@ \param len The length of the signal buffer \return 0. */ -int span_dummy_mod(void *user_data, int16_t amp[], int len); +SPAN_DECLARE(int) span_dummy_mod(void *user_data, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_rx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_rx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_rx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: super_tone_rx.h,v 1.18 2008/11/30 10:17:31 steveu Exp $ + * $Id: super_tone_rx.h,v 1.19 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_SUPER_TONE_RX_H_) @@ -73,18 +73,18 @@ descriptor. \return The supervisory tone set descriptor. */ -super_tone_rx_descriptor_t *super_tone_rx_make_descriptor(super_tone_rx_descriptor_t *desc); +SPAN_DECLARE(super_tone_rx_descriptor_t) *super_tone_rx_make_descriptor(super_tone_rx_descriptor_t *desc); /*! Free a supervisory tone detector descriptor. \param desc The supervisory tone set desciptor. \return 0 for OK, -1 for fail. */ -int super_tone_rx_free_descriptor(super_tone_rx_descriptor_t *desc); +SPAN_DECLARE(int) super_tone_rx_free_descriptor(super_tone_rx_descriptor_t *desc); /*! Add a new tone pattern to a supervisory tone detector set. \param desc The supervisory tone set descriptor. \return The new tone ID. */ -int super_tone_rx_add_tone(super_tone_rx_descriptor_t *desc); +SPAN_DECLARE(int) super_tone_rx_add_tone(super_tone_rx_descriptor_t *desc); /*! Add a new tone pattern element to a tone pattern in a supervisory tone detector. \param desc The supervisory tone set desciptor. @@ -95,12 +95,12 @@ \param max The maximum duration, in ms. \return The new number of elements in the tone description. */ -int super_tone_rx_add_element(super_tone_rx_descriptor_t *desc, - int tone, - int f1, - int f2, - int min, - int max); +SPAN_DECLARE(int) super_tone_rx_add_element(super_tone_rx_descriptor_t *desc, + int tone, + int f1, + int f2, + int min, + int max); /*! Initialise a supervisory tone detector. \param s The supervisory tone detector context. @@ -110,24 +110,24 @@ \param user_data An opaque pointer passed when calling the callback routine. \return The supervisory tone detector context. */ -super_tone_rx_state_t *super_tone_rx_init(super_tone_rx_state_t *s, - super_tone_rx_descriptor_t *desc, - tone_report_func_t callback, - void *user_data); +SPAN_DECLARE(super_tone_rx_state_t) *super_tone_rx_init(super_tone_rx_state_t *s, + super_tone_rx_descriptor_t *desc, + tone_report_func_t callback, + void *user_data); /*! Release a supervisory tone detector. \param s The supervisory tone context. \return 0 for OK, -1 for fail. */ -int super_tone_rx_free(super_tone_rx_state_t *s); +SPAN_DECLARE(int) super_tone_rx_free(super_tone_rx_state_t *s); /*! Define a callback routine to be called each time a tone pattern element is complete. This is mostly used when analysing a tone. \param s The supervisory tone context. \param callback The callback routine. */ -void super_tone_rx_segment_callback(super_tone_rx_state_t *s, - void (*callback)(void *data, int f1, int f2, int duration)); +SPAN_DECLARE(void) super_tone_rx_segment_callback(super_tone_rx_state_t *s, + void (*callback)(void *data, int f1, int f2, int duration)); /*! Apply supervisory tone detection processing to a block of audio samples. \brief Apply supervisory tone detection processing to a block of audio samples. @@ -136,7 +136,7 @@ \param samples The number of samples in the buffer. \return The number of samples processed. */ -int super_tone_rx(super_tone_rx_state_t *super, const int16_t amp[], int samples); +SPAN_DECLARE(int) super_tone_rx(super_tone_rx_state_t *super, const int16_t amp[], int samples); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/super_tone_tx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: super_tone_tx.h,v 1.14 2008/11/30 10:17:31 steveu Exp $ + * $Id: super_tone_tx.h,v 1.15 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_SUPER_TONE_TX_H_) @@ -50,22 +50,22 @@ { #endif -super_tone_tx_step_t *super_tone_tx_make_step(super_tone_tx_step_t *s, - float f1, - float l1, - float f2, - float l2, - int length, - int cycles); +SPAN_DECLARE(super_tone_tx_step_t) *super_tone_tx_make_step(super_tone_tx_step_t *s, + float f1, + float l1, + float f2, + float l2, + int length, + int cycles); -void super_tone_tx_free(super_tone_tx_step_t *s); +SPAN_DECLARE(void) super_tone_tx_free(super_tone_tx_step_t *s); /*! Initialise a supervisory tone generator. \brief Initialise a supervisory tone generator. \param s The supervisory tone generator context. \param tree The supervisory tone tree to be generated. \return The supervisory tone generator context. */ -super_tone_tx_state_t *super_tone_tx_init(super_tone_tx_state_t *s, super_tone_tx_step_t *tree); +SPAN_DECLARE(super_tone_tx_state_t) *super_tone_tx_init(super_tone_tx_state_t *s, super_tone_tx_step_t *tree); /*! Generate a block of audio samples for a supervisory tone pattern. \brief Generate a block of audio samples for a supervisory tone pattern. @@ -73,7 +73,7 @@ \param amp The audio sample buffer. \param max_samples The maximum number of samples to be generated. \return The number of samples generated. */ -int super_tone_tx(super_tone_tx_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE(int) super_tone_tx(super_tone_tx_state_t *s, int16_t amp[], int max_samples); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t30.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t30.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t30.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t30.h,v 1.120 2009/01/19 17:14:10 steveu Exp $ + * $Id: t30.h,v 1.121 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -558,62 +558,62 @@ \param send_hdlc_handler \param send_hdlc_user_data \return A pointer to the context, or NULL if there was a problem. */ -t30_state_t *t30_init(t30_state_t *s, - int calling_party, - t30_set_handler_t *set_rx_type_handler, - void *set_rx_type_user_data, - t30_set_handler_t *set_tx_type_handler, - void *set_tx_type_user_data, - t30_send_hdlc_handler_t *send_hdlc_handler, - void *send_hdlc_user_data); +SPAN_DECLARE(t30_state_t) *t30_init(t30_state_t *s, + int calling_party, + t30_set_handler_t *set_rx_type_handler, + void *set_rx_type_user_data, + t30_set_handler_t *set_tx_type_handler, + void *set_tx_type_user_data, + t30_send_hdlc_handler_t *send_hdlc_handler, + void *send_hdlc_user_data); /*! Release a T.30 context. \brief Release a T.30 context. \param s The T.30 context. \return 0 for OK, else -1. */ -int t30_release(t30_state_t *s); +SPAN_DECLARE(int) t30_release(t30_state_t *s); /*! Free a T.30 context. \brief Free a T.30 context. \param s The T.30 context. \return 0 for OK, else -1. */ -int t30_free(t30_state_t *s); +SPAN_DECLARE(int) t30_free(t30_state_t *s); /*! Restart a T.30 context. \brief Restart a T.30 context. \param s The T.30 context. \return 0 for OK, else -1. */ -int t30_restart(t30_state_t *s); +SPAN_DECLARE(int) t30_restart(t30_state_t *s); /*! Check if a T.30 call is still active. This may be used to regularly poll if the job has finished. \brief Check if a T.30 call is still active. \param s The T.30 context. \return TRUE for call still active, or FALSE for call completed. */ -int t30_call_active(t30_state_t *s); +SPAN_DECLARE(int) t30_call_active(t30_state_t *s); /*! Cleanup a T.30 context if the call terminates. \brief Cleanup a T.30 context if the call terminates. \param s The T.30 context. */ -void t30_terminate(t30_state_t *s); +SPAN_DECLARE(void) t30_terminate(t30_state_t *s); /*! Inform the T.30 engine of a status change in the front end (end of tx, rx signal change, etc.). \brief Inform the T.30 engine of a status change in the front end (end of tx, rx signal change, etc.). \param user_data The T.30 context. \param status The type of status change which occured. */ -void t30_front_end_status(void *user_data, int status); +SPAN_DECLARE(void) t30_front_end_status(void *user_data, int status); /*! Get a bit of received non-ECM image data. \brief Get a bit of received non-ECM image data. \param user_data An opaque pointer, which must point to the T.30 context. \return The next bit to transmit. */ -int t30_non_ecm_get_bit(void *user_data); +SPAN_DECLARE(int) t30_non_ecm_get_bit(void *user_data); /*! Get a byte of received non-ECM image data. \brief Get a byte of received non-ECM image data. \param user_data An opaque pointer, which must point to the T.30 context. \return The next byte to transmit. */ -int t30_non_ecm_get_byte(void *user_data); +SPAN_DECLARE(int) t30_non_ecm_get_byte(void *user_data); /*! Get a chunk of received non-ECM image data. \brief Get a bit of received non-ECM image data. @@ -621,26 +621,26 @@ \param buf The buffer to contain the data. \param max_len The maximum length of the chunk. \return The actual length of the chunk. */ -int t30_non_ecm_get_chunk(void *user_data, uint8_t buf[], int max_len); +SPAN_DECLARE(int) t30_non_ecm_get_chunk(void *user_data, uint8_t buf[], int max_len); /*! Process a bit of received non-ECM image data. \brief Process a bit of received non-ECM image data \param user_data An opaque pointer, which must point to the T.30 context. \param bit The received bit. */ -void t30_non_ecm_put_bit(void *user_data, int bit); +SPAN_DECLARE(void) t30_non_ecm_put_bit(void *user_data, int bit); /*! Process a byte of received non-ECM image data. \brief Process a byte of received non-ECM image data \param user_data An opaque pointer, which must point to the T.30 context. \param byte The received byte. */ -void t30_non_ecm_put_byte(void *user_data, int byte); +SPAN_DECLARE(void) t30_non_ecm_put_byte(void *user_data, int byte); /*! Process a chunk of received non-ECM image data. \brief Process a chunk of received non-ECM image data \param user_data An opaque pointer, which must point to the T.30 context. \param buf The buffer containing the received data. \param len The length of the data in buf. */ -void t30_non_ecm_put_chunk(void *user_data, const uint8_t buf[], int len); +SPAN_DECLARE(void) t30_non_ecm_put_chunk(void *user_data, const uint8_t buf[], int len); /*! Process a received HDLC frame. \brief Process a received HDLC frame. @@ -648,25 +648,25 @@ \param msg The HDLC message. \param len The length of the message, in octets. \param ok TRUE if the frame was received without error. */ -void t30_hdlc_accept(void *user_data, const uint8_t *msg, int len, int ok); +SPAN_DECLARE(void) t30_hdlc_accept(void *user_data, const uint8_t *msg, int len, int ok); /*! Report the passage of time to the T.30 engine. \brief Report the passage of time to the T.30 engine. \param s The T.30 context. \param samples The time change in 1/8000th second steps. */ -void t30_timer_update(t30_state_t *s, int samples); +SPAN_DECLARE(void) t30_timer_update(t30_state_t *s, int samples); /*! Get the current transfer statistics for the file being sent or received. \brief Get the current transfer statistics. \param s The T.30 context. \param t A pointer to a buffer for the statistics. */ -void t30_get_transfer_statistics(t30_state_t *s, t30_stats_t *t); +SPAN_DECLARE(void) t30_get_transfer_statistics(t30_state_t *s, t30_stats_t *t); /*! Request a local interrupt of FAX exchange. \brief Request a local interrupt of FAX exchange. \param s The T.30 context. \param state TRUE to enable interrupt request, else FALSE. */ -void t30_local_interrupt_request(t30_state_t *s, int state); +SPAN_DECLARE(void) t30_local_interrupt_request(t30_state_t *s, int state); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t30_api.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t30_api.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t30_api.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t30_api.h,v 1.7 2008/10/13 13:14:00 steveu Exp $ + * $Id: t30_api.h,v 1.8 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -41,21 +41,21 @@ \param nsf A pointer to the frame. \param len The length of the frame. \return 0 for OK, else -1. */ -int t30_set_tx_nsf(t30_state_t *s, const uint8_t *nsf, int len); +SPAN_DECLARE(int) t30_set_tx_nsf(t30_state_t *s, const uint8_t *nsf, int len); /*! Get an NSF frame to be associated with a T.30 context. \brief Set an NSF frame to be associated with a T.30 context. \param s The T.30 context. \param nsf A pointer to the frame. \return the length of the NSF message. */ -size_t t30_get_tx_nsf(t30_state_t *s, const uint8_t *nsf[]); +SPAN_DECLARE(size_t) t30_get_tx_nsf(t30_state_t *s, const uint8_t *nsf[]); /*! Get an NSF frame to be associated with a T.30 context. \brief Set an NSF frame to be associated with a T.30 context. \param s The T.30 context. \param nsf A pointer to the frame. \return the length of the NSF message. */ -size_t t30_get_rx_nsf(t30_state_t *s, const uint8_t *nsf[]); +SPAN_DECLARE(size_t) t30_get_rx_nsf(t30_state_t *s, const uint8_t *nsf[]); /*! Set the transmitted NSC frame to be associated with a T.30 context. \brief Set the transmitted NSC frame to be associated with a T.30 context. @@ -63,21 +63,21 @@ \param nsf A pointer to the frame. \param len The length of the frame. \return 0 for OK, else -1. */ -int t30_set_tx_nsc(t30_state_t *s, const uint8_t *nsc, int len); +SPAN_DECLARE(int) t30_set_tx_nsc(t30_state_t *s, const uint8_t *nsc, int len); /*! Get an NSC frame to be associated with a T.30 context. \brief Set an NSC frame to be associated with a T.30 context. \param s The T.30 context. \param nsc A pointer to the frame. \return the length of the NSC message. */ -size_t t30_get_tx_nsc(t30_state_t *s, const uint8_t *nsc[]); +SPAN_DECLARE(size_t) t30_get_tx_nsc(t30_state_t *s, const uint8_t *nsc[]); /*! Get an NSC frame to be associated with a T.30 context. \brief Set an NSC frame to be associated with a T.30 context. \param s The T.30 context. \param nsc A pointer to the frame. \return the length of the NSC message. */ -size_t t30_get_rx_nsc(t30_state_t *s, const uint8_t *nsc[]); +SPAN_DECLARE(size_t) t30_get_rx_nsc(t30_state_t *s, const uint8_t *nsc[]); /*! Set the transmitted NSS frame to be associated with a T.30 context. \brief Set the transmitted NSS frame to be associated with a T.30 context. @@ -85,63 +85,63 @@ \param nsf A pointer to the frame. \param len The length of the frame. \return 0 for OK, else -1. */ -int t30_set_tx_nss(t30_state_t *s, const uint8_t *nss, int len); +SPAN_DECLARE(int) t30_set_tx_nss(t30_state_t *s, const uint8_t *nss, int len); /*! Get an NSS frame to be associated with a T.30 context. \brief Set an NSS frame to be associated with a T.30 context. \param s The T.30 context. \param nss A pointer to the frame. \return the length of the NSS message. */ -size_t t30_get_tx_nss(t30_state_t *s, const uint8_t *nss[]); +SPAN_DECLARE(size_t) t30_get_tx_nss(t30_state_t *s, const uint8_t *nss[]); /*! Get an NSS frame to be associated with a T.30 context. \brief Set an NSS frame to be associated with a T.30 context. \param s The T.30 context. \param nss A pointer to the frame. \return the length of the NSS message. */ -size_t t30_get_rx_nss(t30_state_t *s, const uint8_t *nss[]); +SPAN_DECLARE(size_t) t30_get_rx_nss(t30_state_t *s, const uint8_t *nss[]); /*! Set the transmitted identifier associated with a T.30 context. \brief Set the transmitted identifier associated with a T.30 context. \param s The T.30 context. \param id A pointer to the identifier. \return 0 for OK, else -1. */ -int t30_set_tx_ident(t30_state_t *s, const char *id); +SPAN_DECLARE(int) t30_set_tx_ident(t30_state_t *s, const char *id); /*! Get the transmitted identifier associated with a T.30 context. \brief Set the transmitted identifier associated with a T.30 context. \param s The T.30 context. \param id A pointer to the identifier. \return 0 for OK, else -1. */ -const char *t30_get_tx_ident(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_tx_ident(t30_state_t *s); /*! Get the transmitted identifier associated with a T.30 context. \brief Set the transmitted identifier associated with a T.30 context. \param s The T.30 context. \param id A pointer to the identifier. \return 0 for OK, else -1. */ -const char *t30_get_rx_ident(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_ident(t30_state_t *s); /*! Set the transmitted sub-address associated with a T.30 context. \brief Set the transmitted sub-address associated with a T.30 context. \param s The T.30 context. \param sub_address A pointer to the sub-address. \return 0 for OK, else -1. */ -int t30_set_tx_sub_address(t30_state_t *s, const char *sub_address); +SPAN_DECLARE(int) t30_set_tx_sub_address(t30_state_t *s, const char *sub_address); /*! Get the received sub-address associated with a T.30 context. \brief Get the received sub-address associated with a T.30 context. \param s The T.30 context. \param sub_address A pointer to the sub-address. \return 0 for OK, else -1. */ -const char *t30_get_tx_sub_address(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_tx_sub_address(t30_state_t *s); /*! Get the received sub-address associated with a T.30 context. \brief Get the received sub-address associated with a T.30 context. \param s The T.30 context. \param sub_address A pointer to the sub-address. \return 0 for OK, else -1. */ -const char *t30_get_rx_sub_address(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_sub_address(t30_state_t *s); /*! Set the transmitted selective polling address (i.e. the one we will send to the far end) associated with a T.30 context. @@ -149,7 +149,7 @@ \param s The T.30 context. \param selective_polling_address A pointer to the selective polling address. \return 0 for OK, else -1. */ -int t30_set_tx_selective_polling_address(t30_state_t *s, const char *selective_polling_address); +SPAN_DECLARE(int) t30_set_tx_selective_polling_address(t30_state_t *s, const char *selective_polling_address); /*! Get the received selective polling address (i.e. the one we will send to the far end) associated with a T.30 context. @@ -157,7 +157,7 @@ \param s The T.30 context. \param selective_polling_address A pointer to the selective polling address. \return 0 for OK, else -1. */ -const char *t30_get_tx_selective_polling_address(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_tx_selective_polling_address(t30_state_t *s); /*! Get the received selective polling address (i.e. the one we will send to the far end) associated with a T.30 context. @@ -165,7 +165,7 @@ \param s The T.30 context. \param selective_polling_address A pointer to the selective polling address. \return 0 for OK, else -1. */ -const char *t30_get_rx_selective_polling_address(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_selective_polling_address(t30_state_t *s); /*! Set the transmitted polled sub-address (i.e. the one we will send to the far end) associated with a T.30 context. @@ -173,7 +173,7 @@ \param s The T.30 context. \param polled_sub_address A pointer to the polled sub-address. \return 0 for OK, else -1. */ -int t30_set_tx_polled_sub_address(t30_state_t *s, const char *polled_sub_address); +SPAN_DECLARE(int) t30_set_tx_polled_sub_address(t30_state_t *s, const char *polled_sub_address); /*! Get the received polled sub-address (i.e. the one we will send to the far end) associated with a T.30 context. @@ -181,7 +181,7 @@ \param s The T.30 context. \param polled_sub_address A pointer to the polled sub-address. \return 0 for OK, else -1. */ -const char *t30_get_tx_polled_sub_address(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_tx_polled_sub_address(t30_state_t *s); /*! Get the received polled sub-address (i.e. the one we will send to the far end) associated with a T.30 context. @@ -189,7 +189,7 @@ \param s The T.30 context. \param polled_sub_address A pointer to the polled sub-address. \return 0 for OK, else -1. */ -const char *t30_get_rx_polled_sub_address(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_polled_sub_address(t30_state_t *s); /*! Set the transmitted sender ident (i.e. the one we will send to the far end) associated with a T.30 context. @@ -197,7 +197,7 @@ \param s The T.30 context. \param sender_ident A pointer to the sender ident. \return 0 for OK, else -1. */ -int t30_set_tx_sender_ident(t30_state_t *s, const char *sender_ident); +SPAN_DECLARE(int) t30_set_tx_sender_ident(t30_state_t *s, const char *sender_ident); /*! Get the received sender ident (i.e. the one we will send to the far end) associated with a T.30 context. @@ -205,7 +205,7 @@ \param s The T.30 context. \param sender_ident A pointer to the sender ident. \return 0 for OK, else -1. */ -const char *t30_get_tx_sender_ident(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_tx_sender_ident(t30_state_t *s); /*! Get the received sender ident (i.e. the one we will send to the far end) associated with a T.30 context. @@ -213,7 +213,7 @@ \param s The T.30 context. \param sender_ident A pointer to the sender ident. \return 0 for OK, else -1. */ -const char *t30_get_rx_sender_ident(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_sender_ident(t30_state_t *s); /*! Set the transmitted password (i.e. the one we will send to the far end) associated with a T.30 context. @@ -221,7 +221,7 @@ \param s The T.30 context. \param password A pointer to the password. \return 0 for OK, else -1. */ -int t30_set_tx_password(t30_state_t *s, const char *password); +SPAN_DECLARE(int) t30_set_tx_password(t30_state_t *s, const char *password); /*! Get the received password (i.e. the one we will send to the far end) associated with a T.30 context. @@ -229,7 +229,7 @@ \param s The T.30 context. \param password A pointer to the password. \return 0 for OK, else -1. */ -const char *t30_get_tx_password(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_tx_password(t30_state_t *s); /*! Get the received password (i.e. the one we will send to the far end) associated with a T.30 context. @@ -237,7 +237,7 @@ \param s The T.30 context. \param password A pointer to the password. \return 0 for OK, else -1. */ -const char *t30_get_rx_password(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_password(t30_state_t *s); /*! Set the transmitted ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -247,7 +247,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -int t30_set_tx_tsa(t30_state_t *s, int type, const char *address, int len); +SPAN_DECLARE(int) t30_set_tx_tsa(t30_state_t *s, int type, const char *address, int len); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -257,7 +257,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_tx_tsa(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_tx_tsa(t30_state_t *s, int *type, const char *address[]); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -267,7 +267,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_rx_tsa(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_rx_tsa(t30_state_t *s, int *type, const char *address[]); /*! Set the transmitted ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -277,7 +277,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -int t30_set_tx_ira(t30_state_t *s, int type, const char *address, int len); +SPAN_DECLARE(int) t30_set_tx_ira(t30_state_t *s, int type, const char *address, int len); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -287,7 +287,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_tx_ira(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_tx_ira(t30_state_t *s, int *type, const char *address[]); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -297,7 +297,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_rx_ira(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_rx_ira(t30_state_t *s, int *type, const char *address[]); /*! Set the transmitted ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -307,7 +307,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -int t30_set_tx_cia(t30_state_t *s, int type, const char *address, int len); +SPAN_DECLARE(int) t30_set_tx_cia(t30_state_t *s, int type, const char *address, int len); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -317,7 +317,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_tx_cia(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_tx_cia(t30_state_t *s, int *type, const char *address[]); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -327,7 +327,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_rx_cia(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_rx_cia(t30_state_t *s, int *type, const char *address[]); /*! Set the transmitted ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -337,7 +337,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -int t30_set_tx_isp(t30_state_t *s, int type, const char *address, int len); +SPAN_DECLARE(int) t30_set_tx_isp(t30_state_t *s, int type, const char *address, int len); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -346,7 +346,7 @@ \param type The type of address. \param type A pointer to the address. \return 0 for OK, else -1. */ -size_t t30_get_tx_isp(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_tx_isp(t30_state_t *s, int *type, const char *address[]); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -355,7 +355,7 @@ \param type The type of address. \param type A pointer to the address. \return 0 for OK, else -1. */ -size_t t30_get_rx_isp(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_rx_isp(t30_state_t *s, int *type, const char *address[]); /*! Set the transmitted ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -365,7 +365,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -int t30_set_tx_csa(t30_state_t *s, int type, const char *address, int len); +SPAN_DECLARE(int) t30_set_tx_csa(t30_state_t *s, int type, const char *address, int len); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -375,7 +375,7 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_tx_csa(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_tx_csa(t30_state_t *s, int *type, const char *address[]); /*! Get the received ??? (i.e. the one we will send to the far end) associated with a T.30 context. @@ -385,14 +385,14 @@ \param type A pointer to the address. \param len The length of the address. \return 0 for OK, else -1. */ -size_t t30_get_rx_csa(t30_state_t *s, int *type, const char *address[]); +SPAN_DECLARE(size_t) t30_get_rx_csa(t30_state_t *s, int *type, const char *address[]); /*! Set the transmitted header information associated with a T.30 context. \brief Set the transmitted header information associated with a T.30 context. \param s The T.30 context. \param info A pointer to the information string. \return 0 for OK, else -1. */ -int t30_set_tx_page_header_info(t30_state_t *s, const char *info); +SPAN_DECLARE(int) t30_set_tx_page_header_info(t30_state_t *s, const char *info); /*! Get the header information associated with a T.30 context. \brief Get the header information associated with a T.30 context. @@ -400,25 +400,25 @@ \param info A pointer to a buffer for the header information. The buffer should be at least 51 bytes long. \return the length of the string. */ -size_t t30_get_tx_page_header_info(t30_state_t *s, char *info); +SPAN_DECLARE(size_t) t30_get_tx_page_header_info(t30_state_t *s, char *info); /*! Get the country of origin of the remote FAX machine associated with a T.30 context. \brief Get the country of origin of the remote FAX machine associated with a T.30 context. \param s The T.30 context. \return a pointer to the country name, or NULL if the country is not known. */ -const char *t30_get_rx_country(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_country(t30_state_t *s); /*! Get the name of the vendor of the remote FAX machine associated with a T.30 context. \brief Get the name of the vendor of the remote FAX machine associated with a T.30 context. \param s The T.30 context. \return a pointer to the vendor name, or NULL if the vendor is not known. */ -const char *t30_get_rx_vendor(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_vendor(t30_state_t *s); /*! Get the name of the model of the remote FAX machine associated with a T.30 context. \brief Get the name of the model of the remote FAX machine associated with a T.30 context. \param s The T.30 context. \return a pointer to the model name, or NULL if the model is not known. */ -const char *t30_get_rx_model(t30_state_t *s); +SPAN_DECLARE(const char) *t30_get_rx_model(t30_state_t *s); /*! Specify the file name of the next TIFF file to be received by a T.30 context. @@ -426,7 +426,7 @@ \param s The T.30 context. \param file The file name \param stop_page The maximum page to receive. -1 for no restriction. */ -void t30_set_rx_file(t30_state_t *s, const char *file, int stop_page); +SPAN_DECLARE(void) t30_set_rx_file(t30_state_t *s, const char *file, int stop_page); /*! Specify the file name of the next TIFF file to be transmitted by a T.30 context. @@ -435,20 +435,20 @@ \param file The file name \param start_page The first page to send. -1 for no restriction. \param stop_page The last page to send. -1 for no restriction. */ -void t30_set_tx_file(t30_state_t *s, const char *file, int start_page, int stop_page); +SPAN_DECLARE(void) t30_set_tx_file(t30_state_t *s, const char *file, int start_page, int stop_page); /*! Set Internet aware FAX (IAF) mode. \brief Set Internet aware FAX (IAF) mode. \param s The T.30 context. \param iaf TRUE for IAF, or FALSE for non-IAF. */ -void t30_set_iaf_mode(t30_state_t *s, int iaf); +SPAN_DECLARE(void) t30_set_iaf_mode(t30_state_t *s, int iaf); /*! Specify if error correction mode (ECM) is allowed by a T.30 context. \brief Select ECM capability. \param s The T.30 context. \param enabled TRUE for ECM capable, FALSE for not ECM capable. \return 0 if OK, else -1. */ -int t30_set_ecm_capability(t30_state_t *s, int enabled); +SPAN_DECLARE(int) t30_set_ecm_capability(t30_state_t *s, int enabled); /*! Specify the output encoding for TIFF files created during FAX reception. \brief Specify the output encoding for TIFF files created during FAX reception. @@ -458,91 +458,91 @@ densest option, but support for it is broken in a number of software packages. \return 0 if OK, else -1. */ -int t30_set_rx_encoding(t30_state_t *s, int encoding); +SPAN_DECLARE(int) t30_set_rx_encoding(t30_state_t *s, int encoding); /*! Specify the minimum scan line time supported by a T.30 context. \brief Specify minimum scan line time. \param s The T.30 context. \param min_time The minimum permitted scan line time, in milliseconds. \return 0 if OK, else -1. */ -int t30_set_minimum_scan_line_time(t30_state_t *s, int min_time); +SPAN_DECLARE(int) t30_set_minimum_scan_line_time(t30_state_t *s, int min_time); /*! Specify which modem types are supported by a T.30 context. \brief Specify supported modems. \param s The T.30 context. \param supported_modems Bit field list of the supported modems. \return 0 if OK, else -1. */ -int t30_set_supported_modems(t30_state_t *s, int supported_modems); +SPAN_DECLARE(int) t30_set_supported_modems(t30_state_t *s, int supported_modems); /*! Specify which compression types are supported by a T.30 context. \brief Specify supported compression types. \param s The T.30 context. \param supported_compressions Bit field list of the supported compression types. \return 0 if OK, else -1. */ -int t30_set_supported_compressions(t30_state_t *s, int supported_compressions); +SPAN_DECLARE(int) t30_set_supported_compressions(t30_state_t *s, int supported_compressions); /*! Specify which resolutions are supported by a T.30 context. \brief Specify supported resolutions. \param s The T.30 context. \param supported_resolutions Bit field list of the supported resolutions. \return 0 if OK, else -1. */ -int t30_set_supported_resolutions(t30_state_t *s, int supported_resolutions); +SPAN_DECLARE(int) t30_set_supported_resolutions(t30_state_t *s, int supported_resolutions); /*! Specify which images sizes are supported by a T.30 context. \brief Specify supported image sizes. \param s The T.30 context. \param supported_image_sizes Bit field list of the supported widths and lengths. \return 0 if OK, else -1. */ -int t30_set_supported_image_sizes(t30_state_t *s, int supported_image_sizes); +SPAN_DECLARE(int) t30_set_supported_image_sizes(t30_state_t *s, int supported_image_sizes); /*! Specify which special T.30 features are supported by a T.30 context. \brief Specify supported T.30 features. \param s The T.30 context. \param supported_t30_features Bit field list of the supported features. \return 0 if OK, else -1. */ -int t30_set_supported_t30_features(t30_state_t *s, int supported_t30_features); +SPAN_DECLARE(int) t30_set_supported_t30_features(t30_state_t *s, int supported_t30_features); /*! Set T.30 status. This may be used to adjust the status from within the phase B and phase D callbacks. \brief Set T.30 status. \param s The T.30 context. \param status The new status. */ -void t30_set_status(t30_state_t *s, int status); +SPAN_DECLARE(void) t30_set_status(t30_state_t *s, int status); /*! Specify a period of responding with receiver not ready. \brief Specify a period of responding with receiver not ready. \param s The T.30 context. \param count The number of times to report receiver not ready. \return 0 if OK, else -1. */ -int t30_set_receiver_not_ready(t30_state_t *s, int count); +SPAN_DECLARE(int) t30_set_receiver_not_ready(t30_state_t *s, int count); /*! Set a callback function for T.30 phase B handling. \brief Set a callback function for T.30 phase B handling. \param s The T.30 context. \param handler The callback function. \param user_data An opaque pointer passed to the callback function. */ -void t30_set_phase_b_handler(t30_state_t *s, t30_phase_b_handler_t *handler, void *user_data); +SPAN_DECLARE(void) t30_set_phase_b_handler(t30_state_t *s, t30_phase_b_handler_t *handler, void *user_data); /*! Set a callback function for T.30 phase D handling. \brief Set a callback function for T.30 phase D handling. \param s The T.30 context. \param handler The callback function. \param user_data An opaque pointer passed to the callback function. */ -void t30_set_phase_d_handler(t30_state_t *s, t30_phase_d_handler_t *handler, void *user_data); +SPAN_DECLARE(void) t30_set_phase_d_handler(t30_state_t *s, t30_phase_d_handler_t *handler, void *user_data); /*! Set a callback function for T.30 phase E handling. \brief Set a callback function for T.30 phase E handling. \param s The T.30 context. \param handler The callback function. \param user_data An opaque pointer passed to the callback function. */ -void t30_set_phase_e_handler(t30_state_t *s, t30_phase_e_handler_t *handler, void *user_data); +SPAN_DECLARE(void) t30_set_phase_e_handler(t30_state_t *s, t30_phase_e_handler_t *handler, void *user_data); /*! Set a callback function for T.30 end of document handling. \brief Set a callback function for T.30 end of document handling. \param s The T.30 context. \param handler The callback function. \param user_data An opaque pointer passed to the callback function. */ -void t30_set_document_handler(t30_state_t *s, t30_document_handler_t *handler, void *user_data); +SPAN_DECLARE(void) t30_set_document_handler(t30_state_t *s, t30_document_handler_t *handler, void *user_data); /*! Set a callback function for T.30 frame exchange monitoring. This is called from the heart of the signal processing, so don't take too long in the handler routine. @@ -550,14 +550,14 @@ \param s The T.30 context. \param handler The callback function. \param user_data An opaque pointer passed to the callback function. */ -void t30_set_real_time_frame_handler(t30_state_t *s, t30_real_time_frame_handler_t *handler, void *user_data); +SPAN_DECLARE(void) t30_set_real_time_frame_handler(t30_state_t *s, t30_real_time_frame_handler_t *handler, void *user_data); /*! Get a pointer to the logging context associated with a T.30 context. \brief Get a pointer to the logging context associated with a T.30 context. \param s The T.30 context. \return A pointer to the logging context, or NULL. */ -logging_state_t *t30_get_logging_state(t30_state_t *s); +SPAN_DECLARE(logging_state_t) *t30_get_logging_state(t30_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t30_logging.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t30_logging.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t30_logging.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t30_logging.h,v 1.2 2008/04/17 14:27:00 steveu Exp $ + * $Id: t30_logging.h,v 1.3 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -40,20 +40,20 @@ \param x The frametype octet. \return A pointer to the text name for the frame type. If the frame type is not value, the string "???" is returned. */ -const char *t30_frametype(uint8_t x); +SPAN_DECLARE(const char) *t30_frametype(uint8_t x); /*! Decode a DIS, DTC or DCS frame, and log the contents. \brief Decode a DIS, DTC or DCS frame, and log the contents. \param s The T.30 context. \param dis A pointer to the frame to be decoded. \param len The length of the frame. */ -void t30_decode_dis_dtc_dcs(t30_state_t *s, const uint8_t *dis, int len); +SPAN_DECLARE(void) t30_decode_dis_dtc_dcs(t30_state_t *s, const uint8_t *dis, int len); /*! Convert a phase E completion code to a short text description. \brief Convert a phase E completion code to a short text description. \param result The result code. \return A pointer to the description. */ -const char *t30_completion_code_to_str(int result); +SPAN_DECLARE(const char) *t30_completion_code_to_str(int result); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t31.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t31.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t31.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t31.h,v 1.55 2009/01/09 16:09:06 steveu Exp $ + * $Id: t31.h,v 1.56 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -57,9 +57,9 @@ { #endif -void t31_call_event(t31_state_t *s, int event); +SPAN_DECLARE(void) t31_call_event(t31_state_t *s, int event); -int t31_at_rx(t31_state_t *s, const char *t, int len); +SPAN_DECLARE(int) t31_at_rx(t31_state_t *s, const char *t, int len); /*! Process a block of received T.31 modem audio samples. \brief Process a block of received T.31 modem audio samples. @@ -67,7 +67,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int t31_rx(t31_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) t31_rx(t31_state_t *s, int16_t amp[], int len); /*! Generate a block of T.31 modem audio samples. \brief Generate a block of T.31 modem audio samples. @@ -76,9 +76,9 @@ \param max_len The number of samples to be generated. \return The number of samples actually generated. */ -int t31_tx(t31_state_t *s, int16_t amp[], int max_len); +SPAN_DECLARE(int) t31_tx(t31_state_t *s, int16_t amp[], int max_len); -int t31_t38_send_timeout(t31_state_t *s, int samples); +SPAN_DECLARE(int) t31_t38_send_timeout(t31_state_t *s, int samples); /*! Select whether silent audio will be sent when transmit is idle. \brief Select whether silent audio will be sent when transmit is idle. @@ -87,14 +87,14 @@ idle. FALSE to transmit zero length audio when the transmitter is idle. The default behaviour is FALSE. */ -void t31_set_transmit_on_idle(t31_state_t *s, int transmit_on_idle); +SPAN_DECLARE(void) t31_set_transmit_on_idle(t31_state_t *s, int transmit_on_idle); /*! Select whether TEP mode will be used (or time allowed for it (when transmitting). \brief Select whether TEP mode will be used. \param s The T.31 modem context. \param use_tep TRUE if TEP is to be ised. */ -void t31_set_tep_mode(t31_state_t *s, int use_tep); +SPAN_DECLARE(void) t31_set_tep_mode(t31_state_t *s, int use_tep); /*! Select whether T.38 data will be paced as it is transmitted. \brief Select whether T.38 data will be paced. @@ -102,18 +102,18 @@ \param without_pacing TRUE if data is to be sent as fast as possible. FALSE if it is to be paced. */ -void t31_set_t38_config(t31_state_t *s, int without_pacing); +SPAN_DECLARE(void) t31_set_t38_config(t31_state_t *s, int without_pacing); -void t31_set_mode(t31_state_t *s, int t38_mode); +SPAN_DECLARE(void) t31_set_mode(t31_state_t *s, int t38_mode); /*! Get a pointer to the logging context associated with a T.31 context. \brief Get a pointer to the logging context associated with a T.31 context. \param s The T.31 context. \return A pointer to the logging context, or NULL. */ -logging_state_t *t31_get_logging_state(t31_state_t *s); +SPAN_DECLARE(logging_state_t) *t31_get_logging_state(t31_state_t *s); -t38_core_state_t *t31_get_t38_core_state(t31_state_t *s); +SPAN_DECLARE(t38_core_state_t) *t31_get_t38_core_state(t31_state_t *s); /*! Initialise a T.31 context. This must be called before the first use of the context, to initialise its contents. @@ -126,19 +126,19 @@ \param tx_t38_packet_handler ??? \param tx_t38_packet_user_data ??? \return A pointer to the T.31 context. */ -t31_state_t *t31_init(t31_state_t *s, - at_tx_handler_t *at_tx_handler, - void *at_tx_user_data, - t31_modem_control_handler_t *modem_control_handler, - void *modem_control_user_data, - t38_tx_packet_handler_t *tx_t38_packet_handler, - void *tx_t38_packet_user_data); +SPAN_DECLARE(t31_state_t) *t31_init(t31_state_t *s, + at_tx_handler_t *at_tx_handler, + void *at_tx_user_data, + t31_modem_control_handler_t *modem_control_handler, + void *modem_control_user_data, + t38_tx_packet_handler_t *tx_t38_packet_handler, + void *tx_t38_packet_user_data); /*! Release a T.31 context. \brief Release a T.31 context. \param s The T.31 context. \return 0 for OK */ -int t31_release(t31_state_t *s); +SPAN_DECLARE(int) t31_release(t31_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t35.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t35.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t35.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t35.h,v 1.14 2008/04/17 14:27:00 steveu Exp $ + * $Id: t35.h,v 1.15 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -63,7 +63,7 @@ If the model is not identified, NULL will be returned. \return TRUE if the machine was identified, otherwise FALSE. */ -int t35_decode(const uint8_t *msg, int len, const char **country, const char **vendor, const char **model); +SPAN_DECLARE(int) t35_decode(const uint8_t *msg, int len, const char **country, const char **vendor, const char **model); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t38_core.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t38_core.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t38_core.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t38_core.h,v 1.34 2009/01/29 01:41:06 steveu Exp $ + * $Id: t38_core.h,v 1.35 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -197,47 +197,47 @@ /*! \brief Convert the code for an indicator to a short text name. \param indicator The type of indicator. \return A pointer to a short text name for the indicator. */ -const char *t38_indicator_to_str(int indicator); +SPAN_DECLARE(const char) *t38_indicator_to_str(int indicator); /*! \brief Convert the code for a type of data to a short text name. \param data_type The data type. \return A pointer to a short text name for the data type. */ -const char *t38_data_type_to_str(int data_type); +SPAN_DECLARE(const char) *t38_data_type_to_str(int data_type); /*! \brief Convert the code for a type of data field to a short text name. \param field_type The field type. \return A pointer to a short text name for the field type. */ -const char *t38_field_type_to_str(int field_type); +SPAN_DECLARE(const char) *t38_field_type_to_str(int field_type); /*! \brief Convert the code for a CM profile code to text description. \param profile The profile code from a CM message. \return A pointer to a short text description of the profile. */ -const char *t38_cm_profile_to_str(int profile); +SPAN_DECLARE(const char) *t38_cm_profile_to_str(int profile); /*! \brief Convert a JM message code to text description. \param data The data field of the message. \param len The length of the data field. \return A pointer to a short text description of the profile. */ -const char *t38_jm_to_str(const uint8_t *data, int len); +SPAN_DECLARE(const char) *t38_jm_to_str(const uint8_t *data, int len); /*! \brief Convert a V34rate message to an actual bit rate. \param data The data field of the message. \param len The length of the data field. \return The bit rate, or -1 for a bad message. */ -int t38_v34rate_to_bps(const uint8_t *data, int len); +SPAN_DECLARE(int) t38_v34rate_to_bps(const uint8_t *data, int len); /*! \brief Send an indicator packet \param s The T.38 context. \param indicator The indicator to send. \param count The number of copies of the packet to send. \return The delay to allow after this indicator is sent. */ -int t38_core_send_indicator(t38_core_state_t *s, int indicator, int count); +SPAN_DECLARE(int) t38_core_send_indicator(t38_core_state_t *s, int indicator, int count); /*! \brief Find the delay to allow for HDLC flags after sending an indicator \param s The T.38 context. \param indicator The indicator to send. \return The delay to allow for initial HDLC flags after this indicator is sent. */ -int t38_core_send_flags_delay(t38_core_state_t *s, int indicator); +SPAN_DECLARE(int) t38_core_send_flags_delay(t38_core_state_t *s, int indicator); /*! \brief Send a data packet \param s The T.38 context. @@ -247,7 +247,7 @@ \param field_len The length of the message data, in bytes. \param count The number of copies of the packet to send. \return ??? */ -int t38_core_send_data(t38_core_state_t *s, int data_type, int field_type, const uint8_t field[], int field_len, int count); +SPAN_DECLARE(int) t38_core_send_data(t38_core_state_t *s, int data_type, int field_type, const uint8_t field[], int field_len, int count); /*! \brief Send a data packet \param s The T.38 context. @@ -256,7 +256,7 @@ \param fields The number of fields in the list. \param count The number of copies of the packet to send. \return ??? */ -int t38_core_send_data_multi_field(t38_core_state_t *s, int data_type, const t38_data_field_t field[], int fields, int count); +SPAN_DECLARE(int) t38_core_send_data_multi_field(t38_core_state_t *s, int data_type, const t38_data_field_t field[], int fields, int count); /*! \brief Process a received T.38 IFP packet. \param s The T.38 context. @@ -264,77 +264,77 @@ \param len The length of the packet contents. \param seq_no The packet sequence number. \return 0 for OK, else -1. */ -int t38_core_rx_ifp_packet(t38_core_state_t *s, const uint8_t *buf, int len, uint16_t seq_no); +SPAN_DECLARE(int) t38_core_rx_ifp_packet(t38_core_state_t *s, const uint8_t *buf, int len, uint16_t seq_no); /*! Set the method to be used for data rate management, as per the T.38 spec. \param s The T.38 context. \param method 1 for pass TCF across the T.38 link, 2 for handle TCF locally. */ -void t38_set_data_rate_management_method(t38_core_state_t *s, int method); +SPAN_DECLARE(void) t38_set_data_rate_management_method(t38_core_state_t *s, int method); /*! Set the data transport protocol. \param s The T.38 context. \param data_transport_protocol UDPTL, RTP or TPKT. */ -void t38_set_data_transport_protocol(t38_core_state_t *s, int data_transport_protocol); +SPAN_DECLARE(void) t38_set_data_transport_protocol(t38_core_state_t *s, int data_transport_protocol); /*! Set the non-ECM fill bit removal mode. \param s The T.38 context. \param fill_bit_removal TRUE to remove fill bits across the T.38 link, else FALSE. */ -void t38_set_fill_bit_removal(t38_core_state_t *s, int fill_bit_removal); +SPAN_DECLARE(void) t38_set_fill_bit_removal(t38_core_state_t *s, int fill_bit_removal); /*! Set the MMR transcoding mode. \param s The T.38 context. \param mmr_transcoding TRUE to transcode to MMR across the T.38 link, else FALSE. */ -void t38_set_mmr_transcoding(t38_core_state_t *s, int mmr_transcoding); +SPAN_DECLARE(void) t38_set_mmr_transcoding(t38_core_state_t *s, int mmr_transcoding); /*! Set the JBIG transcoding mode. \param s The T.38 context. \param jbig_transcoding TRUE to transcode to JBIG across the T.38 link, else FALSE. */ -void t38_set_jbig_transcoding(t38_core_state_t *s, int jbig_transcoding); +SPAN_DECLARE(void) t38_set_jbig_transcoding(t38_core_state_t *s, int jbig_transcoding); -void t38_set_max_buffer_size(t38_core_state_t *s, int max_buffer_size); +SPAN_DECLARE(void) t38_set_max_buffer_size(t38_core_state_t *s, int max_buffer_size); -void t38_set_max_datagram_size(t38_core_state_t *s, int max_datagram_size); +SPAN_DECLARE(void) t38_set_max_datagram_size(t38_core_state_t *s, int max_datagram_size); -int t38_get_fastest_image_data_rate(t38_core_state_t *s); +SPAN_DECLARE(int) t38_get_fastest_image_data_rate(t38_core_state_t *s); /*! Set the T.38 version to be emulated. \param s The T.38 context. \param t38_version Version number, as in the T.38 spec. */ -void t38_set_t38_version(t38_core_state_t *s, int t38_version); +SPAN_DECLARE(void) t38_set_t38_version(t38_core_state_t *s, int t38_version); /*! Set the sequence number handling option. \param s The T.38 context. \param check TRUE to check sequence numbers, and handle gaps reasonably. FALSE for no sequence number processing (e.g. for TPKT over TCP transport). */ -void t38_set_sequence_number_handling(t38_core_state_t *s, int check); +SPAN_DECLARE(void) t38_set_sequence_number_handling(t38_core_state_t *s, int check); /*! Set the TEP handling option. \param s The T.38 context. \param allow_for_tep TRUE to allow for TEP playout, else FALSE. */ -void t38_set_tep_handling(t38_core_state_t *s, int allow_for_tep); +SPAN_DECLARE(void) t38_set_tep_handling(t38_core_state_t *s, int allow_for_tep); /*! Get a pointer to the logging context associated with a T.38 context. \brief Get a pointer to the logging context associated with a T.38 context. \param s The T.38 context. \return A pointer to the logging context, or NULL. */ -logging_state_t *t38_core_get_logging_state(t38_core_state_t *s); +SPAN_DECLARE(logging_state_t) *t38_core_get_logging_state(t38_core_state_t *s); -t38_core_state_t *t38_core_init(t38_core_state_t *s, - t38_rx_indicator_handler_t *rx_indicator_handler, - t38_rx_data_handler_t *rx_data_handler, - t38_rx_missing_handler_t *rx_missing_handler, - void *rx_user_data, - t38_tx_packet_handler_t *tx_packet_handler, - void *tx_packet_user_data); +SPAN_DECLARE(t38_core_state_t) *t38_core_init(t38_core_state_t *s, + t38_rx_indicator_handler_t *rx_indicator_handler, + t38_rx_data_handler_t *rx_data_handler, + t38_rx_missing_handler_t *rx_missing_handler, + void *rx_user_data, + t38_tx_packet_handler_t *tx_packet_handler, + void *tx_packet_user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t38_gateway.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t38_gateway.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t38_gateway.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t38_gateway.h,v 1.59 2008/10/13 13:14:01 steveu Exp $ + * $Id: t38_gateway.h,v 1.60 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -82,15 +82,15 @@ \param tx_packet_handler A callback routine to encapsulate and transmit T.38 packets. \param tx_packet_user_data An opaque pointer passed to the tx_packet_handler routine. \return A pointer to the termination mode T.38 context, or NULL if there was a problem. */ -t38_gateway_state_t *t38_gateway_init(t38_gateway_state_t *s, - t38_tx_packet_handler_t *tx_packet_handler, - void *tx_packet_user_data); +SPAN_DECLARE(t38_gateway_state_t) *t38_gateway_init(t38_gateway_state_t *s, + t38_tx_packet_handler_t *tx_packet_handler, + void *tx_packet_user_data); /*! Free a gateway mode T.38 context. \brief Free a T.38 context. \param s The T.38 context. \return 0 for OK, else -1. */ -int t38_gateway_free(t38_gateway_state_t *s); +SPAN_DECLARE(int) t38_gateway_free(t38_gateway_state_t *s); /*! Process a block of received FAX audio samples. \brief Process a block of received FAX audio samples. @@ -98,7 +98,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int t38_gateway_rx(t38_gateway_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) t38_gateway_rx(t38_gateway_state_t *s, int16_t amp[], int len); /*! Generate a block of FAX audio samples. \brief Generate a block of FAX audio samples. @@ -107,14 +107,14 @@ \param max_len The number of samples to be generated. \return The number of samples actually generated. */ -int t38_gateway_tx(t38_gateway_state_t *s, int16_t amp[], int max_len); +SPAN_DECLARE(int) t38_gateway_tx(t38_gateway_state_t *s, int16_t amp[], int max_len); /*! Control whether error correcting mode (ECM) is allowed. \brief Control whether error correcting mode (ECM) is allowed. \param s The T.38 context. \param ecm_allowed TRUE is ECM is to be allowed. */ -void t38_gateway_set_ecm_capability(t38_gateway_state_t *s, int ecm_allowed); +SPAN_DECLARE(void) t38_gateway_set_ecm_capability(t38_gateway_state_t *s, int ecm_allowed); /*! Select whether silent audio will be sent when transmit is idle. \brief Select whether silent audio will be sent when transmit is idle. @@ -123,14 +123,14 @@ idle. FALSE to transmit zero length audio when the FAX transmitter is idle. The default behaviour is FALSE. */ -void t38_gateway_set_transmit_on_idle(t38_gateway_state_t *s, int transmit_on_idle); +SPAN_DECLARE(void) t38_gateway_set_transmit_on_idle(t38_gateway_state_t *s, int transmit_on_idle); /*! Specify which modem types are supported by a T.30 context. \brief Specify supported modems. \param s The T.38 context. \param supported_modems Bit field list of the supported modems. */ -void t38_gateway_set_supported_modems(t38_gateway_state_t *s, int supported_modems); +SPAN_DECLARE(void) t38_gateway_set_supported_modems(t38_gateway_state_t *s, int supported_modems); /*! Select whether NSC, NSF, and NSS should be suppressed. It selected, the contents of these messages are forced to zero for all octets beyond the message type. This makes @@ -144,31 +144,31 @@ frames passing through the gateway from the modem to T.38. \param from_modem_len The length of the overwrite string. */ -void t38_gateway_set_nsx_suppression(t38_gateway_state_t *s, - const uint8_t *from_t38, - int from_t38_len, - const uint8_t *from_modem, - int from_modem_len); +SPAN_DECLARE(void) t38_gateway_set_nsx_suppression(t38_gateway_state_t *s, + const uint8_t *from_t38, + int from_t38_len, + const uint8_t *from_modem, + int from_modem_len); /*! Select whether talker echo protection tone will be sent for the image modems. \brief Select whether TEP will be sent for the image modems. \param s The T.38 context. \param use_tep TRUE if TEP should be sent. */ -void t38_gateway_set_tep_mode(t38_gateway_state_t *s, int use_tep); +SPAN_DECLARE(void) t38_gateway_set_tep_mode(t38_gateway_state_t *s, int use_tep); /*! Select whether non-ECM fill bits are to be removed during transmission. \brief Select whether non-ECM fill bits are to be removed during transmission. \param s The T.38 context. \param remove TRUE if fill bits are to be removed. */ -void t38_gateway_set_fill_bit_removal(t38_gateway_state_t *s, int remove); +SPAN_DECLARE(void) t38_gateway_set_fill_bit_removal(t38_gateway_state_t *s, int remove); /*! Get the current transfer statistics for the current T.38 session. \brief Get the current transfer statistics. \param s The T.38 context. \param t A pointer to a buffer for the statistics. */ -void t38_gateway_get_transfer_statistics(t38_gateway_state_t *s, t38_stats_t *t); +SPAN_DECLARE(void) t38_gateway_get_transfer_statistics(t38_gateway_state_t *s, t38_stats_t *t); /*! Get a pointer to the T.38 core IFP packet engine associated with a gateway mode T.38 context. @@ -177,14 +177,14 @@ \param s The T.38 context. \return A pointer to the T.38 core context, or NULL. */ -t38_core_state_t *t38_gateway_get_t38_core_state(t38_gateway_state_t *s); +SPAN_DECLARE(t38_core_state_t) *t38_gateway_get_t38_core_state(t38_gateway_state_t *s); /*! Get a pointer to the logging context associated with a T.38 context. \brief Get a pointer to the logging context associated with a T.38 context. \param s The T.38 context. \return A pointer to the logging context, or NULL. */ -logging_state_t *t38_gateway_get_logging_state(t38_gateway_state_t *s); +SPAN_DECLARE(logging_state_t) *t38_gateway_get_logging_state(t38_gateway_state_t *s); /*! Set a callback function for T.30 frame exchange monitoring. This is called from the heart of the signal processing, so don't take too long in the handler routine. @@ -192,9 +192,9 @@ \param s The T.30 context. \param handler The callback function. \param user_data An opaque pointer passed to the callback function. */ -void t38_gateway_set_real_time_frame_handler(t38_gateway_state_t *s, - t38_gateway_real_time_frame_handler_t *handler, - void *user_data); +SPAN_DECLARE(void) t38_gateway_set_real_time_frame_handler(t38_gateway_state_t *s, + t38_gateway_real_time_frame_handler_t *handler, + void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t38_non_ecm_buffer.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t38_non_ecm_buffer.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t38_non_ecm_buffer.h Mon Feb 2 11:40:52 2009 @@ -23,7 +23,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t38_non_ecm_buffer.h,v 1.3 2008/10/13 13:14:01 steveu Exp $ + * $Id: t38_non_ecm_buffer.h,v 1.4 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -59,41 +59,41 @@ \param mode TRUE for image data mode, or FALSE for TCF mode. \param bits The minimum number of bits per FAX image row. \return A pointer to the buffer context, or NULL if there was a problem. */ -t38_non_ecm_buffer_state_t *t38_non_ecm_buffer_init(t38_non_ecm_buffer_state_t *s, int mode, int min_row_bits); +SPAN_DECLARE(t38_non_ecm_buffer_state_t) *t38_non_ecm_buffer_init(t38_non_ecm_buffer_state_t *s, int mode, int min_row_bits); /*! \brief Set the mode of a T.38 rate adapting non-ECM buffer context. \param s The buffer context. \param mode TRUE for image data mode, or FALSE for TCF mode. \param bits The minimum number of bits per FAX image row. */ -void t38_non_ecm_buffer_set_mode(t38_non_ecm_buffer_state_t *s, int mode, int min_row_bits); +SPAN_DECLARE(void) t38_non_ecm_buffer_set_mode(t38_non_ecm_buffer_state_t *s, int mode, int min_row_bits); /*! \brief Inject data to T.38 rate adapting non-ECM buffer context. \param s The buffer context. \param buf The data buffer to be injected. \param len The length of the data to be injected. */ -void t38_non_ecm_buffer_inject(t38_non_ecm_buffer_state_t *s, const uint8_t *buf, int len); +SPAN_DECLARE(void) t38_non_ecm_buffer_inject(t38_non_ecm_buffer_state_t *s, const uint8_t *buf, int len); /*! \brief Inform a T.38 rate adapting non-ECM buffer context that the incoming data has finished, and the contents of the buffer should be played out as quickly as possible. \param s The buffer context. */ -void t38_non_ecm_buffer_push(t38_non_ecm_buffer_state_t *s); +SPAN_DECLARE(void) t38_non_ecm_buffer_push(t38_non_ecm_buffer_state_t *s); /*! \brief Report the input status of a T.38 rate adapting non-ECM buffer context to the specified logging context. \param s The buffer context. \param logging The logging context. */ -void t38_non_ecm_buffer_report_input_status(t38_non_ecm_buffer_state_t *s, logging_state_t *logging); +SPAN_DECLARE(void) t38_non_ecm_buffer_report_input_status(t38_non_ecm_buffer_state_t *s, logging_state_t *logging); /*! \brief Report the output status of a T.38 rate adapting non-ECM buffer context to the specified logging context. \param s The buffer context. \param logging The logging context. */ -void t38_non_ecm_buffer_report_output_status(t38_non_ecm_buffer_state_t *s, logging_state_t *logging); +SPAN_DECLARE(void) t38_non_ecm_buffer_report_output_status(t38_non_ecm_buffer_state_t *s, logging_state_t *logging); /*! \brief Get the next bit of data from a T.38 rate adapting non-ECM buffer context. \param user_data The buffer context, cast to a void pointer. \return The next bit, or one of the values indicating a change of modem status. */ -int t38_non_ecm_buffer_get_bit(void *user_data); +SPAN_DECLARE(int) t38_non_ecm_buffer_get_bit(void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t38_terminal.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t38_terminal.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t38_terminal.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t38_terminal.h,v 1.39 2008/10/13 13:14:01 steveu Exp $ + * $Id: t38_terminal.h,v 1.40 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -46,30 +46,30 @@ { #endif -int t38_terminal_send_timeout(t38_terminal_state_t *s, int samples); +SPAN_DECLARE(int) t38_terminal_send_timeout(t38_terminal_state_t *s, int samples); -void t38_terminal_set_config(t38_terminal_state_t *s, int without_pacing); +SPAN_DECLARE(void) t38_terminal_set_config(t38_terminal_state_t *s, int without_pacing); /*! Select whether the time for talker echo protection tone will be allowed for when sending. \brief Select whether TEP time will be allowed for. \param s The T.38 context. \param use_tep TRUE if TEP should be allowed for. */ -void t38_terminal_set_tep_mode(t38_terminal_state_t *s, int use_tep); +SPAN_DECLARE(void) t38_terminal_set_tep_mode(t38_terminal_state_t *s, int use_tep); /*! Select whether non-ECM fill bits are to be removed during transmission. \brief Select whether non-ECM fill bits are to be removed during transmission. \param s The T.38 context. \param remove TRUE if fill bits are to be removed. */ -void t38_terminal_set_fill_bit_removal(t38_terminal_state_t *s, int remove); +SPAN_DECLARE(void) t38_terminal_set_fill_bit_removal(t38_terminal_state_t *s, int remove); /*! Get a pointer to the T.30 engine associated with a termination mode T.38 context. \brief Get a pointer to the T.30 engine associated with a T.38 context. \param s The T.38 context. \return A pointer to the T.30 context, or NULL. */ -t30_state_t *t38_terminal_get_t30_state(t38_terminal_state_t *s); +SPAN_DECLARE(t30_state_t) *t38_terminal_get_t30_state(t38_terminal_state_t *s); /*! Get a pointer to the T.38 core IFP packet engine associated with a termination mode T.38 context. @@ -78,14 +78,14 @@ \param s The T.38 context. \return A pointer to the T.38 core context, or NULL. */ -t38_core_state_t *t38_terminal_get_t38_core_state(t38_terminal_state_t *s); +SPAN_DECLARE(t38_core_state_t) *t38_terminal_get_t38_core_state(t38_terminal_state_t *s); /*! Get a pointer to the logging context associated with a T.38 context. \brief Get a pointer to the logging context associated with a T.38 context. \param s The T.38 context. \return A pointer to the logging context, or NULL. */ -logging_state_t *t38_terminal_get_logging_state(t38_terminal_state_t *s); +SPAN_DECLARE(logging_state_t) *t38_terminal_get_logging_state(t38_terminal_state_t *s); /*! \brief Initialise a termination mode T.38 context. \param s The T.38 context. @@ -94,22 +94,22 @@ \param tx_packet_handler A callback routine to encapsulate and transmit T.38 packets. \param tx_packet_user_data An opaque pointer passed to the tx_packet_handler routine. \return A pointer to the termination mode T.38 context, or NULL if there was a problem. */ -t38_terminal_state_t *t38_terminal_init(t38_terminal_state_t *s, - int calling_party, - t38_tx_packet_handler_t *tx_packet_handler, - void *tx_packet_user_data); +SPAN_DECLARE(t38_terminal_state_t) *t38_terminal_init(t38_terminal_state_t *s, + int calling_party, + t38_tx_packet_handler_t *tx_packet_handler, + void *tx_packet_user_data); /*! Release a termination mode T.38 context. \brief Release a T.38 context. \param s The T.38 context. \return 0 for OK, else -1. */ -int t38_terminal_release(t38_terminal_state_t *s); +SPAN_DECLARE(int) t38_terminal_release(t38_terminal_state_t *s); /*! Free a a termination mode T.38 context. \brief Free a T.38 context. \param s The T.38 context. \return 0 for OK, else -1. */ -int t38_terminal_free(t38_terminal_state_t *s); +SPAN_DECLARE(int) t38_terminal_free(t38_terminal_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/t4.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/t4.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/t4.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t4.h,v 1.53 2008/10/13 13:14:01 steveu Exp $ + * $Id: t4.h,v 1.54 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -213,97 +213,97 @@ \param file The name of the file to be received. \param output_encoding The output encoding. \return A pointer to the context, or NULL if there was a problem. */ -t4_state_t *t4_rx_init(t4_state_t *s, const char *file, int output_encoding); +SPAN_DECLARE(t4_state_t) *t4_rx_init(t4_state_t *s, const char *file, int output_encoding); /*! \brief Prepare to receive the next page of the current document. \param s The T.4 context. \return zero for success, -1 for failure. */ -int t4_rx_start_page(t4_state_t *s); +SPAN_DECLARE(int) t4_rx_start_page(t4_state_t *s); /*! \brief Put a bit of the current document page. \param s The T.4 context. \param bit The data bit. \return TRUE when the bit ends the document page, otherwise FALSE. */ -int t4_rx_put_bit(t4_state_t *s, int bit); +SPAN_DECLARE(int) t4_rx_put_bit(t4_state_t *s, int bit); /*! \brief Put a byte of the current document page. \param s The T.4 context. \param byte The data byte. \return TRUE when the byte ends the document page, otherwise FALSE. */ -int t4_rx_put_byte(t4_state_t *s, uint8_t byte); +SPAN_DECLARE(int) t4_rx_put_byte(t4_state_t *s, uint8_t byte); /*! \brief Put a byte of the current document page. \param s The T.4 context. \param buf The buffer containing the chunk. \param len The length of the chunk. \return TRUE when the byte ends the document page, otherwise FALSE. */ -int t4_rx_put_chunk(t4_state_t *s, const uint8_t buf[], int len); +SPAN_DECLARE(int) t4_rx_put_chunk(t4_state_t *s, const uint8_t buf[], int len); /*! \brief Complete the reception of a page. \param s The T.4 receive context. \return 0 for success, otherwise -1. */ -int t4_rx_end_page(t4_state_t *s); +SPAN_DECLARE(int) t4_rx_end_page(t4_state_t *s); /*! \brief End reception of a document. Tidy up, close the file and free the context. This should be used to end T.4 reception started with t4_rx_init. \param s The T.4 receive context. \return 0 for success, otherwise -1. */ -int t4_rx_delete(t4_state_t *s); +SPAN_DECLARE(int) t4_rx_delete(t4_state_t *s); /*! \brief End reception of a document. Tidy up and close the file. This should be used to end T.4 reception started with t4_rx_init. \param s The T.4 context. \return 0 for success, otherwise -1. */ -int t4_rx_end(t4_state_t *s); +SPAN_DECLARE(int) t4_rx_end(t4_state_t *s); -int t4_rx_set_row_write_handler(t4_state_t *s, t4_row_write_handler_t handler, void *user_data); +SPAN_DECLARE(int) t4_rx_set_row_write_handler(t4_state_t *s, t4_row_write_handler_t handler, void *user_data); /*! \brief Set the encoding for the received data. \param s The T.4 context. \param encoding The encoding. */ -void t4_rx_set_rx_encoding(t4_state_t *s, int encoding); +SPAN_DECLARE(void) t4_rx_set_rx_encoding(t4_state_t *s, int encoding); /*! \brief Set the expected width of the received image, in pixel columns. \param s The T.4 context. \param width The number of pixels across the image. */ -void t4_rx_set_image_width(t4_state_t *s, int width); +SPAN_DECLARE(void) t4_rx_set_image_width(t4_state_t *s, int width); /*! \brief Set the row-to-row (y) resolution to expect for a received image. \param s The T.4 context. \param resolution The resolution, in pixels per metre. */ -void t4_rx_set_y_resolution(t4_state_t *s, int resolution); +SPAN_DECLARE(void) t4_rx_set_y_resolution(t4_state_t *s, int resolution); /*! \brief Set the column-to-column (x) resolution to expect for a received image. \param s The T.4 context. \param resolution The resolution, in pixels per metre. */ -void t4_rx_set_x_resolution(t4_state_t *s, int resolution); +SPAN_DECLARE(void) t4_rx_set_x_resolution(t4_state_t *s, int resolution); /*! \brief Set the DCS information of the fax, for inclusion in the file. \param s The T.4 context. \param dcs The DCS information, formatted as an ASCII string. */ -void t4_rx_set_dcs(t4_state_t *s, const char *dcs); +SPAN_DECLARE(void) t4_rx_set_dcs(t4_state_t *s, const char *dcs); /*! \brief Set the sub-address of the fax, for inclusion in the file. \param s The T.4 context. \param sub_address The sub-address string. */ -void t4_rx_set_sub_address(t4_state_t *s, const char *sub_address); +SPAN_DECLARE(void) t4_rx_set_sub_address(t4_state_t *s, const char *sub_address); /*! \brief Set the identity of the remote machine, for inclusion in the file. \param s The T.4 context. \param ident The identity string. */ -void t4_rx_set_far_ident(t4_state_t *s, const char *ident); +SPAN_DECLARE(void) t4_rx_set_far_ident(t4_state_t *s, const char *ident); /*! \brief Set the vendor of the remote machine, for inclusion in the file. \param s The T.4 context. \param vendor The vendor string, or NULL. */ -void t4_rx_set_vendor(t4_state_t *s, const char *vendor); +SPAN_DECLARE(void) t4_rx_set_vendor(t4_state_t *s, const char *vendor); /*! \brief Set the model of the remote machine, for inclusion in the file. \param s The T.4 context. \param model The model string, or NULL. */ -void t4_rx_set_model(t4_state_t *s, const char *model); +SPAN_DECLARE(void) t4_rx_set_model(t4_state_t *s, const char *model); /*! \brief Prepare for transmission of a document. \param s The T.4 context. @@ -311,28 +311,28 @@ \param start_page The first page to send. -1 for no restriction. \param stop_page The last page to send. -1 for no restriction. \return A pointer to the context, or NULL if there was a problem. */ -t4_state_t *t4_tx_init(t4_state_t *s, const char *file, int start_page, int stop_page); +SPAN_DECLARE(t4_state_t) *t4_tx_init(t4_state_t *s, const char *file, int start_page, int stop_page); /*! \brief Prepare to send the next page of the current document. \param s The T.4 context. \return zero for success, -1 for failure. */ -int t4_tx_start_page(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_start_page(t4_state_t *s); /*! \brief Prepare the current page for a resend. \param s The T.4 context. \return zero for success, -1 for failure. */ -int t4_tx_restart_page(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_restart_page(t4_state_t *s); /*! \brief Check for the existance of the next page. This information can be needed before it is determined that the current page is finished with. \param s The T.4 context. \return zero for next page found, -1 for failure. */ -int t4_tx_more_pages(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_more_pages(t4_state_t *s); /*! \brief Complete the sending of a page. \param s The T.4 context. \return zero for success, -1 for failure. */ -int t4_tx_end_page(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_end_page(t4_state_t *s); /*! \brief Get the next bit of the current document page. The document will be padded for the current minimum scan line time. If the @@ -341,7 +341,7 @@ \param s The T.4 context. \return The next bit (i.e. 0 or 1). For the last bit of data, bit 1 is set (i.e. the returned value is 2 or 3). */ -int t4_tx_get_bit(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_get_bit(t4_state_t *s); /*! \brief Get the next byte of the current document page. The document will be padded for the current minimum scan line time. If the @@ -351,7 +351,7 @@ \return The next byte. For the last byte of data, bit 8 is set. In this case, one or more bits of the byte may be padded with zeros, to complete the byte. */ -int t4_tx_get_byte(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_get_byte(t4_state_t *s); /*! \brief Get the next chunk of the current document page. The document will be padded for the current minimum scan line time. If the @@ -362,7 +362,7 @@ \param max_len The maximum length of the chunk. \return The actual length of the chunk. If this is less than max_len it indicates that the end of the document has been reached. */ -int t4_tx_get_chunk(t4_state_t *s, uint8_t buf[], int max_len); +SPAN_DECLARE(int) t4_tx_get_chunk(t4_state_t *s, uint8_t buf[], int max_len); /*! \brief Return the next bit of the current document page, without actually moving forward in the buffer. The document will be padded for the @@ -372,37 +372,37 @@ \param s The T.4 context. \return The next bit (i.e. 0 or 1). For the last bit of data, bit 1 is set (i.e. the returned value is 2 or 3). */ -int t4_tx_check_bit(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_check_bit(t4_state_t *s); /*! \brief End the transmission of a document. Tidy up, close the file and free the context. This should be used to end T.4 transmission started with t4_tx_init. \param s The T.4 context. \return 0 for success, otherwise -1. */ -int t4_tx_delete(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_delete(t4_state_t *s); /*! \brief End the transmission of a document. Tidy up and close the file. This should be used to end T.4 transmission started with t4_tx_init. \param s The T.4 context. \return 0 for success, otherwise -1. */ -int t4_tx_end(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_end(t4_state_t *s); /*! \brief Set the encoding for the encoded data. \param s The T.4 context. \param encoding The encoding. */ -void t4_tx_set_tx_encoding(t4_state_t *s, int encoding); +SPAN_DECLARE(void) t4_tx_set_tx_encoding(t4_state_t *s, int encoding); /*! \brief Set the minimum number of encoded bits per row. This allows the makes the encoding process to be set to comply with the minimum row time specified by a remote receiving machine. \param s The T.4 context. \param bits The minimum number of bits per row. */ -void t4_tx_set_min_row_bits(t4_state_t *s, int bits); +SPAN_DECLARE(void) t4_tx_set_min_row_bits(t4_state_t *s, int bits); /*! \brief Set the identity of the local machine, for inclusion in page headers. \param s The T.4 context. \param ident The identity string. */ -void t4_tx_set_local_ident(t4_state_t *s, const char *ident); +SPAN_DECLARE(void) t4_tx_set_local_ident(t4_state_t *s, const char *ident); /*! Set the info field, included in the header line included in each page of an encoded FAX. This is a string of up to 50 characters. Other information (date, local ident, etc.) @@ -411,41 +411,41 @@ \brief Set the header info. \param s The T.4 context. \param info A string, of up to 50 bytes, which will form the info field. */ -void t4_tx_set_header_info(t4_state_t *s, const char *info); +SPAN_DECLARE(void) t4_tx_set_header_info(t4_state_t *s, const char *info); -int t4_tx_set_row_read_handler(t4_state_t *s, t4_row_read_handler_t handler, void *user_data); +SPAN_DECLARE(int) t4_tx_set_row_read_handler(t4_state_t *s, t4_row_read_handler_t handler, void *user_data); /*! \brief Get the row-to-row (y) resolution of the current page. \param s The T.4 context. \return The resolution, in pixels per metre. */ -int t4_tx_get_y_resolution(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_get_y_resolution(t4_state_t *s); /*! \brief Get the column-to-column (x) resolution of the current page. \param s The T.4 context. \return The resolution, in pixels per metre. */ -int t4_tx_get_x_resolution(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_get_x_resolution(t4_state_t *s); /*! \brief Get the width of the current page, in pixel columns. \param s The T.4 context. \return The number of columns. */ -int t4_tx_get_image_width(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_get_image_width(t4_state_t *s); /*! \brief Get the number of pages in the file. \param s The T.4 context. \return The number of pages, or -1 if there is an error. */ -int t4_tx_get_pages_in_file(t4_state_t *s); +SPAN_DECLARE(int) t4_tx_get_pages_in_file(t4_state_t *s); /*! Get the current image transfer statistics. \brief Get the current transfer statistics. \param s The T.4 context. \param t A pointer to a statistics structure. */ -void t4_get_transfer_statistics(t4_state_t *s, t4_stats_t *t); +SPAN_DECLARE(void) t4_get_transfer_statistics(t4_state_t *s, t4_stats_t *t); /*! Get the short text name of an encoding format. \brief Get the short text name of an encoding format. \param encoding The encoding type. \return A pointer to the string. */ -const char *t4_encoding_to_str(int encoding); +SPAN_DECLARE(const char) *t4_encoding_to_str(int encoding); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h Mon Feb 2 11:40:52 2009 @@ -22,20 +22,37 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: telephony.h,v 1.13 2009/01/19 17:14:10 steveu Exp $ + * $Id: telephony.h,v 1.15 2009/01/31 12:12:21 steveu Exp $ */ #if !defined(_SPANDSP_TELEPHONY_H_) #define _SPANDSP_TELEPHONY_H_ -#define SAMPLE_RATE 8000 +#if defined(SPANDSP_USE_EXPORT_CAPABILITY) +#if defined(__GNUC__) || defined(__SUNCC__) +#define SPAN_DECLARE(type) __attribute__((visibility("default"))) type +#define SPAN_DECLARE_NONSTD(type) __attribute__((visibility("default"))) type +#define SPAN_DECLARE_DATA __attribute__((visibility("default"))) +#endif +#if defined(WIN32) +#define SPAN_DECLARE(type) __declspec(dllexport) type __stdcall +#define SPAN_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl +#define SPAN_DECLARE_DATA __declspec(dllexport) +#endif +#else +#define SPAN_DECLARE(type) /**/ type +#define SPAN_DECLARE_NONSTD(type) /**/ type +#define SPAN_DECLARE_DATA /**/ +#endif + +#define SAMPLE_RATE 8000 /* This is based on A-law, but u-law is only 0.03dB different */ -#define DBM0_MAX_POWER (3.14f + 3.02f) -#define DBM0_MAX_SINE_POWER (3.14f) +#define DBM0_MAX_POWER (3.14f + 3.02f) +#define DBM0_MAX_SINE_POWER (3.14f) /* This is based on the ITU definition of dbOv in G.100.1 */ -#define DBOV_MAX_POWER (0.0f) -#define DBOV_MAX_SINE_POWER (-3.02f) +#define DBOV_MAX_POWER (0.0f) +#define DBOV_MAX_SINE_POWER (-3.02f) /*! \brief A handler for pure receive. The buffer cannot be altered. */ typedef int (span_rx_handler_t)(void *s, const int16_t amp[], int len); @@ -46,8 +63,8 @@ /*! \brief A handler for transmit, where the buffer will be filled. */ typedef int (span_tx_handler_t)(void *s, int16_t amp[], int max_len); -#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000) -#define us_to_samples(t) (((t)*SAMPLE_RATE)/1000000) +#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000) +#define us_to_samples(t) (((t)*SAMPLE_RATE)/1000000) #if !defined(FALSE) #define FALSE 0 @@ -58,7 +75,7 @@ #if defined(__cplusplus) /* C++ doesn't seem to have sane rounding functions/macros yet */ -#ifndef _MSC_VER +#if !defined(WIN32) #define lrint(x) ((long int) (x)) #define lrintf(x) ((long int) (x)) #endif Modified: freeswitch/trunk/libs/spandsp/src/spandsp/time_scale.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/time_scale.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/time_scale.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: time_scale.h,v 1.17 2008/11/15 14:27:29 steveu Exp $ + * $Id: time_scale.h,v 1.18 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_TIME_SCALE_H_) @@ -71,19 +71,19 @@ \param sample_rate The sample rate of the signal. \param playout_rate The ratio between the output speed and the input speed. \return A pointer to the context, or NULL if there was a problem. */ -time_scale_state_t *time_scale_init(time_scale_state_t *s, int sample_rate, float playout_rate); +SPAN_DECLARE(time_scale_state_t) *time_scale_init(time_scale_state_t *s, int sample_rate, float playout_rate); /*! \brief Free a time scale context. \param s The time scale context. \return 0 for OK, else -1. */ -int time_scale_free(time_scale_state_t *s); +SPAN_DECLARE(int) time_scale_free(time_scale_state_t *s); /*! Change the time scale rate. \brief Change the time scale rate. \param s The time scale context. \param playout_rate The ratio between the output speed and the input speed. \return 0 if changed OK, else -1. */ -int time_scale_rate(time_scale_state_t *s, float playout_rate); +SPAN_DECLARE(int) time_scale_rate(time_scale_state_t *s, float playout_rate); /*! Find the maximum possible samples which could result from scaling the specified number of input samples, at the current playback rate. @@ -91,7 +91,7 @@ \param s The time scale context. \param input_len The number of input samples. \return The maximum possible output samples. */ -int time_scale_max_output_len(time_scale_state_t *s, int input_len); +SPAN_DECLARE(int) time_scale_max_output_len(time_scale_state_t *s, int input_len); /*! Time scale a chunk of audio samples. \brief Time scale a chunk of audio samples. @@ -103,7 +103,7 @@ \param len The number of input samples. \return The number of output samples. */ -int time_scale(time_scale_state_t *s, int16_t out[], int16_t in[], int len); +SPAN_DECLARE(int) time_scale(time_scale_state_t *s, int16_t out[], int16_t in[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/tone_detect.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/tone_detect.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/tone_detect.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: tone_detect.h,v 1.42 2008/11/30 10:17:31 steveu Exp $ + * $Id: tone_detect.h,v 1.43 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_TONE_DETECT_H_) @@ -187,7 +187,7 @@ \param window_len The length of the periodogram window. This must be an even number. \return The number of generated coefficients. */ -int periodogram_generate_coeffs(complexf_t coeffs[], float freq, int sample_rate, int window_len); +SPAN_DECLARE(int) periodogram_generate_coeffs(complexf_t coeffs[], float freq, int sample_rate, int window_len); /*! Generate the phase offset to be expected between successive periodograms evaluated at the specified interval. @@ -197,7 +197,7 @@ \param interval The interval between periodograms, in samples. \return The scaling factor. */ -float periodogram_generate_phase_offset(complexf_t *offset, float freq, int sample_rate, int interval); +SPAN_DECLARE(float) periodogram_generate_phase_offset(complexf_t *offset, float freq, int sample_rate, int interval); /*! Evaluate a periodogram. \param coeffs A set of coefficients generated by periodogram_generate_coeffs(). @@ -205,7 +205,7 @@ \param len The length of the periodogram, in samples. This must be an even number. \return The periodogram result. */ -complexf_t periodogram(const complexf_t coeffs[], const complexf_t amp[], int len); +SPAN_DECLARE(complexf_t) periodogram(const complexf_t coeffs[], const complexf_t amp[], int len); /*! Prepare data for evaluating a set of periodograms. \param sum A vector of sums of pairs of signal samples. This will be half the length of len. @@ -214,7 +214,7 @@ \param len The length of the periodogram, in samples. This must be an even number. \return The length of the vectors sum and diff. */ -int periodogram_prepare(complexf_t sum[], complexf_t diff[], const complexf_t amp[], int len); +SPAN_DECLARE(int) periodogram_prepare(complexf_t sum[], complexf_t diff[], const complexf_t amp[], int len); /*! Evaluate a periodogram, based on data prepared by periodogram_prepare(). This is more efficient than using periodogram() when several periodograms are to be applied to the same signal. @@ -224,7 +224,7 @@ \param len The length of the periodogram, in samples. This must be an even number. \return The periodogram result. */ -complexf_t periodogram_apply(const complexf_t coeffs[], const complexf_t sum[], const complexf_t diff[], int len); +SPAN_DECLARE(complexf_t) periodogram_apply(const complexf_t coeffs[], const complexf_t sum[], const complexf_t diff[], int len); /*! Apply a phase offset, to find the frequency error between periodogram evaluations. specified interval. @@ -234,7 +234,7 @@ \param result A pointer to the current periodogram result. \return The frequency error, in Hz. */ -float periodogram_freq_error(const complexf_t *phase_offset, float scale, const complexf_t *last_result, const complexf_t *result); +SPAN_DECLARE(float) periodogram_freq_error(const complexf_t *phase_offset, float scale, const complexf_t *last_result, const complexf_t *result); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: tone_generate.h,v 1.35 2008/11/30 10:17:31 steveu Exp $ + * $Id: tone_generate.h,v 1.36 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -77,20 +77,20 @@ \param d3 x \param d4 x \param repeat x */ -void make_tone_gen_descriptor(tone_gen_descriptor_t *s, - int f1, - int l1, - int f2, - int l2, - int d1, - int d2, - int d3, - int d4, - int repeat); +SPAN_DECLARE(void) make_tone_gen_descriptor(tone_gen_descriptor_t *s, + int f1, + int l1, + int f2, + int l2, + int d1, + int d2, + int d3, + int d4, + int repeat); -tone_gen_state_t *tone_gen_init(tone_gen_state_t *s, tone_gen_descriptor_t *t); +SPAN_DECLARE(tone_gen_state_t) *tone_gen_init(tone_gen_state_t *s, tone_gen_descriptor_t *t); -int tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); +SPAN_DECLARE(int) tone_gen(tone_gen_state_t *s, int16_t amp[], int max_samples); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v17rx.h,v 1.58 2008/10/13 13:14:01 steveu Exp $ + * $Id: v17rx.h,v 1.59 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -243,7 +243,7 @@ \param put_bit The callback routine used to put the received data. \param user_data An opaque pointer passed to the put_bit routine. \return A pointer to the modem context, or NULL if there was a problem. */ -v17_rx_state_t *v17_rx_init(v17_rx_state_t *s, int bit_rate, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(v17_rx_state_t) *v17_rx_init(v17_rx_state_t *s, int bit_rate, put_bit_func_t put_bit, void *user_data); /*! Reinitialise an existing V.17 modem receive context. \brief Reinitialise an existing V.17 modem receive context. @@ -251,29 +251,29 @@ \param bit_rate The bit rate of the modem. Valid values are 7200, 9600, 12000 and 14400. \param short_train TRUE if a short training sequence is expected. \return 0 for OK, -1 for bad parameter */ -int v17_rx_restart(v17_rx_state_t *s, int bit_rate, int short_train); +SPAN_DECLARE(int) v17_rx_restart(v17_rx_state_t *s, int bit_rate, int short_train); /*! Free a V.17 modem receive context. \brief Free a V.17 modem receive context. \param s The modem context. \return 0 for OK */ -int v17_rx_free(v17_rx_state_t *s); +SPAN_DECLARE(int) v17_rx_free(v17_rx_state_t *s); -logging_state_t *v17_rx_get_logging_state(v17_rx_state_t *s); +SPAN_DECLARE(logging_state_t) *v17_rx_get_logging_state(v17_rx_state_t *s); /*! Change the put_bit function associated with a V.17 modem receive context. \brief Change the put_bit function associated with a V.17 modem receive context. \param s The modem context. \param put_bit The callback routine used to handle received bits. \param user_data An opaque pointer. */ -void v17_rx_set_put_bit(v17_rx_state_t *s, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(void) v17_rx_set_put_bit(v17_rx_state_t *s, put_bit_func_t put_bit, void *user_data); /*! Change the modem status report function associated with a V.17 modem receive context. \brief Change the modem status report function associated with a V.17 modem receive context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void v17_rx_set_modem_status_handler(v17_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) v17_rx_set_modem_status_handler(v17_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); /*! Process a block of received V.17 modem audio samples. \brief Process a block of received V.17 modem audio samples. @@ -282,7 +282,7 @@ \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int v17_rx(v17_rx_state_t *s, const int16_t amp[], int len); +SPAN_DECLARE(int) v17_rx(v17_rx_state_t *s, const int16_t amp[], int len); /*! Get a snapshot of the current equalizer coefficients. \brief Get a snapshot of the current equalizer coefficients. @@ -290,36 +290,36 @@ \param coeffs The vector of complex coefficients. \return The number of coefficients in the vector. */ #if defined(SPANDSP_USE_FIXED_POINTx) -int v17_rx_equalizer_state(v17_rx_state_t *s, complexi_t **coeffs); +SPAN_DECLARE(int) v17_rx_equalizer_state(v17_rx_state_t *s, complexi_t **coeffs); #else -int v17_rx_equalizer_state(v17_rx_state_t *s, complexf_t **coeffs); +SPAN_DECLARE(int) v17_rx_equalizer_state(v17_rx_state_t *s, complexf_t **coeffs); #endif /*! Get the current received carrier frequency. \param s The modem context. \return The frequency, in Hertz. */ -float v17_rx_carrier_frequency(v17_rx_state_t *s); +SPAN_DECLARE(float) v17_rx_carrier_frequency(v17_rx_state_t *s); /*! Get the current symbol timing correction since startup. \param s The modem context. \return The correction. */ -float v17_rx_symbol_timing_correction(v17_rx_state_t *s); +SPAN_DECLARE(float) v17_rx_symbol_timing_correction(v17_rx_state_t *s); /*! Get a current received signal power. \param s The modem context. \return The signal power, in dBm0. */ -float v17_rx_signal_power(v17_rx_state_t *s); +SPAN_DECLARE(float) v17_rx_signal_power(v17_rx_state_t *s); /*! Set the power level at which the carrier detection will cut in \param s The modem context. \param cutoff The signal cutoff power, in dBm0. */ -void v17_rx_signal_cutoff(v17_rx_state_t *s, float cutoff); +SPAN_DECLARE(void) v17_rx_signal_cutoff(v17_rx_state_t *s, float cutoff); /*! Set a handler routine to process QAM status reports \param s The modem context. \param handler The handler routine. \param user_data An opaque pointer passed to the handler routine. */ -void v17_rx_set_qam_report_handler(v17_rx_state_t *s, qam_report_handler_t handler, void *user_data); +SPAN_DECLARE(void) v17_rx_set_qam_report_handler(v17_rx_state_t *s, qam_report_handler_t handler, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v17tx.h,v 1.37 2008/10/13 13:14:01 steveu Exp $ + * $Id: v17tx.h,v 1.38 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -98,7 +98,7 @@ \brief Adjust a V.17 modem transmit context's output power. \param s The modem context. \param power The power level, in dBm0 */ -void v17_tx_power(v17_tx_state_t *s, float power); +SPAN_DECLARE(void) v17_tx_power(v17_tx_state_t *s, float power); /*! Initialise a V.17 modem transmit context. This must be called before the first use of the context, to initialise its contents. @@ -109,7 +109,7 @@ \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. \return A pointer to the modem context, or NULL if there was a problem. */ -v17_tx_state_t *v17_tx_init(v17_tx_state_t *s, int rate, int tep, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(v17_tx_state_t) *v17_tx_init(v17_tx_state_t *s, int rate, int tep, get_bit_func_t get_bit, void *user_data); /*! Reinitialise an existing V.17 modem transmit context, so it may be reused. \brief Reinitialise an existing V.17 modem transmit context. @@ -118,29 +118,29 @@ \param tep TRUE is the optional TEP tone is to be transmitted. \param short_train TRUE if the short training sequence should be used. \return 0 for OK, -1 for parameter error. */ -int v17_tx_restart(v17_tx_state_t *s, int bit_rate, int tep, int short_train); +SPAN_DECLARE(int) v17_tx_restart(v17_tx_state_t *s, int bit_rate, int tep, int short_train); /*! Free a V.17 modem transmit context. \brief Free a V.17 modem transmit context. \param s The modem context. \return 0 for OK */ -int v17_tx_free(v17_tx_state_t *s); +SPAN_DECLARE(int) v17_tx_free(v17_tx_state_t *s); -logging_state_t *v17_tx_get_logging_state(v17_tx_state_t *s); +SPAN_DECLARE(logging_state_t) *v17_tx_get_logging_state(v17_tx_state_t *s); /*! Change the get_bit function associated with a V.17 modem transmit context. \brief Change the get_bit function associated with a V.17 modem transmit context. \param s The modem context. \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. */ -void v17_tx_set_get_bit(v17_tx_state_t *s, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(void) v17_tx_set_get_bit(v17_tx_state_t *s, get_bit_func_t get_bit, void *user_data); /*! Change the modem status report function associated with a V.17 modem transmit context. \brief Change the modem status report function associated with a V.17 modem transmit context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void v17_tx_set_modem_status_handler(v17_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) v17_tx_set_modem_status_handler(v17_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); /*! Generate a block of V.17 modem audio samples. \brief Generate a block of V.17 modem audio samples. @@ -149,7 +149,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -int v17_tx(v17_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) v17_tx(v17_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v22bis.h,v 1.32 2008/11/30 03:40:12 steveu Exp $ + * $Id: v22bis.h,v 1.33 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -75,7 +75,7 @@ \param s The modem context. \param bit_rate The bit rate of the modem. Valid values are 1200 and 2400. \return 0 for OK, -1 for bad parameter */ -int v22bis_rx_restart(v22bis_state_t *s, int bit_rate); +SPAN_DECLARE(int) v22bis_rx_restart(v22bis_state_t *s, int bit_rate); /*! Process a block of received V.22bis modem audio samples. \brief Process a block of received V.22bis modem audio samples. @@ -83,34 +83,34 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int v22bis_rx(v22bis_state_t *s, const int16_t amp[], int len); +SPAN_DECLARE(int) v22bis_rx(v22bis_state_t *s, const int16_t amp[], int len); /*! Get a snapshot of the current equalizer coefficients. \brief Get a snapshot of the current equalizer coefficients. \param coeffs The vector of complex coefficients. \return The number of coefficients in the vector. */ -int v22bis_equalizer_state(v22bis_state_t *s, complexf_t **coeffs); +SPAN_DECLARE(int) v22bis_equalizer_state(v22bis_state_t *s, complexf_t **coeffs); /*! Get the current received carrier frequency. \param s The modem context. \return The frequency, in Hertz. */ -float v22bis_rx_carrier_frequency(v22bis_state_t *s); +SPAN_DECLARE(float) v22bis_rx_carrier_frequency(v22bis_state_t *s); /*! Get the current symbol timing correction since startup. \param s The modem context. \return The correction. */ -float v22bis_symbol_timing_correction(v22bis_state_t *s); +SPAN_DECLARE(float) v22bis_symbol_timing_correction(v22bis_state_t *s); /*! Get a current received signal power. \param s The modem context. \return The signal power, in dBm0. */ -float v22bis_rx_signal_power(v22bis_state_t *s); +SPAN_DECLARE(float) v22bis_rx_signal_power(v22bis_state_t *s); /*! Set a handler routine to process QAM status reports \param s The modem context. \param handler The handler routine. \param user_data An opaque pointer passed to the handler routine. */ -void v22bis_set_qam_report_handler(v22bis_state_t *s, qam_report_handler_t handler, void *user_data); +SPAN_DECLARE(void) v22bis_set_qam_report_handler(v22bis_state_t *s, qam_report_handler_t handler, void *user_data); /*! Generate a block of V.22bis modem audio samples. \brief Generate a block of V.22bis modem audio samples. @@ -118,20 +118,20 @@ \param amp The audio sample buffer. \param len The number of samples to be generated. \return The number of samples actually generated. */ -int v22bis_tx(v22bis_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) v22bis_tx(v22bis_state_t *s, int16_t amp[], int len); /*! Adjust a V.22bis modem transmit context's power output. \brief Adjust a V.22bis modem transmit context's output power. \param s The modem context. \param power The power level, in dBm0 */ -void v22bis_tx_power(v22bis_state_t *s, float power); +SPAN_DECLARE(void) v22bis_tx_power(v22bis_state_t *s, float power); /*! Reinitialise an existing V.22bis modem context, so it may be reused. \brief Reinitialise an existing V.22bis modem context. \param s The modem context. \param bit_rate The bit rate of the modem. Valid values are 1200 and 2400. \return 0 for OK, -1 for bad parameter. */ -int v22bis_restart(v22bis_state_t *s, int bit_rate); +SPAN_DECLARE(int) v22bis_restart(v22bis_state_t *s, int bit_rate); /*! Initialise a V.22bis modem context. This must be called before the first use of the context, to initialise its contents. @@ -144,35 +144,35 @@ \param put_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer, passed in calls to the get and put routines. \return A pointer to the modem context, or NULL if there was a problem. */ -v22bis_state_t *v22bis_init(v22bis_state_t *s, - int bit_rate, - int guard, - int caller, - get_bit_func_t get_bit, - put_bit_func_t put_bit, - void *user_data); +SPAN_DECLARE(v22bis_state_t) *v22bis_init(v22bis_state_t *s, + int bit_rate, + int guard, + int caller, + get_bit_func_t get_bit, + put_bit_func_t put_bit, + void *user_data); /*! Free a V.22bis modem receive context. \brief Free a V.22bis modem receive context. \param s The modem context. \return 0 for OK */ -int v22bis_free(v22bis_state_t *s); +SPAN_DECLARE(int) v22bis_free(v22bis_state_t *s); -logging_state_t *v22bis_get_logging_state(v22bis_state_t *s); +SPAN_DECLARE(logging_state_t) *v22bis_get_logging_state(v22bis_state_t *s); /*! Change the get_bit function associated with a V.22bis modem context. \brief Change the get_bit function associated with a V.22bis modem context. \param s The modem context. \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. */ -void v22bis_set_get_bit(v22bis_state_t *s, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(void) v22bis_set_get_bit(v22bis_state_t *s, get_bit_func_t get_bit, void *user_data); /*! Change the get_bit function associated with a V.22bis modem context. \brief Change the put_bit function associated with a V.22bis modem context. \param s The modem context. \param put_bit The callback routine used to process the data received. \param user_data An opaque pointer. */ -void v22bis_set_put_bit(v22bis_state_t *s, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(void) v22bis_set_put_bit(v22bis_state_t *s, put_bit_func_t put_bit, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v27ter_rx.h,v 1.54 2008/10/13 13:14:01 steveu Exp $ + * $Id: v27ter_rx.h,v 1.55 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -78,7 +78,7 @@ \param put_bit The callback routine used to put the received data. \param user_data An opaque pointer passed to the put_bit routine. \return A pointer to the modem context, or NULL if there was a problem. */ -v27ter_rx_state_t *v27ter_rx_init(v27ter_rx_state_t *s, int bit_rate, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(v27ter_rx_state_t) *v27ter_rx_init(v27ter_rx_state_t *s, int bit_rate, put_bit_func_t put_bit, void *user_data); /*! Reinitialise an existing V.27ter modem receive context. \brief Reinitialise an existing V.27ter modem receive context. @@ -86,29 +86,29 @@ \param bit_rate The bit rate of the modem. Valid values are 2400 and 4800. \param old_train TRUE if a previous trained values are to be reused. \return 0 for OK, -1 for bad parameter */ -int v27ter_rx_restart(v27ter_rx_state_t *s, int bit_rate, int old_train); +SPAN_DECLARE(int) v27ter_rx_restart(v27ter_rx_state_t *s, int bit_rate, int old_train); /*! Free a V.27ter modem receive context. \brief Free a V.27ter modem receive context. \param s The modem context. \return 0 for OK */ -int v27ter_rx_free(v27ter_rx_state_t *s); +SPAN_DECLARE(int) v27ter_rx_free(v27ter_rx_state_t *s); -logging_state_t *v27ter_rx_get_logging_state(v27ter_rx_state_t *s); +SPAN_DECLARE(logging_state_t) *v27ter_rx_get_logging_state(v27ter_rx_state_t *s); /*! Change the put_bit function associated with a V.27ter modem receive context. \brief Change the put_bit function associated with a V.27ter modem receive context. \param s The modem context. \param put_bit The callback routine used to handle received bits. \param user_data An opaque pointer. */ -void v27ter_rx_set_put_bit(v27ter_rx_state_t *s, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(void) v27ter_rx_set_put_bit(v27ter_rx_state_t *s, put_bit_func_t put_bit, void *user_data); /*! Change the modem status report function associated with a V.27ter modem receive context. \brief Change the modem status report function associated with a V.27ter modem receive context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void v27ter_rx_set_modem_status_handler(v27ter_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) v27ter_rx_set_modem_status_handler(v27ter_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); /*! Process a block of received V.27ter modem audio samples. \brief Process a block of received V.27ter modem audio samples. @@ -117,39 +117,39 @@ \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int v27ter_rx(v27ter_rx_state_t *s, const int16_t amp[], int len); +SPAN_DECLARE(int) v27ter_rx(v27ter_rx_state_t *s, const int16_t amp[], int len); /*! Get a snapshot of the current equalizer coefficients. \brief Get a snapshot of the current equalizer coefficients. \param coeffs The vector of complex coefficients. \return The number of coefficients in the vector. */ -int v27ter_rx_equalizer_state(v27ter_rx_state_t *s, complexf_t **coeffs); +SPAN_DECLARE(int) v27ter_rx_equalizer_state(v27ter_rx_state_t *s, complexf_t **coeffs); /*! Get the current received carrier frequency. \param s The modem context. \return The frequency, in Hertz. */ -float v27ter_rx_carrier_frequency(v27ter_rx_state_t *s); +SPAN_DECLARE(float) v27ter_rx_carrier_frequency(v27ter_rx_state_t *s); /*! Get the current symbol timing correction since startup. \param s The modem context. \return The correction. */ -float v27ter_rx_symbol_timing_correction(v27ter_rx_state_t *s); +SPAN_DECLARE(float) v27ter_rx_symbol_timing_correction(v27ter_rx_state_t *s); /*! Get a current received signal power. \param s The modem context. \return The signal power, in dBm0. */ -float v27ter_rx_signal_power(v27ter_rx_state_t *s); +SPAN_DECLARE(float) v27ter_rx_signal_power(v27ter_rx_state_t *s); /*! Set the power level at which the carrier detection will cut in \param s The modem context. \param cutoff The signal cutoff power, in dBm0. */ -void v27ter_rx_signal_cutoff(v27ter_rx_state_t *s, float cutoff); +SPAN_DECLARE(void) v27ter_rx_signal_cutoff(v27ter_rx_state_t *s, float cutoff); /*! Set a handler routine to process QAM status reports \param s The modem context. \param handler The handler routine. \param user_data An opaque pointer passed to the handler routine. */ -void v27ter_rx_set_qam_report_handler(v27ter_rx_state_t *s, qam_report_handler_t handler, void *user_data); +SPAN_DECLARE(void) v27ter_rx_set_qam_report_handler(v27ter_rx_state_t *s, qam_report_handler_t handler, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v27ter_tx.h,v 1.37 2008/10/13 13:14:01 steveu Exp $ + * $Id: v27ter_tx.h,v 1.38 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -81,7 +81,7 @@ \brief Adjust a V.27ter modem transmit context's output power. \param s The modem context. \param power The power level, in dBm0 */ -void v27ter_tx_power(v27ter_tx_state_t *s, float power); +SPAN_DECLARE(void) v27ter_tx_power(v27ter_tx_state_t *s, float power); /*! Initialise a V.27ter modem transmit context. \brief Initialise a V.27ter modem transmit context. @@ -91,7 +91,7 @@ \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. \return A pointer to the modem context, or NULL if there was a problem. */ -v27ter_tx_state_t *v27ter_tx_init(v27ter_tx_state_t *s, int bit_rate, int tep, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(v27ter_tx_state_t) *v27ter_tx_init(v27ter_tx_state_t *s, int bit_rate, int tep, get_bit_func_t get_bit, void *user_data); /*! Reinitialise an existing V.27ter modem transmit context, so it may be reused. \brief Reinitialise an existing V.27ter modem transmit context. @@ -99,29 +99,29 @@ \param bit_rate The bit rate of the modem. Valid values are 2400 and 4800. \param tep TRUE is the optional TEP tone is to be transmitted. \return 0 for OK, -1 for bad parameter */ -int v27ter_tx_restart(v27ter_tx_state_t *s, int bit_rate, int tep); +SPAN_DECLARE(int) v27ter_tx_restart(v27ter_tx_state_t *s, int bit_rate, int tep); /*! Free a V.27ter modem transmit context. \brief Free a V.27ter modem transmit context. \param s The modem context. \return 0 for OK */ -int v27ter_tx_free(v27ter_tx_state_t *s); +SPAN_DECLARE(int) v27ter_tx_free(v27ter_tx_state_t *s); -logging_state_t *v27ter_tx_get_logging_state(v27ter_tx_state_t *s); +SPAN_DECLARE(logging_state_t) *v27ter_tx_get_logging_state(v27ter_tx_state_t *s); /*! Change the get_bit function associated with a V.27ter modem transmit context. \brief Change the get_bit function associated with a V.27ter modem transmit context. \param s The modem context. \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. */ -void v27ter_tx_set_get_bit(v27ter_tx_state_t *s, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(void) v27ter_tx_set_get_bit(v27ter_tx_state_t *s, get_bit_func_t get_bit, void *user_data); /*! Change the modem status report function associated with a V.27ter modem transmit context. \brief Change the modem status report function associated with a V.27ter modem transmit context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void v27ter_tx_set_modem_status_handler(v27ter_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) v27ter_tx_set_modem_status_handler(v27ter_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); /*! Generate a block of V.27ter modem audio samples. \brief Generate a block of V.27ter modem audio samples. @@ -130,7 +130,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -int v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); +SPAN_DECLARE(int) v27ter_tx(v27ter_tx_state_t *s, int16_t amp[], int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v29rx.h,v 1.65 2008/10/13 13:14:01 steveu Exp $ + * $Id: v29rx.h,v 1.66 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -147,7 +147,7 @@ \param put_bit The callback routine used to put the received data. \param user_data An opaque pointer passed to the put_bit routine. \return A pointer to the modem context, or NULL if there was a problem. */ -v29_rx_state_t *v29_rx_init(v29_rx_state_t *s, int bit_rate, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(v29_rx_state_t) *v29_rx_init(v29_rx_state_t *s, int bit_rate, put_bit_func_t put_bit, void *user_data); /*! Reinitialise an existing V.29 modem receive context. \brief Reinitialise an existing V.29 modem receive context. @@ -155,29 +155,29 @@ \param bit_rate The bit rate of the modem. Valid values are 4800, 7200 and 9600. \param old_train TRUE if a previous trained values are to be reused. \return 0 for OK, -1 for bad parameter */ -int v29_rx_restart(v29_rx_state_t *s, int bit_rate, int old_train); +SPAN_DECLARE(int) v29_rx_restart(v29_rx_state_t *s, int bit_rate, int old_train); /*! Free a V.29 modem receive context. \brief Free a V.29 modem receive context. \param s The modem context. \return 0 for OK */ -int v29_rx_free(v29_rx_state_t *s); +SPAN_DECLARE(int) v29_rx_free(v29_rx_state_t *s); -logging_state_t *v29_rx_get_logging_state(v29_rx_state_t *s); +SPAN_DECLARE(logging_state_t) *v29_rx_get_logging_state(v29_rx_state_t *s); /*! Change the put_bit function associated with a V.29 modem receive context. \brief Change the put_bit function associated with a V.29 modem receive context. \param s The modem context. \param put_bit The callback routine used to handle received bits. \param user_data An opaque pointer. */ -void v29_rx_set_put_bit(v29_rx_state_t *s, put_bit_func_t put_bit, void *user_data); +SPAN_DECLARE(void) v29_rx_set_put_bit(v29_rx_state_t *s, put_bit_func_t put_bit, void *user_data); /*! Change the modem status report function associated with a V.29 modem receive context. \brief Change the modem status report function associated with a V.29 modem receive context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void v29_rx_set_modem_status_handler(v29_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) v29_rx_set_modem_status_handler(v29_rx_state_t *s, modem_rx_status_func_t handler, void *user_data); /*! Process a block of received V.29 modem audio samples. \brief Process a block of received V.29 modem audio samples. @@ -185,7 +185,7 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. \return The number of samples unprocessed. */ -int v29_rx(v29_rx_state_t *s, const int16_t amp[], int len); +SPAN_DECLARE(int) v29_rx(v29_rx_state_t *s, const int16_t amp[], int len); /*! Get a snapshot of the current equalizer coefficients. \brief Get a snapshot of the current equalizer coefficients. @@ -193,36 +193,36 @@ \param coeffs The vector of complex coefficients. \return The number of coefficients in the vector. */ #if defined(SPANDSP_USE_FIXED_POINT) -int v29_rx_equalizer_state(v29_rx_state_t *s, complexi16_t **coeffs); +SPAN_DECLARE(int) v29_rx_equalizer_state(v29_rx_state_t *s, complexi16_t **coeffs); #else -int v29_rx_equalizer_state(v29_rx_state_t *s, complexf_t **coeffs); +SPAN_DECLARE(int) v29_rx_equalizer_state(v29_rx_state_t *s, complexf_t **coeffs); #endif /*! Get the current received carrier frequency. \param s The modem context. \return The frequency, in Hertz. */ -float v29_rx_carrier_frequency(v29_rx_state_t *s); +SPAN_DECLARE(float) v29_rx_carrier_frequency(v29_rx_state_t *s); /*! Get the current symbol timing correction since startup. \param s The modem context. \return The correction. */ -float v29_rx_symbol_timing_correction(v29_rx_state_t *s); +SPAN_DECLARE(float) v29_rx_symbol_timing_correction(v29_rx_state_t *s); /*! Get the current received signal power. \param s The modem context. \return The signal power, in dBm0. */ -float v29_rx_signal_power(v29_rx_state_t *s); +SPAN_DECLARE(float) v29_rx_signal_power(v29_rx_state_t *s); /*! Set the power level at which the carrier detection will cut in \param s The modem context. \param cutoff The signal cutoff power, in dBm0. */ -void v29_rx_signal_cutoff(v29_rx_state_t *s, float cutoff); +SPAN_DECLARE(void) v29_rx_signal_cutoff(v29_rx_state_t *s, float cutoff); /*! Set a handler routine to process QAM status reports \param s The modem context. \param handler The handler routine. \param user_data An opaque pointer passed to the handler routine. */ -void v29_rx_set_qam_report_handler(v29_rx_state_t *s, qam_report_handler_t handler, void *user_data); +SPAN_DECLARE(void) v29_rx_set_qam_report_handler(v29_rx_state_t *s, qam_report_handler_t handler, void *user_data); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v29tx.h,v 1.35 2008/10/13 13:14:01 steveu Exp $ + * $Id: v29tx.h,v 1.36 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -111,7 +111,7 @@ \brief Adjust a V.29 modem transmit context's output power. \param s The modem context. \param power The power level, in dBm0 */ -void v29_tx_power(v29_tx_state_t *s, float power); +SPAN_DECLARE(void) v29_tx_power(v29_tx_state_t *s, float power); /*! Initialise a V.29 modem transmit context. This must be called before the first use of the context, to initialise its contents. @@ -122,7 +122,7 @@ \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. \return A pointer to the modem context, or NULL if there was a problem. */ -v29_tx_state_t *v29_tx_init(v29_tx_state_t *s, int bit_rate, int tep, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(v29_tx_state_t) *v29_tx_init(v29_tx_state_t *s, int bit_rate, int tep, get_bit_func_t get_bit, void *user_data); /*! Reinitialise an existing V.29 modem transmit context, so it may be reused. \brief Reinitialise an existing V.29 modem transmit context. @@ -130,29 +130,29 @@ \param bit_rate The bit rate of the modem. Valid values are 4800, 7200 and 9600. \param tep TRUE is the optional TEP tone is to be transmitted. \return 0 for OK, -1 for bad parameter */ -int v29_tx_restart(v29_tx_state_t *s, int bit_rate, int tep); +SPAN_DECLARE(int) v29_tx_restart(v29_tx_state_t *s, int bit_rate, int tep); /*! Free a V.29 modem transmit context. \brief Free a V.29 modem transmit context. \param s The modem context. \return 0 for OK */ -int v29_tx_free(v29_tx_state_t *s); +SPAN_DECLARE(int) v29_tx_free(v29_tx_state_t *s); -logging_state_t *v29_tx_get_logging_state(v29_tx_state_t *s); +SPAN_DECLARE(logging_state_t) *v29_tx_get_logging_state(v29_tx_state_t *s); /*! Change the get_bit function associated with a V.29 modem transmit context. \brief Change the get_bit function associated with a V.29 modem transmit context. \param s The modem context. \param get_bit The callback routine used to get the data to be transmitted. \param user_data An opaque pointer. */ -void v29_tx_set_get_bit(v29_tx_state_t *s, get_bit_func_t get_bit, void *user_data); +SPAN_DECLARE(void) v29_tx_set_get_bit(v29_tx_state_t *s, get_bit_func_t get_bit, void *user_data); /*! Change the modem status report function associated with a V.29 modem transmit context. \brief Change the modem status report function associated with a V.29 modem transmit context. \param s The modem context. \param handler The callback routine used to report modem status changes. \param user_data An opaque pointer. */ -void v29_tx_set_modem_status_handler(v29_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); +SPAN_DECLARE(void) v29_tx_set_modem_status_handler(v29_tx_state_t *s, modem_tx_status_func_t handler, void *user_data); /*! Generate a block of V.29 modem audio samples. \brief Generate a block of V.29 modem audio samples. @@ -161,7 +161,7 @@ \param len The number of samples to be generated. \return The number of samples actually generated. */ -int v29_tx(v29_tx_state_t *s, int16_t *amp, int len); +SPAN_DECLARE(int) v29_tx(v29_tx_state_t *s, int16_t *amp, int len); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v42.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v42.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v42.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v42.h,v 1.26 2008/11/15 14:43:08 steveu Exp $ + * $Id: v42.h,v 1.27 2009/01/31 08:48:11 steveu Exp $ */ /*! \page v42_page V.42 modem error correction @@ -82,7 +82,7 @@ { #endif -const char *lapm_status_to_str(int status); +SPAN_DECLARE(const char) *lapm_status_to_str(int status); /*! Dump LAP.M frames in a raw and/or decoded forms \param frame The frame itself @@ -90,43 +90,43 @@ \param showraw TRUE if the raw octets should be dumped \param txrx TRUE if tx, FALSE if rx. Used to highlight the packet's direction. */ -void lapm_dump(lapm_state_t *s, const uint8_t *frame, int len, int showraw, int txrx); +SPAN_DECLARE(void) lapm_dump(lapm_state_t *s, const uint8_t *frame, int len, int showraw, int txrx); /*! Accept an HDLC packet */ -void lapm_receive(void *user_data, const uint8_t *buf, int len, int ok); +SPAN_DECLARE(void) lapm_receive(void *user_data, const uint8_t *buf, int len, int ok); /*! Transmit a LAP.M frame */ -int lapm_tx(lapm_state_t *s, const void *buf, int len); +SPAN_DECLARE(int) lapm_tx(lapm_state_t *s, const void *buf, int len); /*! Transmit a LAP.M information frame */ -int lapm_tx_iframe(lapm_state_t *s, const void *buf, int len, int cr); +SPAN_DECLARE(int) lapm_tx_iframe(lapm_state_t *s, const void *buf, int len, int cr); /*! Send a break over a LAP.M connection */ -int lapm_break(lapm_state_t *s, int enable); +SPAN_DECLARE(int) lapm_break(lapm_state_t *s, int enable); /*! Initiate an orderly release of a LAP.M connection */ -int lapm_release(lapm_state_t *s); +SPAN_DECLARE(int) lapm_release(lapm_state_t *s); /*! Enable or disable loopback of a LAP.M connection */ -int lapm_loopback(lapm_state_t *s, int enable); +SPAN_DECLARE(int) lapm_loopback(lapm_state_t *s, int enable); /*! Assign or remove a callback routine used to deal with V.42 status changes. */ -void v42_set_status_callback(v42_state_t *s, v42_status_func_t callback, void *user_data); +SPAN_DECLARE(void) v42_set_status_callback(v42_state_t *s, v42_status_func_t callback, void *user_data); /*! Process a newly received bit for a V.42 context. */ -void v42_rx_bit(void *user_data, int bit); +SPAN_DECLARE(void) v42_rx_bit(void *user_data, int bit); /*! Get the next transmit bit for a V.42 context. */ -int v42_tx_bit(void *user_data); +SPAN_DECLARE(int) v42_tx_bit(void *user_data); /*! Initialise a V.42 context. \param s The V.42 context. @@ -135,17 +135,17 @@ \param user_data An opaque pointer passed to the frame handler routine. \return ??? */ -v42_state_t *v42_init(v42_state_t *s, int caller, int detect, v42_frame_handler_t frame_handler, void *user_data); +SPAN_DECLARE(v42_state_t) *v42_init(v42_state_t *s, int caller, int detect, v42_frame_handler_t frame_handler, void *user_data); /*! Restart a V.42 context. \param s The V.42 context. */ -void v42_restart(v42_state_t *s); +SPAN_DECLARE(void) v42_restart(v42_state_t *s); /*! Release a V.42 context. \param s The V.42 context. \return 0 if OK */ -int v42_release(v42_state_t *s); +SPAN_DECLARE(int) v42_release(v42_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v42bis.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v42bis.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v42bis.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v42bis.h,v 1.23 2008/11/15 14:43:08 steveu Exp $ + * $Id: v42bis.h,v 1.24 2009/01/31 08:48:11 steveu Exp $ */ /*! \page v42bis_page V.42bis modem data compression @@ -75,24 +75,24 @@ \param buf The data to be compressed. \param len The length of the data buffer. \return 0 */ -int v42bis_compress(v42bis_state_t *s, const uint8_t *buf, int len); +SPAN_DECLARE(int) v42bis_compress(v42bis_state_t *s, const uint8_t *buf, int len); /*! Flush out any data remaining in a compression buffer. \param s The V.42bis context. \return 0 */ -int v42bis_compress_flush(v42bis_state_t *s); +SPAN_DECLARE(int) v42bis_compress_flush(v42bis_state_t *s); /*! Decompress a block of octets. \param s The V.42bis context. \param buf The data to be decompressed. \param len The length of the data buffer. \return 0 */ -int v42bis_decompress(v42bis_state_t *s, const uint8_t *buf, int len); +SPAN_DECLARE(int) v42bis_decompress(v42bis_state_t *s, const uint8_t *buf, int len); /*! Flush out any data remaining in the decompression buffer. \param s The V.42bis context. \return 0 */ -int v42bis_decompress_flush(v42bis_state_t *s); +SPAN_DECLARE(int) v42bis_decompress_flush(v42bis_state_t *s); /*! Initialise a V.42bis context. \param s The V.42bis context. @@ -106,16 +106,16 @@ \param data_user_data . \param max_data_len The maximum length that should be passed to the data handler. \return The V.42bis context. */ -v42bis_state_t *v42bis_init(v42bis_state_t *s, - int negotiated_p0, - int negotiated_p1, - int negotiated_p2, - v42bis_frame_handler_t frame_handler, - void *frame_user_data, - int max_frame_len, - v42bis_data_handler_t data_handler, - void *data_user_data, - int max_data_len); +SPAN_DECLARE(v42bis_state_t) *v42bis_init(v42bis_state_t *s, + int negotiated_p0, + int negotiated_p1, + int negotiated_p2, + v42bis_frame_handler_t frame_handler, + void *frame_user_data, + int max_frame_len, + v42bis_data_handler_t data_handler, + void *data_user_data, + int max_data_len); /*! Set the compression mode. \param s The V.42bis context. @@ -123,12 +123,12 @@ V42BIS_COMPRESSION_MODE_DYNAMIC, V42BIS_COMPRESSION_MODE_ALWAYS, V42BIS_COMPRESSION_MODE_NEVER */ -void v42bis_compression_control(v42bis_state_t *s, int mode); +SPAN_DECLARE(void) v42bis_compression_control(v42bis_state_t *s, int mode); /*! Release a V.42bis context. \param s The V.42bis context. \return 0 if OK */ -int v42bis_release(v42bis_state_t *s); +SPAN_DECLARE(int) v42bis_release(v42bis_state_t *s); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v8.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/v8.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/v8.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: v8.h,v 1.25 2008/10/13 14:19:18 steveu Exp $ + * $Id: v8.h,v 1.26 2009/01/31 08:48:11 steveu Exp $ */ /*! \file */ @@ -128,25 +128,25 @@ \param result_handler The callback routine used to handle the results of negotiation. \param user_data An opaque pointer passed to the result_handler routine. \return A pointer to the V.8 context, or NULL if there was a problem. */ -v8_state_t *v8_init(v8_state_t *s, - int caller, - int available_modulations, - v8_result_handler_t *result_handler, - void *user_data); +SPAN_DECLARE(v8_state_t) *v8_init(v8_state_t *s, + int caller, + int available_modulations, + v8_result_handler_t *result_handler, + void *user_data); /*! Release a V.8 context. \brief Release a V.8 context. \param s The V.8 context. \return 0 for OK. */ -int v8_release(v8_state_t *s); +SPAN_DECLARE(int) v8_release(v8_state_t *s); /*! Free a V.8 context. \brief Release a V.8 context. \param s The V.8 context. \return 0 for OK. */ -int v8_free(v8_state_t *s); +SPAN_DECLARE(int) v8_free(v8_state_t *s); -logging_state_t *v8_get_logging_state(v8_state_t *s); +SPAN_DECLARE(logging_state_t) *v8_get_logging_state(v8_state_t *s); /*! Generate a block of V.8 audio samples. \brief Generate a block of V.8 audio samples. @@ -155,7 +155,7 @@ \param max_len The number of samples to be generated. \return The number of samples actually generated. */ -int v8_tx(v8_state_t *s, int16_t *amp, int max_len); +SPAN_DECLARE(int) v8_tx(v8_state_t *s, int16_t *amp, int max_len); /*! Process a block of received V.8 audio samples. \brief Process a block of received V.8 audio samples. @@ -163,19 +163,19 @@ \param amp The audio sample buffer. \param len The number of samples in the buffer. */ -int v8_rx(v8_state_t *s, const int16_t *amp, int len); +SPAN_DECLARE(int) v8_rx(v8_state_t *s, const int16_t *amp, int len); /*! Log the list of supported modulations. \brief Log the list of supported modulations. \param s The V.8 context. \param modulation_schemes The list of supported modulations. */ -void v8_log_supported_modulations(v8_state_t *s, int modulation_schemes); +SPAN_DECLARE(void) v8_log_supported_modulations(v8_state_t *s, int modulation_schemes); -const char *v8_call_function_to_str(int call_function); -const char *v8_modulation_to_str(int modulation_scheme); -const char *v8_protocol_to_str(int protocol); -const char *v8_pstn_access_to_str(int pstn_access); -const char *v8_pcm_modem_availability_to_str(int pcm_modem_availability); +SPAN_DECLARE(const char) *v8_call_function_to_str(int call_function); +SPAN_DECLARE(const char) *v8_modulation_to_str(int modulation_scheme); +SPAN_DECLARE(const char) *v8_protocol_to_str(int protocol); +SPAN_DECLARE(const char) *v8_pstn_access_to_str(int pstn_access); +SPAN_DECLARE(const char) *v8_pcm_modem_availability_to_str(int pcm_modem_availability); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/vector_float.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/vector_float.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/vector_float.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: vector_float.h,v 1.14 2008/10/09 13:25:19 steveu Exp $ + * $Id: vector_float.h,v 1.15 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_VECTOR_FLOAT_H_) @@ -33,124 +33,124 @@ { #endif -void vec_copyf(float z[], const float x[], int n); +SPAN_DECLARE(void) vec_copyf(float z[], const float x[], int n); -void vec_copy(double z[], const double x[], int n); +SPAN_DECLARE(void) vec_copy(double z[], const double x[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_copyl(long double z[], const long double x[], int n); +SPAN_DECLARE(void) vec_copyl(long double z[], const long double x[], int n); #endif -void vec_negatef(float z[], const float x[], int n); +SPAN_DECLARE(void) vec_negatef(float z[], const float x[], int n); -void vec_negate(double z[], const double x[], int n); +SPAN_DECLARE(void) vec_negate(double z[], const double x[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_negatel(long double z[], const long double x[], int n); +SPAN_DECLARE(void) vec_negatel(long double z[], const long double x[], int n); #endif -void vec_zerof(float z[], int n); +SPAN_DECLARE(void) vec_zerof(float z[], int n); -void vec_zero(double z[], int n); +SPAN_DECLARE(void) vec_zero(double z[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_zerol(long double z[], int n); +SPAN_DECLARE(void) vec_zerol(long double z[], int n); #endif -void vec_setf(float z[], float x, int n); +SPAN_DECLARE(void) vec_setf(float z[], float x, int n); -void vec_set(double z[], double x, int n); +SPAN_DECLARE(void) vec_set(double z[], double x, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_setl(long double z[], long double x, int n); +SPAN_DECLARE(void) vec_setl(long double z[], long double x, int n); #endif -void vec_addf(float z[], const float x[], const float y[], int n); +SPAN_DECLARE(void) vec_addf(float z[], const float x[], const float y[], int n); -void vec_add(double z[], const double x[], const double y[], int n); +SPAN_DECLARE(void) vec_add(double z[], const double x[], const double y[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_addl(long double z[], const long double x[], const long double y[], int n); +SPAN_DECLARE(void) vec_addl(long double z[], const long double x[], const long double y[], int n); #endif -void vec_scaledxy_addf(float z[], const float x[], float x_scale, const float y[], float y_scale, int n); +SPAN_DECLARE(void) vec_scaledxy_addf(float z[], const float x[], float x_scale, const float y[], float y_scale, int n); -void vec_scaledxy_add(double z[], const double x[], double x_scale, const double y[], double y_scale, int n); +SPAN_DECLARE(void) vec_scaledxy_add(double z[], const double x[], double x_scale, const double y[], double y_scale, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scaledxy_addl(long double z[], const long double x[], long double x_scale, const long double y[], long double y_scale, int n); +SPAN_DECLARE(void) vec_scaledxy_addl(long double z[], const long double x[], long double x_scale, const long double y[], long double y_scale, int n); #endif -void vec_scaledy_addf(float z[], const float x[], const float y[], float y_scale, int n); +SPAN_DECLARE(void) vec_scaledy_addf(float z[], const float x[], const float y[], float y_scale, int n); -void vec_scaledy_add(double z[], const double x[], const double y[], double y_scale, int n); +SPAN_DECLARE(void) vec_scaledy_add(double z[], const double x[], const double y[], double y_scale, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scaledy_addl(long double z[], const long double x[], const long double y[], long double y_scale, int n); +SPAN_DECLARE(void) vec_scaledy_addl(long double z[], const long double x[], const long double y[], long double y_scale, int n); #endif -void vec_subf(float z[], const float x[], const float y[], int n); +SPAN_DECLARE(void) vec_subf(float z[], const float x[], const float y[], int n); -void vec_sub(double z[], const double x[], const double y[], int n); +SPAN_DECLARE(void) vec_sub(double z[], const double x[], const double y[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_subl(long double z[], const long double x[], const long double y[], int n); +SPAN_DECLARE(void) vec_subl(long double z[], const long double x[], const long double y[], int n); #endif -void vec_scaledxy_subf(float z[], const float x[], float x_scale, const float y[], float y_scale, int n); +SPAN_DECLARE(void) vec_scaledxy_subf(float z[], const float x[], float x_scale, const float y[], float y_scale, int n); -void vec_scaledxy_sub(double z[], const double x[], double x_scale, const double y[], double y_scale, int n); +SPAN_DECLARE(void) vec_scaledxy_sub(double z[], const double x[], double x_scale, const double y[], double y_scale, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scaledxy_subl(long double z[], const long double x[], long double x_scale, const long double y[], long double y_scale, int n); +SPAN_DECLARE(void) vec_scaledxy_subl(long double z[], const long double x[], long double x_scale, const long double y[], long double y_scale, int n); #endif -void vec_scaledx_subf(float z[], const float x[], float x_scale, const float y[], int n); +SPAN_DECLARE(void) vec_scaledx_subf(float z[], const float x[], float x_scale, const float y[], int n); -void vec_scaledx_sub(double z[], const double x[], double x_scale, const double y[], int n); +SPAN_DECLARE(void) vec_scaledx_sub(double z[], const double x[], double x_scale, const double y[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scaledx_subl(long double z[], const long double x[], long double x_scale, const long double y[], int n); +SPAN_DECLARE(void) vec_scaledx_subl(long double z[], const long double x[], long double x_scale, const long double y[], int n); #endif -void vec_scaledy_subf(float z[], const float x[], const float y[], float y_scale, int n); +SPAN_DECLARE(void) vec_scaledy_subf(float z[], const float x[], const float y[], float y_scale, int n); -void vec_scaledy_sub(double z[], const double x[], const double y[], double y_scale, int n); +SPAN_DECLARE(void) vec_scaledy_sub(double z[], const double x[], const double y[], double y_scale, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scaledy_subl(long double z[], const long double x[], const long double y[], long double y_scale, int n); +SPAN_DECLARE(void) vec_scaledy_subl(long double z[], const long double x[], const long double y[], long double y_scale, int n); #endif -void vec_scalar_mulf(float z[], const float x[], float y, int n); +SPAN_DECLARE(void) vec_scalar_mulf(float z[], const float x[], float y, int n); -void vec_scalar_mul(double z[], const double x[], double y, int n); +SPAN_DECLARE(void) vec_scalar_mul(double z[], const double x[], double y, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scalar_mull(long double z[], const long double x[], long double y, int n); +SPAN_DECLARE(void) vec_scalar_mull(long double z[], const long double x[], long double y, int n); #endif -void vec_scalar_addf(float z[], const float x[], float y, int n); +SPAN_DECLARE(void) vec_scalar_addf(float z[], const float x[], float y, int n); -void vec_scalar_add(double z[], const double x[], double y, int n); +SPAN_DECLARE(void) vec_scalar_add(double z[], const double x[], double y, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scalar_addl(long double z[], const long double x[], long double y, int n); +SPAN_DECLARE(void) vec_scalar_addl(long double z[], const long double x[], long double y, int n); #endif -void vec_scalar_subf(float z[], const float x[], float y, int n); +SPAN_DECLARE(void) vec_scalar_subf(float z[], const float x[], float y, int n); -void vec_scalar_sub(double z[], const double x[], double y, int n); +SPAN_DECLARE(void) vec_scalar_sub(double z[], const double x[], double y, int n); #if defined(HAVE_LONG_DOUBLE) -void vec_scalar_subl(long double z[], const long double x[], long double y, int n); +SPAN_DECLARE(void) vec_scalar_subl(long double z[], const long double x[], long double y, int n); #endif -void vec_mulf(float z[], const float x[], const float y[], int n); +SPAN_DECLARE(void) vec_mulf(float z[], const float x[], const float y[], int n); -void vec_mul(double z[], const double x[], const double y[], int n); +SPAN_DECLARE(void) vec_mul(double z[], const double x[], const double y[], int n); #if defined(HAVE_LONG_DOUBLE) -void vec_mull(long double z[], const long double x[], const long double y[], int n); +SPAN_DECLARE(void) vec_mull(long double z[], const long double x[], const long double y[], int n); #endif /*! \brief Find the dot product of two float vectors. @@ -158,14 +158,14 @@ \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -float vec_dot_prodf(const float x[], const float y[], int n); +SPAN_DECLARE(float) vec_dot_prodf(const float x[], const float y[], int n); /*! \brief Find the dot product of two double vectors. \param x The first vector. \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -double vec_dot_prod(const double x[], const double y[], int n); +SPAN_DECLARE(double) vec_dot_prod(const double x[], const double y[], int n); #if defined(HAVE_LONG_DOUBLE) /*! \brief Find the dot product of two long double vectors. @@ -173,7 +173,7 @@ \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -long double vec_dot_prodl(const long double x[], const long double y[], int n); +SPAN_DECLARE(long double) vec_dot_prodl(const long double x[], const long double y[], int n); #endif /*! \brief Find the dot product of two float vectors, where the first is a circular buffer @@ -183,11 +183,11 @@ \param n The number of elements in the vectors. \param pos The starting position in the x vector. \return The dot product of the two vectors. */ -float vec_circular_dot_prodf(const float x[], const float y[], int n, int pos); +SPAN_DECLARE(float) vec_circular_dot_prodf(const float x[], const float y[], int n, int pos); -void vec_lmsf(const float x[], float y[], int n, float error); +SPAN_DECLARE(void) vec_lmsf(const float x[], float y[], int n, float error); -void vec_circular_lmsf(const float x[], float y[], int n, int pos, float error); +SPAN_DECLARE(void) vec_circular_lmsf(const float x[], float y[], int n, int pos, float error); #if defined(__cplusplus) } Modified: freeswitch/trunk/libs/spandsp/src/spandsp/vector_int.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/vector_int.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/vector_int.h Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: vector_int.h,v 1.13 2008/09/18 13:54:32 steveu Exp $ + * $Id: vector_int.h,v 1.14 2009/01/31 08:48:11 steveu Exp $ */ #if !defined(_SPANDSP_VECTOR_INT_H_) @@ -101,7 +101,7 @@ \param y The first vector. \param n The number of elements in the vectors. \return The dot product of the two vectors. */ -int32_t vec_dot_prodi16(const int16_t x[], const int16_t y[], int n); +SPAN_DECLARE(int32_t) vec_dot_prodi16(const int16_t x[], const int16_t y[], int n); /*! \brief Find the dot product of two int16_t vectors, where the first is a circular buffer with an offset for the starting position. @@ -110,11 +110,11 @@ \param n The number of elements in the vectors. \param pos The starting position in the x vector. \return The dot product of the two vectors. */ -int32_t vec_circular_dot_prodi16(const int16_t x[], const int16_t y[], int n, int pos); +SPAN_DECLARE(int32_t) vec_circular_dot_prodi16(const int16_t x[], const int16_t y[], int n, int pos); -void vec_lmsi16(const int16_t x[], int16_t y[], int n, int16_t error); +SPAN_DECLARE(void) vec_lmsi16(const int16_t x[], int16_t y[], int n, int16_t error); -void vec_circular_lmsi16(const int16_t x[], int16_t y[], int n, int pos, int16_t error); +SPAN_DECLARE(void) vec_circular_lmsi16(const int16_t x[], int16_t y[], int n, int pos, int16_t error); /*! \brief Find the minimum and maximum values in an int16_t vector. \param x The vector to be searched. @@ -125,7 +125,7 @@ \return The absolute maximum value. Since the range of negative numbers exceeds the range of positive one, the returned integer is longer than the ones being searched. */ -int32_t vec_min_maxi16(const int16_t x[], int n, int16_t out[]); +SPAN_DECLARE(int32_t) vec_min_maxi16(const int16_t x[], int n, int16_t out[]); static __inline__ int vec_norm2i16(const int16_t *vec, int len) { Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/version.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h Mon Feb 2 11:40:52 2009 @@ -30,8 +30,8 @@ /* The date and time of the version are in UTC form. */ -#define SPANDSP_RELEASE_DATE 20090130 -#define SPANDSP_RELEASE_TIME 102456 +#define SPANDSP_RELEASE_DATE 20090131 +#define SPANDSP_RELEASE_TIME 122642 #endif /*- End of file ------------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/t30.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t30.c (original) +++ freeswitch/trunk/libs/spandsp/src/t30.c Mon Feb 2 11:40:52 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t30.c,v 1.280 2009/01/29 18:30:14 steveu Exp $ + * $Id: t30.c,v 1.282 2009/01/31 09:47:59 steveu Exp $ */ /*! \file */ @@ -289,7 +289,7 @@ /* (Annex C - ISDN) Time-out T7 is used to detect loss of command/response synchronization. T7 is 6+-1s. The timeout begins when initiating a command search (e.g., the first entrance into the "command received" -subroutine � see flow diagram in C.5) and is reset upon detecting a valid signal or when T7 times out. */ +subroutine - see flow diagram in C.5) and is reset upon detecting a valid signal or when T7 times out. */ #define DEFAULT_TIMER_T7 7000 /* (Annex C - ISDN) Time-out T8 defines the amount of time waiting for clearance of the busy condition @@ -5050,7 +5050,7 @@ break; case T30_STATE_F_DOC_NON_ECM: /* Document transfer */ - if (t4_rx_put_byte(&s->t4, byte)) + if (t4_rx_put_byte(&s->t4, (uint8_t) byte)) { /* That is the end of the document */ set_state(s, T30_STATE_F_POST_DOC_NON_ECM); Modified: freeswitch/trunk/libs/spandsp/src/t4.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t4.c (original) +++ freeswitch/trunk/libs/spandsp/src/t4.c Mon Feb 2 11:40:52 2009 @@ -24,7 +24,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t4.c,v 1.119 2009/01/28 03:41:27 steveu Exp $ + * $Id: t4.c,v 1.120 2009/01/31 08:48:10 steveu Exp $ */ /* @@ -611,6 +611,7 @@ int fudge; int row_starts_at; int x; + int j; if (s->run_length) add_run_to_row(s); @@ -659,7 +660,7 @@ for (x = 0, fudge = 0; x < s->a_cursor; x++, fudge ^= 0xFF) { i = s->cur_runs[x]; - if (i >= s->tx_bits) + if ((int) i >= s->tx_bits) { s->tx_bitstream = (s->tx_bitstream << s->tx_bits) | (msbmask[s->tx_bits] & fudge); for (i += (8 - s->tx_bits); i >= 8; i -= 8) @@ -681,8 +682,8 @@ row for the next row. Use a copy of the previous good row as the actual current row. If the row only fell apart near the end, reusing it might be the best solution. */ - for (i = 0, fudge = 0; i < s->a_cursor && fudge < s->image_width; i++) - fudge += s->cur_runs[i]; + for (j = 0, fudge = 0; j < s->a_cursor && fudge < s->image_width; j++) + fudge += s->cur_runs[j]; if (fudge < s->image_width) { /* Try to pad with white, and avoid black, to minimise mess on the image. */ @@ -1613,11 +1614,11 @@ b_cursor |= 1; else b_cursor &= ~1; - if (a0 < s->ref_runs[b_cursor]) + if (a0 < (int) s->ref_runs[b_cursor]) { for ( ; b_cursor >= 0; b_cursor -= 2) { - if (a0 >= s->ref_runs[b_cursor]) + if (a0 >= (int) s->ref_runs[b_cursor]) break; } b_cursor += 2; @@ -1626,7 +1627,7 @@ { for ( ; b_cursor < s->ref_steps; b_cursor += 2) { - if (a0 < s->ref_runs[b_cursor]) + if (a0 < (int) s->ref_runs[b_cursor]) break; } if (b_cursor >= s->ref_steps)

1 0

[commit] r11599 - freeswitch/trunk/libs/spandsp/src
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 11:13:25 2009 New Revision: 11599 Log: cleanup Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.sln Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.sln ============================================================================== --- freeswitch/trunk/libs/spandsp/src/libspandsp.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.sln Mon Feb 2 11:13:25 2009 @@ -1,14 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.vcproj", "{CF70F278-3364-4395-A2E1-23501C9B8AD2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" ProjectSection(ProjectDependencies) = postProject - {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94} {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "at_dictionary_gen", "src\msvc\at_dictionary_gen.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" EndProject Global @@ -17,14 +14,10 @@ Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Debug|Win32.Build.0 = Debug|Win32 - {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.ActiveCfg = Release|Win32 - {CF70F278-3364-4395-A2E1-23501C9B8AD2}.Release|Win32.Build.0 = Release|Win32 - {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.ActiveCfg = Debug|Win32 - {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.Build.0 = Debug|Win32 - {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32 - {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32

1 0

[commit] r11598 - freeswitch/trunk/libs/win32/libg722_1
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 11:11:33 2009 New Revision: 11598 Log: fix windows build Modified: freeswitch/trunk/libs/win32/libg722_1/libg722_1.vcproj Modified: freeswitch/trunk/libs/win32/libg722_1/libg722_1.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/libg722_1/libg722_1.vcproj (original) +++ freeswitch/trunk/libs/win32/libg722_1/libg722_1.vcproj Mon Feb 2 11:11:33 2009 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\libg722_1\src\msvc\"" + AdditionalIncludeDirectories=""$(InputDir)..\..\libg722_1\src\msvc\";"$(InputDir)..\..\libg722_1\src\generated\"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -106,7 +106,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories=""$(InputDir)..\..\libg722_1\src\msvc\"" + AdditionalIncludeDirectories=""$(InputDir)..\..\libg722_1\src\msvc\";"$(InputDir)..\..\libg722_1\src\generated\"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBG722_1_EXPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true"

1 0

[commit] r11597 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 11:10:04 2009 New Revision: 11597 Log: fix windows build Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Feb 2 11:10:04 2009 @@ -508,7 +508,7 @@ case nua_i_notify: - if (sip->sip_event && !strcmp(sip->sip_event->o_type, "dialog") && sip->sip_event->o_params && !strcmp(sip->sip_event->o_params[0], "sla")) { + if (sip && sip->sip_event && !strcmp(sip->sip_event->o_type, "dialog") && sip->sip_event->o_params && !strcmp(sip->sip_event->o_params[0], "sla")) { check_destroy = 0; }

1 0

[commit] r11596 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 11:04:56 2009 New Revision: 11596 Log: fix windows build Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Feb 2 11:04:56 2009 @@ -1299,7 +1299,9 @@ log = switch_core_session_alloc(session, sizeof(*log)); log->app = switch_core_session_strdup(session, application_interface->interface_name); - log->arg = switch_core_session_strdup(session, expanded); + if (expanded) { + log->arg = switch_core_session_strdup(session, expanded); + } for (lp = session->app_log; lp && lp->next; lp = lp->next);

1 0

[commit] r11595 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 10:55:43 2009 New Revision: 11595 Log: fix windows build Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Feb 2 10:55:43 2009 @@ -582,7 +582,6 @@ SWITCH_DECLARE(void) CoreSession::execute(const char *app, const char *data) { - const switch_application_interface_t *application_interface; this_check_void(); sanity_check_noreturn;

1 0

[commit] r11594 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 10:54:17 2009 New Revision: 11594 Log: fix windows build Modified: freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Mon Feb 2 10:54:17 2009 @@ -234,11 +234,11 @@ assert(divisor); - rnd2 = (int16_t) (intptr_t) &data + switch_epoch_time_now(NULL); + rnd2 = (int16_t) (intptr_t) (&data + switch_epoch_time_now(NULL)); for (i = 0; i < samples; i++, sum_rnd = 0) { for (x = 0; x < 10; x++) { - rnd += ((x + i) * rnd2); + rnd += (int16_t)((x + i) * rnd2); sum_rnd += rnd; } switch_normalize_to_16bit(sum_rnd);

1 0

[commit] r11593 - freeswitch/trunk/libs/libg722_1/src/generated
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: mikej Date: Mon Feb 2 10:14:45 2009 New Revision: 11593 Log: fixing windows build 1/2 Added: freeswitch/trunk/libs/libg722_1/src/generated/ freeswitch/trunk/libs/libg722_1/src/generated/dct4.h freeswitch/trunk/libs/libg722_1/src/generated/g722_1.h Added: freeswitch/trunk/libs/libg722_1/src/generated/dct4.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libg722_1/src/generated/dct4.h Mon Feb 2 10:14:45 2009 @@ -0,0 +1,1515 @@ +static const float max_dct_core_a[] = +{ + 5.572937315437795e-02f, + 5.435713103213160e-02f, + 5.164643594289910e-02f, + 4.766403419605858e-02f, + 4.250798573945089e-02f, + 3.630524959802148e-02f, + 2.920855772127337e-02f, + 2.139265421578210e-02f, + 1.304999256534943e-02f, + 4.385996787515619e-03f, + 5.435713103213160e-02f, + 4.250798573945089e-02f, + 2.139265421578210e-02f, + -4.385996787515612e-03f, + -2.920855772127336e-02f, + -4.766403419605858e-02f, + -5.572937315437795e-02f, + -5.164643594289911e-02f, + -3.630524959802151e-02f, + -1.304999256534941e-02f, + 5.164643594289910e-02f, + 2.139265421578210e-02f, + -2.139265421578209e-02f, + -5.164643594289910e-02f, + -5.164643594289911e-02f, + -2.139265421578213e-02f, + 2.139265421578211e-02f, + 5.164643594289909e-02f, + 5.164643594289910e-02f, + 2.139265421578213e-02f, + 4.766403419605858e-02f, + -4.385996787515612e-03f, + -5.164643594289910e-02f, + -4.250798573945090e-02f, + 1.304999256534939e-02f, + 5.435713103213161e-02f, + 3.630524959802152e-02f, + -2.139265421578210e-02f, + -5.572937315437795e-02f, + -2.920855772127336e-02f, + 4.250798573945089e-02f, + -2.920855772127336e-02f, + -5.164643594289911e-02f, + 1.304999256534939e-02f, + 5.572937315437795e-02f, + 4.385996787515657e-03f, + -5.435713103213161e-02f, + -2.139265421578214e-02f, + 4.766403419605858e-02f, + 3.630524959802153e-02f, + 3.630524959802148e-02f, + -4.766403419605858e-02f, + -2.139265421578213e-02f, + 5.435713103213161e-02f, + 4.385996787515657e-03f, + -5.572937315437795e-02f, + 1.304999256534937e-02f, + 5.164643594289910e-02f, + -2.920855772127332e-02f, + -4.250798573945090e-02f, + 2.920855772127337e-02f, + -5.572937315437795e-02f, + 2.139265421578211e-02f, + 3.630524959802152e-02f, + -5.435713103213161e-02f, + 1.304999256534937e-02f, + 4.250798573945089e-02f, + -5.164643594289908e-02f, + 4.385996787515504e-03f, + 4.766403419605861e-02f, + 2.139265421578210e-02f, + -5.164643594289911e-02f, + 5.164643594289909e-02f, + -2.139265421578210e-02f, + -2.139265421578214e-02f, + 5.164643594289910e-02f, + -5.164643594289908e-02f, + 2.139265421578208e-02f, + 2.139265421578216e-02f, + -5.164643594289915e-02f, + 1.304999256534943e-02f, + -3.630524959802151e-02f, + 5.164643594289910e-02f, + -5.572937315437795e-02f, + 4.766403419605858e-02f, + -2.920855772127332e-02f, + 4.385996787515504e-03f, + 2.139265421578216e-02f, + -4.250798573945092e-02f, + 5.435713103213160e-02f, + 4.385996787515619e-03f, + -1.304999256534941e-02f, + 2.139265421578213e-02f, + -2.920855772127336e-02f, + 3.630524959802153e-02f, + -4.250798573945090e-02f, + 4.766403419605861e-02f, + -5.164643594289915e-02f, + 5.435713103213160e-02f, + -5.572937315437796e-02f +}; + +static const float dct_core_a[] = +{ + 7.881323533747238e-02f, + 7.687259191733195e-02f, + 7.303909015868119e-02f, + 6.740712359748102e-02f, + 6.011536994189358e-02f, + 5.134337636686234e-02f, + 4.130713846678219e-02f, + 3.025378172711701e-02f, + 1.845547647478522e-02f, + 6.202736141429415e-03f, + 7.687259191733195e-02f, + 6.011536994189358e-02f, + 3.025378172711701e-02f, + -6.202736141429404e-03f, + -4.130713846678218e-02f, + -6.740712359748102e-02f, + -7.881323533747238e-02f, + -7.303909015868121e-02f, + -5.134337636686238e-02f, + -1.845547647478519e-02f, + 7.303909015868119e-02f, + 3.025378172711701e-02f, + -3.025378172711701e-02f, + -7.303909015868119e-02f, + -7.303909015868121e-02f, + -3.025378172711705e-02f, + 3.025378172711703e-02f, + 7.303909015868118e-02f, + 7.303909015868119e-02f, + 3.025378172711706e-02f, + 6.740712359748102e-02f, + -6.202736141429404e-03f, + -7.303909015868119e-02f, + -6.011536994189359e-02f, + 1.845547647478516e-02f, + 7.687259191733196e-02f, + 5.134337636686239e-02f, + -3.025378172711702e-02f, + -7.881323533747238e-02f, + -4.130713846678218e-02f, + 6.011536994189358e-02f, + -4.130713846678218e-02f, + -7.303909015868121e-02f, + 1.845547647478516e-02f, + 7.881323533747238e-02f, + 6.202736141429469e-03f, + -7.687259191733196e-02f, + -3.025378172711707e-02f, + 6.740712359748102e-02f, + 5.134337636686240e-02f, + 5.134337636686234e-02f, + -6.740712359748102e-02f, + -3.025378172711705e-02f, + 7.687259191733196e-02f, + 6.202736141429469e-03f, + -7.881323533747238e-02f, + 1.845547647478515e-02f, + 7.303909015868119e-02f, + -4.130713846678212e-02f, + -6.011536994189359e-02f, + 4.130713846678219e-02f, + -7.881323533747238e-02f, + 3.025378172711703e-02f, + 5.134337636686239e-02f, + -7.687259191733196e-02f, + 1.845547647478515e-02f, + 6.011536994189358e-02f, + -7.303909015868118e-02f, + 6.202736141429252e-03f, + 6.740712359748108e-02f, + 3.025378172711701e-02f, + -7.303909015868121e-02f, + 7.303909015868118e-02f, + -3.025378172711702e-02f, + -3.025378172711707e-02f, + 7.303909015868119e-02f, + -7.303909015868118e-02f, + 3.025378172711699e-02f, + 3.025378172711710e-02f, + -7.303909015868128e-02f, + 1.845547647478522e-02f, + -5.134337636686238e-02f, + 7.303909015868119e-02f, + -7.881323533747238e-02f, + 6.740712359748102e-02f, + -4.130713846678212e-02f, + 6.202736141429252e-03f, + 3.025378172711710e-02f, + -6.011536994189360e-02f, + 7.687259191733195e-02f, + 6.202736141429415e-03f, + -1.845547647478519e-02f, + 3.025378172711706e-02f, + -4.130713846678218e-02f, + 5.134337636686240e-02f, + -6.011536994189359e-02f, + 6.740712359748108e-02f, + -7.303909015868128e-02f, + 7.687259191733195e-02f, + -7.881323533747239e-02f +}; + +static const cos_msin_t cos_msin_5[5] = +{ + {9.969173337331280e-01f, -7.845909572784494e-02f}, + {9.723699203976766e-01f, -2.334453638559054e-01f}, + {9.238795325112867e-01f, -3.826834323650898e-01f}, + {8.526401643540922e-01f, -5.224985647159488e-01f}, + {7.604059656000309e-01f, -6.494480483301837e-01f} +}; + +static const cos_msin_t cos_msin_10[10] = +{ + {9.992290362407229e-01f, -3.925981575906861e-02f}, + {9.930684569549263e-01f, -1.175373974578376e-01f}, + {9.807852804032304e-01f, -1.950903220161282e-01f}, + {9.624552364536473e-01f, -2.714404498650743e-01f}, + {9.381913359224842e-01f, -3.461170570774930e-01f}, + {9.081431738250813e-01f, -4.186597375374281e-01f}, + {8.724960070727972e-01f, -4.886212414969549e-01f}, + {8.314696123025452e-01f, -5.555702330196022e-01f}, + {7.853169308807449e-01f, -6.190939493098340e-01f}, + {7.343225094356856e-01f, -6.788007455329417e-01f} +}; + +static const cos_msin_t cos_msin_20[20] = +{ + {9.998072404820648e-01f, -1.963369246062830e-02f}, + {9.982656101847159e-01f, -5.887080365118903e-02f}, + {9.951847266721969e-01f, -9.801714032956060e-02f}, + {9.905693404435773e-01f, -1.370123416819680e-01f}, + {9.844265680898916e-01f, -1.757962799343545e-01f}, + {9.767658813208724e-01f, -2.143091530650507e-01f}, + {9.675990923602598e-01f, -2.524915770151580e-01f}, + {9.569403357322088e-01f, -2.902846772544623e-01f}, + {9.448060464668780e-01f, -3.276301795616935e-01f}, + {9.312149347588036e-01f, -3.644704998791496e-01f}, + {9.161879571171360e-01f, -4.007488331031410e-01f}, + {8.997482840522215e-01f, -4.364092406733421e-01f}, + {8.819212643483550e-01f, -4.713967368259976e-01f}, + {8.627343859777918e-01f, -5.056573733779846e-01f}, + {8.422172337162865e-01f, -5.391383229110002e-01f}, + {8.204014435255136e-01f, -5.717879602276122e-01f}, + {7.973206537727071e-01f, -6.035559419535714e-01f}, + {7.730104533627370e-01f, -6.343932841636455e-01f}, + {7.475083268625968e-01f, -6.642524379112817e-01f}, + {7.208535967029188e-01f, -6.930873625456359e-01f} +}; + +static const cos_msin_t cos_msin_40[40] = +{ + {9.999518089593280e-01f, -9.817319337149617e-03f}, + {9.995663085020212e-01f, -2.944817324796316e-02f}, + {9.987954562051724e-01f, -4.906767432741801e-02f}, + {9.976395492470157e-01f, -6.866825888437376e-02f}, + {9.960990332516871e-01f, -8.824237052036951e-02f}, + {9.941745021174282e-01f, -1.077824630427593e-01f}, + {9.918666977876260e-01f, -1.272810033739132e-01f}, + {9.891765099647810e-01f, -1.467304744553617e-01f}, + {9.861049757675088e-01f, -1.661233781457655e-01f}, + {9.826532793307118e-01f, -1.854522381115909e-01f}, + {9.788227513490724e-01f, -2.047096027093796e-01f}, + {9.746148685640450e-01f, -2.238880478584984e-01f}, + {9.700312531945440e-01f, -2.429801799032639e-01f}, + {9.650736723115474e-01f, -2.619786384633375e-01f}, + {9.597440371568574e-01f, -2.808760992712921e-01f}, + {9.540444024062804e-01f, -2.996652769962566e-01f}, + {9.479769653775104e-01f, -3.183389280525497e-01f}, + {9.415440651830208e-01f, -3.368898533922201e-01f}, + {9.347481818282924e-01f, -3.553109012804161e-01f}, + {9.275919352557240e-01f, -3.735949700525164e-01f}, + {9.200780843345949e-01f, -3.917350108519559e-01f}, + {9.122095257974677e-01f, -4.097240303476953e-01f}, + {9.039892931234433e-01f, -4.275550934302821e-01f}, + {8.954205553686970e-01f, -4.452213258854682e-01f}, + {8.865066159447464e-01f, -4.627159170443501e-01f}, + {8.772509113449243e-01f, -4.800321224090111e-01f}, + {8.676570098195440e-01f, -4.971632662526544e-01f}, + {8.577286100002721e-01f, -5.141027441932217e-01f}, + {8.474695394742344e-01f, -5.308440257395095e-01f}, + {8.368837533084094e-01f, -5.473806568087964e-01f}, + {8.259753325248732e-01f, -5.637062622150167e-01f}, + {8.147484825274894e-01f, -5.798145481265136e-01f}, + {8.032075314806449e-01f, -5.956993044924334e-01f}, + {7.913569286406602e-01f, -6.113544074368165e-01f}, + {7.792012426405167e-01f, -6.267738216194696e-01f}, + {7.667451597285615e-01f, -6.419516025627030e-01f}, + {7.539934819618694e-01f, -6.568818989430414e-01f}, + {7.409511253549591e-01f, -6.715589548470183e-01f}, + {7.276231179845748e-01f, -6.859771119901928e-01f}, + {7.140145980512683e-01f, -7.001308118985236e-01f} +}; + +static const cos_msin_t cos_msin_80[80] = +{ + {9.999879521672569e-01f, -4.908718807997990e-03f}, + {9.998915712471080e-01f, -1.472568331145852e-02f}, + {9.996988186962042e-01f, -2.454122852291229e-02f}, + {9.994097130924373e-01f, -3.435440839968228e-02f}, + {9.990242823004072e-01f, -4.416427712706736e-02f}, + {9.985425634687357e-01f, -5.396988920950188e-02f}, + {9.979646030264866e-01f, -6.377029956168449e-02f}, + {9.972904566786902e-01f, -7.356456359966743e-02f}, + {9.965201894009746e-01f, -8.335173733189745e-02f}, + {9.956538754333033e-01f, -9.313087745019979e-02f}, + {9.946915982728195e-01f, -1.029010414206961e-01f}, + {9.936334506657989e-01f, -1.126612875746478e-01f}, + {9.924795345987100e-01f, -1.224106751992162e-01f}, + {9.912299612883853e-01f, -1.321482646281301e-01f}, + {9.898848511713010e-01f, -1.418731173322532e-01f}, + {9.884443338919700e-01f, -1.515842960100411e-01f}, + {9.869085482904458e-01f, -1.612808646778805e-01f}, + {9.852776423889412e-01f, -1.709618887603012e-01f}, + {9.835517733775615e-01f, -1.806264351800528e-01f}, + {9.817311075991542e-01f, -1.902735724480359e-01f}, + {9.798158205332763e-01f, -1.999023707530817e-01f}, + {9.778060967792817e-01f, -2.095119020515688e-01f}, + {9.757021300385286e-01f, -2.191012401568698e-01f}, + {9.735041230957107e-01f, -2.286694608286194e-01f}, + {9.712122877993118e-01f, -2.382156418617946e-01f}, + {9.688268450411880e-01f, -2.477388631755984e-01f}, + {9.663480247352773e-01f, -2.572382069021397e-01f}, + {9.637760657954398e-01f, -2.667127574748984e-01f}, + {9.611112161124317e-01f, -2.761616017169707e-01f}, + {9.583537325300114e-01f, -2.855838289290823e-01f}, + {9.555038808201862e-01f, -2.949785309773635e-01f}, + {9.525619356575953e-01f, -3.043448023808773e-01f}, + {9.495281805930367e-01f, -3.136817403988915e-01f}, + {9.464029080261377e-01f, -3.229884451178863e-01f}, + {9.431864191771733e-01f, -3.322640195382908e-01f}, + {9.398790240580331e-01f, -3.415075696609363e-01f}, + {9.364810414423427e-01f, -3.507182045732232e-01f}, + {9.329927988347390e-01f, -3.598950365349881e-01f}, + {9.294146324393044e-01f, -3.690371810640665e-01f}, + {9.257468871271640e-01f, -3.781437570215405e-01f}, + {9.219899164032445e-01f, -3.872138866966656e-01f}, + {9.181440823722039e-01f, -3.962466958914656e-01f}, + {9.142097557035307e-01f, -4.052413140049899e-01f}, + {9.101873155958178e-01f, -4.141968741172237e-01f}, + {9.060771497402148e-01f, -4.231125130726441e-01f}, + {9.018796542830616e-01f, -4.319873715634118e-01f}, + {8.975952337877069e-01f, -4.408205942121939e-01f}, + {8.932243011955153e-01f, -4.496113296546065e-01f}, + {8.887672777860675e-01f, -4.583587306212713e-01f}, + {8.842245931365562e-01f, -4.670619540194765e-01f}, + {8.795966850803829e-01f, -4.757201610144369e-01f}, + {8.748839996649583e-01f, -4.843325171101412e-01f}, + {8.700869911087115e-01f, -4.928981922297840e-01f}, + {8.652061217573113e-01f, -5.014163607957690e-01f}, + {8.602418620391045e-01f, -5.098862018092806e-01f}, + {8.551946904197751e-01f, -5.183068989294132e-01f}, + {8.500650933562288e-01f, -5.266776405518521e-01f}, + {8.448535652497071e-01f, -5.349976198870972e-01f}, + {8.395606083981356e-01f, -5.432660350382236e-01f}, + {8.341867329477124e-01f, -5.514820890781694e-01f}, + {8.287324568437381e-01f, -5.596449901265460e-01f}, + {8.231983057806959e-01f, -5.677539514259605e-01f}, + {8.175848131515837e-01f, -5.758081914178453e-01f}, + {8.118925199965048e-01f, -5.838069338177863e-01f}, + {8.061219749505210e-01f, -5.917494076903429e-01f}, + {8.002737341907743e-01f, -5.996348475233523e-01f}, + {7.943483613828813e-01f, -6.074624933017110e-01f}, + {7.883464276266063e-01f, -6.152315905806268e-01f}, + {7.822685114008164e-01f, -6.229413905583340e-01f}, + {7.761151985077279e-01f, -6.305911501482637e-01f}, + {7.698870820164444e-01f, -6.381801320506653e-01f}, + {7.635847622057965e-01f, -6.457076048236672e-01f}, + {7.572088465064846e-01f, -6.531728429537768e-01f}, + {7.507599494425343e-01f, -6.605751269258050e-01f}, + {7.442386925720670e-01f, -6.679137432922161e-01f}, + {7.376457044273930e-01f, -6.751879847418903e-01f}, + {7.309816204544317e-01f, -6.823971501682968e-01f}, + {7.242470829514670e-01f, -6.895405447370668e-01f}, + {7.174427410072399e-01f, -6.966174799529642e-01f}, + {7.105692504383896e-01f, -7.036272737262429e-01f} +}; + +static const cos_msin_t cos_msin_160[160] = +{ + {9.999969880372782e-01f, -2.454366796460292e-03f}, + {9.999728924443673e-01f, -7.363041249779567e-03f}, + {9.999247018391445e-01f, -1.227153828571993e-02f}, + {9.998524173827948e-01f, -1.717973963077875e-02f}, + {9.997560408170603e-01f, -2.208752701857829e-02f}, + {9.996355744641984e-01f, -2.699478219271537e-02f}, + {9.994910212269259e-01f, -3.190138690961086e-02f}, + {9.993223845883495e-01f, -3.680722294135883e-02f}, + {9.991296686118811e-01f, -4.171217207857533e-02f}, + {9.989128779411404e-01f, -4.661611613324671e-02f}, + {9.986720177998429e-01f, -5.151893694157748e-02f}, + {9.984070939916740e-01f, -5.642051636683749e-02f}, + {9.981181129001492e-01f, -6.132073630220858e-02f}, + {9.978050814884601e-01f, -6.621947867363034e-02f}, + {9.974680072993071e-01f, -7.111662544264533e-02f}, + {9.971068984547168e-01f, -7.601205860924312e-02f}, + {9.967217636558474e-01f, -8.090566021470375e-02f}, + {9.963126121827780e-01f, -8.579731234443989e-02f}, + {9.958794538942858e-01f, -9.068689713083816e-02f}, + {9.954222992276077e-01f, -9.557429675609919e-02f}, + {9.949411591981900e-01f, -1.004593934550765e-01f}, + {9.944360453994218e-01f, -1.053420695181141e-01f}, + {9.939069700023561e-01f, -1.102222072938831e-01f}, + {9.933539457554167e-01f, -1.150996891922159e-01f}, + {9.927769859840909e-01f, -1.199743976869403e-01f}, + {9.921761045906085e-01f, -1.248462153187112e-01f}, + {9.915513160536062e-01f, -1.297150246978405e-01f}, + {9.909026354277800e-01f, -1.345807085071262e-01f}, + {9.902300783435211e-01f, -1.394431495046788e-01f}, + {9.895336610065398e-01f, -1.443022305267465e-01f}, + {9.888134001974757e-01f, -1.491578344905386e-01f}, + {9.880693132714919e-01f, -1.540098443970461e-01f}, + {9.873014181578584e-01f, -1.588581433338614e-01f}, + {9.865097333595187e-01f, -1.637026144779952e-01f}, + {9.856942779526452e-01f, -1.685431410986913e-01f}, + {9.848550715861784e-01f, -1.733796065602395e-01f}, + {9.839921344813541e-01f, -1.782118943247859e-01f}, + {9.831054874312163e-01f, -1.830398879551410e-01f}, + {9.821951518001156e-01f, -1.878634711175852e-01f}, + {9.812611495231950e-01f, -1.926825275846723e-01f}, + {9.803035031058607e-01f, -1.974969412380297e-01f}, + {9.793222356232406e-01f, -2.023065960711564e-01f}, + {9.783173707196277e-01f, -2.071113761922186e-01f}, + {9.772889326079104e-01f, -2.119111658268416e-01f}, + {9.762369460689896e-01f, -2.167058493209000e-01f}, + {9.751614364511810e-01f, -2.214953111433043e-01f}, + {9.740624296696047e-01f, -2.262794358887845e-01f}, + {9.729399522055602e-01f, -2.310581082806711e-01f}, + {9.717940311058891e-01f, -2.358312131736727e-01f}, + {9.706246939823230e-01f, -2.405986355566504e-01f}, + {9.694319690108180e-01f, -2.453602605553894e-01f}, + {9.682158849308760e-01f, -2.501159734353663e-01f}, + {9.669764710448521e-01f, -2.548656596045146e-01f}, + {9.657137572172489e-01f, -2.596092046159851e-01f}, + {9.644277738739964e-01f, -2.643464941709040e-01f}, + {9.631185520017188e-01f, -2.690774141211269e-01f}, + {9.617861231469886e-01f, -2.738018504719892e-01f}, + {9.604305194155658e-01f, -2.785196893850531e-01f}, + {9.590517734716243e-01f, -2.832308171808502e-01f}, + {9.576499185369652e-01f, -2.879351203416211e-01f}, + {9.562249883902162e-01f, -2.926324855140505e-01f}, + {9.547770173660172e-01f, -2.973227995119985e-01f}, + {9.533060403541939e-01f, -3.020059493192281e-01f}, + {9.518120927989161e-01f, -3.066818220921279e-01f}, + {9.502952106978444e-01f, -3.113503051624320e-01f}, + {9.487554306012626e-01f, -3.160112860399338e-01f}, + {9.471927896111967e-01f, -3.206646524151973e-01f}, + {9.456073253805213e-01f, -3.253102921622629e-01f}, + {9.439990761120522e-01f, -3.299480933413494e-01f}, + {9.423680805576258e-01f, -3.345779442015508e-01f}, + {9.407143780171653e-01f, -3.391997331835298e-01f}, + {9.390380083377340e-01f, -3.438133489222048e-01f}, + {9.373390119125750e-01f, -3.484186802494346e-01f}, + {9.356174296801376e-01f, -3.530156161966958e-01f}, + {9.338733031230915e-01f, -3.576040459977578e-01f}, + {9.321066742673269e-01f, -3.621838590913509e-01f}, + {9.303175856809415e-01f, -3.667549451238308e-01f}, + {9.285060804732156e-01f, -3.713171939518375e-01f}, + {9.266722022935726e-01f, -3.758704956449495e-01f}, + {9.248159953305278e-01f, -3.804147404883323e-01f}, + {9.229375043106232e-01f, -3.849498189853822e-01f}, + {9.210367744973499e-01f, -3.894756218603648e-01f}, + {9.191138516900578e-01f, -3.939920400610481e-01f}, + {9.171687822228516e-01f, -3.984989647613298e-01f}, + {9.152016129634744e-01f, -4.029962873638600e-01f}, + {9.132123913121788e-01f, -4.074838995026576e-01f}, + {9.112011652005843e-01f, -4.119616930457218e-01f}, + {9.091679830905224e-01f, -4.164295600976372e-01f}, + {9.071128939728691e-01f, -4.208873930021739e-01f}, + {9.050359473663644e-01f, -4.253350843448814e-01f}, + {9.029371933164189e-01f, -4.297725269556770e-01f}, + {9.008166823939081e-01f, -4.341996139114278e-01f}, + {8.986744656939538e-01f, -4.386162385385277e-01f}, + {8.965105948346932e-01f, -4.430222944154668e-01f}, + {8.943251219560346e-01f, -4.474176753753967e-01f}, + {8.921180997184014e-01f, -4.518022755086881e-01f}, + {8.898895813014630e-01f, -4.561759891654830e-01f}, + {8.876396204028539e-01f, -4.605387109582400e-01f}, + {8.853682712368793e-01f, -4.648903357642744e-01f}, + {8.830755885332088e-01f, -4.692307587282903e-01f}, + {8.807616275355579e-01f, -4.735598752649081e-01f}, + {8.784264440003567e-01f, -4.778775810611837e-01f}, + {8.760700941954066e-01f, -4.821837720791227e-01f}, + {8.736926348985243e-01f, -4.864783445581868e-01f}, + {8.712941233961736e-01f, -4.907611950177941e-01f}, + {8.688746174820854e-01f, -4.950322202598127e-01f}, + {8.664341754558650e-01f, -4.992913173710469e-01f}, + {8.639728561215868e-01f, -5.035383837257176e-01f}, + {8.614907187863783e-01f, -5.077733169879345e-01f}, + {8.589878232589904e-01f, -5.119960151141624e-01f}, + {8.564642298483565e-01f, -5.162063763556797e-01f}, + {8.539199993621391e-01f, -5.204042992610306e-01f}, + {8.513551931052652e-01f, -5.245896826784689e-01f}, + {8.487698728784481e-01f, -5.287624257583958e-01f}, + {8.461641009766995e-01f, -5.329224279557898e-01f}, + {8.435379401878270e-01f, -5.370695890326298e-01f}, + {8.408914537909229e-01f, -5.412038090603096e-01f}, + {8.382247055548381e-01f, -5.453249884220465e-01f}, + {8.355377597366458e-01f, -5.494330278152808e-01f}, + {8.328306810800937e-01f, -5.535278282540700e-01f}, + {8.301035348140438e-01f, -5.576092910714722e-01f}, + {8.273563866508998e-01f, -5.616773179219247e-01f}, + {8.245893027850253e-01f, -5.657318107836131e-01f}, + {8.218023498911473e-01f, -5.697726719608341e-01f}, + {8.189955951227504e-01f, -5.737998040863485e-01f}, + {8.161691061104588e-01f, -5.778131101237274e-01f}, + {8.133229509604062e-01f, -5.818124933696910e-01f}, + {8.104571982525948e-01f, -5.857978574564389e-01f}, + {8.075719170392435e-01f, -5.897691063539708e-01f}, + {8.046671768431229e-01f, -5.937261443724019e-01f}, + {8.017430476558816e-01f, -5.976688761642677e-01f}, + {7.987995999363579e-01f, -6.015972067268220e-01f}, + {7.958369046088836e-01f, -6.055110414043255e-01f}, + {7.928550330615741e-01f, -6.094102858903271e-01f}, + {7.898540571446090e-01f, -6.132948462299359e-01f}, + {7.868340491684999e-01f, -6.171646288220856e-01f}, + {7.837950819023488e-01f, -6.210195404217892e-01f}, + {7.807372285720945e-01f, -6.248594881423863e-01f}, + {7.776605628587479e-01f, -6.286843794577813e-01f}, + {7.745651588966166e-01f, -6.324941222046724e-01f}, + {7.714510912715192e-01f, -6.362886245847729e-01f}, + {7.683184350189877e-01f, -6.400677951670226e-01f}, + {7.651672656224590e-01f, -6.438315428897914e-01f}, + {7.619976590114568e-01f, -6.475797770630733e-01f}, + {7.588096915597616e-01f, -6.513124073706714e-01f}, + {7.556034400835709e-01f, -6.550293438723744e-01f}, + {7.523789818396478e-01f, -6.587304970061237e-01f}, + {7.491363945234594e-01f, -6.624157775901718e-01f}, + {7.458757562673048e-01f, -6.660850968252301e-01f}, + {7.425971456384329e-01f, -6.697383662966099e-01f}, + {7.393006416371488e-01f, -6.733754979763520e-01f}, + {7.359863236949099e-01f, -6.769964042253483e-01f}, + {7.326542716724128e-01f, -6.806009977954530e-01f}, + {7.293045658576685e-01f, -6.841891918315852e-01f}, + {7.259372869640676e-01f, -6.877608998738217e-01f}, + {7.225525161284360e-01f, -6.913160358594803e-01f}, + {7.191503349090794e-01f, -6.948545141251936e-01f}, + {7.157308252838186e-01f, -6.983762494089729e-01f}, + {7.122940696480137e-01f, -7.018811568522627e-01f}, + {7.088401508125785e-01f, -7.053691520019861e-01f} +}; + +static const cos_msin_t cos_msin_320[320] = +{ + {9.999992470090361e-01f, -1.227184322288852e-03f}, + {9.999932230881285e-01f, -3.681545574399692e-03f}, + {9.999811752826011e-01f, -6.135884649154475e-03f}, + {9.999631036650289e-01f, -8.590186761797602e-03f}, + {9.999390083442741e-01f, -1.104443712779613e-02f}, + {9.999088894654848e-01f, -1.349862096292883e-02f}, + {9.998727472100952e-01f, -1.595272348337527e-02f}, + {9.998305817958234e-01f, -1.840672990580482e-02f}, + {9.997823934766707e-01f, -2.086062544746576e-02f}, + {9.997281825429201e-01f, -2.331439532627430e-02f}, + {9.996679493211340e-01f, -2.576802476090363e-02f}, + {9.996016941741530e-01f, -2.822149897087298e-02f}, + {9.995294175010931e-01f, -3.067480317663663e-02f}, + {9.994511197373437e-01f, -3.312792259967294e-02f}, + {9.993668013545645e-01f, -3.558084246257342e-02f}, + {9.992764628606833e-01f, -3.803354798913168e-02f}, + {9.991801047998923e-01f, -4.048602440443251e-02f}, + {9.990777277526454e-01f, -4.293825693494082e-02f}, + {9.989693323356542e-01f, -4.539023080859068e-02f}, + {9.988549192018848e-01f, -4.784193125487429e-02f}, + {9.987344890405533e-01f, -5.029334350493095e-02f}, + {9.986080425771219e-01f, -5.274445279163603e-02f}, + {9.984755805732948e-01f, -5.519524434968993e-02f}, + {9.983371038270131e-01f, -5.764570341570704e-02f}, + {9.981926131724506e-01f, -6.009581522830464e-02f}, + {9.980421094800079e-01f, -6.254556502819182e-02f}, + {9.978855936563085e-01f, -6.499493805825848e-02f}, + {9.977230666441916e-01f, -6.744391956366405e-02f}, + {9.975545294227081e-01f, -6.989249479192657e-02f}, + {9.973799830071135e-01f, -7.234064899301137e-02f}, + {9.971994284488623e-01f, -7.478836741942015e-02f}, + {9.970128668356021e-01f, -7.723563532627951e-02f}, + {9.968202992911657e-01f, -7.968243797143013e-02f}, + {9.966217269755658e-01f, -8.212876061551522e-02f}, + {9.964171510849874e-01f, -8.457458852206962e-02f}, + {9.962065728517802e-01f, -8.701990695760831e-02f}, + {9.959899935444517e-01f, -8.946470119171543e-02f}, + {9.957674144676598e-01f, -9.190895649713272e-02f}, + {9.955388369622040e-01f, -9.435265814984850e-02f}, + {9.953042624050182e-01f, -9.679579142918618e-02f}, + {9.950636922091622e-01f, -9.923834161789306e-02f}, + {9.948171278238128e-01f, -1.016802940022289e-01f}, + {9.945645707342554e-01f, -1.041216338720546e-01f}, + {9.943060224618753e-01f, -1.065623465209208e-01f}, + {9.940414845641478e-01f, -1.090024172461564e-01f}, + {9.937709586346295e-01f, -1.114418313489574e-01f}, + {9.934944463029486e-01f, -1.138805741344751e-01f}, + {9.932119492347945e-01f, -1.163186309119048e-01f}, + {9.929234691319088e-01f, -1.187559869945741e-01f}, + {9.926290077320739e-01f, -1.211926277000318e-01f}, + {9.923285668091033e-01f, -1.236285383501360e-01f}, + {9.920221481728309e-01f, -1.260637042711424e-01f}, + {9.917097536690995e-01f, -1.284981107937932e-01f}, + {9.913913851797506e-01f, -1.309317432534049e-01f}, + {9.910670446226119e-01f, -1.333645869899571e-01f}, + {9.907367339514870e-01f, -1.357966273481804e-01f}, + {9.904004551561425e-01f, -1.382278496776452e-01f}, + {9.900582102622971e-01f, -1.406582393328492e-01f}, + {9.897100013316084e-01f, -1.430877816733065e-01f}, + {9.893558304616609e-01f, -1.455164620636352e-01f}, + {9.889956997859536e-01f, -1.479442658736455e-01f}, + {9.886296114738869e-01f, -1.503711784784285e-01f}, + {9.882575677307495e-01f, -1.527971852584434e-01f}, + {9.878795707977051e-01f, -1.552222715996064e-01f}, + {9.874956229517791e-01f, -1.576464228933781e-01f}, + {9.871057265058446e-01f, -1.600696245368518e-01f}, + {9.867098838086088e-01f, -1.624918619328416e-01f}, + {9.863080972445987e-01f, -1.649131204899699e-01f}, + {9.859003692341464e-01f, -1.673333856227558e-01f}, + {9.854867022333751e-01f, -1.697526427517024e-01f}, + {9.850670987341841e-01f, -1.721708773033852e-01f}, + {9.846415612642334e-01f, -1.745880747105397e-01f}, + {9.842100923869290e-01f, -1.770042204121487e-01f}, + {9.837726947014075e-01f, -1.794192998535309e-01f}, + {9.833293708425197e-01f, -1.818332984864276e-01f}, + {9.828801234808157e-01f, -1.842462017690910e-01f}, + {9.824249553225278e-01f, -1.866579951663718e-01f}, + {9.819638691095552e-01f, -1.890686641498062e-01f}, + {9.814968676194470e-01f, -1.914781941977041e-01f}, + {9.810239536653852e-01f, -1.938865707952361e-01f}, + {9.805451300961683e-01f, -1.962937794345212e-01f}, + {9.800603997961936e-01f, -1.986998056147138e-01f}, + {9.795697656854405e-01f, -2.011046348420919e-01f}, + {9.790732307194523e-01f, -2.035082526301433e-01f}, + {9.785707978893183e-01f, -2.059106444996538e-01f}, + {9.780624702216568e-01f, -2.083117959787937e-01f}, + {9.775482507785956e-01f, -2.107116926032057e-01f}, + {9.770281426577544e-01f, -2.131103199160914e-01f}, + {9.765021489922255e-01f, -2.155076634682986e-01f}, + {9.759702729505557e-01f, -2.179037088184086e-01f}, + {9.754325177367266e-01f, -2.202984415328229e-01f}, + {9.748888865901355e-01f, -2.226918471858500e-01f}, + {9.743393827855759e-01f, -2.250839113597928e-01f}, + {9.737840096332177e-01f, -2.274746196450351e-01f}, + {9.732227704785874e-01f, -2.298639576401283e-01f}, + {9.726556687025479e-01f, -2.322519109518786e-01f}, + {9.720827077212779e-01f, -2.346384651954331e-01f}, + {9.715038909862518e-01f, -2.370236059943672e-01f}, + {9.709192219842182e-01f, -2.394073189807704e-01f}, + {9.703287042371799e-01f, -2.417895897953334e-01f}, + {9.697323413023714e-01f, -2.441704040874346e-01f}, + {9.691301367722388e-01f, -2.465497475152259e-01f}, + {9.685220942744174e-01f, -2.489276057457201e-01f}, + {9.679082174717095e-01f, -2.513039644548766e-01f}, + {9.672885100620635e-01f, -2.536788093276874e-01f}, + {9.666629757785506e-01f, -2.560521260582643e-01f}, + {9.660316183893426e-01f, -2.584239003499241e-01f}, + {9.653944416976894e-01f, -2.607941179152755e-01f}, + {9.647514495418958e-01f, -2.631627644763044e-01f}, + {9.641026457952987e-01f, -2.655298257644607e-01f}, + {9.634480343662435e-01f, -2.678952875207434e-01f}, + {9.627876191980606e-01f, -2.702591354957875e-01f}, + {9.621214042690416e-01f, -2.726213554499490e-01f}, + {9.614493935924158e-01f, -2.749819331533909e-01f}, + {9.607715912163253e-01f, -2.773408543861692e-01f}, + {9.600880012238011e-01f, -2.796981049383182e-01f}, + {9.593986277327383e-01f, -2.820536706099365e-01f}, + {9.587034748958716e-01f, -2.844075372112719e-01f}, + {9.580025469007496e-01f, -2.867596905628075e-01f}, + {9.572958479697103e-01f, -2.891101164953470e-01f}, + {9.565833823598556e-01f, -2.914588008500998e-01f}, + {9.558651543630251e-01f, -2.938057294787664e-01f}, + {9.551411683057708e-01f, -2.961508882436238e-01f}, + {9.544114285493304e-01f, -2.984942630176104e-01f}, + {9.536759394896021e-01f, -3.008358396844112e-01f}, + {9.529347055571170e-01f, -3.031756041385431e-01f}, + {9.521877312170133e-01f, -3.055135422854393e-01f}, + {9.514350209690083e-01f, -3.078496400415349e-01f}, + {9.506765793473728e-01f, -3.101838833343510e-01f}, + {9.499124109209025e-01f, -3.125162581025802e-01f}, + {9.491425202928909e-01f, -3.148467502961706e-01f}, + {9.483669121011018e-01f, -3.171753458764112e-01f}, + {9.475855910177411e-01f, -3.195020308160157e-01f}, + {9.467985617494289e-01f, -3.218267910992075e-01f}, + {9.460058290371707e-01f, -3.241496127218040e-01f}, + {9.452073976563291e-01f, -3.264704816913009e-01f}, + {9.444032724165956e-01f, -3.287893840269567e-01f}, + {9.435934581619604e-01f, -3.311063057598764e-01f}, + {9.427779597706842e-01f, -3.334212329330963e-01f}, + {9.419567821552687e-01f, -3.357341516016679e-01f}, + {9.411299302624264e-01f, -3.380450478327413e-01f}, + {9.402974090730516e-01f, -3.403539077056500e-01f}, + {9.394592236021899e-01f, -3.426607173119944e-01f}, + {9.386153788990080e-01f, -3.449654627557252e-01f}, + {9.377658800467635e-01f, -3.472681301532278e-01f}, + {9.369107321627741e-01f, -3.495687056334055e-01f}, + {9.360499403983871e-01f, -3.518671753377630e-01f}, + {9.351835099389476e-01f, -3.541635254204903e-01f}, + {9.343114460037683e-01f, -3.564577420485457e-01f}, + {9.334337538460973e-01f, -3.587498114017393e-01f}, + {9.325504387530866e-01f, -3.610397196728160e-01f}, + {9.316615060457607e-01f, -3.633274530675394e-01f}, + {9.307669610789837e-01f, -3.656129978047739e-01f}, + {9.298668092414279e-01f, -3.678963401165684e-01f}, + {9.289610559555410e-01f, -3.701774662482391e-01f}, + {9.280497066775131e-01f, -3.724563624584523e-01f}, + {9.271327668972442e-01f, -3.747330150193071e-01f}, + {9.262102421383114e-01f, -3.770074102164183e-01f}, + {9.252821379579349e-01f, -3.792795343489985e-01f}, + {9.243484599469451e-01f, -3.815493737299417e-01f}, + {9.234092137297489e-01f, -3.838169146859046e-01f}, + {9.224644049642953e-01f, -3.860821435573893e-01f}, + {9.215140393420420e-01f, -3.883450466988262e-01f}, + {9.205581225879205e-01f, -3.906056104786556e-01f}, + {9.195966604603021e-01f, -3.928638212794095e-01f}, + {9.186296587509630e-01f, -3.951196654977946e-01f}, + {9.176571232850496e-01f, -3.973731295447735e-01f}, + {9.166790599210427e-01f, -3.996241998456468e-01f}, + {9.156954745507232e-01f, -4.018728628401348e-01f}, + {9.147063730991362e-01f, -4.041191049824593e-01f}, + {9.137117615245548e-01f, -4.063629127414251e-01f}, + {9.127116458184452e-01f, -4.086042726005015e-01f}, + {9.117060320054299e-01f, -4.108431710579039e-01f}, + {9.106949261432513e-01f, -4.130795946266749e-01f}, + {9.096783343227359e-01f, -4.153135298347656e-01f}, + {9.086562626677570e-01f, -4.175449632251170e-01f}, + {9.076287173351980e-01f, -4.197738813557405e-01f}, + {9.065957045149153e-01f, -4.220002707997997e-01f}, + {9.055572304297014e-01f, -4.242241181456904e-01f}, + {9.045133013352465e-01f, -4.264454099971220e-01f}, + {9.034639235201017e-01f, -4.286641329731982e-01f}, + {9.024091033056408e-01f, -4.308802737084970e-01f}, + {9.013488470460220e-01f, -4.330938188531520e-01f}, + {9.002831611281501e-01f, -4.353047550729321e-01f}, + {8.992120519716374e-01f, -4.375130690493225e-01f}, + {8.981355260287659e-01f, -4.397187474796043e-01f}, + {8.970535897844474e-01f, -4.419217770769352e-01f}, + {8.959662497561852e-01f, -4.441221445704292e-01f}, + {8.948735124940346e-01f, -4.463198367052365e-01f}, + {8.937753845805634e-01f, -4.485148402426236e-01f}, + {8.926718726308122e-01f, -4.507071419600526e-01f}, + {8.915629832922548e-01f, -4.528967286512617e-01f}, + {8.904487232447579e-01f, -4.550835871263438e-01f}, + {8.893290992005409e-01f, -4.572677042118265e-01f}, + {8.882041179041357e-01f, -4.594490667507513e-01f}, + {8.870737861323454e-01f, -4.616276616027529e-01f}, + {8.859381106942048e-01f, -4.638034756441384e-01f}, + {8.847970984309378e-01f, -4.659764957679662e-01f}, + {8.836507562159172e-01f, -4.681467088841250e-01f}, + {8.824990909546231e-01f, -4.703141019194129e-01f}, + {8.813421095846011e-01f, -4.724786618176158e-01f}, + {8.801798190754208e-01f, -4.746403755395864e-01f}, + {8.790122264286335e-01f, -4.767992300633221e-01f}, + {8.778393386777302e-01f, -4.789552123840445e-01f}, + {8.766611628880995e-01f, -4.811083095142767e-01f}, + {8.754777061569843e-01f, -4.832585084839222e-01f}, + {8.742889756134398e-01f, -4.854057963403425e-01f}, + {8.730949784182901e-01f, -4.875501601484360e-01f}, + {8.718957217640854e-01f, -4.896915869907146e-01f}, + {8.706912128750582e-01f, -4.918300639673830e-01f}, + {8.694814590070804e-01f, -4.939655781964152e-01f}, + {8.682664674476190e-01f, -4.960981168136327e-01f}, + {8.670462455156926e-01f, -4.982276669727819e-01f}, + {8.658208005618273e-01f, -5.003542158456112e-01f}, + {8.645901399680118e-01f, -5.024777506219491e-01f}, + {8.633542711476541e-01f, -5.045982585097801e-01f}, + {8.621132015455357e-01f, -5.067157267353229e-01f}, + {8.608669386377673e-01f, -5.088301425431070e-01f}, + {8.596154899317437e-01f, -5.109414931960489e-01f}, + {8.583588629660989e-01f, -5.130497659755299e-01f}, + {8.570970653106597e-01f, -5.151549481814718e-01f}, + {8.558301045664012e-01f, -5.172570271324139e-01f}, + {8.545579883654005e-01f, -5.193559901655896e-01f}, + {8.532807243707908e-01f, -5.214518246370019e-01f}, + {8.519983202767152e-01f, -5.235445179215000e-01f}, + {8.507107838082801e-01f, -5.256340574128560e-01f}, + {8.494181227215095e-01f, -5.277204305238395e-01f}, + {8.481203448032972e-01f, -5.298036246862946e-01f}, + {8.468174578713608e-01f, -5.318836273512150e-01f}, + {8.455094697741939e-01f, -5.339604259888194e-01f}, + {8.441963883910193e-01f, -5.360340080886280e-01f}, + {8.428782216317413e-01f, -5.381043611595366e-01f}, + {8.415549774368984e-01f, -5.401714727298929e-01f}, + {8.402266637776148e-01f, -5.422353303475707e-01f}, + {8.388932886555529e-01f, -5.442959215800456e-01f}, + {8.375548601028652e-01f, -5.463532340144698e-01f}, + {8.362113861821453e-01f, -5.484072552577465e-01f}, + {8.348628749863800e-01f, -5.504579729366048e-01f}, + {8.335093346389004e-01f, -5.525053746976744e-01f}, + {8.321507732933324e-01f, -5.545494482075597e-01f}, + {8.307871991335484e-01f, -5.565901811529141e-01f}, + {8.294186203736174e-01f, -5.586275612405148e-01f}, + {8.280450452577558e-01f, -5.606615761973360e-01f}, + {8.266664820602777e-01f, -5.626922137706231e-01f}, + {8.252829390855451e-01f, -5.647194617279668e-01f}, + {8.238944246679176e-01f, -5.667433078573766e-01f}, + {8.225009471717026e-01f, -5.687637399673542e-01f}, + {8.211025149911046e-01f, -5.707807458869673e-01f}, + {8.196991365501750e-01f, -5.727943134659226e-01f}, + {8.182908203027607e-01f, -5.748044305746390e-01f}, + {8.168775747324537e-01f, -5.768110851043212e-01f}, + {8.154594083525400e-01f, -5.788142649670318e-01f}, + {8.140363297059484e-01f, -5.808139580957645e-01f}, + {8.126083473651983e-01f, -5.828101524445172e-01f}, + {8.111754699323488e-01f, -5.848028359883638e-01f}, + {8.097377060389469e-01f, -5.867919967235272e-01f}, + {8.082950643459751e-01f, -5.887776226674516e-01f}, + {8.068475535437993e-01f, -5.907597018588742e-01f}, + {8.053951823521167e-01f, -5.927382223578977e-01f}, + {8.039379595199031e-01f, -5.947131722460625e-01f}, + {8.024758938253601e-01f, -5.966845396264172e-01f}, + {8.010089940758625e-01f, -5.986523126235920e-01f}, + {7.995372691079050e-01f, -6.006164793838690e-01f}, + {7.980607277870492e-01f, -6.025770280752539e-01f}, + {7.965793790078698e-01f, -6.045339468875478e-01f}, + {7.950932316939014e-01f, -6.064872240324176e-01f}, + {7.936022947975847e-01f, -6.084368477434675e-01f}, + {7.921065773002124e-01f, -6.103828062763095e-01f}, + {7.906060882118751e-01f, -6.123250879086344e-01f}, + {7.891008365714072e-01f, -6.142636809402826e-01f}, + {7.875908314463325e-01f, -6.161985736933142e-01f}, + {7.860760819328091e-01f, -6.181297545120795e-01f}, + {7.845565971555752e-01f, -6.200572117632891e-01f}, + {7.830323862678940e-01f, -6.219809338360844e-01f}, + {7.815034584514979e-01f, -6.239009091421072e-01f}, + {7.799698229165344e-01f, -6.258171261155689e-01f}, + {7.784314889015095e-01f, -6.277295732133219e-01f}, + {7.768884656732324e-01f, -6.296382389149270e-01f}, + {7.753407625267603e-01f, -6.315431117227246e-01f}, + {7.737883887853415e-01f, -6.334441801619028e-01f}, + {7.722313538003597e-01f, -6.353414327805670e-01f}, + {7.706696669512773e-01f, -6.372348581498091e-01f}, + {7.691033376455797e-01f, -6.391244448637757e-01f}, + {7.675323753187178e-01f, -6.410101815397373e-01f}, + {7.659567894340514e-01f, -6.428920568181569e-01f}, + {7.643765894827926e-01f, -6.447700593627579e-01f}, + {7.627917849839481e-01f, -6.466441778605931e-01f}, + {7.612023854842618e-01f, -6.485144010221124e-01f}, + {7.596084005581580e-01f, -6.503807175812309e-01f}, + {7.580098398076831e-01f, -6.522431162953969e-01f}, + {7.564067128624476e-01f, -6.541015859456593e-01f}, + {7.547990293795690e-01f, -6.559561153367355e-01f}, + {7.531867990436125e-01f, -6.578066932970786e-01f}, + {7.515700315665336e-01f, -6.596533086789452e-01f}, + {7.499487366876190e-01f, -6.614959503584616e-01f}, + {7.483229241734281e-01f, -6.633346072356920e-01f}, + {7.466926038177344e-01f, -6.651692682347043e-01f}, + {7.450577854414661e-01f, -6.669999223036375e-01f}, + {7.434184788926470e-01f, -6.688265584147679e-01f}, + {7.417746940463380e-01f, -6.706491655645758e-01f}, + {7.401264408045760e-01f, -6.724677327738116e-01f}, + {7.384737290963160e-01f, -6.742822490875620e-01f}, + {7.368165688773699e-01f, -6.760927035753159e-01f}, + {7.351549701303474e-01f, -6.778990853310308e-01f}, + {7.334889428645953e-01f, -6.797013834731973e-01f}, + {7.318184971161379e-01f, -6.814995871449060e-01f}, + {7.301436429476156e-01f, -6.832936855139119e-01f}, + {7.284643904482252e-01f, -6.850836677727004e-01f}, + {7.267807497336585e-01f, -6.868695231385515e-01f}, + {7.250927309460417e-01f, -6.886512408536060e-01f}, + {7.234003442538740e-01f, -6.904288101849290e-01f}, + {7.217035998519666e-01f, -6.922022204245754e-01f}, + {7.200025079613817e-01f, -6.939714608896540e-01f}, + {7.182970788293696e-01f, -6.957365209223924e-01f}, + {7.165873227293083e-01f, -6.974973898902004e-01f}, + {7.148732499606411e-01f, -6.992540571857347e-01f}, + {7.131548708488146e-01f, -7.010065122269625e-01f}, + {7.114321957452164e-01f, -7.027547444572253e-01f}, + {7.097052350271130e-01f, -7.044987433453024e-01f}, + {7.079739990975870e-01f, -7.062384983854745e-01f} +}; + +static const cos_msin_t cos_msin_640[640] = +{ + {9.999998117522413e-01f, -6.135922766517967e-04f}, + {9.999983057705969e-01f, -1.840775905896510e-03f}, + {9.999952938095762e-01f, -3.067956762965976e-03f}, + {9.999907758737150e-01f, -4.295132999748002e-03f}, + {9.999847519698173e-01f, -5.522302768137352e-03f}, + {9.999772221069551e-01f, -6.749464220038533e-03f}, + {9.999681862964679e-01f, -7.976615507368575e-03f}, + {9.999576445519639e-01f, -9.203754782059819e-03f}, + {9.999455968893185e-01f, -1.043088019606269e-02f}, + {9.999320433266753e-01f, -1.165798990134850e-02f}, + {9.999169838844458e-01f, -1.288508204991220e-02f}, + {9.999004185853092e-01f, -1.411215479377519e-02f}, + {9.998823474542126e-01f, -1.533920628498810e-02f}, + {9.998627705183706e-01f, -1.656623467563356e-02f}, + {9.998416878072659e-01f, -1.779323811782898e-02f}, + {9.998190993526487e-01f, -1.902021476372936e-02f}, + {9.997950051885367e-01f, -2.024716276553004e-02f}, + {9.997694053512153e-01f, -2.147408027546951e-02f}, + {9.997422998792375e-01f, -2.270096544583216e-02f}, + {9.997136888134235e-01f, -2.392781642895110e-02f}, + {9.996835721968610e-01f, -2.515463137721094e-02f}, + {9.996519500749053e-01f, -2.638140844305051e-02f}, + {9.996188224951786e-01f, -2.760814577896574e-02f}, + {9.995841895075704e-01f, -2.883484153751236e-02f}, + {9.995480511642375e-01f, -3.006149387130874e-02f}, + {9.995104075196035e-01f, -3.128810093303862e-02f}, + {9.994712586303591e-01f, -3.251466087545394e-02f}, + {9.994306045554617e-01f, -3.374117185137758e-02f}, + {9.993884453561358e-01f, -3.496763201370620e-02f}, + {9.993447810958722e-01f, -3.619403951541294e-02f}, + {9.992996118404286e-01f, -3.742039250955028e-02f}, + {9.992529376578290e-01f, -3.864668914925275e-02f}, + {9.992047586183639e-01f, -3.987292758773981e-02f}, + {9.991550747945901e-01f, -4.109910597831850e-02f}, + {9.991038862613305e-01f, -4.232522247438635e-02f}, + {9.990511930956741e-01f, -4.355127522943403e-02f}, + {9.989969953769761e-01f, -4.477726239704831e-02f}, + {9.989412931868569e-01f, -4.600318213091462e-02f}, + {9.988840866092031e-01f, -4.722903258482004e-02f}, + {9.988253757301669e-01f, -4.845481191265589e-02f}, + {9.987651606381658e-01f, -4.968051826842070e-02f}, + {9.987034414238826e-01f, -5.090614980622282e-02f}, + {9.986402181802653e-01f, -5.213170468028332e-02f}, + {9.985754910025268e-01f, -5.335718104493870e-02f}, + {9.985092599881454e-01f, -5.458257705464371e-02f}, + {9.984415252368637e-01f, -5.580789086397409e-02f}, + {9.983722868506889e-01f, -5.703312062762941e-02f}, + {9.983015449338929e-01f, -5.825826450043575e-02f}, + {9.982292995930115e-01f, -5.948332063734863e-02f}, + {9.981555509368452e-01f, -6.070828719345561e-02f}, + {9.980802990764579e-01f, -6.193316232397920e-02f}, + {9.980035441251777e-01f, -6.315794418427960e-02f}, + {9.979252861985960e-01f, -6.438263092985747e-02f}, + {9.978455254145679e-01f, -6.560722071635666e-02f}, + {9.977642618932119e-01f, -6.683171169956714e-02f}, + {9.976814957569091e-01f, -6.805610203542757e-02f}, + {9.975972271303040e-01f, -6.928038988002828e-02f}, + {9.975114561403035e-01f, -7.050457338961386e-02f}, + {9.974241829160772e-01f, -7.172865072058610e-02f}, + {9.973354075890570e-01f, -7.295262002950662e-02f}, + {9.972451302929369e-01f, -7.417647947309980e-02f}, + {9.971533511636731e-01f, -7.540022720825540e-02f}, + {9.970600703394830e-01f, -7.662386139203149e-02f}, + {9.969652879608459e-01f, -7.784738018165707e-02f}, + {9.968690041705026e-01f, -7.907078173453497e-02f}, + {9.967712191134545e-01f, -8.029406420824454e-02f}, + {9.966719329369642e-01f, -8.151722576054453e-02f}, + {9.965711457905548e-01f, -8.274026454937569e-02f}, + {9.964688578260101e-01f, -8.396317873286374e-02f}, + {9.963650691973739e-01f, -8.518596646932200e-02f}, + {9.962597800609497e-01f, -8.640862591725426e-02f}, + {9.961529905753015e-01f, -8.763115523535747e-02f}, + {9.960447009012520e-01f, -8.885355258252460e-02f}, + {9.959349112018836e-01f, -9.007581611784729e-02f}, + {9.958236216425376e-01f, -9.129794400061877e-02f}, + {9.957108323908140e-01f, -9.251993439033654e-02f}, + {9.955965436165716e-01f, -9.374178544670515e-02f}, + {9.954807554919269e-01f, -9.496349532963899e-02f}, + {9.953634681912550e-01f, -9.618506219926506e-02f}, + {9.952446818911883e-01f, -9.740648421592572e-02f}, + {9.951243967706169e-01f, -9.862775954018151e-02f}, + {9.950026130106879e-01f, -9.984888633281383e-02f}, + {9.948793307948056e-01f, -1.010698627548278e-01f}, + {9.947545503086307e-01f, -1.022906869674551e-01f}, + {9.946282717400804e-01f, -1.035113571321563e-01f}, + {9.945004952793278e-01f, -1.047318714106244e-01f}, + {9.943712211188022e-01f, -1.059522279647869e-01f}, + {9.942404494531879e-01f, -1.071724249568088e-01f}, + {9.941081804794248e-01f, -1.083924605490956e-01f}, + {9.939744143967076e-01f, -1.096123329042957e-01f}, + {9.938391514064855e-01f, -1.108320401853034e-01f}, + {9.937023917124622e-01f, -1.120515805552615e-01f}, + {9.935641355205953e-01f, -1.132709521775643e-01f}, + {9.934243830390962e-01f, -1.144901532158602e-01f}, + {9.932831344784294e-01f, -1.157091818340545e-01f}, + {9.931403900513129e-01f, -1.169280361963119e-01f}, + {9.929961499727171e-01f, -1.181467144670601e-01f}, + {9.928504144598651e-01f, -1.193652148109914e-01f}, + {9.927031837322318e-01f, -1.205835353930663e-01f}, + {9.925544580115441e-01f, -1.218016743785162e-01f}, + {9.924042375217801e-01f, -1.230196299328457e-01f}, + {9.922525224891693e-01f, -1.242374002218357e-01f}, + {9.920993131421918e-01f, -1.254549834115462e-01f}, + {9.919446097115779e-01f, -1.266723776683190e-01f}, + {9.917884124303086e-01f, -1.278895811587802e-01f}, + {9.916307215336136e-01f, -1.291065920498434e-01f}, + {9.914715372589731e-01f, -1.303234085087122e-01f}, + {9.913108598461154e-01f, -1.315400287028831e-01f}, + {9.911486895370180e-01f, -1.327564508001479e-01f}, + {9.909850265759061e-01f, -1.339726729685971e-01f}, + {9.908198712092535e-01f, -1.351886933766218e-01f}, + {9.906532236857811e-01f, -1.364045101929175e-01f}, + {9.904850842564571e-01f, -1.376201215864860e-01f}, + {9.903154531744962e-01f, -1.388355257266385e-01f}, + {9.901443306953601e-01f, -1.400507207829983e-01f}, + {9.899717170767560e-01f, -1.412657049255036e-01f}, + {9.897976125786367e-01f, -1.424804763244102e-01f}, + {9.896220174632009e-01f, -1.436950331502945e-01f}, + {9.894449319948911e-01f, -1.449093735740556e-01f}, + {9.892663564403953e-01f, -1.461234957669190e-01f}, + {9.890862910686448e-01f, -1.473373979004386e-01f}, + {9.889047361508148e-01f, -1.485510781464996e-01f}, + {9.887216919603238e-01f, -1.497645346773215e-01f}, + {9.885371587728330e-01f, -1.509777656654608e-01f}, + {9.883511368662461e-01f, -1.521907692838135e-01f}, + {9.881636265207087e-01f, -1.534035437056180e-01f}, + {9.879746280186079e-01f, -1.546160871044581e-01f}, + {9.877841416445722e-01f, -1.558283976542652e-01f}, + {9.875921676854704e-01f, -1.570404735293217e-01f}, + {9.873987064304122e-01f, -1.582523129042630e-01f}, + {9.872037581707463e-01f, -1.594639139540810e-01f}, + {9.870073232000616e-01f, -1.606752748541265e-01f}, + {9.868094018141855e-01f, -1.618863937801118e-01f}, + {9.866099943111839e-01f, -1.630972689081137e-01f}, + {9.864091009913611e-01f, -1.643078984145762e-01f}, + {9.862067221572588e-01f, -1.655182804763130e-01f}, + {9.860028581136556e-01f, -1.667284132705107e-01f}, + {9.857975091675675e-01f, -1.679382949747312e-01f}, + {9.855906756282459e-01f, -1.691479237669144e-01f}, + {9.853823578071785e-01f, -1.703572978253813e-01f}, + {9.851725560180883e-01f, -1.715664153288364e-01f}, + {9.849612705769328e-01f, -1.727752744563706e-01f}, + {9.847485018019042e-01f, -1.739838733874638e-01f}, + {9.845342500134284e-01f, -1.751922103019880e-01f}, + {9.843185155341647e-01f, -1.764002833802096e-01f}, + {9.841012986890054e-01f, -1.776080908027924e-01f}, + {9.838825998050751e-01f, -1.788156307508001e-01f}, + {9.836624192117303e-01f, -1.800229014056995e-01f}, + {9.834407572405590e-01f, -1.812299009493628e-01f}, + {9.832176142253802e-01f, -1.824366275640705e-01f}, + {9.829929905022433e-01f, -1.836430794325141e-01f}, + {9.827668864094273e-01f, -1.848492547377989e-01f}, + {9.825393022874412e-01f, -1.860551516634466e-01f}, + {9.823102384790224e-01f, -1.872607683933984e-01f}, + {9.820796953291370e-01f, -1.884661031120172e-01f}, + {9.818476731849786e-01f, -1.896711540040907e-01f}, + {9.816141723959685e-01f, -1.908759192548340e-01f}, + {9.813791933137546e-01f, -1.920803970498924e-01f}, + {9.811427362922112e-01f, -1.932845855753442e-01f}, + {9.809048016874382e-01f, -1.944884830177032e-01f}, + {9.806653898577611e-01f, -1.956920875639216e-01f}, + {9.804245011637294e-01f, -1.968953974013927e-01f}, + {9.801821359681174e-01f, -1.980984107179536e-01f}, + {9.799382946359226e-01f, -1.993011257018880e-01f}, + {9.796929775343657e-01f, -2.005035405419289e-01f}, + {9.794461850328897e-01f, -2.017056534272613e-01f}, + {9.791979175031598e-01f, -2.029074625475249e-01f}, + {9.789481753190622e-01f, -2.041089660928169e-01f}, + {9.786969588567044e-01f, -2.053101622536946e-01f}, + {9.784442684944136e-01f, -2.065110492211783e-01f}, + {9.781901046127370e-01f, -2.077116251867540e-01f}, + {9.779344675944409e-01f, -2.089118883423760e-01f}, + {9.776773578245099e-01f, -2.101118368804696e-01f}, + {9.774187756901469e-01f, -2.113114689939341e-01f}, + {9.771587215807717e-01f, -2.125107828761450e-01f}, + {9.768971958880210e-01f, -2.137097767209575e-01f}, + {9.766341990057480e-01f, -2.149084487227085e-01f}, + {9.763697313300211e-01f, -2.161067970762195e-01f}, + {9.761037932591240e-01f, -2.173048199767996e-01f}, + {9.758363851935545e-01f, -2.185025156202481e-01f}, + {9.755675075360243e-01f, -2.196998822028567e-01f}, + {9.752971606914583e-01f, -2.208969179214133e-01f}, + {9.750253450669941e-01f, -2.220936209732035e-01f}, + {9.747520610719810e-01f, -2.232899895560143e-01f}, + {9.744773091179798e-01f, -2.244860218681361e-01f}, + {9.742010896187618e-01f, -2.256817161083659e-01f}, + {9.739234029903089e-01f, -2.268770704760098e-01f}, + {9.736442496508120e-01f, -2.280720831708857e-01f}, + {9.733636300206708e-01f, -2.292667523933261e-01f}, + {9.730815445224936e-01f, -2.304610763441808e-01f}, + {9.727979935810960e-01f, -2.316550532248194e-01f}, + {9.725129776235006e-01f, -2.328486812371343e-01f}, + {9.722264970789363e-01f, -2.340419585835434e-01f}, + {9.719385523788376e-01f, -2.352348834669925e-01f}, + {9.716491439568440e-01f, -2.364274540909583e-01f}, + {9.713582722487994e-01f, -2.376196686594509e-01f}, + {9.710659376927513e-01f, -2.388115253770169e-01f}, + {9.707721407289504e-01f, -2.400030224487415e-01f}, + {9.704768817998493e-01f, -2.411941580802516e-01f}, + {9.701801613501028e-01f, -2.423849304777186e-01f}, + {9.698819798265667e-01f, -2.435753378478606e-01f}, + {9.695823376782966e-01f, -2.447653783979458e-01f}, + {9.692812353565485e-01f, -2.459550503357946e-01f}, + {9.689786733147769e-01f, -2.471443518697825e-01f}, + {9.686746520086348e-01f, -2.483332812088429e-01f}, + {9.683691718959728e-01f, -2.495218365624697e-01f}, + {9.680622334368384e-01f, -2.507100161407201e-01f}, + {9.677538370934755e-01f, -2.518978181542170e-01f}, + {9.674439833303232e-01f, -2.530852408141520e-01f}, + {9.671326726140158e-01f, -2.542722823322882e-01f}, + {9.668199054133816e-01f, -2.554589409209625e-01f}, + {9.665056821994423e-01f, -2.566452147930884e-01f}, + {9.661900034454125e-01f, -2.578311021621590e-01f}, + {9.658728696266987e-01f, -2.590166012422493e-01f}, + {9.655542812208985e-01f, -2.602017102480191e-01f}, + {9.652342387078005e-01f, -2.613864273947156e-01f}, + {9.649127425693828e-01f, -2.625707508981763e-01f}, + {9.645897932898128e-01f, -2.637546789748313e-01f}, + {9.642653913554462e-01f, -2.649382098417065e-01f}, + {9.639395372548267e-01f, -2.661213417164257e-01f}, + {9.636122314786845e-01f, -2.673040728172135e-01f}, + {9.632834745199362e-01f, -2.684864013628985e-01f}, + {9.629532668736839e-01f, -2.696683255729151e-01f}, + {9.626216090372143e-01f, -2.708498436673069e-01f}, + {9.622885015099981e-01f, -2.720309538667289e-01f}, + {9.619539447936892e-01f, -2.732116543924507e-01f}, + {9.616179393921240e-01f, -2.743919434663584e-01f}, + {9.612804858113206e-01f, -2.755718193109581e-01f}, + {9.609415845594780e-01f, -2.767512801493782e-01f}, + {9.606012361469752e-01f, -2.779303242053718e-01f}, + {9.602594410863711e-01f, -2.791089497033199e-01f}, + {9.599161998924024e-01f, -2.802871548682339e-01f}, + {9.595715130819845e-01f, -2.814649379257579e-01f}, + {9.592253811742094e-01f, -2.826422971021723e-01f}, + {9.588778046903456e-01f, -2.838192306243950e-01f}, + {9.585287841538368e-01f, -2.849957367199857e-01f}, + {9.581783200903017e-01f, -2.861718136171474e-01f}, + {9.578264130275329e-01f, -2.873474595447295e-01f}, + {9.574730634954960e-01f, -2.885226727322305e-01f}, + {9.571182720263292e-01f, -2.896974514098006e-01f}, + {9.567620391543418e-01f, -2.908717938082443e-01f}, + {9.564043654160141e-01f, -2.920456981590233e-01f}, + {9.560452513499964e-01f, -2.932191626942586e-01f}, + {9.556846974971080e-01f, -2.943921856467341e-01f}, + {9.553227044003364e-01f, -2.955647652498983e-01f}, + {9.549592726048367e-01f, -2.967368997378675e-01f}, + {9.545944026579306e-01f, -2.979085873454284e-01f}, + {9.542280951091057e-01f, -2.990798263080405e-01f}, + {9.538603505100144e-01f, -3.002506148618392e-01f}, + {9.534911694144735e-01f, -3.014209512436381e-01f}, + {9.531205523784633e-01f, -3.025908336909318e-01f}, + {9.527484999601259e-01f, -3.037602604418984e-01f}, + {9.523750127197659e-01f, -3.049292297354024e-01f}, + {9.520000912198481e-01f, -3.060977398109971e-01f}, + {9.516237360249976e-01f, -3.072657889089275e-01f}, + {9.512459477019986e-01f, -3.084333752701328e-01f}, + {9.508667268197933e-01f, -3.096004971362489e-01f}, + {9.504860739494817e-01f, -3.107671527496115e-01f}, + {9.501039896643201e-01f, -3.119333403532583e-01f}, + {9.497204745397203e-01f, -3.130990581909318e-01f}, + {9.493355291532494e-01f, -3.142643045070820e-01f}, + {9.489491540846281e-01f, -3.154290775468691e-01f}, + {9.485613499157303e-01f, -3.165933755561658e-01f}, + {9.481721172305820e-01f, -3.177571967815606e-01f}, + {9.477814566153607e-01f, -3.189205394703594e-01f}, + {9.473893686583942e-01f, -3.200834018705895e-01f}, + {9.469958539501598e-01f, -3.212457822310009e-01f}, + {9.466009130832835e-01f, -3.224076788010699e-01f}, + {9.462045466525394e-01f, -3.235690898310011e-01f}, + {9.458067552548478e-01f, -3.247300135717307e-01f}, + {9.454075394892756e-01f, -3.258904482749284e-01f}, + {9.450068999570345e-01f, -3.270503921930005e-01f}, + {9.446048372614803e-01f, -3.282098435790925e-01f}, + {9.442013520081122e-01f, -3.293688006870915e-01f}, + {9.437964448045717e-01f, -3.305272617716291e-01f}, + {9.433901162606417e-01f, -3.316852250880838e-01f}, + {9.429823669882458e-01f, -3.328426888925837e-01f}, + {9.425731976014469e-01f, -3.339996514420094e-01f}, + {9.421626087164466e-01f, -3.351561109939961e-01f}, + {9.417506009515846e-01f, -3.363120658069366e-01f}, + {9.413371749273369e-01f, -3.374675141399838e-01f}, + {9.409223312663159e-01f, -3.386224542530535e-01f}, + {9.405060705932683e-01f, -3.397768844068269e-01f}, + {9.400883935350755e-01f, -3.409308028627527e-01f}, + {9.396693007207513e-01f, -3.420842078830508e-01f}, + {9.392487927814420e-01f, -3.432370977307140e-01f}, + {9.388268703504251e-01f, -3.443894706695110e-01f}, + {9.384035340631081e-01f, -3.455413249639891e-01f}, + {9.379787845570278e-01f, -3.466926588794764e-01f}, + {9.375526224718491e-01f, -3.478434706820849e-01f}, + {9.371250484493645e-01f, -3.489937586387129e-01f}, + {9.366960631334929e-01f, -3.501435210170474e-01f}, + {9.362656671702783e-01f, -3.512927560855671e-01f}, + {9.358338612078891e-01f, -3.524414621135448e-01f}, + {9.354006458966176e-01f, -3.535896373710499e-01f}, + {9.349660218888781e-01f, -3.547372801289512e-01f}, + {9.345299898392064e-01f, -3.558843886589194e-01f}, + {9.340925504042590e-01f, -3.570309612334300e-01f}, + {9.336537042428116e-01f, -3.581769961257653e-01f}, + {9.332134520157588e-01f, -3.593224916100174e-01f}, + {9.327717943861125e-01f, -3.604674459610909e-01f}, + {9.323287320190009e-01f, -3.616118574547051e-01f}, + {9.318842655816681e-01f, -3.627557243673972e-01f}, + {9.314383957434725e-01f, -3.638990449765241e-01f}, + {9.309911231758859e-01f, -3.650418175602657e-01f}, + {9.305424485524929e-01f, -3.661840403976272e-01f}, + {9.300923725489892e-01f, -3.673257117684415e-01f}, + {9.296408958431813e-01f, -3.684668299533723e-01f}, + {9.291880191149847e-01f, -3.696073932339162e-01f}, + {9.287337430464239e-01f, -3.707473998924054e-01f}, + {9.282780683216301e-01f, -3.718868482120106e-01f}, + {9.278209956268415e-01f, -3.730257364767432e-01f}, + {9.273625256504011e-01f, -3.741640629714579e-01f}, + {9.269026590827565e-01f, -3.753018259818559e-01f}, + {9.264413966164585e-01f, -3.764390237944864e-01f}, + {9.259787389461599e-01f, -3.775756546967501e-01f}, + {9.255146867686148e-01f, -3.787117169769015e-01f}, + {9.250492407826776e-01f, -3.798472089240512e-01f}, + {9.245824016893013e-01f, -3.809821288281689e-01f}, + {9.241141701915373e-01f, -3.821164749800858e-01f}, + {9.236445469945337e-01f, -3.832502456714969e-01f}, + {9.231735328055345e-01f, -3.843834391949643e-01f}, + {9.227011283338786e-01f, -3.855160538439188e-01f}, + {9.222273342909986e-01f, -3.866480879126634e-01f}, + {9.217521513904198e-01f, -3.877795396963752e-01f}, + {9.212755803477590e-01f, -3.889104074911081e-01f}, + {9.207976218807237e-01f, -3.900406895937958e-01f}, + {9.203182767091106e-01f, -3.911703843022539e-01f}, + {9.198375455548048e-01f, -3.922994899151824e-01f}, + {9.193554291417789e-01f, -3.934280047321689e-01f}, + {9.188719281960914e-01f, -3.945559270536903e-01f}, + {9.183870434458861e-01f, -3.956832551811160e-01f}, + {9.179007756213905e-01f, -3.968099874167103e-01f}, + {9.174131254549152e-01f, -3.979361220636348e-01f}, + {9.169240936808526e-01f, -3.990616574259509e-01f}, + {9.164336810356757e-01f, -4.001865918086229e-01f}, + {9.159418882579371e-01f, -4.013109235175197e-01f}, + {9.154487160882678e-01f, -4.024346508594184e-01f}, + {9.149541652693762e-01f, -4.035577721420057e-01f}, + {9.144582365460469e-01f, -4.046802856738814e-01f}, + {9.139609306651395e-01f, -4.058021897645602e-01f}, + {9.134622483755878e-01f, -4.069234827244749e-01f}, + {9.129621904283982e-01f, -4.080441628649787e-01f}, + {9.124607575766490e-01f, -4.091642284983474e-01f}, + {9.119579505754890e-01f, -4.102836779377824e-01f}, + {9.114537701821365e-01f, -4.114025094974132e-01f}, + {9.109482171558779e-01f, -4.125207214922996e-01f}, + {9.104412922580672e-01f, -4.136383122384345e-01f}, + {9.099329962521239e-01f, -4.147552800527466e-01f}, + {9.094233299035327e-01f, -4.158716232531024e-01f}, + {9.089122939798419e-01f, -4.169873401583093e-01f}, + {9.083998892506623e-01f, -4.181024290881177e-01f}, + {9.078861164876663e-01f, -4.192168883632239e-01f}, + {9.073709764645862e-01f, -4.203307163052724e-01f}, + {9.068544699572136e-01f, -4.214439112368585e-01f}, + {9.063365977433983e-01f, -4.225564714815306e-01f}, + {9.058173606030460e-01f, -4.236683953637931e-01f}, + {9.052967593181188e-01f, -4.247796812091088e-01f}, + {9.047747946726327e-01f, -4.258903273439013e-01f}, + {9.042514674526569e-01f, -4.270003320955576e-01f}, + {9.037267784463131e-01f, -4.281096937924305e-01f}, + {9.032007284437731e-01f, -4.292184107638414e-01f}, + {9.026733182372588e-01f, -4.303264813400826e-01f}, + {9.021445486210405e-01f, -4.314339038524199e-01f}, + {9.016144203914357e-01f, -4.325406766330948e-01f}, + {9.010829343468079e-01f, -4.336467980153277e-01f}, + {9.005500912875654e-01f, -4.347522663333197e-01f}, + {9.000158920161603e-01f, -4.358570799222555e-01f}, + {8.994803373370870e-01f, -4.369612371183058e-01f}, + {8.989434280568812e-01f, -4.380647362586298e-01f}, + {8.984051649841186e-01f, -4.391675756813778e-01f}, + {8.978655489294136e-01f, -4.402697537256935e-01f}, + {8.973245807054183e-01f, -4.413712687317167e-01f}, + {8.967822611268210e-01f, -4.424721190405857e-01f}, + {8.962385910103452e-01f, -4.435723029944398e-01f}, + {8.956935711747483e-01f, -4.446718189364220e-01f}, + {8.951472024408204e-01f, -4.457706652106809e-01f}, + {8.945994856313827e-01f, -4.468688401623742e-01f}, + {8.940504215712870e-01f, -4.479663421376699e-01f}, + {8.935000110874138e-01f, -4.490631694837502e-01f}, + {8.929482550086714e-01f, -4.501593205488127e-01f}, + {8.923951541659944e-01f, -4.512547936820739e-01f}, + {8.918407093923427e-01f, -4.523495872337709e-01f}, + {8.912849215227001e-01f, -4.534436995551644e-01f}, + {8.907277913940732e-01f, -4.545371289985410e-01f}, + {8.901693198454897e-01f, -4.556298739172159e-01f}, + {8.896095077179980e-01f, -4.567219326655349e-01f}, + {8.890483558546646e-01f, -4.578133035988772e-01f}, + {8.884858651005743e-01f, -4.589039850736579e-01f}, + {8.879220363028281e-01f, -4.599939754473306e-01f}, + {8.873568703105417e-01f, -4.610832730783892e-01f}, + {8.867903679748451e-01f, -4.621718763263714e-01f}, + {8.862225301488806e-01f, -4.632597835518601e-01f}, + {8.856533576878016e-01f, -4.643469931164871e-01f}, + {8.850828514487716e-01f, -4.654335033829341e-01f}, + {8.845110122909626e-01f, -4.665193127149364e-01f}, + {8.839378410755541e-01f, -4.676044194772847e-01f}, + {8.833633386657316e-01f, -4.686888220358279e-01f}, + {8.827875059266853e-01f, -4.697725187574754e-01f}, + {8.822103437256089e-01f, -4.708555080101994e-01f}, + {8.816318529316984e-01f, -4.719377881630376e-01f}, + {8.810520344161502e-01f, -4.730193575860958e-01f}, + {8.804708890521608e-01f, -4.741002146505500e-01f}, + {8.798884177149244e-01f, -4.751803577286489e-01f}, + {8.793046212816323e-01f, -4.762597851937166e-01f}, + {8.787195006314716e-01f, -4.773384954201548e-01f}, + {8.781330566456232e-01f, -4.784164867834454e-01f}, + {8.775452902072614e-01f, -4.794937576601530e-01f}, + {8.769562022015515e-01f, -4.805703064279270e-01f}, + {8.763657935156495e-01f, -4.816461314655044e-01f}, + {8.757740650387004e-01f, -4.827212311527123e-01f}, + {8.751810176618363e-01f, -4.837956038704698e-01f}, + {8.745866522781761e-01f, -4.848692480007911e-01f}, + {8.739909697828232e-01f, -4.859421619267875e-01f}, + {8.733939710728648e-01f, -4.870143440326701e-01f}, + {8.727956570473698e-01f, -4.880857927037520e-01f}, + {8.721960286073888e-01f, -4.891565063264507e-01f}, + {8.715950866559510e-01f, -4.902264832882912e-01f}, + {8.709928320980644e-01f, -4.912957219779071e-01f}, + {8.703892658407133e-01f, -4.923642207850446e-01f}, + {8.697843887928577e-01f, -4.934319781005636e-01f}, + {8.691782018654314e-01f, -4.944989923164409e-01f}, + {8.685707059713409e-01f, -4.955652618257725e-01f}, + {8.679619020254642e-01f, -4.966307850227757e-01f}, + {8.673517909446490e-01f, -4.976955603027919e-01f}, + {8.667403736477115e-01f, -4.987595860622885e-01f}, + {8.661276510554351e-01f, -4.998228606988624e-01f}, + {8.655136240905691e-01f, -5.008853826112407e-01f}, + {8.648982936778269e-01f, -5.019471501992850e-01f}, + {8.642816607438848e-01f, -5.030081618639924e-01f}, + {8.636637262173812e-01f, -5.040684160074983e-01f}, + {8.630444910289141e-01f, -5.051279110330795e-01f}, + {8.624239561110406e-01f, -5.061866453451552e-01f}, + {8.618021223982749e-01f, -5.072446173492910e-01f}, + {8.611789908270876e-01f, -5.083018254522002e-01f}, + {8.605545623359034e-01f, -5.093582680617462e-01f}, + {8.599288378651004e-01f, -5.104139435869457e-01f}, + {8.593018183570085e-01f, -5.114688504379703e-01f}, + {8.586735047559073e-01f, -5.125229870261497e-01f}, + {8.580438980080262e-01f, -5.135763517639729e-01f}, + {8.574129990615412e-01f, -5.146289430650919e-01f}, + {8.567808088665750e-01f, -5.156807593443229e-01f}, + {8.561473283751945e-01f, -5.167317990176499e-01f}, + {8.555125585414098e-01f, -5.177820605022260e-01f}, + {8.548765003211730e-01f, -5.188315422163763e-01f}, + {8.542391546723761e-01f, -5.198802425796005e-01f}, + {8.536005225548502e-01f, -5.209281600125748e-01f}, + {8.529606049303636e-01f, -5.219752929371544e-01f}, + {8.523194027626210e-01f, -5.230216397763758e-01f}, + {8.516769170172609e-01f, -5.240671989544601e-01f}, + {8.510331486618554e-01f, -5.251119688968137e-01f}, + {8.503880986659081e-01f, -5.261559480300321e-01f}, + {8.497417680008525e-01f, -5.271991347819013e-01f}, + {8.490941576400509e-01f, -5.282415275814013e-01f}, + {8.484452685587929e-01f, -5.292831248587072e-01f}, + {8.477951017342936e-01f, -5.303239250451923e-01f}, + {8.471436581456926e-01f, -5.313639265734305e-01f}, + {8.464909387740521e-01f, -5.324031278771979e-01f}, + {8.458369446023557e-01f, -5.334415273914767e-01f}, + {8.451816766155068e-01f, -5.344791235524554e-01f}, + {8.445251358003272e-01f, -5.355159147975332e-01f}, + {8.438673231455553e-01f, -5.365518995653215e-01f}, + {8.432082396418454e-01f, -5.375870762956454e-01f}, + {8.425478862817651e-01f, -5.386214434295480e-01f}, + {8.418862640597948e-01f, -5.396549994092906e-01f}, + {8.412233739723254e-01f, -5.406877426783570e-01f}, + {8.405592170176576e-01f, -5.417196716814542e-01f}, + {8.398937941959995e-01f, -5.427507848645159e-01f}, + {8.392271065094661e-01f, -5.437810806747042e-01f}, + {8.385591549620770e-01f, -5.448105575604123e-01f}, + {8.378899405597550e-01f, -5.458392139712668e-01f}, + {8.372194643103249e-01f, -5.468670483581293e-01f}, + {8.365477272235120e-01f, -5.478940591731002e-01f}, + {8.358747303109401e-01f, -5.489202448695194e-01f}, + {8.352004745861303e-01f, -5.499456039019702e-01f}, + {8.345249610644997e-01f, -5.509701347262801e-01f}, + {8.338481907633595e-01f, -5.519938357995242e-01f}, + {8.331701647019132e-01f, -5.530167055800275e-01f}, + {8.324908839012561e-01f, -5.540387425273663e-01f}, + {8.318103493843727e-01f, -5.550599451023716e-01f}, + {8.311285621761358e-01f, -5.560803117671306e-01f}, + {8.304455233033046e-01f, -5.570998409849897e-01f}, + {8.297612337945230e-01f, -5.581185312205561e-01f}, + {8.290756946803191e-01f, -5.591363809397010e-01f}, + {8.283889069931020e-01f, -5.601533886095610e-01f}, + {8.277008717671618e-01f, -5.611695526985409e-01f}, + {8.270115900386670e-01f, -5.621848716763159e-01f}, + {8.263210628456635e-01f, -5.631993440138341e-01f}, + {8.256292912280727e-01f, -5.642129681833185e-01f}, + {8.249362762276903e-01f, -5.652257426582692e-01f}, + {8.242420188881840e-01f, -5.662376659134664e-01f}, + {8.235465202550933e-01f, -5.672487364249718e-01f}, + {8.228497813758264e-01f, -5.682589526701315e-01f}, + {8.221518032996592e-01f, -5.692683131275782e-01f}, + {8.214525870777344e-01f, -5.702768162772331e-01f}, + {8.207521337630588e-01f, -5.712844606003090e-01f}, + {8.200504444105025e-01f, -5.722912445793115e-01f}, + {8.193475200767969e-01f, -5.732971666980422e-01f}, + {8.186433618205335e-01f, -5.743022254416005e-01f}, + {8.179379707021619e-01f, -5.753064192963863e-01f}, + {8.172313477839882e-01f, -5.763097467501014e-01f}, + {8.165234941301740e-01f, -5.773122062917532e-01f}, + {8.158144108067338e-01f, -5.783137964116556e-01f}, + {8.151040988815345e-01f, -5.793145156014319e-01f}, + {8.143925594242929e-01f, -5.803143623540171e-01f}, + {8.136797935065747e-01f, -5.813133351636602e-01f}, + {8.129658022017924e-01f, -5.823114325259262e-01f}, + {8.122505865852039e-01f, -5.833086529376983e-01f}, + {8.115341477339112e-01f, -5.843049948971807e-01f}, + {8.108164867268581e-01f, -5.853004569039005e-01f}, + {8.100976046448293e-01f, -5.862950374587097e-01f}, + {8.093775025704479e-01f, -5.872887350637883e-01f}, + {8.086561815881750e-01f, -5.882815482226452e-01f}, + {8.079336427843067e-01f, -5.892734754401222e-01f}, + {8.072098872469734e-01f, -5.902645152223945e-01f}, + {8.064849160661379e-01f, -5.912546660769743e-01f}, + {8.057587303335938e-01f, -5.922439265127122e-01f}, + {8.050313311429637e-01f, -5.932322950397998e-01f}, + {8.043027195896973e-01f, -5.942197701697721e-01f}, + {8.035728967710708e-01f, -5.952063504155093e-01f}, + {8.028418637861839e-01f, -5.961920342912395e-01f}, + {8.021096217359593e-01f, -5.971768203125404e-01f}, + {8.013761717231402e-01f, -5.981607069963423e-01f}, + {8.006415148522891e-01f, -5.991436928609294e-01f}, + {7.999056522297859e-01f, -6.001257764259429e-01f}, + {7.991685849638264e-01f, -6.011069562123827e-01f}, + {7.984303141644207e-01f, -6.020872307426096e-01f}, + {7.976908409433912e-01f, -6.030665985403482e-01f}, + {7.969501664143711e-01f, -6.040450581306880e-01f}, + {7.962082916928030e-01f, -6.050226080400867e-01f}, + {7.954652178959369e-01f, -6.059992467963715e-01f}, + {7.947209461428283e-01f, -6.069749729287426e-01f}, + {7.939754775543372e-01f, -6.079497849677736e-01f}, + {7.932288132531257e-01f, -6.089236814454155e-01f}, + {7.924809543636567e-01f, -6.098966608949977e-01f}, + {7.917319020121923e-01f, -6.108687218512306e-01f}, + {7.909816573267918e-01f, -6.118398628502083e-01f}, + {7.902302214373100e-01f, -6.128100824294097e-01f}, + {7.894775954753960e-01f, -6.137793791277018e-01f}, + {7.887237805744907e-01f, -6.147477514853411e-01f}, + {7.879687778698258e-01f, -6.157151980439765e-01f}, + {7.872125884984216e-01f, -6.166817173466510e-01f}, + {7.864552135990858e-01f, -6.176473079378039e-01f}, + {7.856966543124112e-01f, -6.186119683632733e-01f}, + {7.849369117807745e-01f, -6.195756971702979e-01f}, + {7.841759871483340e-01f, -6.205384929075197e-01f}, + {7.834138815610288e-01f, -6.215003541249855e-01f}, + {7.826505961665757e-01f, -6.224612793741500e-01f}, + {7.818861321144691e-01f, -6.234212672078768e-01f}, + {7.811204905559779e-01f, -6.243803161804418e-01f}, + {7.803536726441443e-01f, -6.253384248475345e-01f}, + {7.795856795337824e-01f, -6.262955917662607e-01f}, + {7.788165123814760e-01f, -6.272518154951441e-01f}, + {7.780461723455767e-01f, -6.282070945941292e-01f}, + {7.772746605862029e-01f, -6.291614276245828e-01f}, + {7.765019782652373e-01f, -6.301148131492967e-01f}, + {7.757281265463254e-01f, -6.310672497324895e-01f}, + {7.749531065948739e-01f, -6.320187359398091e-01f}, + {7.741769195780490e-01f, -6.329692703383341e-01f}, + {7.733995666647743e-01f, -6.339188514965771e-01f}, + {7.726210490257291e-01f, -6.348674779844861e-01f}, + {7.718413678333470e-01f, -6.358151483734467e-01f}, + {7.710605242618138e-01f, -6.367618612362842e-01f}, + {7.702785194870657e-01f, -6.377076151472665e-01f}, + {7.694953546867879e-01f, -6.386524086821050e-01f}, + {7.687110310404124e-01f, -6.395962404179578e-01f}, + {7.679255497291163e-01f, -6.405391089334316e-01f}, + {7.671389119358204e-01f, -6.414810128085832e-01f}, + {7.663511188451869e-01f, -6.424219506249224e-01f}, + {7.655621716436182e-01f, -6.433619209654138e-01f}, + {7.647720715192542e-01f, -6.443009224144792e-01f}, + {7.639808196619715e-01f, -6.452389535579994e-01f}, + {7.631884172633813e-01f, -6.461760129833163e-01f}, + {7.623948655168271e-01f, -6.471120992792355e-01f}, + {7.616001656173835e-01f, -6.480472110360278e-01f}, + {7.608043187618542e-01f, -6.489813468454321e-01f}, + {7.600073261487703e-01f, -6.499145053006563e-01f}, + {7.592091889783881e-01f, -6.508466849963809e-01f}, + {7.584099084526877e-01f, -6.517778845287601e-01f}, + {7.576094857753715e-01f, -6.527081024954242e-01f}, + {7.568079221518612e-01f, -6.536373374954818e-01f}, + {7.560052187892974e-01f, -6.545655881295217e-01f}, + {7.552013768965365e-01f, -6.554928529996153e-01f}, + {7.543963976841503e-01f, -6.564191307093185e-01f}, + {7.535902823644226e-01f, -6.573444198636738e-01f}, + {7.527830321513488e-01f, -6.582687190692122e-01f}, + {7.519746482606328e-01f, -6.591920269339562e-01f}, + {7.511651319096865e-01f, -6.601143420674205e-01f}, + {7.503544843176265e-01f, -6.610356630806152e-01f}, + {7.495427067052737e-01f, -6.619559885860479e-01f}, + {7.487298002951505e-01f, -6.628753171977246e-01f}, + {7.479157663114792e-01f, -6.637936475311532e-01f}, + {7.471006059801801e-01f, -6.647109782033448e-01f}, + {7.462843205288703e-01f, -6.656273078328160e-01f}, + {7.454669111868606e-01f, -6.665426350395909e-01f}, + {7.446483791851549e-01f, -6.674569584452033e-01f}, + {7.438287257564475e-01f, -6.683702766726985e-01f}, + {7.430079521351217e-01f, -6.692825883466360e-01f}, + {7.421860595572477e-01f, -6.701938920930909e-01f}, + {7.413630492605809e-01f, -6.711041865396560e-01f}, + {7.405389224845600e-01f, -6.720134703154446e-01f}, + {7.397136804703048e-01f, -6.729217420510915e-01f}, + {7.388873244606151e-01f, -6.738290003787560e-01f}, + {7.380598556999681e-01f, -6.747352439321236e-01f}, + {7.372312754345167e-01f, -6.756404713464076e-01f}, + {7.364015849120877e-01f, -6.765446812583521e-01f}, + {7.355707853821803e-01f, -6.774478723062332e-01f}, + {7.347388780959635e-01f, -6.783500431298615e-01f}, + {7.339058643062745e-01f, -6.792511923705841e-01f}, + {7.330717452676171e-01f, -6.801513186712865e-01f}, + {7.322365222361595e-01f, -6.810504206763948e-01f}, + {7.314001964697324e-01f, -6.819484970318775e-01f}, + {7.305627692278276e-01f, -6.828455463852481e-01f}, + {7.297242417715950e-01f, -6.837415673855661e-01f}, + {7.288846153638420e-01f, -6.846365586834405e-01f}, + {7.280438912690308e-01f, -6.855305189310302e-01f}, + {7.272020707532766e-01f, -6.864234467820476e-01f}, + {7.263591550843460e-01f, -6.873153408917591e-01f}, + {7.255151455316546e-01f, -6.882061999169885e-01f}, + {7.246700433662657e-01f, -6.890960225161182e-01f}, + {7.238238498608879e-01f, -6.899848073490914e-01f}, + {7.229765662898732e-01f, -6.908725530774144e-01f}, + {7.221281939292153e-01f, -6.917592583641577e-01f}, + {7.212787340565479e-01f, -6.926449218739597e-01f}, + {7.204281879511419e-01f, -6.935295422730269e-01f}, + {7.195765568939045e-01f, -6.944131182291369e-01f}, + {7.187238421673769e-01f, -6.952956484116404e-01f}, + {7.178700450557317e-01f, -6.961771314914630e-01f}, + {7.170151668447722e-01f, -6.970575661411068e-01f}, + {7.161592088219294e-01f, -6.979369510346534e-01f}, + {7.153021722762606e-01f, -6.988152848477649e-01f}, + {7.144440584984474e-01f, -6.996925662576865e-01f}, + {7.135848687807936e-01f, -7.005687939432483e-01f}, + {7.127246044172235e-01f, -7.014439665848672e-01f}, + {7.118632667032795e-01f, -7.023180828645491e-01f}, + {7.110008569361208e-01f, -7.031911414658905e-01f}, + {7.101373764145209e-01f, -7.040631410740809e-01f}, + {7.092728264388657e-01f, -7.049340803759049e-01f}, + {7.084072083111520e-01f, -7.058039580597435e-01f}, + {7.075405233349850e-01f, -7.066727728155766e-01f} +}; + Added: freeswitch/trunk/libs/libg722_1/src/generated/g722_1.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libg722_1/src/generated/g722_1.h Mon Feb 2 10:14:45 2009 @@ -0,0 +1,31 @@ +/* + * g722_1 - a library for the G.722.1 codec + * + * g722_1.h - The head guy amongst the headers + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * $Id: g722_1.h.in,v 1.1.1.1 2008/09/20 09:47:17 steveu Exp $ + */ + +/*! \file */ + +#if !defined(_G722_1_H_) +#define _G722_1_H_ + +#undef G722_1_USE_FIXED_POINT + +#include <stdlib.h> +#include <inttypes.h> +#include <string.h> +#include <limits.h> +#include <time.h> +#include <math.h> + +#include <g722_1/g722_1.h> + +#endif +/*- End of file ------------------------------------------------------------*/

1 0

[commit] r11592 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Feb '09

02 Feb '09

Author: brian Date: Mon Feb 2 01:27:04 2009 New Revision: 11592 Log: segfault if these are empty... found this playing with the Cisco 7975 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Feb 2 01:27:04 2009 @@ -1517,7 +1517,7 @@ /* the following could be refactored back to the calling event handler in sofia.c XXX MTK */ if (profile->manage_shared_appearance) { - if (!strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { + if (sip->sip_request->rq_url->url_user && !strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { /* only fire this on <200 to try to avoid resubscribes. probably better ways to do this? */ if (status < 200) { sofia_sla_handle_sip_i_subscribe(nua, contact_str, profile, nh, sip, tags); @@ -1837,7 +1837,7 @@ /* the following could instead be refactored back to the calling event handler in sofia.c XXX MTK */ if (profile->manage_shared_appearance) { /* also it probably is unsafe to dereference so many things in a row without testing XXX MTK */ - if (!strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { + if (sip->sip_request->rq_url->url_user && !strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { sofia_sla_handle_sip_i_publish(nua, profile, nh, sip, tags); return; }

1 0

[commit] r11589 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 01 Feb '09

01 Feb '09

Author: brian Date: Sun Feb 1 15:59:50 2009 New Revision: 11589 Log: make sure sip->sip_request->rq_url->url_user exists before you strncmp on it. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Sun Feb 1 15:59:50 2009 @@ -103,7 +103,7 @@ */ if (profile->manage_shared_appearance) { - if (!strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { + if (sip->sip_request->rq_url->url_user && !strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { int sub_state; tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END());

1 0