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

FS-7513: prefer avatar img over mute and reset layer bg on patch of blanked mode

This commit is contained in:
Anthony Minessale 2015-04-30 20:03:25 -05:00 committed by Michael Jerris
parent ed866593a7
commit 0ca23ab617
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2074,15 +2074,22 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
} else { } else {
imember->blanks++; imember->blanks++;
if (imember->video_mute_img && (imember->blanks == conference->video_fps.fps * 2 || if ((imember->avatar_png_img || imember->video_mute_img) && (imember->blanks == conference->video_fps.fps * 2 ||
imember->blanks >= conference->video_fps.fps * 2) && !layer->blanked) { imember->blanks >= conference->video_fps.fps * 2) && !layer->blanked) {
switch_image_t *img = imember->avatar_png_img;
if (!img) img = imember->video_mute_img;
if (img) {
switch_img_free(&layer->cur_img); switch_img_free(&layer->cur_img);
switch_img_copy(imember->video_mute_img, &layer->cur_img); switch_img_copy(img, &layer->cur_img);
layer->refresh = 1;
layer->tagged = 1; layer->tagged = 1;
layer->blanked = 1; layer->blanked = 1;
} }
} }
} }
}
switch_mutex_unlock(conference->canvas->mutex); switch_mutex_unlock(conference->canvas->mutex);