]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix issue with default video echo
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 3 Sep 2013 21:58:05 +0000 (02:58 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 3 Sep 2013 21:58:05 +0000 (02:58 +0500)
src/switch_core_media.c
src/switch_core_session.c

index b18ec859e8c9d73efbc6b5fb7a81b5e5b74b4363..2d18266cb5f216f2514432c8d0d168388e7a8439 100644 (file)
@@ -3890,7 +3890,8 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
        mh->up = 1;
        switch_mutex_lock(mh->cond_mutex);
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Video thread started\n", switch_channel_get_name(session->channel));
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Video thread started. 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);
 
        while (switch_channel_up_nosig(channel)) {
index a67359d6770787ab91bb9ccd1a67c2943c91ded5..88519d4c63a03a65197d1b38654af85b042f8594 100644 (file)
@@ -2523,11 +2523,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_async(sw
 
 SWITCH_DECLARE(void) switch_core_session_video_reset(switch_core_session_t *session)
 {
-       if (switch_channel_test_flag(session->channel, CF_VIDEO)) {
-               switch_channel_set_flag(session->channel, CF_VIDEO_ECHO);
-               switch_channel_clear_flag(session->channel, CF_VIDEO_PASSIVE);
-               switch_core_session_refresh_video(session);
-       }
+       switch_channel_set_flag(session->channel, CF_VIDEO_ECHO);
+       switch_channel_clear_flag(session->channel, CF_VIDEO_PASSIVE);
+       switch_core_session_refresh_video(session);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_get_flags(switch_core_session_t *session, const char *app,