- Freeswitch-svn - FreeSWITCH Mailing Lists

[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] r11159 - in freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax: . configs
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: gmaruzz Date: Tue Jan 13 06:40:46 2009 New Revision: 11159 Log: skypiax: added Xserver (Xvfb) authorization file Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.X.conf Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/README Tue Jan 13 06:40:46 2009 @@ -131,6 +131,9 @@ root@8-04-srv:~/freeswitch_gmaruzz# cp src/mod/endpoints/mod_skypiax/configs/startskype.sh ./ root@8-04-srv:~/freeswitch_gmaruzz# vi startskype.sh +**** let's copy the X servers' auth config file +root@8-04-srv:~/freeswitch_gmaruzz#cp src/mod/endpoints/mod_skypiax/configs/skypiax.X.conf /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf + **** start the X servers and the Skype clients root@8-04-srv:~/freeswitch_gmaruzz# sh ./startskype.sh Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.X.conf ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.X.conf Tue Jan 13 06:40:46 2009 @@ -0,0 +1 @@ +localhost Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh Tue Jan 13 06:40:46 2009 @@ -8,14 +8,14 @@ sleep 3 #start the fake X server on a given port -/usr/bin/Xvfb :101 & +/usr/bin/Xvfb :101 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & sleep 3 # start a Skype client instance that will connect to the X server above, and will login to the Skype network using the "username password" you send to it on stdin. Here xxx would be the password and skypiax1 the username echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype --pipelogin & sleep 7 -/usr/bin/Xvfb :102 & +/usr/bin/Xvfb :102 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & sleep 3 echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype --pipelogin & @@ -25,109 +25,109 @@ ################################################################# # Following X server Skype client instances are commented out ################################################################# -###/usr/bin/Xvfb :103 & +###/usr/bin/Xvfb :103 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :104 & +###/usr/bin/Xvfb :104 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :105 & +###/usr/bin/Xvfb :105 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :106 & +###/usr/bin/Xvfb :106 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :107 & +###/usr/bin/Xvfb :107 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :108 & +###/usr/bin/Xvfb :108 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :109 & +###/usr/bin/Xvfb :109 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :110 & +###/usr/bin/Xvfb :110 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :111 & +###/usr/bin/Xvfb :111 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :112 & +###/usr/bin/Xvfb :112 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :113 & +###/usr/bin/Xvfb :113 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :114 & +###/usr/bin/Xvfb :114 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :115 & +###/usr/bin/Xvfb :115 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :116 & +###/usr/bin/Xvfb :116 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :117 & +###/usr/bin/Xvfb :117 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :118 & +###/usr/bin/Xvfb :118 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :119 & +###/usr/bin/Xvfb :119 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype --pipelogin & ### ###sleep 7 -###/usr/bin/Xvfb :120 & +###/usr/bin/Xvfb :120 -auth /usr/local/freeswitch/conf/autoload_configs/skypiax.X.conf & ###sleep 3 ### ###echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype --pipelogin &

1 0

[commit] r11158 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: gmaruzz Date: Tue Jan 13 03:55:53 2009 New Revision: 11158 Log: docs Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/README.skypiax_auth Tue Jan 13 03:55:53 2009 @@ -11,23 +11,19 @@ Then: -1) Start the Skype client on a desktop linux machine, logout from your autologin username if any, and login with the username and password you want to use for skypiax - -2) Configure the Skype client to use the right audio devices, to not update, to not make "events", etc etc... - -3) Then, when satisfied, use skypiax_auth (that simulates FS-skypiax connecting to the Skype client). The Skype client will ask you to be authorized to let "skypiax" connect. - +1) on a Linux desktop machine, rmmod all the snd* modules +2) on the desktop machine, modprobe snd-dummy +3) on the desktop machine, logout from your autologin username if any, launch the Skype client and login as the username you'll use on server +4) on the desktop machine, set the desktop client to use the "hw:dummy" audio device, to not update, to not make "events", etc etc... Make and receive a couple of test calls. Please note that you (and the remote party) will hear nothing (you're using the snd-dummy "fake" audio driver), that's ok. +3) on the desktop machine, when satisfied of the Skype client setup, use skypiax_auth (that simulates FS-skypiax connecting to the Skype client). The Skype client will ask you to be authorized to let "skypiax" connect. 4) Give the authorization and check the "not ask me again" option. - 5) Close (Quit) the Skype client from the tray icon, so it saves its config. - 6) Then, relaunch the Skype client and use skypiax_auth again, just to be sure it now succeed. - 7) Close (Quit) the Skype client from the tray icon, so it saves its config. *** Do the steps 1-7 for all Skype usernames you will want to use on the server (eg: one Skype username per channel) -When finished wityh all the Skype usernames: +When finished with all the Skype usernames: Copy or targzip the .Skype directory and all its content on the home directory of the server user that will launch the Skype client(s). ############################

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