July 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r1800 - freeswitch/trunk
by Freeswitch SVN 09 Jul '06

09 Jul '06

Author: mikej Date: Sun Jul 9 19:53:51 2006 New Revision: 1800 Modified: freeswitch/trunk/modules.conf.in Log: add mod_conference to modules.conf.in Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Sun Jul 9 19:53:51 2006 @@ -1,6 +1,7 @@ loggers/mod_console loggers/mod_syslog applications/mod_commands +applications/mod_conference applications/mod_bridgecall applications/mod_echo applications/mod_ivrtest

1 0

[commit] r1795 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jul '06

08 Jul '06

Author: anthm Date: Sat Jul 8 15:11:09 2006 New Revision: 1795 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: forgot a few stupid things, here they are 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 Sat Jul 8 15:11:09 2006 @@ -213,6 +213,7 @@ #define SMAX 32767 #define SMIN -32768 +#define normalize_to_16bit(n) if (n > SMAX) n = SMAX; else if (n < SMIN) n = SMIN; static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol) { @@ -224,17 +225,14 @@ if (v > 0) { mult += (.2 * abs(v)); + mult = 4; } else { mult -= 1; } for (x = 0; x < samples; x++) { b = (int32_t)((double)p[x] * mult); - if (b > SMAX) { - b = SMAX; - } else if (b < SMIN) { - b = SMIN; - } + normalize_to_16bit(b); p[x] = (int16_t) b; } } @@ -557,7 +555,9 @@ muxed = (int16_t *) omember->mux_frame; for (x = 0; x < imember->read / 2; x++) { - muxed[x] = muxed[x] + bptr[x]; + int32_t z = muxed[x] + bptr[x]; + normalize_to_16bit(z); + muxed[x] = z; } ready++; @@ -2424,7 +2424,7 @@ /* Check for input volume adjustments */ if (member->volume_in_level) { - switch_change_sln_volume(read_frame->data, read_frame->samples, member->volume_in_level); + switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->volume_in_level); } /* Write the audio into the input buffer */

1 0

[commit] r1792 - freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep
by Freeswitch SVN 08 Jul '06

08 Jul '06

Author: athompson Date: Fri Jul 7 23:53:14 2006 New Revision: 1792 Modified: freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c Log: Rewrite of mod_sleep to read packets/digits off the channel for the requested time instead of just stopping time with a call to sleep. Modified: freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c ============================================================================== --- freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c (original) +++ freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c Fri Jul 7 23:53:14 2006 @@ -36,7 +36,12 @@ static void sleep_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; + switch_status_t status; char *delay = NULL; + unsigned int timeout; + switch_time_t maxtime; + + switch_time_t started = switch_time_now(); channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -44,8 +49,23 @@ switch_channel_answer(channel); delay = switch_core_session_strdup(session, data); - /* 1000000 seems to be equiv to 1 second */ - switch_sleep(atof(delay) * 1000000); + maxtime = (atoi(delay) * 1000) + started; + + while(switch_channel_ready(channel)) { + switch_frame_t *read_frame; + + if (switch_time_now() >= maxtime) { + break; + } + + if (switch_channel_has_dtmf(channel)) { + char dtmf[128]; + switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); + } + + timeout = (unsigned int)((maxtime - switch_time_now()) / 1000); + status = switch_core_session_read_frame(session, &read_frame, timeout, 0); + } } static const switch_application_interface_t sleep_application_interface = {

1 0