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

FS-7913 #resolve

This commit is contained in:
Anthony Minessale 2015-07-29 16:00:22 -05:00
parent 7644b6834f
commit 06758f6f4f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,7 +385,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
double screen_aspect = 0, img_aspect = 0; double screen_aspect = 0, img_aspect = 0;
int x_pos = layer->x_pos; int x_pos = layer->x_pos;
int y_pos = layer->y_pos; int y_pos = layer->y_pos;
int64_t img_addr = 0; switch_size_t img_addr = 0;
img_w = layer->screen_w = IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE; img_w = layer->screen_w = IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE;
img_h = layer->screen_h = IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE; img_h = layer->screen_h = IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE;
@ -394,7 +394,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
screen_aspect = (double) layer->screen_w / layer->screen_h; screen_aspect = (double) layer->screen_w / layer->screen_h;
img_aspect = (double) img->d_w / img->d_h; img_aspect = (double) img->d_w / img->d_h;
img_addr = (int64_t)img; img_addr = (switch_size_t)img;
if (layer->last_img_addr != img_addr && layer->geometry.zoom) { if (layer->last_img_addr != img_addr && layer->geometry.zoom) {
if (screen_aspect < img_aspect) { if (screen_aspect < img_aspect) {

2
src/mod/applications/mod_conference/mod_conference.h
View File

@ -438,7 +438,7 @@ typedef struct mcu_layer_s {
int avatar_patched; int avatar_patched;
int refresh; int refresh;
int is_avatar; int is_avatar;
int64_t last_img_addr; switch_size_t last_img_addr;
switch_img_position_t logo_pos; switch_img_position_t logo_pos;
switch_image_t *img; switch_image_t *img;
switch_image_t *cur_img; switch_image_t *cur_img;