- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5313 - freeswitch/trunk/scripts/socket/socket2me
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: mikej Date: Tue Jun 12 16:46:13 2007 New Revision: 5313 Modified: freeswitch/trunk/scripts/socket/socket2me/Makefile Log: use CFLAGS env var for socket2me Makefile. Fixes MODAPP-13. Thanks Bret. Modified: freeswitch/trunk/scripts/socket/socket2me/Makefile ============================================================================== --- freeswitch/trunk/scripts/socket/socket2me/Makefile (original) +++ freeswitch/trunk/scripts/socket/socket2me/Makefile Tue Jun 12 16:46:13 2007 @@ -1,4 +1,4 @@ socket2me: socket2me.c - $(CC) -Wall socket2me.c -o socket2me -l spandsp + $(CC) $(CFLAGS) socket2me.c -o socket2me -l spandsp clean: rm socket2me

1 0

[commit] r5312 - freeswitch/trunk
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: mikej Date: Tue Jun 12 15:25:22 2007 New Revision: 5312 Modified: freeswitch/trunk/Freeswitch.sln Log: add build file to the sln file for editing. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Tue Jun 12 15:25:22 2007 @@ -584,6 +584,7 @@ configure.in = configure.in Makefile.am = Makefile.am build\modmake.sh = build\modmake.sh + libs\win32\util.vbs = libs\win32\util.vbs EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "m4", "m4", "{CDE9B06A-3C27-4987-8FAE-DF1006BC705D}"

1 0

[commit] r5309 - freeswitch/trunk/src
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: anthm Date: Mon Jun 11 21:24:29 2007 New Revision: 5309 Modified: freeswitch/trunk/src/switch_core.c Log: rm newline Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jun 11 21:24:29 2007 @@ -58,7 +58,7 @@ "%u minute%s, " "%u second%s, " "%u millisecond%s, " - "%u microsecond%s\n", + "%u microsecond%s", duration.yr, duration.yr == 1 ? "" : "s", duration.day, duration.day == 1 ? "" : "s", duration.hr, duration.hr == 1 ? "" : "s",

1 0

[commit] r5308 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/codecs/mod_g722 mod/endpoints/mod_sofia
by Freeswitch SVN 11 Jun '07

11 Jun '07

