January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11072 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:18:00 2009 New Revision: 11072 Log: clean up a little more Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 13 18:18:00 2009 @@ -44,11 +44,11 @@ typedef struct easyroute_results{ char limit[16]; - char destnum[16]; - char dialstring[256]; - char group[16]; + char destnum[16]; + char dialstring[256]; + char group[16]; char acctcode[17]; - char translated[17]; + char translated[17]; } easyroute_results_t; @@ -170,7 +170,7 @@ if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); } - } else { + } else { #endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Connection (did you enable it?!)\n"); #ifdef SWITCH_HAVE_ODBC

1 0

[commit] r11163 - freeswitch/trunk/build
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 17:16:12 2009 New Revision: 11163 Log: more info Modified: freeswitch/trunk/build/Makefile Modified: freeswitch/trunk/build/Makefile ============================================================================== --- freeswitch/trunk/build/Makefile (original) +++ freeswitch/trunk/build/Makefile Tue Jan 13 17:16:12 2009 @@ -14,6 +14,9 @@ @echo " + (uhd-sounds includes hd-sounds, sounds) +" @echo " + (hd-sounds includes sounds) +" @echo " + ------------------------------------ +" + @echo " + $(MAKE) cd-sounds-install +" + @echo " + $(MAKE) cd-moh-install +" + @echo " + +" @echo " + $(MAKE) uhd-sounds-install +" @echo " + $(MAKE) uhd-moh-install +" @echo " + +"

1 0

[commit] r11162 - in freeswitch/trunk: src/mod/formats/mod_local_stream support-d
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 15:43:55 2009 New Revision: 11162 Log: buffer regressions Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Jan 13 15:43:55 2009 @@ -183,7 +183,7 @@ fname = path_buf; fh.prebuf = source->prebuf; - fh.pre_buffer_datalen = 65536; + fh.pre_buffer_datalen = source->prebuf; if (switch_core_file_open(&fh, (char *) fname, @@ -206,16 +206,23 @@ while (RUNNING) { switch_core_timer_next(&timer); olen = source->samples; + int is_open = switch_test_flag((&fh), SWITCH_FILE_OPEN); - if (switch_core_file_read(&fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) { - switch_core_file_close(&fh); - break; + if (is_open) { + if (switch_core_file_read(&fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) { + switch_core_file_close(&fh); + } + + switch_buffer_write(audio_buffer, abuf, olen * 2); } - switch_buffer_write(audio_buffer, abuf, olen * 2); used = switch_buffer_inuse(audio_buffer); - if (used >= source->prebuf || (source->total && used > source->samples * 2)) { + if (!used && !is_open) { + break; + } + + if (!is_open || used >= source->prebuf || (source->total && used > source->samples * 2)) { used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2); if (source->total) { @@ -285,6 +292,9 @@ char *alt_path = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; + /* already buffering a step back, so always disable it */ + handle->pre_buffer_datalen = 0; + if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing!\n"); return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Tue Jan 13 15:43:55 2009 @@ -7,7 +7,7 @@ ;(setq cperl-hairy t) (global-unset-key "\C-h") (global-set-key "\C-h" 'delete-backward-char) -(load "/usr/share/emacs/site-lisp/rng-auto.el") +;(load "/usr/share/emacs/site-lisp/rng-auto.el") (require 'cc-mode) (defun my-build-tab-stop-list (width)

1 0

[commit] r11071 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 16:43:25 2009 New Revision: 11071 Log: useless comments Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 13 16:43:25 2009 @@ -332,15 +332,6 @@ stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); } else { - - /* char limit[16]; - char destnum[16]; - char dialstring[256]; - char group[16]; - char acctcode[17]; - char translated[17]; - */ - if (!strncasecmp(argv[1], "dialstring", 10)) { stream->write_function(stream, "%s", results.dialstring); } else if (!strncasecmp(argv[1], "translated", 10)) {

1 0

[commit] r11161 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: anthm Date: Tue Jan 13 13:02:48 2009 New Revision: 11161 Log: reset rtp media timer when we get a reinvite Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Jan 13 13:02:48 2009 @@ -168,7 +168,7 @@ SWITCH_DECLARE(char *) switch_rtp_get_remote_host(switch_rtp_t *rtp_session); SWITCH_DECLARE(switch_port_t) switch_rtp_get_remote_port(switch_rtp_t *rtp_session); - +SWITCH_DECLARE(void) switch_rtp_reset_media_timer(switch_rtp_t *rtp_session); SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max); /*! 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 Tue Jan 13 13:02:48 2009 @@ -1817,6 +1817,10 @@ switch_assert(tech_pvt != NULL); switch_mutex_lock(tech_pvt->sofia_mutex); + if (switch_rtp_ready(tech_pvt->rtp_session)) { + switch_rtp_reset_media_timer(tech_pvt->rtp_session); + } + if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { switch_set_flag_locked(tech_pvt, TFLAG_SECURE); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Jan 13 13:02:48 2009 @@ -608,6 +608,11 @@ rtp_session->max_missed_packets = max; } +SWITCH_DECLARE(void) switch_rtp_reset_media_timer(switch_rtp_t *rtp_session) +{ + rtp_session->missed_count = 0; +} + SWITCH_DECLARE(char *) switch_rtp_get_remote_host(switch_rtp_t *rtp_session) { return switch_strlen_zero(rtp_session->remote_host_str) ? "0.0.0.0" : rtp_session->remote_host_str;

1 0

[commit] r11160 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: anthm Date: Tue Jan 13 11:56:35 2009 New Revision: 11160 Log: MODENDP-169 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Jan 13 11:56:35 2009 @@ -801,6 +801,7 @@ } globals.indev = globals.outdev = globals.ringdev = -1; + globals.sample_rate = 8000; if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { @@ -821,7 +822,7 @@ globals.sample_rate = atoi(val); } else if (!strcmp(var, "codec-ms")) { int tmp = atoi(val); - if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { + if (switch_check_interval(globals.sample_rate, tmp)) { globals.codec_ms = tmp; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Jan 13 11:56:35 2009 @@ -1007,6 +1007,13 @@ return SWITCH_STATUS_SUCCESS; } +static void ping_socket(switch_rtp_t *rtp_session) +{ + uint32_t o = UINT_MAX; + switch_size_t len = sizeof(o); + switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) &o, &len); +} + SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) { if (!switch_rtp_ready(rtp_session)) { @@ -1023,9 +1030,7 @@ } if (rtp_session->sock_input) { - uint32_t o = UINT_MAX; - switch_size_t len = sizeof(o); - switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) &o, &len); + ping_socket(rtp_session); } switch_mutex_unlock(rtp_session->flag_mutex); } @@ -1037,6 +1042,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); if (rtp_session->sock_input) { + ping_socket(rtp_session); switch_socket_shutdown(rtp_session->sock_input, SWITCH_SHUTDOWN_READWRITE); } if (rtp_session->sock_output && rtp_session->sock_output != rtp_session->sock_input) {

1 0

[commit] r11157 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Mon Jan 12 23:22:21 2009 New Revision: 11157 Log: sigh Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Jan 12 23:22:21 2009 @@ -210,7 +210,7 @@ switch_assert(fh->buffer); } if (!fh->dbuf) { - fh->dbuflen = want * 4; + fh->dbuflen = want * 8; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen);

1 0

[commit] r11156 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Mon Jan 12 23:17:07 2009 New Revision: 11156 Log: doh I did that wrong Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Jan 12 23:17:07 2009 @@ -204,13 +204,13 @@ switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); if (fh->resampler->to_len < want || fh->resampler->to_len > orig_len) { - int factor = fh->resampler->to_len * fh->samplerate / 1000; if (!fh->buffer) { + int factor = fh->resampler->to_len * fh->samplerate / 1000; switch_buffer_create_dynamic(&fh->buffer, factor, factor, 0); switch_assert(fh->buffer); } if (!fh->dbuf) { - fh->dbuflen = want * factor; + fh->dbuflen = want * 4; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen);

1 0

[commit] r11155 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Mon Jan 12 21:56:40 2009 New Revision: 11155 Log: If you were to be in a 32k or 48k conference and play an 8k or 16k file into either one you would over run this buffer. Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Jan 12 21:56:40 2009 @@ -204,13 +204,13 @@ switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); if (fh->resampler->to_len < want || fh->resampler->to_len > orig_len) { + int factor = fh->resampler->to_len * fh->samplerate / 1000; if (!fh->buffer) { - int factor = fh->resampler->to_len * fh->samplerate / 1000; switch_buffer_create_dynamic(&fh->buffer, factor, factor, 0); switch_assert(fh->buffer); } if (!fh->dbuf) { - fh->dbuflen = want * 2; + fh->dbuflen = want * factor; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen);

1 0

[commit] r11152 - in freeswitch/trunk/src: . mod/formats/mod_local_stream
by FreeSWITCH SVN 12 Jan '09

12 Jan '09

Author: anthm Date: Mon Jan 12 17:14:55 2009 New Revision: 11152 Log: fix another buffering regression Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Mon Jan 12 17:14:55 2009 @@ -32,7 +32,7 @@ */ #include <switch.h> /* for apr_pstrcat */ -#define DEFAULT_PREBUFFER_SIZE 1024 * 32 +#define DEFAULT_PREBUFFER_SIZE 1024 * 64 SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_local_stream_shutdown); Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Jan 12 17:14:55 2009 @@ -158,8 +158,9 @@ int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); if (!switch_test_flag(fh, SWITCH_FILE_BUFFER_DONE)) { - if (!switch_buffer_inuse(fh->pre_buffer)) { - rlen = asis ? fh->pre_buffer_datalen : fh->pre_buffer_datalen / 2; + rlen = asis ? fh->pre_buffer_datalen : fh->pre_buffer_datalen / 2; + + if (switch_buffer_inuse(fh->pre_buffer) < rlen * 2) { if ((status = fh->file_interface->file_read(fh, fh->pre_buffer_data, &rlen)) != SWITCH_STATUS_SUCCESS || !rlen) { switch_set_flag(fh, SWITCH_FILE_BUFFER_DONE); } else {

1 0