kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-08 19:11:20 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7636 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-02-15 22:17:20 +00:00
parent e88a0702cb
commit 950f13e4d9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1516,7 +1516,6 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t * thread,
if (!switch_test_flag(member, MFLAG_TALKING)) { if (!switch_test_flag(member, MFLAG_TALKING)) {
switch_event_t *event; switch_event_t *event;
switch_set_flag_locked(member, MFLAG_TALKING); switch_set_flag_locked(member, MFLAG_TALKING);
switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
switch_mutex_lock(member->conference->member_mutex); switch_mutex_lock(member->conference->member_mutex);
if (!member->conference->floor_holder || if (!member->conference->floor_holder ||
!switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score > !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score >
@ -1657,7 +1656,7 @@ static void conference_loop_output(conference_member_t * member)
switch_assert(member->conference != NULL); switch_assert(member->conference != NULL);
flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 2; flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 10;
if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) { if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n");
@ -1847,6 +1846,7 @@ static void conference_loop_output(conference_member_t * member)
/* forget the conference data we played file node data instead */ /* forget the conference data we played file node data instead */
printf("set flush 2\n");
switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
} }
} }
@ -1859,10 +1859,12 @@ static void conference_loop_output(conference_member_t * member)
if (mux_used < bytes) { if (mux_used < bytes) {
if (++low_count >= 5) { if (++low_count >= 5) {
/* partial frame sitting around this long is useless and builds delay */ /* partial frame sitting around this long is useless and builds delay */
printf("set flush 3\n");
switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
} }
} else if (mux_used > flush_len) { } else if (mux_used > flush_len) {
/* getting behind, clear the buffer */ /* getting behind, clear the buffer */
printf("set flush 4 %d\n", flush_len);
switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
} }
} }
@ -1891,6 +1893,7 @@ static void conference_loop_output(conference_member_t * member)
switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_out_mutex);
} else { } else {
printf("WTF\n");
if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) {
if (member->conference->comfort_noise_level) { if (member->conference->comfort_noise_level) {
switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level); switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level);
@ -1907,6 +1910,7 @@ static void conference_loop_output(conference_member_t * member)
if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) {
if (switch_buffer_inuse(member->mux_buffer)) { if (switch_buffer_inuse(member->mux_buffer)) {
printf("do flush\n");
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);
switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_out_mutex);