March 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4462 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Tue Mar 6 19:53:51 2007 New Revision: 4462 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: more conference fixes 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 Tue Mar 6 19:53:51 2007 @@ -118,7 +118,8 @@ MFLAG_ITHREAD = (1 << 4), MFLAG_NOCHANNEL = (1 << 5), MFLAG_INTREE = (1 << 6), - MFLAG_WASTE_BANDWIDTH = (1 << 7) + MFLAG_WASTE_BANDWIDTH = (1 << 7), + MFLAG_FLUSH_BUFFER = (1 << 8) } member_flag_t; typedef enum { @@ -815,9 +816,11 @@ /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */ for (imember = conference->members; imember; imember = imember->next) { - switch_mutex_lock(imember->audio_out_mutex); - switch_buffer_write(imember->mux_buffer, imember->mux_frame, imember->len); - switch_mutex_unlock(imember->audio_out_mutex); + if (switch_test_flag(imember, MFLAG_RUNNING)) { + switch_mutex_lock(imember->audio_out_mutex); + switch_buffer_write(imember->mux_buffer, imember->mux_frame, imember->len); + switch_mutex_unlock(imember->audio_out_mutex); + } } } @@ -1333,7 +1336,8 @@ if (!talking) { switch_event_t *event; - talking = 1; + talking = 1; + switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); @@ -1444,7 +1448,7 @@ uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; //uint32_t samples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t samples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); - uint32_t bytes = samples * 2; + uint32_t low_count = 0, bytes = samples * 2; channel = switch_core_session_get_channel(member->session); @@ -1627,41 +1631,62 @@ switch_core_timer_next(&timer); /* forget the conference data we played file node data instead */ - switch_mutex_lock(member->audio_out_mutex); - switch_buffer_zero(member->mux_buffer); - switch_mutex_unlock(member->audio_out_mutex); + switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } } switch_mutex_unlock(member->flag_mutex); } else { /* send the conferecne frame to the call leg */ switch_buffer_t *use_buffer = NULL; - uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; + uint32_t mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer); - if (mux_used) { - while (mux_used) { - /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ + if (mux_used){ + if (mux_used < bytes) { + if (++low_count >= 5) { + /* partial frame sitting around this long is useless and builds delay */ + switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); + } + mux_used = 0; + } else if (mux_used > bytes * 2) { + /* getting behind, clear the buffer */ + switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); + } + } + + if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { + if (mux_used) { switch_mutex_lock(member->audio_out_mutex); - write_frame.data = data; - use_buffer = member->mux_buffer; + switch_buffer_zero(member->mux_buffer); + switch_mutex_unlock(member->audio_out_mutex); + mux_used = 0; + } + switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER); + } - if ((write_frame.datalen = (uint32_t)switch_buffer_read(use_buffer, write_frame.data, bytes))) { - if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { - write_frame.samples = write_frame.datalen / 2; - - /* Check for output volume adjustments */ - if (member->volume_out_level) { - switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); - } + if (mux_used) { + /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ + switch_mutex_lock(member->audio_out_mutex); + write_frame.data = data; + use_buffer = member->mux_buffer; + low_count = 0; + + if ((write_frame.datalen = (uint32_t)switch_buffer_read(use_buffer, write_frame.data, bytes))) { + if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { + write_frame.samples = write_frame.datalen / 2; - write_frame.timestamp = timer.samplecount; - switch_core_session_write_frame(member->session, &write_frame, -1, 0); + /* Check for output volume adjustments */ + if (member->volume_out_level) { + switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); } + //printf("WRITE %d %d\n", write_frame.datalen, ++x); + write_frame.timestamp = timer.samplecount; + switch_core_session_write_frame(member->session, &write_frame, -1, 0); } - mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; - switch_mutex_unlock(member->audio_out_mutex); - switch_core_timer_next(&timer); } + + switch_mutex_unlock(member->audio_out_mutex); + switch_core_timer_next(&timer); + } else { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { memset(write_frame.data, 255, bytes);

1 0

