kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-30 05:36:14 +00:00
Code Issues Projects Releases Wiki Activity

fix regression in bugged layers

Browse Source
This commit is contained in:
Brian West 2015-08-03 22:37:04 -05:00
parent fc201f4588
commit 8835487172
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,6 +343,7 @@ void conference_video_reset_layer(mcu_layer_t *layer)
switch_img_free(&layer->logo_img); switch_img_free(&layer->logo_img);
switch_img_free(&layer->logo_text_img); switch_img_free(&layer->logo_text_img);
layer->bugged = 0;
layer->mute_patched = 0; layer->mute_patched = 0;
layer->banner_patched = 0; layer->banner_patched = 0;
layer->is_avatar = 0; layer->is_avatar = 0;
@ -471,14 +472,18 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
switch_img_scale(img, &layer->img, img_w, img_h); switch_img_scale(img, &layer->img, img_w, img_h);
if (layer->img) { if (layer->img) {
if (layer->bugged && layer->member_id > -1 && layer->member && switch_thread_rwlock_tryrdlock(layer->member->rwlock) == SWITCH_STATUS_SUCCESS) { if (layer->bugged) {
switch_frame_t write_frame = { 0 }; if (layer->member_id > -1 && layer->member && switch_thread_rwlock_tryrdlock(layer->member->rwlock) == SWITCH_STATUS_SUCCESS) {
write_frame.img = layer->img; switch_frame_t write_frame = { 0 };
write_frame.img = layer->img;
switch_core_media_bug_patch_video(layer->member->session, &write_frame); switch_core_media_bug_patch_video(layer->member->session, &write_frame);
switch_thread_rwlock_unlock(layer->member->rwlock); switch_thread_rwlock_unlock(layer->member->rwlock);
} }
layer->bugged = 0;
}
switch_img_patch(IMG, layer->img, x_pos + layer->geometry.border, y_pos + layer->geometry.border); switch_img_patch(IMG, layer->img, x_pos + layer->geometry.border, y_pos + layer->geometry.border);
} }
@ -2442,8 +2447,6 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
layer->tagged = 0; layer->tagged = 0;
} }
layer->bugged = 0;
} }
} }