Author: anthm Date: Mon Jun 11 18:12:10 2007 New Revision: 5308 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: the endless saga of g722 bs Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jun 11 18:12:10 2007 @@ -1484,6 +1484,7 @@ uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); + uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL; @@ -1494,9 +1495,9 @@ if (switch_core_timer_init(&timer, member->conference->timer_name, interval, //member->conference->interval, - samples, NULL) == SWITCH_STATUS_SUCCESS) { + tsamples, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", - member->conference->timer_name, interval, samples); + member->conference->timer_name, interval, tsamples); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); return; Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Mon Jun 11 18:12:10 2007 @@ -142,10 +142,10 @@ /*.ianacode */ 9, /*.iananame */ "G722", /*.fmtp */ NULL, - /*.samples_per_second */ 16000, + /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, - /*.samples_per_frame */ 320, + /*.samples_per_frame */ 160, /*.bytes_per_frame */ 640, /*.encoded_bytes_per_frame */ 160, /*.number_of_channels */ 1, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon Jun 11 18:12:10 2007 @@ -41,7 +41,7 @@ { char buf[2048]; int ptime = 0; - int rate = 0; + uint32_t rate = 0; uint32_t v_port; if (!force && !ip && !sr && switch_channel_test_flag(tech_pvt->channel, CF_BYPASS_MEDIA)) { @@ -112,7 +112,7 @@ if (tech_pvt->rm_encoding) { rate = tech_pvt->rm_rate; - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%ld\n", tech_pvt->pt, tech_pvt->rm_encoding, tech_pvt->rm_rate); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate); if (tech_pvt->fmtp_out) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); } @@ -124,24 +124,18 @@ int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; - uint32_t rfc_3551_sucks = imp->samples_per_second; if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) { continue; } - if (!rate) { - rate = imp->samples_per_second; - } + rate = imp->samples_per_second; + if (ptime && ptime != imp->microseconds_per_frame / 1000) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); } - if (rfc_3551_sucks && imp->ianacode == 9) { - rfc_3551_sucks = 8000; - } - - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rfc_3551_sucks); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); if (imp->fmtp) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); } @@ -152,7 +146,7 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); } if (tech_pvt->cng_pt) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt); if (!tech_pvt->rm_encoding) { tech_pvt->cng_pt = 0; } @@ -814,8 +808,10 @@ int ms; tech_pvt->read_frame.rate = tech_pvt->rm_rate; ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms\n", - switch_channel_get_name(tech_pvt->channel), tech_pvt->rm_encoding, tech_pvt->rm_rate, tech_pvt->codec_ms); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n", + switch_channel_get_name(tech_pvt->channel), tech_pvt->rm_encoding, tech_pvt->rm_rate, tech_pvt->codec_ms, + tech_pvt->read_codec.implementation->samples_per_frame + ); tech_pvt->read_frame.codec = &tech_pvt->read_codec; switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); @@ -1176,10 +1172,6 @@ continue; } - if (map->rm_pt == 9) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Oh sure! You say 8000, but you mean 16000! This is, of course, stupid!\n"); - codec_rate = 8000; - } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u]/[%s:%d:%u]\n", rm_encoding, map->rm_pt, (int)map->rm_rate, imp->iananame, imp->ianacode, codec_rate); if (map->rm_pt < 96) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jun 11 18:12:10 2007 @@ -1281,11 +1281,15 @@ send_msg = (rtp_msg_t *) data; } else { uint8_t m = 0; - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) { + + if ((rtp_session->ts > (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 10))) + || rtp_session->ts == rtp_session->samples_per_interval) { m++; } + if (rtp_session->cn && payload != rtp_session->cng_pt) { rtp_session->cn = 0; + m++; } send_msg = &rtp_session->send_msg;

1 0

[commit] r5307 - in freeswitch/trunk: conf src/mod/applications/mod_conference
by Freeswitch SVN 11 Jun '07

11 Jun '07

Author: anthm Date: Mon Jun 11 17:44:41 2007 New Revision: 5307 Modified: freeswitch/trunk/conf/conference.conf.xml freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add perpetual-sound option to conference Modified: freeswitch/trunk/conf/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/conference.conf.xml (original) +++ freeswitch/trunk/conf/conference.conf.xml Mon Jun 11 17:44:41 2007 @@ -62,6 +62,8 @@    +  +     Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jun 11 17:44:41 2007 @@ -175,6 +175,7 @@ char *enter_sound; char *exit_sound; char *alone_sound; + char *perpetual_sound; char *ack_sound; char *nack_sound; char *muted_sound; @@ -516,7 +517,7 @@ if (conference->count >= conference->anounce_count && conference->anounce_count > 1) { snprintf(msg, sizeof(msg), "There are %d callers", conference->count); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); - } else if (conference->count == 1) { + } else if (conference->count == 1 && !conference->perpetual_sound) { if (conference->alone_sound) { conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 0); } else { @@ -684,6 +685,10 @@ switch_size_t file_data_len = samples * 2; int has_file_data = 0; + if (conference->perpetual_sound && !conference->fnode) { + conference_play_file(conference, conference->perpetual_sound, CONF_DEFAULT_LEADIN, NULL, 0); + } + /* Sync the conference to a single timing source */ if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { switch_set_flag(conference, CFLAG_DESTRUCT); @@ -4536,6 +4541,7 @@ char *caller_id_number = NULL; char *caller_controls = NULL; char *member_flags = NULL; + char *perpetual_sound = NULL; uint32_t max_members = 0; uint32_t anounce_count = 0; char *maxmember_sound = NULL; @@ -4583,6 +4589,8 @@ exit_sound = val; } else if (!strcasecmp(var, "alone-sound")) { alone_sound = val; + } else if (!strcasecmp(var, "perpetual-sound")) { + perpetual_sound = val; } else if (!strcasecmp(var, "ack-sound")) { ack_sound = val; } else if (!strcasecmp(var, "nack-sound")) { @@ -4696,7 +4704,13 @@ conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name); conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number); - conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; + + if (!switch_strlen_zero(perpetual_sound)) { + conference->perpetual_sound = switch_core_strdup(conference->pool, perpetual_sound); + conference->mflags = MFLAG_CAN_HEAR; + } else { + conference->mflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; + } if (member_flags) { set_mflags(member_flags, &conference->mflags);

1 0

[commit] r5306 - freeswitch/trunk/src
by Freeswitch SVN 11 Jun '07

11 Jun '07

Author: anthm Date: Mon Jun 11 13:47:48 2007 New Revision: 5306 Modified: freeswitch/trunk/src/switch_rtp.c Log: bit by mark Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jun 11 13:47:48 2007 @@ -1286,7 +1286,6 @@ } if (rtp_session->cn && payload != rtp_session->cng_pt) { rtp_session->cn = 0; - m++; } send_msg = &rtp_session->send_msg;

1 0

[commit] r5305 - freeswitch/trunk/build/config
by Freeswitch SVN 11 Jun '07

11 Jun '07

Author: mikej Date: Sun Jun 10 22:14:13 2007 New Revision: 5305 Added: freeswitch/trunk/build/config/ODBC.m4 Log: add odbc m4 detection. Added: freeswitch/trunk/build/config/ODBC.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/build/config/ODBC.m4 Sun Jun 10 22:14:13 2007 @@ -0,0 +1,323 @@ +dnl ODBC.m4 generated automatically by aclocal 1.4a + +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +# Copyright (c) 1999-2000 Ajuba Solutions +# Copyright (c) 2004 ActiveState + + +#------------------------------------------------------------------------ +# AX_PATH_ODBC -- +# +# Locate the ODBC files (includes and libraries). +# +# Arguments: +# +# Requires: +# +# Results: +# +# Adds ODBC include and libs to PKG info +#------------------------------------------------------------------------ + +dnl the alternative search directory is invoked by --with-odbcinclude +dnl and --with-odbclibrary +AC_DEFUN(AX_PATH_ODBC, [ +case "$host" in + *darwin*) + DYNAMIC_LIB_EXTEN="dylib" + ;; + *cygwin* | *mingw*) + DYNAMIC_LIB_EXTEN="dll" + ;; + *) + DYNAMIC_LIB_EXTEN="so" + ;; +esac + AX_PATH_ODBCH + AX_PATH_ODBCLIB + AC_SUBST(ODBC_INCLUDE_DIR) + AC_SUBST(ODBC_LIB_DIR) + AC_SUBST(ODBC_LIB) +]) + +dnl Find the ODBC headers. This code may not work for certain +dnl intallations. +AC_DEFUN(AX_PATH_ODBCH, [ + dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." + no_odbc=true + ac_cv_c_odbch="" + ODBCTYPE="" + + AC_ARG_WITH(odbcinclude, [ --with-odbcinclude directory where odbc headers are], with_odbcinclude=${withval}) + + if test x"${with_odbcinclude}" != x ; then + # first check to see if --with-odbcinclude was specified + list="/odbc/sql.h /ODBC/sql.h /unixodbc/sql.h /unixODBC/sql.h \ + /iodbc/isql.h" + for i in $list ; do + if test -f "${with_odbcinclude}$i" ; then + ac_cv_c_odbch=`dirname ${with_odbcinclude}$i` + ac_cv_c_odbch=`(cd ${ac_cv_c_odbch}; pwd)` + break + fi + done + if test x"${ac_cv_c_odbch}" = x; then + AC_MSG_ERROR([${with_odbcinclude} directory does not contain headers]) + fi + fi + + dnl =============================== + dnl IODBC... I have not tested this a whole lot + dnl =============================== + dn`l Check in the source tree + for i in $dirlist; do + if test -f "${srcdir}/$i/postodbc/isql.h" ; then + ac_cv_c_odbch=`(cd ${srcdir}/$i/postodbc/; pwd)` + ODBCTYPE=iodbc + fi + done + + dnl Check a few common places in the file system + if test x"${ac_cv_c_odbch}" = x ; then + for i in \ + /usr/local/mysql/include \ + /usr/local/include/iodbc \ + /usr/local/share/iodbc \ + ${prefix}/include/iodbc \ + /usr/local/include \ + /usr/include \ + ${prefix}/include ; do + if test -f $i/isql.h; then + ac_cv_c_odbch=`(cd $i; pwd)` + ODBCTYPE=iodbc + fi + done + fi + + dnl check if its installed with the compiler + if test x"${ac_cv_c_odbch}" = x ; then + dnl Get the path to the compiler, strip off any args in ${CC} + ccprog=`echo ${CC} | sed -e 's: .*::'` + ccpath=`which ${ccprog} | sed -e 's:/bin/.*::'`/include/iodbc + if test -f $ccpath/isql.h; then + ac_cv_c_odbch=$ccpath + ODBCTYPE=iodbc + fi + fi + + dnl see if one is installed + if test x"${ac_cv_c_odbch}" = x ; then + AC_CHECK_HEADER(isql.h, ac_cv_c_odbch=installed, ac_cv_c_odbch="") + if test x"${ac_cv_c_odbch}" != x ; then + ODBCTYPE=iodbc + fi + fi + + dnl =============================== + dnl unixODBC or Intersolv... I have tested this + dnl =============================== + dnl Check for unixODBC headers + if test x"${ac_cv_c_odbch}" = x ; then + for i in \ + /opt/odbc/include \ + /opt/ODBC/include \ + ${prefix}/include/odbc \ + ${prefix}/include/ODBC \ + /opt/unixodbc/include \ + /opt/unixODBC/include \ + ${prefix}/include/unixodbc \ + ${prefix}/include/unixODBC \ + /usr/local/mysql/include \ + /usr/local/include \ + /usr/include \ + ${prefix}/include ; do + if test -f "$i/sql.h"; then + ac_cv_c_odbch=`(cd $i; pwd)` + ODBCTYPE=unixODBC + fi + done + fi + + dnl see if one is installed + if test x"${ac_cv_c_odbch}" = x ; then + AC_CHECK_HEADER(sql.h, ac_cv_c_odbch=installed, ac_cv_c_odbch="") + if test x"${ac_cv_c_odbch}" != x ; then + ODBCTYPE=unixODBC + fi + fi + + dnl Figure out whether this is unixODBC or Intersolv + if test x"${ODBCTYPE}" = xunixODBC ; then + if test -f "${ac_cv_c_odbch}/odbcver.h" ; then + ODBCTYPE=intersolv + fi + fi + + ODBC_INCLUDE_DIR="" + if test x"${ac_cv_c_odbch}" = x ; then + AC_MSG_ERROR([Cannot find any ODBC headers]) + else + if test x"${ODBCTYPE}" = x ; then + if test -f "${ac_cv_c_odbch}/odbcver.h" ; then + ODBCTYPE=intersolv + elif test -f "${ac_cv_c_odbch}/sql.h" ; then + ODBCTYPE=unixODBC + elif test -f "${ac_cv_c_odbch}/isql.h" ; then + ODBCTYPE=iodbc + fi + fi + fi + + AC_MSG_CHECKING([for ODBC headers files]) + if test x"${ac_cv_c_odbch}" != x ; then + no_odbc="" + if test x"${ac_cv_c_odbch}" != xinstalled ; then + AC_MSG_RESULT(${ac_cv_c_odbch}) + ODBC_INCLUDE_DIR="-I${ac_cv_c_odbch}" + else + AC_MSG_RESULT(none) + fi + fi + + AC_SUBST(ODBC_INCLUDE_DIR) + AC_SUBST(ODBCTYPE) +]) + +dnl Find the ODBC library. This code may not work for certain +dnl intallations. +AC_DEFUN(AX_PATH_ODBCLIB, [ + dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." + no_odbc=true + ac_cv_c_odbc_libdir="" + ac_cv_c_odbc_lib="" + ODBC_LIB_NAME="" + + AC_ARG_WITH(odbclibrary, [ --with-odbclibrary directory where odbc libraries are], with_odbclibrary=${withval}) + + dnl first check to see if --with-odbclibrary was specified + if test x"${with_odbclibrary}" != x ; then + if test -f ${with_odbclibrary} ; then + ac_cv_c_odbc_libdir=`echo ${with_odbclibrary} | sed -e 's:/libpsqlodbc.*::'` + ac_cv_c_odbc_libdir=`(cd ${ac_cv_c_odbc_libdir}; pwd)` + ac_cv_c_odbc_lib=`echo ${with_odbclibrary} | sed -e 's:.*/::'` + elif test -f ${with_odbclibrary}/libodbc.${DYNAMIC_LIB_EXTEN} ; then + ac_cv_c_odbc_libdir=`(cd ${with_odbclibrary}; pwd)` + ac_cv_c_odbc_lib='-lodbc' + elif test -f ${with_odbclibrary}/libpsqlodbc.${DYNAMIC_LIB_EXTEN} ; then + ac_cv_c_odbc_libdir=`(cd ${with_odbclibrary}; pwd)` + elif test -f ${with_odbclibrary}/iodbc/libpsqlodbc.${DYNAMIC_LIB_EXTEN} ; then + ac_cv_c_odbc_libdir=`(cd ${with_odbclibrary}/iodbc; pwd)` + ac_cv_c_odbc_lib='-llibpsqlodbc' + else + AC_MSG_ERROR([${with_odbclibrary} directory does not contain library]) + fi + fi + + dnl Check for multiple library names depending on the ODBC type + if test x"${ODBCTYPE}" = xiodbc ; then + liblist="libpsqlodbc libmysqlodbc librbodbc libiodbc iodbc" + libpathlist="/usr/local/lib/iodbc ${prefix}/iodbc/lib \ + ${prefix}/lib/iodbc /usr/local/mysql/lib /usr/local/lib /usr/lib ${prefix}/lib" + elif test x"${ODBCTYPE}" = xunixODBC ; then + liblist="libodbc" + libpathlist="/opt/unixodbc/lib /opt/unixODBC/lib /usr/include/odbc \ + /usr/include/ODBC /usr/local/mysql/lib /usr/local/lib \ + ${prefix}/lib" + elif test x"${ODBCTYPE}" = xintersolv ; then + liblist="libodbc" + libpathlist="/opt/odbc/lib /opt/ODBC/lib /usr/include/unixodbc \ + /usr/include/unixODBC /usr/local/mysql/lib /usr/local/lib \ + ${prefix}/lib" + else + AC_MSG_ERROR([ODBC support could not be identified.]) + fi + + for libname in $liblist; do + dnl Check in the build tree + for i in $dirlist; do + if test -f "$i/postodbc/${libname}.${DYNAMIC_LIB_EXTEN}" ; then + ac_cv_c_odbc_libdir=`(cd $i/postodbc/; pwd)` + break + fi + done + + dnl Check a few common places in the file system + if test x"${ac_cv_c_odbc_libdir}" = x ; then + for i in $libpathlist; do + if test -f $i/${libname}.${DYNAMIC_LIB_EXTEN}; then + ac_cv_c_odbc_libdir=`(cd $i; pwd)` + break + fi + done + fi + + dnl check if its installed with the compiler + if test x"${ac_cv_c_odbc_libdir}" = x ; then + dnl Get the path to the compiler, strip off any args in ${CC} + ccprog=`echo ${CC} | sed -e 's: .*::'` + ccpath=`which ${ccprog} | sed -e 's:/bin/.*::'`/lib + if test -f $ccpath/${libname}.${DYNAMIC_LIB_EXTEN}; then + ac_cv_c_odbc_libdir=$ccpath + fi + fi + + dnl see if one is installed + if test x"${ac_cv_c_odbc_libdir}" = x ; then + AC_CHECK_LIB(${libname}, main) + fi + + dnl do not keep searching for the other libraries, cause we found one + if test x"${ac_cv_c_odbc_libdir}" != x ; then + ac_cv_c_odbc_lib=${libname} + break + fi + done + + ODBC_LIB_DIR="" + AC_MSG_CHECKING(for ODBC library files) + if test x"${ac_cv_c_odbc_libdir}" = x ; then + AC_MSG_ERROR([Cannot find an ODBC library path]) + fi + if test x"${ac_cv_c_odbc_lib}" = x ; then + AC_MSG_ERROR([Cannot find an ODBC library]) + fi + if test x"${ac_cv_c_odbc_libdir}" != x ; then + AC_MSG_RESULT(${ac_cv_c_odbc_libdir}) + ODBC_LIB_DIR="-L${ac_cv_c_odbc_libdir}" + fi + + AC_MSG_CHECKING(for ODBC library name) + ODBC_LIB=-l`echo $ac_cv_c_odbc_lib | sed -e 's:^lib::'` + AC_MSG_RESULT($ODBC_LIB) + + if test x"${ODBCTYPE}" = xiodbc ; then + AC_MSG_RESULT(Using IODBC driver) + AC_DEFINE(HAVE_IODBC) + ODBC_LIB="$ODBC_LIB -liodbcinst" + fi + + if test x"${ODBCTYPE}" = xunixODBC ; then + AC_MSG_RESULT(Using UnixODBC driver) + AC_DEFINE(HAVE_UNIXODBC) + AC_DEFINE(DONT_TD_VOID) + fi + + if test x"${ODBCTYPE}" = xintersolv ; then + AC_MSG_RESULT(Using Intersolv driver) + AC_DEFINE(HAVE_INTERSOLV) + fi + + AC_SUBST(ODBC_LIB) + AC_SUBST(ODBC_LIB_DIR) +]) + +

1 0

[commit] r5304 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Jun '07

10 Jun '07

Author: anthm Date: Sat Jun 9 22:52:23 2007 New Revision: 5304 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add inbound-codec-negotiation and channel variable to enable greedy codec negotiation Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Sat Jun 9 22:52:23 2007 @@ -50,6 +50,8 @@ <param name="rtp-timer-name" value="soft"/> <param name="rtp-ip" value="$${bind_server_ip}"/> <param name="sip-ip" value="$${bind_server_ip}"/> +  + <param name="inbound-codec-negotiation" value="generous"/>   Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Sat Jun 9 22:52:23 2007 @@ -111,7 +111,8 @@ PFLAG_DISABLE_TRANSCODING = (1 << 6), PFLAG_REWRITE_TIMESTAMPS = (1 << 7), PFLAG_RUNNING = (1 << 8), - PFLAG_RESPAWN = (1 << 9) + PFLAG_RESPAWN = (1 << 9), + PFLAG_GREEDY = (1 << 10) } PFLAGS; 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 Sat Jun 9 22:52:23 2007 @@ -797,6 +797,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PASS_RFC2833; } + } else if (!strcasecmp(var, "inbound-codec-negotiation")) { + if (!strcasecmp(val, "greedy")) { + profile->pflags |= PFLAG_GREEDY; + } } else if (!strcasecmp(var, "disable-transcoding")) { if (switch_true(val)) { profile->pflags |= PFLAG_DISABLE_TRANSCODING; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Jun 9 22:52:23 2007 @@ -1042,12 +1042,25 @@ private_object_t *tech_pvt; sdp_media_t *m; sdp_attribute_t *a; - + int first = 0, last = 0; int ptime = 0, dptime = 0; + int greedy = 0, x = 0, skip = 0, mine = 0; + switch_channel_t *channel = NULL; + char *val; tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + greedy = !!(tech_pvt->profile->pflags & PFLAG_GREEDY); + + if (!greedy) { + if ((val = switch_channel_get_variable(channel, "sip_codec_negotiation")) && !strcasecmp(val, "greedy")) { + greedy = 1; + } + } if ((tech_pvt->origin = switch_core_session_strdup(session, (char *) sdp->sdp_origin->o_username))) { if (strstr(tech_pvt->origin, "CiscoSystemsSIP-GW-UserAgent")) { @@ -1108,12 +1121,18 @@ match = 0; break; } - + + greed: + x = 0; for (map = m->m_rtpmaps; map; map = map->rm_next) { int32_t i; const switch_codec_implementation_t *mimp = NULL, *near_match = NULL; const char *rm_encoding; - + + if (x++ < skip) { + printf("skip %s\n", map->rm_encoding); + continue; + } if (!(rm_encoding = map->rm_encoding)) { rm_encoding = ""; @@ -1135,15 +1154,22 @@ switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_AUTO_CNG); } } - + if (match) { if (te && cng_pt) { break; } continue; } + + if (greedy) { + first = mine; + last = first + 1; + } else { + first = 0; last = tech_pvt->num_codecs; + } - for (i = 0; i < tech_pvt->num_codecs; i++) { + for (i = first; i < last && i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; uint32_t codec_rate = imp->samples_per_second; if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) { @@ -1174,6 +1200,11 @@ match = 0; } } + + if (!match && greedy) { + skip++; + continue; + } if (!match && near_match) { const switch_codec_implementation_t *search[1]; @@ -1182,7 +1213,7 @@ int num; snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", near_match->iananame, near_match->samples_per_second, ptime); - + prefs[0] = tmp; num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1); @@ -1221,6 +1252,13 @@ } } } + + if (!match && greedy && mine < tech_pvt->num_codecs) { + mine++; + skip = 0; + goto greed; + } + } else if (m->m_type == sdp_media_video) { sdp_rtpmap_t *map; const char *rm_encoding;

1 0

[commit] r5303 - in freeswitch/trunk/src/mod/languages: mod_python mod_spidermonkey
by Freeswitch SVN 09 Jun '07

09 Jun '07

Author: anthm Date: Sat Jun 9 19:07:00 2007 New Revision: 5303 Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add adjustable buffering to mod_shout (see example in config file) Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Sat Jun 9 19:07:00 2007 @@ -9,6 +9,7 @@ switch_input_args_t args = { 0 }, *ap = NULL; struct input_callback_state cb_state = { 0 }; switch_file_handle_t fh = { 0 }; + char *prebuf; sanity_check(-1); cb_state.funcargs = funcargs; @@ -31,6 +32,13 @@ ap = &args; } + if ((prebuf = switch_channel_get_variable(this->channel, "stream_prebuffer"))) { + int maybe = atoi(prebuf); + if (maybe > 0) { + fh.prebuf = maybe; + } + } + this->begin_allow_threads(); cb_state.threadState = threadState; // pass threadState so the dtmfhandler can pick it up Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Jun 9 19:07:00 2007 @@ -1357,6 +1357,7 @@ switch_file_handle_t fh = { 0 }; JSFunction *function; switch_input_args_t args = { 0 }; + char *prebuf; if (!jss || !jss->session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "You must call the session.originate method before calling this method!\n"); @@ -1404,6 +1405,14 @@ JS_ValueToInt32(cx, argv[3], &samps); fh.samples = samps; } + + if ((prebuf = switch_channel_get_variable(channel, "stream_prebuffer"))) { + int maybe = atoi(prebuf); + if (maybe > 0) { + fh.prebuf = maybe; + } + } + cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);

1 0

[commit] r5302 - in freeswitch/trunk: conf src src/include src/mod/formats/mod_shout
by Freeswitch SVN 09 Jun '07

09 Jun '07

Author: anthm Date: Sat Jun 9 19:02:38 2007 New Revision: 5302 Modified: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/switch_ivr_play_say.c Log: add adjustable buffering to mod_shout (see example in config file) Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Sat Jun 9 19:02:38 2007 @@ -19,6 +19,16 @@ </condition> </extension> + <extension name="9192"> + <condition field="destination_number" expression="^9192$"> +  + <action application="set" data="stream_prebuffer=131072"/> +  + <action application="playback" data="shout://mp3.ihets.org/wfyihd132"/> + </condition> + </extension> + +  <extension name="9191">  Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Sat Jun 9 19:02:38 2007 @@ -221,6 +221,8 @@ int speed; /*! the handle's memory pool */ switch_memory_pool_t *memory_pool; + /*! pre-buffer x bytes for streams */ + uint32_t prebuf; /*! private data for the format module to store handle specific info */ void *private_info; char *handler; Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sat Jun 9 19:02:38 2007 @@ -65,6 +65,7 @@ int samplerate; uint8_t thread_running; uint8_t shout_init; + uint32_t prebuf; }; typedef struct shout_context shout_context_t; @@ -336,6 +337,10 @@ error_check(); + if (context->prebuf) { + buf_size = context->prebuf; + } + /* make sure we aren't over zealous by slowing down the stream when the buffer is too full */ for (;;) { error_check(); @@ -350,10 +355,11 @@ switch_mutex_unlock(context->audio_mutex); if (used < buf_size) { + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Buffered %u/%u!\n", used, buf_size); break; } - switch_yield(1000000); + switch_yield(500000); } error_check(); @@ -556,6 +562,7 @@ InitMP3(&context->mp, OUTSCALE, context->samplerate); if (handle->handler) { context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path); + context->prebuf = handle->prebuf; launch_read_stream_thread(context); } else { if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sat Jun 9 19:02:38 2007 @@ -505,6 +505,7 @@ char *ext; char *prefix; char *timer_name; + char *prebuf; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -512,6 +513,7 @@ prefix = switch_channel_get_variable(channel, "sound_prefix"); timer_name = switch_channel_get_variable(channel, "timer_name"); + if (!file) { return SWITCH_STATUS_FALSE; } @@ -552,6 +554,15 @@ fh->samples = 0; } + if ((prebuf = switch_channel_get_variable(channel, "stream_prebuffer"))) { + int maybe = atoi(prebuf); + if (maybe > 0) { + fh->prebuf = maybe; + } + } + + + if (switch_core_file_open(fh, file, read_codec->implementation->number_of_channels,

1 0