Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix zoom in landscape & improved algorithm

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-11 14:36:07 +01:00
parent 3b943018cf
commit bc23809b15
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/org/linphone/VideoCallFragment.java
View file

@ -171,7 +171,11 @@ public class VideoCallFragment extends Fragment implements OnGestureListener, On
public boolean onScale(CompatibilityScaleGestureDetector detector) { public boolean onScale(CompatibilityScaleGestureDetector detector) {
mZoomFactor *= detector.getScaleFactor(); mZoomFactor *= detector.getScaleFactor();
// Don't let the object get too small or too large. // Don't let the object get too small or too large.
mZoomFactor = Math.max(0.1f, Math.min(mZoomFactor, ((float) mVideoView.getHeight()) / LinphoneManager.getLc().getPreferredVideoSize().height)); // Zoom to make the video fill the screen vertically
float portraitZoomFactor = ((float) mVideoView.getHeight()) / (float) ((3 * mVideoView.getWidth()) / 4);
// Zoom to make the video fill the screen horizontally
float landscapeZoomFactor = ((float) mVideoView.getWidth()) / (float) ((3 * mVideoView.getHeight()) / 4);
mZoomFactor = Math.max(0.1f, Math.min(mZoomFactor, Math.max(portraitZoomFactor, landscapeZoomFactor)));
LinphoneManager.getLc().getCurrentCall().zoomVideo(mZoomFactor, mZoomCenterX, mZoomCenterY); LinphoneManager.getLc().getCurrentCall().zoomVideo(mZoomFactor, mZoomCenterX, mZoomCenterY);
return true; return true;
@ -187,11 +191,20 @@ public class VideoCallFragment extends Fragment implements OnGestureListener, On
} else if(distanceX < 0 && mZoomCenterX > 0) { } else if(distanceX < 0 && mZoomCenterX > 0) {
mZoomCenterX -= 0.01; mZoomCenterX -= 0.01;
} }
if (distanceY < 0 && mZoomCenterY < 1) {
mZoomCenterY += 0.01;
} else if(distanceY > 0 && mZoomCenterY > 0) {
mZoomCenterY -= 0.01;
}
if (mZoomCenterX > 1) if (mZoomCenterX > 1)
mZoomCenterX = 1; mZoomCenterX = 1;
if (mZoomCenterX < 0) if (mZoomCenterX < 0)
mZoomCenterX = 0; mZoomCenterX = 0;
if (mZoomCenterY > 1)
mZoomCenterY = 1;
if (mZoomCenterY < 0)
mZoomCenterY = 0;
LinphoneManager.getLc().getCurrentCall().zoomVideo(mZoomFactor, mZoomCenterX, mZoomCenterY); LinphoneManager.getLc().getCurrentCall().zoomVideo(mZoomFactor, mZoomCenterX, mZoomCenterY);
return true; return true;
@ -205,8 +218,12 @@ public class VideoCallFragment extends Fragment implements OnGestureListener, On
public boolean onDoubleTap(MotionEvent e) { public boolean onDoubleTap(MotionEvent e) {
if (LinphoneUtils.isCallEstablished(LinphoneManager.getLc().getCurrentCall())) { if (LinphoneUtils.isCallEstablished(LinphoneManager.getLc().getCurrentCall())) {
if (mZoomFactor == 1.f) { if (mZoomFactor == 1.f) {
// Zoom to make the video fill the screen in height // Zoom to make the video fill the screen vertically
mZoomFactor = ((float) mVideoView.getHeight()) / LinphoneManager.getLc().getPreferredVideoSize().height; float portraitZoomFactor = ((float) mVideoView.getHeight()) / (float) ((3 * mVideoView.getWidth()) / 4);
// Zoom to make the video fill the screen horizontally
float landscapeZoomFactor = ((float) mVideoView.getWidth()) / (float) ((3 * mVideoView.getHeight()) / 4);
mZoomFactor = Math.max(portraitZoomFactor, landscapeZoomFactor);
} }
else { else {
resetZoom(); resetZoom();