February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12167 - in freeswitch: branches/gmaruzz/mod_skypiax trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: brian Date: Thu Feb 19 14:57:36 2009 New Revision: 12167 Log: Move Skypiax into svn Trunk Removed: freeswitch/branches/gmaruzz/mod_skypiax/ Changes in other areas also in this revision: Added: freeswitch/trunk/src/mod/endpoints/mod_skypiax/ - copied from r12166, /freeswitch/branches/gmaruzz/mod_skypiax/

1 0

[commit] r12166 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: brian Date: Thu Feb 19 10:38:23 2009 New Revision: 12166 Log: This version of flite has three new voices. rms, awb (male) and slt (female), The build system will automatically download the correct flite build from our website and compile it. You'll need to rm -rf libs/flite* to make sure that takes place. Thanks, /b Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Thu Feb 19 10:38:23 2009 @@ -1,7 +1,11 @@ FLITE=flite-1.3.99 FLITE_DIR=$(switch_srcdir)/libs/$(FLITE) FLITE_LIBDIR=$(FLITE_DIR)/build/libs -FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_kal.a $(FLITE_LIBDIR)/libflite_cmu_us_kal16.a $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a +FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \ + $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \ + $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lasound -lm LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include LOCAL_LIBADD=$(FLITE_A) Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Thu Feb 19 10:38:23 2009 @@ -32,19 +32,27 @@ #include <switch.h> #include <flite.h> +cst_voice *register_cmu_us_awb(void); +void unregister_cmu_us_awb(cst_voice * v); + cst_voice *register_cmu_us_kal(void); void unregister_cmu_us_kal(cst_voice * v); -cst_voice *register_cmu_us_kal16(void); -void unregister_cmu_us_kal16(cst_voice * v); +cst_voice *register_cmu_us_rms(void); +void unregister_cmu_us_rms(cst_voice * v); + +cst_voice *register_cmu_us_slt(void); +void unregister_cmu_us_slt(cst_voice * v); SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load); SWITCH_MODULE_DEFINITION(mod_flite, mod_flite_load, NULL, NULL); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown); static struct { - cst_voice *v8; - cst_voice *v16; + cst_voice *awb; + cst_voice *kal; + cst_voice *rms; + cst_voice *slt; } globals; struct flite_data { @@ -52,6 +60,7 @@ cst_wave *w; switch_buffer_t *audio_buffer; }; + typedef struct flite_data flite_t; #define free_wave(w) if (w) {delete_wave(w) ; w = NULL; } @@ -60,13 +69,19 @@ static switch_status_t flite_speech_open(switch_speech_handle_t *sh, const char *voice_name, int rate, switch_speech_flag_t *flags) { flite_t *flite = switch_core_alloc(sh->memory_pool, sizeof(*flite)); + + sh->native_rate = 16000; - if (rate == 8000) { - flite->v = globals.v8; - } else if (rate == 16000) { - flite->v = globals.v16; + if (!strcasecmp(voice_name, "awb")) { + flite->v = globals.awb; + } else if (!strcasecmp(voice_name, "kal")) { + flite->v = globals.kal; + } else if (!strcasecmp(voice_name, "rms")) { + flite->v = globals.rms; + } else if (!strcasecmp(voice_name, "slt")) { + flite->v = globals.slt; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid rate %d. Only 8000 and 16000 are supported.\n", rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Valid voice names are awb, kal, rms or slt.\n"); } if (flite->v) { @@ -109,7 +124,7 @@ free_wave(flite->w); } -static switch_status_t flite_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, switch_speech_flag_t *flags) +static switch_status_t flite_speech_read_tts(switch_speech_handle_t *sh, void *data, size_t *datalen, switch_speech_flag_t *flags) { size_t bytes_read; flite_t *flite = (flite_t *) sh->private_info; @@ -160,8 +175,10 @@ switch_speech_interface_t *speech_interface; flite_init(); - globals.v8 = register_cmu_us_kal(); - globals.v16 = register_cmu_us_kal16(); + globals.awb = register_cmu_us_awb(); + globals.kal = register_cmu_us_kal(); + globals.rms = register_cmu_us_rms(); + globals.slt = register_cmu_us_slt(); /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -182,13 +199,14 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown) { - unregister_cmu_us_kal(globals.v8); - unregister_cmu_us_kal(globals.v16); + unregister_cmu_us_awb(globals.awb); + unregister_cmu_us_kal(globals.kal); + unregister_cmu_us_rms(globals.rms); + unregister_cmu_us_slt(globals.slt); return SWITCH_STATUS_UNLOAD; } - /* For Emacs: * Local Variables: * mode:c

