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

update

This commit is contained in:
Anthony Minessale 2015-10-28 16:35:06 -05:00
parent 65b7eeef52
commit ca49966f76
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_conference/conference_video.c
View File

@ -1515,15 +1515,19 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_write_thread_run(switch_thread_
if (member->video_layer_id > -1 && member->canvas_id > -1) { if (member->video_layer_id > -1 && member->canvas_id > -1) {
canvas = member->conference->canvases[member->canvas_id]; canvas = member->conference->canvases[member->canvas_id];
layer = &canvas->layers[member->video_layer_id]; layer = &canvas->layers[member->video_layer_id];
if (!layer->need_patch || switch_thread_rwlock_tryrdlock(canvas->video_rwlock) != SWITCH_STATUS_SUCCESS) {
canvas = NULL;
layer = NULL;
}
} }
switch_mutex_unlock(member->conference->canvas_mutex);
if (canvas && layer && layer->need_patch) { if (canvas && layer && layer->need_patch) {
switch_thread_rwlock_rdlock(canvas->video_rwlock);
conference_video_scale_and_patch(layer, NULL, SWITCH_FALSE); conference_video_scale_and_patch(layer, NULL, SWITCH_FALSE);
layer->need_patch = 0; layer->need_patch = 0;
switch_thread_rwlock_unlock(canvas->video_rwlock); switch_thread_rwlock_unlock(canvas->video_rwlock);
} }
switch_mutex_unlock(member->conference->canvas_mutex);
} }
} }