kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9498 fix regession with 100% cpu

This commit is contained in:
Anthony Minessale 2016-09-21 10:35:06 -05:00
parent d34b501758
commit 188318e2d9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_conference/conference_video.c
View 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;
}
}