1 0

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

19 Feb '09

Author: mrene Date: Thu Feb 19 09:14:13 2009 New Revision: 12165 Log: add party=calling to rpid Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Thu Feb 19 09:14:13 2009 @@ -1308,7 +1308,7 @@ screen = "yes"; } - tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: \"%s\"<sip:%s@%s>;screen=%s;privacy=%s", + tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: \"%s\"<sip:%s@%s>;party=calling;screen=%s;privacy=%s", tech_pvt->caller_profile->caller_id_name, tech_pvt->caller_profile->caller_id_number, rpid_domain, screen, priv);

1 0

[commit] r12164 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mrene Date: Thu Feb 19 08:41:20 2009 New Revision: 12164 Log: those are microseconds Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Feb 19 08:41:20 2009 @@ -869,7 +869,7 @@ if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet); + "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet / 1000); } else { memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error starting timer [%s], async RTP disabled\n", timer_name);

1 0

[commit] r12162 - freeswitch/trunk/src/mod/languages/mod_perl
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Thu Feb 19 00:01:53 2009 New Revision: 12162 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Thu Feb 19 00:01:53 2009 @@ -11512,17 +11512,17 @@ SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv);

1 0

[commit] r12161 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: intralanman Date: Wed Feb 18 23:34:35 2009 New Revision: 12161 Log: added fs_curl_debug option which will send XML with no whitespace if not passed (might save a little in transfer bw and time in large XMLs) Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Wed Feb 18 23:34:35 2009 @@ -51,10 +51,10 @@ * @return void */ public function fs_curl() { - openlog('fs_curl', LOG_NDELAY | LOG_PID, LOG_USER); + openlog('fs_curl', LOG_NDELAY | LOG_PID, LOG_USER); header('Content-Type: text/xml'); - $this -> open_xml(); $this -> generate_request_array(); + $this -> open_xml(); $inc = array('required'=>'libs/fs_pdo.php'); // include an external file. i.e. 'required'=>'important_file.php' $this -> include_files($inc); $this -> connect_db(DEFAULT_DSN, DEFAULT_DSN_LOGIN, DEFAULT_DSN_PASSWORD ); @@ -69,13 +69,13 @@ */ public function connect_db($dsn, $login, $password) { try { - $this -> db = new FS_PDO($dsn, $login, $password); - } catch(Exception $e) { - $this -> comment($e->getMessage()); - $this -> file_not_found(); //program terminates in function file_not_found() - } + $this -> db = new FS_PDO($dsn, $login, $password); + } catch(Exception $e) { + $this -> comment($e->getMessage()); + $this -> file_not_found(); //program terminates in function file_not_found() + } } - + /** * Method to add comments to XML * Adds a comment to be displayed in the final XML @@ -107,8 +107,14 @@ private function open_xml() { $this -> xmlw = new XMLWriter(); $this -> xmlw -> openMemory(); - $this -> xmlw -> setIndent(true); - $this -> xmlw -> setIndentString(' '); + if (array_key_exists('fs_curl_debug', $this -> request) + && $this -> request['fs_curl_debug'] == true) { + $this -> xmlw -> setIndent(true); + $this -> xmlw -> setIndentString(' '); + } else { + $this -> xmlw -> setIndent(false); + $this -> xmlw -> setIndentString(' '); + } $this -> xmlw -> startDocument('1.0', 'UTF-8', 'no'); //set the freeswitch document type $this -> xmlw -> startElement('document'); @@ -138,8 +144,10 @@ $not_found -> writeAttribute('status', 'not found'); $not_found -> endElement(); $not_found -> endElement(); - $not_found -> endElement(); + /* we put the comments inside the root element so we don't + * get complaints about markup outside of it */ $this -> comments2xml($not_found, $this -> comments); + $not_found -> endElement(); echo $not_found -> outputMemory(); exit(); } @@ -181,25 +189,22 @@ * @return void */ public function output_xml() { - $this->comment( + $this->comment( sprintf('Total # of Queries Run: %d', $this->db->counter) ); $this -> comment(sprintf("Estimated Execution Time Is: %s" , (ereg_replace( '^0\.([0-9]+) ([0-9]+)$', '\2.\1', microtime()) - START_TIME) - )); - + )); + + $this -> comments2xml($this -> xmlw, $this -> comments); $this -> close_xml(); - $comment_count = count($this -> comments); - for ($i = 0; $i < $comment_count; $i++) { - $this -> xmlw -> writeComment($this -> comments[$i]); - } $xml_out = $this -> xmlw -> outputMemory(); $this -> debug('---- Start XML Output ----'); $this -> debug(explode("\n", $xml_out)); $this -> debug('---- End XML Output ----'); echo $xml_out; - exit(); + exit(); } /** @@ -269,20 +274,20 @@ switch ($no) { case E_USER_NOTICE: - case E_NOTICE: - break; - case E_USER_WARNING: - case E_WARNING: - if (defined('RETURN_ON_WARN') && RETURN_ON_WARN == true) { + case E_NOTICE: break; - } - case E_ERROR: - case E_USER_ERROR: - default: - $this -> file_not_found(); - } - return true; - } + case E_USER_WARNING: + case E_WARNING: + if (defined('RETURN_ON_WARN') && RETURN_ON_WARN == true) { + break; + } + case E_ERROR: + case E_USER_ERROR: + default: + $this -> file_not_found(); + } + return true; + } /** * Function to print out debugging info @@ -292,41 +297,41 @@ * @param integer $debug_level debug if $debug_level <= FS_CURL_DEBUG * @param integer $spaces */ - public function debug($input, $debug_level=0, $spaces=0) { - if (defined('FS_CURL_DEBUG') && $debug_level <= FS_CURL_DEBUG ) { - if (is_array($input)) { - $this -> debug('Array (', $debug_level, $spaces); - foreach ($input as $key=>$val) { - if (is_array($val) || is_object($val)) { - $this -> debug("[$key] => $val", $debug_level, $spaces+4); - $this -> debug('(', $debug_level, $spaces + 8); - $this -> debug($val, $debug_level, $spaces + 8); - } else { - $this -> debug("[$key] => '$val'", $debug_level, $spaces + 4); - } - } - $this -> debug(")", $debug_level, $spaces); - } else { - $debug_str = sprintf("%s%s" - , str_repeat(' ', $spaces), $input - ); - switch (FS_DEBUG_TYPE) { - case 0: - syslog(LOG_NOTICE, $debug_str); - break; - case 1: - $this -> comment($debug_str); - break; - case 2: - $ptr = fopen(FS_DEBUG_FILE, 'a'); - fputs($ptr, "$debug_str\r\n"); - fclose($ptr); - break; - default: - return; - } - } - } - } -} + public function debug($input, $debug_level=0, $spaces=0) { + if (defined('FS_CURL_DEBUG') && $debug_level <= FS_CURL_DEBUG ) { + if (is_array($input)) { + $this -> debug('Array (', $debug_level, $spaces); + foreach ($input as $key=>$val) { + if (is_array($val) || is_object($val)) { + $this -> debug("[$key] => $val", $debug_level, $spaces+4); + $this -> debug('(', $debug_level, $spaces + 8); + $this -> debug($val, $debug_level, $spaces + 8); + } else { + $this -> debug("[$key] => '$val'", $debug_level, $spaces + 4); + } + } + $this -> debug(")", $debug_level, $spaces); + } else { + $debug_str = sprintf("%s%s" + , str_repeat(' ', $spaces), $input + ); + switch (FS_DEBUG_TYPE) { + case 0: + syslog(LOG_NOTICE, $debug_str); + break; + case 1: + $this -> comment($debug_str); + break; + case 2: + $ptr = fopen(FS_DEBUG_FILE, 'a'); + fputs($ptr, "$debug_str\r\n"); + fclose($ptr); + break; + default: + return; + } + } + } + } + }

1 0

[commit] r12160 - freeswitch/trunk
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:32:49 2009 New Revision: 12160 Log: fix fs_cli build on solaris Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Wed Feb 18 23:32:49 2009 @@ -259,7 +259,7 @@ ;; *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) - APR_ADDTO(ESL_LDFLAGS, -lnsl) + APR_ADDTO(ESL_LDFLAGS, -lnsl -lsocket) ;; *bsd*) APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include)

