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

FS-7500: fix calculation bug in switch_img_fit

This commit is contained in:
Anthony Minessale 2015-03-06 11:29:01 -06:00 committed by Michael Jerris
parent b7fc2e047d
commit 6f379f43c1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_core_media.c
View File

@ -10089,7 +10089,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
if (switch_channel_test_flag(session->channel, CF_VIDEO_READY) && smh->vid_params.width && if (switch_channel_test_flag(session->channel, CF_VIDEO_READY) && smh->vid_params.width &&
switch_channel_test_flag(session->channel, CF_VIDEO_MIRROR_INPUT) && switch_channel_test_flag(session->channel, CF_VIDEO_MIRROR_INPUT) &&
(smh->vid_params.width * smh->vid_params.height) < (img->d_w * img->d_h)) { (smh->vid_params.width * smh->vid_params.height) < (img->d_w * img->d_h)) {
switch_img_scale(img, &dup_img, smh->vid_params.width, smh->vid_params.height);
switch_img_copy(img, &dup_img);
switch_img_fit(&dup_img, smh->vid_params.width, smh->vid_params.height);
img = dup_img; img = dup_img;
} }

8
src/switch_core_video.c
View File

@ -1232,7 +1232,6 @@ SWITCH_DECLARE(switch_status_t) switch_img_fit(switch_image_t **srcP, int width,
{ {
switch_image_t *src, *tmp = NULL; switch_image_t *src, *tmp = NULL;
int new_w = 0, new_h = 0; int new_w = 0, new_h = 0;
double img_aspect;
switch_assert(srcP); switch_assert(srcP);
switch_assert(width && height); switch_assert(width && height);
@ -1243,19 +1242,18 @@ SWITCH_DECLARE(switch_status_t) switch_img_fit(switch_image_t **srcP, int width,
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
img_aspect = (double) src->d_w / src->d_h;
new_w = src->d_w; new_w = src->d_w;
new_h = src->d_h; new_h = src->d_h;
while(new_w > width || new_h > height) { while(new_w > width || new_h > height) {
if (new_w >= new_h) { if (new_w > width) {
double m = (double) width / new_w; double m = (double) width / new_w;
new_w = width; new_w = width;
new_h = (int) (new_h * m * img_aspect); new_h = (int) (new_h * m);
} else { } else {
double m = (double) height / new_h; double m = (double) height / new_h;
new_h = height; new_h = height;
new_w = (int) (new_w * m * img_aspect); new_w = (int) (new_w * m);
} }
} }