From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 20 Jul 2017 22:58:46 +0000 (-0500)
Subject: FS-10528: [mod_conference] Put proper color behind letterboxed video avatars #resolve
X-Git-Tag: v1.8.0~335
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad80c385627113b7e766792e4616d2f23ec64200;p=thirdparty%2Ffreeswitch.git

FS-10528: [mod_conference] Put proper color behind letterboxed video avatars #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index f66453e283..f903fb93fd 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -3337,7 +3337,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 						layer->tagged = 1;
 						//layer->is_avatar = 1;
 						switch_img_free(&layer->cur_img);
-						switch_img_copy(imember->avatar_png_img, &layer->cur_img);
+						switch_img_letterbox(imember->avatar_png_img,
+											 &layer->cur_img, layer->screen_w, layer->screen_h, conference->video_letterbox_bgcolor);
 						imember->avatar_patched = 1;
 					}
 				}
@@ -3390,7 +3391,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 							if (!layer->mute_img) {
 								if (imember->video_mute_img) {
 									//layer->mute_img = switch_img_read_png(imember->video_mute_png, SWITCH_IMG_FMT_I420);
-									switch_img_copy(imember->video_mute_img, &layer->mute_img);
+									switch_img_letterbox(imember->video_mute_img, 
+														 &layer->mute_img, layer->screen_w, layer->screen_h, conference->video_letterbox_bgcolor);
+									//switch_img_copy(imember->video_mute_img, &layer->mute_img);
 								}
 							}
 
@@ -3643,7 +3646,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 						} else {
 							if (!layer->avatar_patched) {
 								if (omember->avatar_png_img) {
-									switch_img_copy(omember->avatar_png_img, &layer->cur_img);
+									switch_img_letterbox(omember->avatar_png_img,
+														 &layer->cur_img, layer->screen_w, layer->screen_h, conference->video_letterbox_bgcolor);
 								}
 								layer->avatar_patched = 1;
 							}