Removed getter/setter to access video height/width directly.
This commit is contained in:
parent
6a3217539e
commit
3a5ae54b1d
5 changed files with 8 additions and 8 deletions
|
@ -201,7 +201,7 @@ public class VideoCallActivity extends Activity {
|
||||||
|
|
||||||
|
|
||||||
public float ratioWidthHeight(VideoSize vs) {
|
public float ratioWidthHeight(VideoSize vs) {
|
||||||
return (float) vs.getWidth() / vs.getHeight();
|
return (float) vs.width / vs.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
* @author Guillaume Beraudo
|
||||||
*
|
*
|
||||||
|
@ -231,7 +231,7 @@ public class AndroidCameraRecordManager {
|
||||||
VideoSize testSize = vSize.isPortrait() ? vSize.createInverted() : vSize;
|
VideoSize testSize = vSize.isPortrait() ? vSize.createInverted() : vSize;
|
||||||
|
|
||||||
for (Size s : AndroidCameraRecordManager.getInstance().supportedVideoSizes()) {
|
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;
|
return vSize;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -395,15 +395,15 @@ class LinphoneCoreImpl implements LinphoneCore {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPreferredVideoSize(VideoSize vSize) {
|
public void setPreferredVideoSize(VideoSize vSize) {
|
||||||
setPreferredVideoSize(nativePtr, vSize.getWidth(), vSize.getHeight());
|
setPreferredVideoSize(nativePtr, vSize.width, vSize.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
public VideoSize getPreferredVideoSize() {
|
public VideoSize getPreferredVideoSize() {
|
||||||
int[] nativeSize = getPreferredVideoSize(nativePtr);
|
int[] nativeSize = getPreferredVideoSize(nativePtr);
|
||||||
|
|
||||||
VideoSize vSize = new VideoSize();
|
VideoSize vSize = new VideoSize();
|
||||||
vSize.setWidth(nativeSize[0]);
|
vSize.width = nativeSize[0];
|
||||||
vSize.setHeight(nativeSize[1]);
|
vSize.height = nativeSize[1];
|
||||||
return vSize;
|
return vSize;
|
||||||
}
|
}
|
||||||
public void setRing(String path) {
|
public void setRing(String path) {
|
||||||
|
|
|
@ -139,7 +139,7 @@ public class TestVideoActivity extends Activity implements Callback, OnClickList
|
||||||
}
|
}
|
||||||
|
|
||||||
VideoSize size = videoSizes.pop();
|
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
|
// on surface changed the recorder will be restarted with new values
|
||||||
// and the surface will be resized
|
// and the surface will be resized
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6ed021b4be9d333d13e70c688ce8b0f02c9ecf2a
|
Subproject commit b09e13a9cf53bf8544d05e4709fd922052b31744
|
Loading…
Reference in a new issue