]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8543 make sure if the mute image is taken from the camera that it does not dissappear
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 20 Nov 2015 19:19:20 +0000 (13:19 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 20 Nov 2015 19:19:20 +0000 (13:19 -0600)
src/mod/applications/mod_conference/conference_video.c

index 05d3ea3236455da4f0d9864efe3b7e1a79c7cd99..489564e6e52da5a1e080cc04af64e2c5758a572c 100644 (file)
@@ -2285,13 +2285,19 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                        }
 
                                        if (!layer->mute_patched) {
-
+                                               
+                                               if (!imember->video_mute_img) {
+                                                       conference_video_vmute_snap(imember, SWITCH_FALSE);
+                                               }
+                                               
                                                if (imember->video_mute_img || layer->mute_img) {
                                                        conference_video_clear_layer(layer);
-
-                                                       if (!layer->mute_img && imember->video_mute_img) {
-                                                               //layer->mute_img = switch_img_read_png(imember->video_mute_png, SWITCH_IMG_FMT_I420);
-                                                               switch_img_copy(imember->video_mute_img, &layer->mute_img);
+                                                       
+                                                       if (!layer->mute_img) {                                                         
+                                                               if (imember->video_mute_img) {
+                                                                       //layer->mute_img = switch_img_read_png(imember->video_mute_png, SWITCH_IMG_FMT_I420);
+                                                                       switch_img_copy(imember->video_mute_img, &layer->mute_img);
+                                                               }
                                                        }
 
                                                        if (layer->mute_img) {