[commit] r4461 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: anthm Date: Tue Mar 6 16:19:32 2007 New Revision: 4461 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix logic bug in conference 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 Tue Mar 6 16:19:32 2007 @@ -1624,9 +1624,8 @@ } write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); - if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { - break; - } + switch_core_timer_next(&timer); + /* forget the conference data we played file node data instead */ switch_mutex_lock(member->audio_out_mutex); switch_buffer_zero(member->mux_buffer); @@ -1661,9 +1660,7 @@ } mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; switch_mutex_unlock(member->audio_out_mutex); - if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { - break; - } + switch_core_timer_next(&timer); } } else { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { @@ -1673,9 +1670,7 @@ write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); } - if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { - break; - } + switch_core_timer_next(&timer); } } } /* Rinse ... Repeat */

1 0

[commit] r4460 - freeswitch/trunk/src
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: mikej Date: Tue Mar 6 15:46:09 2007 New Revision: 4460 Modified: freeswitch/trunk/src/switch_xml.c Log: correct mistake from global find and replace. Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Mar 6 15:46:09 2007 @@ -28,7 +28,7 @@ * * switch_xml.c -- XML PARSER * - * Derived from switch_xml http://switch_xml.sourceforge.net + * Derived from ezxml http://ezxml.sourceforge.net * Original Copyright * * Copyright 2004, 2006 Aaron Voisine <aaron(a)voisine.org>

1 0

