kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-12 18:17:59 +00:00
Code Issues Projects Releases Wiki Activity

FS-9742

Browse Source
This commit is contained in:
Anthony Minessale 2016-11-16 16:36:55 -06:00
parent 18d1762a5b
commit b4e0592e84
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,7 +421,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
if (layer->last_img_addr != img_addr && layer->geometry.zoom) { if (layer->last_img_addr != img_addr && layer->geometry.zoom) {
uint32_t new_w = 0, new_h = 0; uint32_t new_w = 0, new_h = 0;
unsigned int cropsize = 0; int cropsize = 0;
double scale = 1; double scale = 1;
if (screen_aspect < img_aspect) { if (screen_aspect < img_aspect) {
@ -433,15 +433,8 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
new_w = (uint32_t)((double)layer->screen_w / scale); new_w = (uint32_t)((double)layer->screen_w / scale);
new_h = (uint32_t)((double)layer->screen_h / scale); new_h = (uint32_t)((double)layer->screen_h / scale);
if (layer->bug_frame.geometry.x) { if (layer->bug_frame.geometry.w) {
if (layer->bug_frame.geometry.x < layer->bug_frame.geometry.w) {
cropsize = 1;
} else {
cropsize = layer->bug_frame.geometry.x - (new_w / 2); cropsize = layer->bug_frame.geometry.x - (new_w / 2);
if (cropsize > img->d_w - new_w) {
cropsize = img->d_w - new_w;
}
}
} else { } else {
cropsize = (img->d_w - new_w) / 2; cropsize = (img->d_w - new_w) / 2;
} }
@ -450,7 +443,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
cropsize = 1; cropsize = 1;
} }
if (cropsize) { if (cropsize > 0) {
switch_img_set_rect(img, cropsize, 0, new_w, new_h); switch_img_set_rect(img, cropsize, 0, new_w, new_h);
img_aspect = (double) img->d_w / img->d_h; img_aspect = (double) img->d_w / img->d_h;
} }
@ -466,14 +459,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
new_h = (uint32_t)((double)layer->screen_h / scale); new_h = (uint32_t)((double)layer->screen_h / scale);
if (layer->bug_frame.geometry.y) { if (layer->bug_frame.geometry.y) {
if (layer->bug_frame.geometry.y < layer->bug_frame.geometry.h) {
cropsize = 1;
} else {
cropsize = layer->bug_frame.geometry.y - (new_h / 2); cropsize = layer->bug_frame.geometry.y - (new_h / 2);
if (cropsize > img->d_h - new_h) {
cropsize = img->d_h - new_h;
}
}
} else { } else {
cropsize = (img->d_h - new_h) / 2; cropsize = (img->d_h - new_h) / 2;
} }
@ -482,7 +468,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
cropsize = 1; cropsize = 1;
} }
if (cropsize) { if (cropsize > 0) {
switch_img_set_rect(img, 0, cropsize, (unsigned int)(layer->screen_w/scale), (unsigned int)(layer->screen_h/scale)); switch_img_set_rect(img, 0, cropsize, (unsigned int)(layer->screen_w/scale), (unsigned int)(layer->screen_h/scale));
img_aspect = (double) img->d_w / img->d_h; img_aspect = (double) img->d_w / img->d_h;
} }