]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9498 fix regession with 100% cpu
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 21 Sep 2016 15:35:06 +0000 (10:35 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 21 Sep 2016 15:35:06 +0000 (10:35 -0500)
src/mod/applications/mod_conference/conference_video.c

index 96f3a98d16b41867c4a61ad64ff1a950e44ac51a..12cb5acffce790270130f708732c11189752e5eb 100644 (file)
@@ -1527,12 +1527,13 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_write_thread_run(switch_thread_
        //switch_core_autobind_cpu();
 
        while(conference_utils_member_test_flag(member, MFLAG_RUNNING)) {
+
                if (patched) {
                        pop_status = switch_queue_trypop(member->mux_out_queue, &pop);
                } else {
                        pop_status = switch_queue_pop(member->mux_out_queue, &pop);
                }
-
+               
                if (pop_status == SWITCH_STATUS_SUCCESS) {
                        mcu_layer_t *layer = NULL;
                        mcu_canvas_t *canvas = NULL;
@@ -1593,6 +1594,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_write_thread_run(switch_thread_
                                }
                        }
                        switch_mutex_unlock(member->conference->canvas_mutex);
+               } else {
+                       patched = 0;
                }
        }