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

FS-11363 Fix unpredictable/random zoom, when camera's video aspect ratio (a/r) equal to conference layout's tile a/r

This commit is contained in:
shripchenko 2018-09-03 18:20:15 +03:00 committed by Mike Jerris
parent 5dd445180c
commit 4a90ac8b1c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/applications/mod_conference/conference_video.c
View File

@ -525,9 +525,9 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
if (img->d_w && layer->last_w) { if (img->d_w && layer->last_w) {
if (img->d_w < layer->last_w) { if (img->d_w < layer->last_w) {
change_scale = layer->last_w / img->d_w; change_scale = (double) layer->last_w / img->d_w;
} else { } else {
change_scale = img->d_w / layer->last_w; change_scale = (double) img->d_w / layer->last_w;
} }
layer->crop_x = (int)(layer->crop_x * change_scale); layer->crop_x = (int)(layer->crop_x * change_scale);
@ -637,7 +637,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
int can_zoom = 0; int can_zoom = 0;
int did_zoom = 0; int did_zoom = 0;
if (screen_aspect < img_aspect) { if (screen_aspect <= img_aspect) {
if (img->d_h != layer->screen_h) { if (img->d_h != layer->screen_h) {
scale = (double)layer->screen_h / img->d_h; scale = (double)layer->screen_h / img->d_h;
} }
@ -744,7 +744,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
} else { } else {
crop_x = use_geometry->x; crop_x = use_geometry->x;
} }
} else if (screen_aspect < img_aspect) { } else if (screen_aspect <= img_aspect) {
crop_x = img->w / 4; crop_x = img->w / 4;
} }