From 3a5ae54b1d03a08b599517e623d29a44dac9dafe Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 29 Dec 2010 08:15:12 +0100 Subject: [PATCH] Removed getter/setter to access video height/width directly. --- src/org/linphone/VideoCallActivity.java | 2 +- src/org/linphone/core/AndroidCameraRecordManager.java | 4 ++-- src/org/linphone/core/LinphoneCoreImpl.java | 6 +++--- src/org/linphone/core/tutorials/TestVideoActivity.java | 2 +- submodules/linphone | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index 27e489175..4c913ee81 100644 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -201,7 +201,7 @@ public class VideoCallActivity extends Activity { public float ratioWidthHeight(VideoSize vs) { - return (float) vs.getWidth() / vs.getHeight(); + return (float) vs.width / vs.height; } } diff --git a/src/org/linphone/core/AndroidCameraRecordManager.java b/src/org/linphone/core/AndroidCameraRecordManager.java index 42a57806d..a6c38d76d 100644 --- a/src/org/linphone/core/AndroidCameraRecordManager.java +++ b/src/org/linphone/core/AndroidCameraRecordManager.java @@ -32,7 +32,7 @@ import android.view.SurfaceHolder.Callback; /** - * Manage the video capture, only on for all cameras. + * Manage the video capture, only one for all cameras. * * @author Guillaume Beraudo * @@ -231,7 +231,7 @@ public class AndroidCameraRecordManager { VideoSize testSize = vSize.isPortrait() ? vSize.createInverted() : vSize; for (Size s : AndroidCameraRecordManager.getInstance().supportedVideoSizes()) { - if (s.height == testSize.getHeight() && s.width == testSize.getWidth()) { + if (s.height == testSize.height && s.width == testSize.width) { return vSize; } } diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index 929403c9d..b49856e91 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -395,15 +395,15 @@ class LinphoneCoreImpl implements LinphoneCore { } public void setPreferredVideoSize(VideoSize vSize) { - setPreferredVideoSize(nativePtr, vSize.getWidth(), vSize.getHeight()); + setPreferredVideoSize(nativePtr, vSize.width, vSize.height); } public VideoSize getPreferredVideoSize() { int[] nativeSize = getPreferredVideoSize(nativePtr); VideoSize vSize = new VideoSize(); - vSize.setWidth(nativeSize[0]); - vSize.setHeight(nativeSize[1]); + vSize.width = nativeSize[0]; + vSize.height = nativeSize[1]; return vSize; } public void setRing(String path) { diff --git a/src/org/linphone/core/tutorials/TestVideoActivity.java b/src/org/linphone/core/tutorials/TestVideoActivity.java index 971b8f73f..6bbdab517 100644 --- a/src/org/linphone/core/tutorials/TestVideoActivity.java +++ b/src/org/linphone/core/tutorials/TestVideoActivity.java @@ -139,7 +139,7 @@ public class TestVideoActivity extends Activity implements Callback, OnClickList } VideoSize size = videoSizes.pop(); - changeSurfaceViewLayout(size.getWidth(), size.getHeight()); + changeSurfaceViewLayout(size.width, size.height); // on surface changed the recorder will be restarted with new values // and the surface will be resized diff --git a/submodules/linphone b/submodules/linphone index 6ed021b4b..b09e13a9c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6ed021b4be9d333d13e70c688ce8b0f02c9ecf2a +Subproject commit b09e13a9cf53bf8544d05e4709fd922052b31744