[commit] r4459 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: anthm Date: Mon Mar 5 23:59:20 2007 New Revision: 4459 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update 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 Mar 5 23:59:20 2007 @@ -1365,13 +1365,8 @@ } } - - if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH) && !talking) { - memset(read_frame->data, 255, read_frame->datalen); - } - /* skip frames that are not actual media or when we are muted or silent */ - if ((talking || energy_level == 0) && switch_test_flag(member, MFLAG_CAN_SPEAK) || switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { + if ((talking || energy_level == 0) && switch_test_flag(member, MFLAG_CAN_SPEAK)) { if (member->read_resampler) { int16_t *bptr = (int16_t *) read_frame->data; int len = (int) read_frame->datalen;; @@ -1644,31 +1639,43 @@ switch_buffer_t *use_buffer = NULL; uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; - while (mux_used) { - /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ - switch_mutex_lock(member->audio_out_mutex); - write_frame.data = data; - use_buffer = member->mux_buffer; - - if ((write_frame.datalen = (uint32_t)switch_buffer_read(use_buffer, write_frame.data, bytes))) { - if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { - write_frame.samples = write_frame.datalen / 2; + if (mux_used) { + while (mux_used) { + /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ + switch_mutex_lock(member->audio_out_mutex); + write_frame.data = data; + use_buffer = member->mux_buffer; + + if ((write_frame.datalen = (uint32_t)switch_buffer_read(use_buffer, write_frame.data, bytes))) { + if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { + write_frame.samples = write_frame.datalen / 2; + + /* Check for output volume adjustments */ + if (member->volume_out_level) { + switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + } - /* Check for output volume adjustments */ - if (member->volume_out_level) { - switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + write_frame.timestamp = timer.samplecount; + switch_core_session_write_frame(member->session, &write_frame, -1, 0); } - - write_frame.timestamp = timer.samplecount; - switch_core_session_write_frame(member->session, &write_frame, -1, 0); + } + mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; + switch_mutex_unlock(member->audio_out_mutex); + if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { + break; } } - mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; - switch_mutex_unlock(member->audio_out_mutex); + } else { + if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { + memset(write_frame.data, 255, bytes); + write_frame.datalen = bytes; + write_frame.samples = samples; + write_frame.timestamp = timer.samplecount; + switch_core_session_write_frame(member->session, &write_frame, -1, 0); + } if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { break; } - } } } /* Rinse ... Repeat */

1 0

[commit] r4458 - freeswitch/trunk/src/include
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: mikej Date: Mon Mar 5 22:07:35 2007 New Revision: 4458 Modified: freeswitch/trunk/src/include/switch_apr.h Log: add format string define Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Mar 5 22:07:35 2007 @@ -76,6 +76,7 @@ * @{ */ +#define SWITCH_SIZE_T_FMT APR_SIZE_T_FMT typedef apr_size_t swtich_size_t; typedef apr_int16_t switch_int16_t;

1 0

[commit] r4457 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: anthm Date: Mon Mar 5 21:54:47 2007 New Revision: 4457 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: trick cepstral into not printing a warning on the console Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Mon Mar 5 21:54:47 2007 @@ -223,7 +223,7 @@ return SWITCH_STATUS_FALSE; } - if ((to_say = switch_mprintf("<break time=\"500ms\"/> %s <break time=\"500ms\"/>", text))) { + if ((to_say = switch_mprintf(".<break time=\"500ms\"/> %s <break time=\"500ms\"/>", text))) { swift_port_speak_text(cepstral->port, to_say, 0, NULL, &cepstral->tts_stream, NULL); switch_safe_free(to_say); }

1 0

[commit] r4456 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: anthm Date: Mon Mar 5 21:52:11 2007 New Revision: 4456 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: make timer in conference match channel not conference thread so we can generate timestamps 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 Mar 5 21:52:11 2007 @@ -1445,7 +1445,10 @@ switch_frame_t write_frame = {0}; uint8_t data[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_timer_t timer = {0}; - uint32_t samples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); + switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session); + uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; + //uint32_t samples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); + uint32_t samples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); uint32_t bytes = samples * 2; channel = switch_core_session_get_channel(member->session); @@ -1455,7 +1458,8 @@ if (switch_core_timer_init(&timer, member->conference->timer_name, - member->conference->interval, + interval, + //member->conference->interval, samples, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", @@ -1533,7 +1537,8 @@ if (member->conference->dtmf_parser != NULL) { for (digit = dtmf; *digit && caller_action == NULL; digit++) { - caller_action = (caller_control_action_t *)switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); + caller_action = (caller_control_action_t *) + switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); } } /* otherwise, clock the parser so that it can handle digit timeout detection */ @@ -1624,7 +1629,9 @@ } write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); - + if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { + break; + } /* forget the conference data we played file node data instead */ switch_mutex_lock(member->audio_out_mutex); switch_buffer_zero(member->mux_buffer); @@ -1635,15 +1642,15 @@ switch_mutex_unlock(member->flag_mutex); } else { /* send the conferecne frame to the call leg */ switch_buffer_t *use_buffer = NULL; - uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer); + uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; - if (mux_used) { + while (mux_used) { /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ switch_mutex_lock(member->audio_out_mutex); write_frame.data = data; use_buffer = member->mux_buffer; - while ((write_frame.datalen = (uint32_t)switch_buffer_read(use_buffer, write_frame.data, bytes))) { + if ((write_frame.datalen = (uint32_t)switch_buffer_read(use_buffer, write_frame.data, bytes))) { if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { write_frame.samples = write_frame.datalen / 2; @@ -1656,16 +1663,14 @@ switch_core_session_write_frame(member->session, &write_frame, -1, 0); } } - + mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; switch_mutex_unlock(member->audio_out_mutex); - continue; - } - } + if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { + break; + } - if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { - break; + } } - } /* Rinse ... Repeat */ if (member->digit_stream != NULL) {

1 0

[commit] r4455 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_sofia mod/timers/mod_softtimer
by Freeswitch SVN 06 Mar '07

06 Mar '07

Author: anthm Date: Mon Mar 5 20:19:41 2007 New Revision: 4455 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/switch_rtp.c Log: now with rollover 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 Mon Mar 5 20:19:41 2007 @@ -225,7 +225,7 @@ /*! sample count to increment by on each cycle */ unsigned int samples; /*! current sample count based on samples parameter */ - switch_size_t samplecount; + uint32_t samplecount; /*! the timer interface provided from a loadable module */ switch_timer_interface_t *timer_interface; /*! the timer's memory pool */ Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Mar 5 20:19:41 2007 @@ -147,7 +147,7 @@ unsigned int cand_id; unsigned int desc_id; unsigned int dc; - switch_size_t timestamp_send; + uint32_t timestamp_send; int32_t timestamp_recv; uint32_t last_read; char *codec_name; @@ -1357,7 +1357,7 @@ samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; tech_pvt->timestamp_send += samples; - if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, (uint32_t)tech_pvt->timestamp_send) < 0) { + if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, tech_pvt->timestamp_send) < 0) { terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Mar 5 20:19:41 2007 @@ -276,7 +276,7 @@ switch_codec_t write_codec; uint32_t codec_ms; switch_caller_profile_t *caller_profile; - switch_size_t timestamp_send; + uint32_t timestamp_send; //int32_t timestamp_recv; switch_rtp_t *rtp_session; int ssrc; @@ -1881,7 +1881,7 @@ #endif tech_pvt->timestamp_send += samples; - switch_rtp_write_frame(tech_pvt->rtp_session, frame, (uint32_t)tech_pvt->timestamp_send); + switch_rtp_write_frame(tech_pvt->rtp_session, frame, tech_pvt->timestamp_send); switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); return status; Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Mar 5 20:19:41 2007 @@ -32,6 +32,13 @@ #include <switch.h> #include <stdio.h> +#ifndef UINT32_MAX +#define UINT32_MAX 0xffffffff +#endif + +#define MAX_TICK UINT32_MAX - 1024 + + static switch_memory_pool_t *module_pool = NULL; static struct { @@ -44,12 +51,15 @@ struct timer_private { switch_size_t reference; + switch_size_t start; + uint32_t roll; }; typedef struct timer_private timer_private_t; struct timer_matrix { switch_size_t tick; uint32_t count; + uint32_t roll; }; typedef struct timer_matrix timer_matrix_t; @@ -71,23 +81,41 @@ TIMER_MATRIX[timer->interval].count++; switch_mutex_unlock(globals.mutex); timer->private_info = private_info; - private_info->reference = TIMER_MATRIX[timer->interval].tick; + private_info->start = private_info->reference = TIMER_MATRIX[timer->interval].tick; + private_info->roll = TIMER_MATRIX[timer->interval].roll; return SWITCH_STATUS_SUCCESS; } return SWITCH_STATUS_MEMERR; } + +#define check_roll() if (private_info->roll < TIMER_MATRIX[timer->interval].roll) {\ + private_info->roll++;\ + private_info->reference = private_info->start = TIMER_MATRIX[timer->interval].tick;\ + }\ + + + static inline switch_status_t timer_step(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; + uint64_t samples; if (globals.RUNNING != 1) { return SWITCH_STATUS_FALSE; } - timer->samplecount = timer->samples * private_info->reference; - private_info->reference++;// timer->interval; + check_roll(); + samples = timer->samples * (private_info->reference - private_info->start); + + if (samples > UINT32_MAX) { + private_info->start = private_info->reference; + samples = timer->samples; + } + + timer->samplecount = (uint32_t)samples; + private_info->reference++; return SWITCH_STATUS_SUCCESS; } @@ -96,11 +124,12 @@ static inline switch_status_t timer_next(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; - + timer_step(timer); while (globals.RUNNING == 1 && TIMER_MATRIX[timer->interval].tick < private_info->reference) { - switch_yield(1000); + check_roll(); + switch_yield(1000); } if (globals.RUNNING == 1) { @@ -121,6 +150,8 @@ return SWITCH_STATUS_SUCCESS; } + check_roll(); + if (TIMER_MATRIX[timer->interval].tick < private_info->reference) { diff = private_info->reference - TIMER_MATRIX[timer->interval].tick; } else { @@ -141,6 +172,9 @@ { switch_mutex_lock(globals.mutex); TIMER_MATRIX[timer->interval].count--; + if (TIMER_MATRIX[timer->interval].count == 0) { + TIMER_MATRIX[timer->interval].tick = 0; + } switch_mutex_unlock(globals.mutex); timer->private_info = NULL; return SWITCH_STATUS_SUCCESS; @@ -211,8 +245,11 @@ index = (current_ms % i == 0) ? i : 0; if (TIMER_MATRIX[index].count) { - //TIMER_MATRIX[index].tick += index; TIMER_MATRIX[index].tick++; + if (TIMER_MATRIX[index].tick == MAX_TICK) { + TIMER_MATRIX[index].tick = 0; + TIMER_MATRIX[index].roll++; + } } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 5 20:19:41 2007 @@ -1311,7 +1311,7 @@ rtp_session->ts = ts; - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size) { + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { mark++; } @@ -1349,7 +1349,7 @@ rtp_session->ts = ts; } - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size) { + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { mark++; }

1 0

[commit] r4454 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/endpoints/mod_portaudio mod/languages/mod_spidermonkey_teletone
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: mikej Date: Mon Mar 5 18:18:29 2007 New Revision: 4454 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: change switch_core_timer_next to return switch_status_t, update all users to new usage, add some error checking to mod_conference so that it bails out of the loops more gracefully on shutdown. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Mar 5 18:18:29 2007 @@ -931,7 +931,7 @@ \param timer the timer to wait on \return the newest sample count */ -SWITCH_DECLARE(int) switch_core_timer_next(switch_timer_t *timer); +SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer); /*! \brief Step the timer one step 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 Mar 5 18:18:29 2007 @@ -676,7 +676,10 @@ switch_size_t file_data_len = samples * 2; /* Sync the conference to a single timing source */ - switch_core_timer_next(&timer); + if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { + switch_set_flag(conference, CFLAG_DESTRUCT); + break; + } switch_mutex_lock(conference->mutex); ready = 0; @@ -1659,7 +1662,9 @@ } } - switch_core_timer_next(&timer); + if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { + break; + } } /* Rinse ... Repeat */ 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 Mon Mar 5 18:18:29 2007 @@ -623,7 +623,7 @@ { switch_size_t olen = globals.read_codec.implementation->samples_per_frame; - if (switch_core_timer_next(&tech_pvt->timer) < 0) { + if (switch_core_timer_next(&tech_pvt->timer) != SWITCH_STATUS_SUCCESS) { switch_core_file_close(&tech_pvt->fh); switch_core_codec_destroy(&tech_pvt->write_codec); goto cng; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Mon Mar 5 18:18:29 2007 @@ -273,7 +273,7 @@ } if (tto->timer) { - if (switch_core_timer_next(tto->timer)< 0) { + if (switch_core_timer_next(tto->timer) != SWITCH_STATUS_SUCCESS) { break; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 5 18:18:29 2007 @@ -1315,7 +1315,7 @@ } -SWITCH_DECLARE(int) switch_core_timer_next(switch_timer_t *timer) +SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer) { if (!timer->timer_interface) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); @@ -1323,9 +1323,9 @@ } if (timer->timer_interface->timer_next(timer) == SWITCH_STATUS_SUCCESS) { - return timer->samplecount; + return SWITCH_STATUS_SUCCESS; } else { - return -1; + return SWITCH_STATUS_GENERR; } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Mar 5 18:18:29 2007 @@ -1444,7 +1444,7 @@ if (timer_name) { - if (switch_core_timer_next(&timer) < 0) { + if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { break; } } else { /* time off the channel (if you must) */ @@ -1750,7 +1750,7 @@ if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_PAUSE)) { if (timer) { - if ((x = switch_core_timer_next(timer)) < 0) { + if (switch_core_timer_next(timer) != SWITCH_STATUS_SUCCESS) { break; } } else { @@ -1813,7 +1813,7 @@ } if (timer) { - if ((x = switch_core_timer_next(timer)) < 0) { + if (switch_core_timer_next(timer) != SWITCH_STATUS_SUCCESS) { break; } } else { /* time off the channel (if you must) */

1 0

[commit] r4453 - in freeswitch/trunk/src: . include
by Freeswitch SVN 05 Mar '07

05 Mar '07

Author: anthm Date: Mon Mar 5 15:55:41 2007 New Revision: 4453 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_event.c Log: add TRAP event Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 5 15:55:41 2007 @@ -816,6 +816,7 @@ SWITCH_EVENT_DETECTED_SPEECH - Detected Speech SWITCH_EVENT_PRIVATE_COMMAND - A private command event SWITCH_EVENT_HEARTBEAT - Machine is alive + SWITCH_EVENT_TRAP - Error Trap SWITCH_EVENT_ALL - All events at once </pre> @@ -857,6 +858,7 @@ SWITCH_EVENT_DETECTED_SPEECH, SWITCH_EVENT_PRIVATE_COMMAND, SWITCH_EVENT_HEARTBEAT, + SWITCH_EVENT_TRAP, SWITCH_EVENT_ALL } switch_event_types_t; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 5 15:55:41 2007 @@ -132,6 +132,7 @@ "DETECTED_SPEECH", "PRIVATE_COMMAND", "HEARTBEAT", + "TRAP", "ALL" };

1 0