1 0

[commit] r12159 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: intralanman Date: Wed Feb 18 23:29:33 2009 New Revision: 12159 Log: get rid of a couple of undefined variable warnings in XML generation Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Wed Feb 18 23:29:33 2009 @@ -116,11 +116,11 @@ $ce = $row['condition_expression']; //$rcd = $row['re_cdata']; $cc = empty($row['cond_break']) ? '0' : $row['cond_break']; - $dp_array[$ct]["$et;$ec"]["$cf;$ce;$cc;$rcd"][] = array( + $dp_array[$ct]["$et;$ec"]["$cf;$ce;$cc"][] = array( 'type'=>$type, 'application'=>$app, 'data'=>$data, - 'is_cdata'=>$app_cdata + 'is_cdata'=>(empty($app_cdata) ? '' : $app_cdata) ); } return $dp_array;

1 0

[commit] r12158 - in freeswitch/trunk/libs/ilbc: . config doc localtests src tests
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:08:16 2009 New Revision: 12158 Log: remove generated files from tree Removed: freeswitch/trunk/libs/ilbc/Makefile.in freeswitch/trunk/libs/ilbc/aclocal.m4 freeswitch/trunk/libs/ilbc/config/config.guess freeswitch/trunk/libs/ilbc/config/config.sub freeswitch/trunk/libs/ilbc/config/ltmain.sh freeswitch/trunk/libs/ilbc/doc/Makefile.in freeswitch/trunk/libs/ilbc/localtests/Makefile.in freeswitch/trunk/libs/ilbc/src/Makefile.in freeswitch/trunk/libs/ilbc/tests/Makefile.in

