]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for 1.8...
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 16 Aug 2017 19:16:45 +0000 (14:16 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 16 Aug 2017 19:17:16 +0000 (14:17 -0500)
src/mod/applications/mod_conference/conference_event.c

index 56343155c477768b2a2c320d559e392336105b15..cd9b5c2b818c628e9724430e4d923b737d5a8f64 100644 (file)
@@ -586,7 +586,6 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can
        cJSON_AddItemToObject(msg, "eventChannel", cJSON_CreateString(conference->info_event_channel));
        cJSON_AddItemToObject(data, "contentType", cJSON_CreateString("layout-info"));
        
-       switch_mutex_lock(canvas->write_mutex);
        switch_mutex_lock(canvas->mutex);
        
        if ((obj = get_canvas_info(canvas))) {
@@ -622,7 +621,6 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can
                cJSON_AddItemToObject(data, "canvasInfo", obj);
        }
 
-       switch_mutex_unlock(canvas->write_mutex);       
        switch_mutex_unlock(canvas->mutex);
 
        switch_event_channel_broadcast(conference->info_event_channel, &msg, "mod_conference", conference_globals.event_channel_id);