diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index a7ccef402..a8440a63d 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4782,7 +4782,7 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para params->in_conference=FALSE; } -void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, float cy) { +void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy) { VideoStream* vstream = call->videostream; float zoom[3]; @@ -4790,18 +4790,18 @@ void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, f zoom_factor = 1; float halfsize = 0.5 * 1.0 / zoom_factor; - if ((cx - halfsize) < 0) - cx = 0 + halfsize; - if ((cx + halfsize) > 1) - cx = 1 - halfsize; - if ((cy - halfsize) < 0) - cy = 0 + halfsize; - if ((cy + halfsize) > 1) - cy = 1 - halfsize; + if ((*cx - halfsize) < 0) + *cx = 0 + halfsize; + if ((*cx + halfsize) > 1) + *cx = 1 - halfsize; + if ((*cy - halfsize) < 0) + *cy = 0 + halfsize; + if ((*cy + halfsize) > 1) + *cy = 1 - halfsize; zoom[0] = zoom_factor; - zoom[1] = cx; - zoom[2] = cy; + zoom[1] = *cx; + zoom[2] = *cy; ms_filter_call_method(vstream->output, MS_VIDEO_DISPLAY_ZOOM, &zoom); } diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index d3a514a69..bd10556a0 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1134,7 +1134,7 @@ typedef struct LinphoneTunnel LinphoneTunnel; */ LinphoneTunnel *linphone_core_get_tunnel(LinphoneCore *lc); - void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, float cy); +void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy); #ifdef __cplusplus } diff --git a/mediastreamer2 b/mediastreamer2 index 43c192346..37474c877 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 43c1923468d962aa5577ebcf6d8674ef9d426e40 +Subproject commit 37474c877a7f4e1c458c6f9edf1302e75d929dd1