1 0

[commit] r12157 - freeswitch/trunk/libs/libteletone/src
by FreeSWITCH SVN 19 Feb '09

19 Feb '09

Author: mikej Date: Wed Feb 18 23:06:04 2009 New Revision: 12157 Log: fix suncc visibility support Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Wed Feb 18 23:06:04 2009 @@ -79,7 +79,7 @@ #pragma warning(disable:4706) #endif -int16_t TELETONE_SINES[SINE_TABLE_MAX] = { +TELETONE_API int16_t TELETONE_SINES[SINE_TABLE_MAX] = { 0x00c9, 0x025b, 0x03ed, 0x057f, 0x0711, 0x08a2, 0x0a33, 0x0bc4, 0x0d54, 0x0ee4, 0x1073, 0x1201, 0x138f, 0x151c, 0x16a8, 0x1833, 0x19be, 0x1b47, 0x1cd0, 0x1e57, 0x1fdd, 0x2162, 0x22e5, 0x2467, Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Wed Feb 18 23:06:04 2009 @@ -137,7 +137,7 @@ /* 3.02 represents twice the power */ #define DBM0_MAX_POWER (3.14f + 3.02f) -extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; +TELETONE_API extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; static __inline__ int32_t teletone_dds_phase_rate(teletone_process_t tone, uint32_t rate) {

1 0