From 188318e2d94b23287cabeb4accbf626a2a954538 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 21 Sep 2016 10:35:06 -0500 Subject: [PATCH] FS-9498 fix regession with 100% cpu --- src/mod/applications/mod_conference/conference_video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 96f3a98d16..12cb5acffc 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -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; } }