android: fix sent video landscape rotation and add logging for previe…

…w aspect ratio
wireapp · Oct 18, 2021 · 0cf9004 · 0cf9004
1 parent 818bceb
commit 0cf9004
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/android/java/com/waz/avs/VideoCapturer.java b/android/java/com/waz/avs/VideoCapturer.java
@@ -572,7 +572,7 @@ public int getRotation() {
 		if (camera == null || cameraInfo == null)
 			return 0;
 
-		return (360 - (cameraInfo.orientation + ui_rotation)) % 360;
+		return (360 + ui_rotation - cameraInfo.orientation) % 360;
 	}
 
 	public void setUIRotation(int rotation) {

diff --git a/android/java/com/waz/avs/VideoPreview.java b/android/java/com/waz/avs/VideoPreview.java
@@ -87,6 +87,9 @@ protected void onLayout(boolean changed,
 		if (orientation % 180 != 0)
 			tAspRatio = 1.0f/aspectRatio;
 
+		Log.d(TAG, "onLayout: " + vWidth + "x" + vHeight + " ori: " + orientation +
+		      " va: " + vAspRatio + " ta: " + tAspRatio);
+
 		float scaleX = Math.max(1.0f, tAspRatio / vAspRatio);
 		float scaleY = Math.max(1.0f, vAspRatio / tAspRatio);
 		float dx = - (scaleX * vWidth - vWidth) / 2.0f;