FS-8921 #resolve [Tweak banner code in mod conference]

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index f4710176096449c316e053c61f14976106e3c43c..2eb91fb95cc0815bb95dba5567d78ba8bef4cf55 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -449,6 +449,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
                
                if (layer->banner_img && !layer->banner_patched) {
                        switch_img_fill(layer->canvas->img, layer->x_pos + layer->geometry.border, layer->y_pos + layer->geometry.border, layer->screen_w, layer->screen_h, &layer->canvas->letterbox_bgcolor);
+                       switch_img_fit(&layer->banner_img, layer->screen_w, layer->screen_h, SWITCH_FIT_SIZE);
                        switch_img_patch(IMG, layer->banner_img, layer->x_pos + layer->geometry.border, layer->y_pos + (layer->screen_h - layer->banner_img->d_h) + layer->geometry.border);
 
                        if (!freeze) {

diff --git a/src/switch_core_video.c b/src/switch_core_video.c
index 69bd310fd1d8f6cb046e652e9540285b0a89ade9..288940bea1b1e0d04150d01534612d45edac09a7 100644 (file)
--- a/src/switch_core_video.c
+++ b/src/switch_core_video.c
@@ -1061,7 +1061,7 @@ SWITCH_DECLARE(uint32_t) switch_img_txt_handle_render(switch_img_txt_handle_t *h
                pen.y += slot->advance.y >> 6;
        }
 
-       ret = width + slot->bitmap.width * 3;
+       ret = width + slot->bitmap.width * 5;
 
        FT_Done_Face(face);
 
@@ -1128,6 +1128,7 @@ SWITCH_DECLARE(switch_image_t *) switch_img_write_text_img(int w, int h, switch_
 
     if (len < 5) len = 5;
 
+
        switch_img_txt_handle_create(&txthandle, font_face, fg, bg, font_size, 0, NULL);
        switch_color_set_rgb(&bgcolor, bg);