]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10247: [mod_conference] Fit logo img to size of cropped video or mute image #resolve
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 19 Apr 2017 19:55:37 +0000 (14:55 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 19 Apr 2017 19:55:37 +0000 (14:55 -0500)
src/mod/applications/mod_conference/conference_video.c

index 6dee4c851d0d31d22dec0b53858a5f9b4208d53b..c88cad9817d45a78c92c3edf15aecfa4fe5ea67d 100644 (file)
@@ -838,7 +838,8 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
                
 
                if (layer->logo_img) {
-                       int ew = layer->screen_w - (layer->geometry.border * 2), eh = layer->screen_h - (layer->banner_img ? layer->banner_img->d_h : 0) - (layer->geometry.border * 2);
+                       //int ew = layer->screen_w - (layer->geometry.border * 2), eh = layer->screen_h - (layer->banner_img ? layer->banner_img->d_h : 0) - (layer->geometry.border * 2);
+                       int ew = layer->img->d_w, eh = layer->img->d_h;
                        int ex = 0, ey = 0;
 
                        switch_img_fit(&layer->logo_img, ew, eh, layer->logo_fit);