FS-10107: [mod_conference] Reduce contention on layer floor changes

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index a449cea499951d6a275c23f5045effd7f3c1221d..d522c9de1f800efa5a1f95811e936caa456a22ba 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -1007,6 +1007,12 @@ void conference_video_detach_video_layer(conference_member_t *member)
                goto end;
        }
 
+       if (member->id == member->conference->last_video_floor_holder) {
+               if (conference_utils_member_test_flag(member, MFLAG_VIDEO_BRIDGE)) {
+                       conference_utils_set_flag(member->conference, CFLAG_VID_FLOOR_LOCK);
+               }
+       }
+
        layer = &canvas->layers[member->video_layer_id];
 
        if (layer->geometry.audio_position) {
@@ -4167,16 +4173,6 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
                                conference->last_video_floor_holder = conference->video_floor_holder;
                        }
 
-                       if (conference->last_video_floor_holder && (imember = conference_member_get(conference, conference->last_video_floor_holder))) {
-                               switch_core_session_request_video_refresh(imember->session);
-                               conference_video_clear_managed_kps(imember);
-                               if (conference_utils_member_test_flag(imember, MFLAG_VIDEO_BRIDGE)) {
-                                       conference_utils_set_flag(conference, CFLAG_VID_FLOOR_LOCK);
-                               }
-                               switch_thread_rwlock_unlock(imember->rwlock);
-                               imember = NULL;
-                       }
-
                        old_member = conference->video_floor_holder;
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Dropping video floor %d\n", old_member);
                }