FS-10247: [mod_conference] Fit logo img to size of cropped video or mute image #resolve

This commit is contained in:
Anthony Minessale 2017-04-19 14:55:37 -05:00
parent 2e02f3b498
commit d2c27f1ec4
1 changed files with 2 additions and 1 deletions

View 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);