FS-8629 #resolve [Add new param video-mute-exit-canvas to conference cflags]

diff --git a/src/mod/applications/mod_conference/conference_utils.c b/src/mod/applications/mod_conference/conference_utils.c
index b28fedf6d3e664c0b9697fe5d8d30692dbb8b86a..274b499e448a8f4ece7855224d18773e0412a36c 100644 (file)
--- a/src/mod/applications/mod_conference/conference_utils.c
+++ b/src/mod/applications/mod_conference/conference_utils.c
@@ -193,6 +193,8 @@ void conference_utils_set_cflags(const char *flags, conference_flag_t *f)
                                f[CFLAG_VIDEO_BRIDGE_FIRST_TWO] = 1;
                        } else if (!strcasecmp(argv[i], "video-required-for-canvas")) {
                                f[CFLAG_VIDEO_REQUIRED_FOR_CANVAS] = 1;
+                       } else if (!strcasecmp(argv[i], "video-mute-exit-canvas")) {
+                               f[CFLAG_VIDEO_MUTE_EXIT_CANVAS] = 1;
                        } else if (!strcasecmp(argv[i], "manage-inbound-video-bitrate")) {
                                f[CFLAG_MANAGE_INBOUND_VIDEO_BITRATE] = 1;
                        } else if (!strcasecmp(argv[i], "video-muxing-personal-canvas")) {

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index e4301fc27972a06571a5c6c13497ffb07e3d61eb..db57c03bb68e1e72bff9067be7bc6c8e6b54097e 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -893,6 +893,11 @@ switch_status_t conference_video_attach_video_layer(conference_member_t *member,
 
        channel = switch_core_session_get_channel(member->session);
 
+       if (conference_utils_test_flag(member->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS) &&
+               !conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN)) {
+               return SWITCH_STATUS_FALSE;
+       }
+
 
        if (!switch_channel_test_flag(channel, CF_VIDEO_READY) && !member->avatar_png_img) {
                return SWITCH_STATUS_FALSE;
@@ -1725,6 +1730,11 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
        mcu_layer_t *layer = NULL;
        int i;
 
+       if (conference_utils_test_flag(conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS) &&
+               !conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN)) {
+               return SWITCH_STATUS_FALSE;
+       }
+
        switch_mutex_lock(canvas->mutex);
 
        for (i = 0; i < canvas->total_layers; i++) {
@@ -2097,11 +2107,15 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                        layout_group_t *lg = NULL;
                        video_layout_t *vlayout = NULL;
                        int canvas_count = 0;
-
+                       
                        switch_mutex_lock(conference->member_mutex);
                        for (imember = conference->members; imember; imember = imember->next) {
+                               int no_muted = conference_utils_test_flag(imember->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS);
+                               int no_av = conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS);
+                               int seen = conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN);
+
                                if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && 
-                                       conference_utils_member_test_flag(imember, MFLAG_RUNNING) 
+                                       conference_utils_member_test_flag(imember, MFLAG_RUNNING) && (!no_muted || seen) && (!no_av || imember->avatar_png_img)
                                        && imember->canvas_id == canvas->canvas_id && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY) {
                                        canvas_count++;
                                }
@@ -2234,6 +2248,21 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                continue;
                        }
 
+                       if (conference_utils_test_flag(imember->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS) && 
+                               !conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN) && imember->video_layer_id > -1) {
+                               conference_video_detach_video_layer(imember);
+                               switch_img_free(&imember->video_mute_img);
+                               
+                               if (imember->id == imember->conference->video_floor_holder) {
+                                       conference_video_set_floor_holder(conference, NULL, SWITCH_FALSE);
+                               } else if (imember->id == imember->conference->last_video_floor_holder) {
+                                       conference->last_video_floor_holder = 0;
+                               }
+                               
+                               switch_core_session_rwunlock(imember->session);
+                               continue;
+                       }
+
                        //VIDFLOOR
                        if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder &&
                                imember->video_layer_id != canvas->layout_floor_id) {
@@ -2250,8 +2279,6 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                continue;
                        }
 
-
-
                        switch_mutex_lock(canvas->mutex);
 
                        //printf("MEMBER %d layer_id %d canvas: %d/%d\n", imember->id, imember->video_layer_id,
@@ -2300,7 +2327,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                //      switch_img_free(&layer->cur_img);
                                //}
 
-                               if (conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN)) {
+                               if (conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN) || switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY || conference_utils_test_flag(imember->conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS)) {
                                        layer->mute_patched = 0;
                                } else {
                                        switch_image_t *tmp;

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 4ba5a23f5140b8dbb35dcaa65483c44017a6b7be..ff5e57b348dad0c5b879267b7bbd0bd37472be2c 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -279,7 +279,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
                                        }
                                }
 
-                               if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_VIDEO) && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY) {
+                               if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_VIDEO_READY) && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY && (!conference_utils_test_flag(conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS) || conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN))) {
                                        members_with_video++;
                                }
 

diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 7c9793686b1b3bece5ede2885ed73dbdead1b89f..83f78603077458fc9bee7dbb9b06c62c99009ebc 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -246,6 +246,7 @@ typedef enum {
        CFLAG_VIDEO_REQUIRED_FOR_CANVAS,
        CFLAG_PERSONAL_CANVAS,
        CFLAG_REFRESH_LAYOUT,
+       CFLAG_VIDEO_MUTE_EXIT_CANVAS,
        /////////////////////////////////
        CFLAG_MAX
 } conference_flag_t;