]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7500: don't send blank vid on sleep unless there is nothing else going on
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 8 Apr 2015 16:33:10 +0000 (11:33 -0500)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:17 +0000 (12:47 -0500)
src/switch_core_media.c

index da9626a9e5ed88f35c8f06b3d3c734281a02a6ee..0efb43b04cc83dd531fdacb3b6b1e36cf539ca56 100644 (file)
@@ -4805,7 +4805,8 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
                        send_blank = 1;
                }
 
-               if (send_blank || switch_channel_test_flag(channel, CF_VIDEO_BLANK)) {
+               if ((send_blank || switch_channel_test_flag(channel, CF_VIDEO_BLANK)) && 
+                       !session->video_read_callback && !switch_channel_test_flag(session->channel, CF_BRIDGED)) {
                        fr.img = blank_img;
                        switch_yield(100000);
                        switch_core_session_write_video_frame(session, &fr, SWITCH_IO_FLAG_NONE, SWITCH_IO_FLAG_FORCE);