android: better sent video rotation and remember rotation when changi…

…ng cameras
wireapp · Oct 18, 2021 · f1f555e · f1f555e
1 parent 0cf9004
commit f1f555e
Show file tree

Hide file tree

Showing 2 changed files with 15 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,16 @@ public int getRotation() {
 		if (camera == null || cameraInfo == null)
 			return 0;
 
-		return (360 + ui_rotation - cameraInfo.orientation) % 360;
+		switch (cameraInfo.facing) {
+		case CameraInfo.CAMERA_FACING_BACK:
+			return (360 + ui_rotation - cameraInfo.orientation) % 360;
+
+		case CameraInfo.CAMERA_FACING_FRONT:
+			return (360 - (ui_rotation + cameraInfo.orientation)) % 360;
+
+		default:
+			return 0;
+		}
 	}
 
 	public void setUIRotation(int rotation) {

diff --git a/android/java/com/waz/call/FlowManager.java b/android/java/com/waz/call/FlowManager.java
@@ -25,6 +25,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import android.view.Surface;
 import java.io.File;
 
 import com.waz.avs.AVSystem;
@@ -113,6 +114,7 @@ public class FlowManager
 
   private HashSet<FlowManagerListener> _listenerSet = null;
 
+  private int ui_rotation = Surface.ROTATION_0;
 
   private HashSet<FlowManagerListener> getListenerSet ( ) {
     if ( this._listenerSet == null ) {
@@ -371,6 +373,7 @@ public void setVideoSendState(String convId, int state) {
   public native void setVideoSendStateNative(String convId, int state);
 
   public void setUIRotation(int rotation) {
+     this.ui_rotation = rotation;
      if (this.videoCapturer != null) {
          this.videoCapturer.setUIRotation(rotation);
      }
@@ -484,6 +487,8 @@ private void createCapturer() {
 		if (this.previewView != null)
 			this.videoCapturer.startCapture(this.previewView);
 
+		this.videoCapturer.setUIRotation(this.ui_rotation);
+
 		Log.d(TAG, "createCapturer: created");
 	}