From eff5f3a766bc59521fb9c8c1ca4124dd355c6e99 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 16 Jul 2013 09:05:06 -0500 Subject: [PATCH] add debug --- src/mod/applications/mod_conference/mod_conference.c | 8 ++++++++ src/switch_core_media.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index d301ed4f50..3a8818a813 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1590,6 +1590,8 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf if (conference->video_floor_holder == member) { return; } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Dropping video floor %s\n", + switch_channel_get_name(conference->video_floor_holder->channel)); old_id = conference->video_floor_holder->id; switch_channel_clear_flag(conference->video_floor_holder->channel, CF_VIDEO_PASSIVE); switch_core_session_refresh_video(conference->video_floor_holder->session); @@ -1597,6 +1599,8 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf } if ((conference->video_floor_holder = member)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Adding video floor %s\n", + switch_channel_get_name(conference->video_floor_holder->channel)); switch_channel_set_flag(member->channel, CF_VIDEO_PASSIVE); switch_core_session_refresh_video(conference->video_floor_holder->session); switch_set_flag(conference, CFLAG_FLOOR_CHANGE); @@ -1632,6 +1636,8 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference } else { old_id = conference->floor_holder->id; if (!conference->video_floor_holder && !switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Dropping floor %s\n", + switch_channel_get_name(conference->floor_holder->channel)); switch_channel_clear_flag(conference->floor_holder->channel, CF_VIDEO_PASSIVE); switch_core_session_refresh_video(conference->floor_holder->session); } @@ -1640,6 +1646,8 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference if ((conference->floor_holder = member)) { if (!conference->video_floor_holder && !switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Adding floor %s\n", + switch_channel_get_name(conference->floor_holder->channel)); switch_channel_set_flag(member->channel, CF_VIDEO_PASSIVE); switch_core_session_refresh_video(conference->floor_holder->session); } diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 6f2fa533a1..109158e229 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -3797,9 +3797,11 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi while (switch_channel_up_nosig(channel)) { if (switch_channel_test_flag(channel, CF_VIDEO_PASSIVE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Video thread paused\n", switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Video thread paused. Echo is %s\n", + switch_channel_get_name(session->channel), switch_channel_test_flag(channel, CF_VIDEO_ECHO) ? "on" : "off"); switch_thread_cond_wait(mh->cond, mh->cond_mutex); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Video thread resumed\n", switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Video thread resumed Echo is %s\n", + switch_channel_get_name(session->channel), switch_channel_test_flag(channel, CF_VIDEO_ECHO) ? "on" : "off"); switch_core_session_refresh_video(session); }