kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make timer in conference match channel not conference thread so we can generate timestamps 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4456 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-06 02:52:11 +00:00
parent 8f0580cd73
commit b813cac121
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1445,7 +1445,10 @@ static void conference_loop_output(conference_member_t *member)
switch_frame_t write_frame = {0}; switch_frame_t write_frame = {0};
uint8_t data[SWITCH_RECCOMMENDED_BUFFER_SIZE]; uint8_t data[SWITCH_RECCOMMENDED_BUFFER_SIZE];
switch_timer_t timer = {0}; 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; uint32_t bytes = samples * 2;
channel = switch_core_session_get_channel(member->session); channel = switch_core_session_get_channel(member->session);
@ -1455,7 +1458,8 @@ static void conference_loop_output(conference_member_t *member)
if (switch_core_timer_init(&timer, if (switch_core_timer_init(&timer,
member->conference->timer_name, member->conference->timer_name,
member->conference->interval, interval,
//member->conference->interval,
samples, samples,
NULL) == SWITCH_STATUS_SUCCESS) { NULL) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n",
@ -1533,7 +1537,8 @@ static void conference_loop_output(conference_member_t *member)
if (member->conference->dtmf_parser != NULL) { if (member->conference->dtmf_parser != NULL) {
for (digit = dtmf; *digit && caller_action == NULL; digit++) { 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 */ /* otherwise, clock the parser so that it can handle digit timeout detection */
@ -1624,7 +1629,9 @@ static void conference_loop_output(conference_member_t *member)
} }
write_frame.timestamp = timer.samplecount; write_frame.timestamp = timer.samplecount;
switch_core_session_write_frame(member->session, &write_frame, -1, 0); 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 */ /* forget the conference data we played file node data instead */
switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->audio_out_mutex);
switch_buffer_zero(member->mux_buffer); switch_buffer_zero(member->mux_buffer);
@ -1635,15 +1642,15 @@ static void conference_loop_output(conference_member_t *member)
switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->flag_mutex);
} else { /* send the conferecne frame to the call leg */ } else { /* send the conferecne frame to the call leg */
switch_buffer_t *use_buffer = NULL; 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 */ /* Flush the output buffer and write all the data (presumably muxed) back to the channel */
switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->audio_out_mutex);
write_frame.data = data; write_frame.data = data;
use_buffer = member->mux_buffer; 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)) { if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) {
write_frame.samples = write_frame.datalen / 2; write_frame.samples = write_frame.datalen / 2;
@ -1656,16 +1663,14 @@ static void conference_loop_output(conference_member_t *member)
switch_core_session_write_frame(member->session, &write_frame, -1, 0); 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_mutex_unlock(member->audio_out_mutex);
continue;
}
}
if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
break; break;
} }
}
}
} /* Rinse ... Repeat */ } /* Rinse ... Repeat */
if (member->digit_stream != NULL) { if (member->digit_stream != NULL) {