Maximize FOV on video call

1) Use 4:3 video aspect ratio to prevent cropping to 16:9 2) Disable EIS 3) Zoom out
nextcloud · Jul 27, 2023 · 58d1de9 · 58d1de9
1 parent 6a0605b
commit 58d1de9
Show file tree

Hide file tree

Showing 5 changed files with 454 additions and 4 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
@@ -163,6 +163,7 @@ import org.webrtc.CameraVideoCapturer.CameraSwitchHandler
 import org.webrtc.DefaultVideoDecoderFactory
 import org.webrtc.DefaultVideoEncoderFactory
 import org.webrtc.EglBase
+import org.webrtc.ExtCamera2Enumerator
 import org.webrtc.Logging
 import org.webrtc.MediaConstraints
 import org.webrtc.MediaStream
@@ -240,6 +241,9 @@ class CallActivity : CallBaseActivity() {
     private val callInfosHandler = Handler()
     private val cameraSwitchHandler = Handler()
 
+    private var disableEIS = true
+    private var zoomOut = true
+
     // push to talk
     private var isPushToTalkActive = false
     private var pulseAnimation: PulseAnimation? = null
@@ -610,7 +614,9 @@ class CallActivity : CallBaseActivity() {
         } catch (t: Throwable) {
             Log.w(TAG, "Camera2Enumerator threw an error", t)
         }
-        cameraEnumerator = if (camera2EnumeratorIsSupported) {
+        cameraEnumerator = if (camera2EnumeratorIsSupported && (disableEIS || zoomOut)){
+            ExtCamera2Enumerator(this, disableEIS, zoomOut)
+        } else if (camera2EnumeratorIsSupported) {
             Camera2Enumerator(this)
         } else {
             Camera1Enumerator(MagicWebRTCUtils.shouldEnableVideoHardwareAcceleration())
@@ -1857,7 +1863,7 @@ class CallActivity : CallBaseActivity() {
 
     private fun startVideoCapture() {
         if (videoCapturer != null) {
-            videoCapturer!!.startCapture(1280, 720, 30)
+            videoCapturer!!.startCapture(1280, 960, 30)
         }
     }
 

diff --git a/app/src/main/java/org/webrtc/ExtCamera2Capturer.java b/app/src/main/java/org/webrtc/ExtCamera2Capturer.java
@@ -0,0 +1,42 @@
+package org.webrtc;
+
+import android.content.Context;
+import android.hardware.camera2.CameraManager;
+
+import org.jetbrains.annotations.Nullable;
+
+public class ExtCamera2Capturer extends Camera2Capturer {
+
+    @Nullable private final CameraManager cameraManager;
+    private final boolean disableEIS, zoomOut;
+
+    public ExtCamera2Capturer(Context context, String cameraName, CameraEventsHandler eventsHandler,
+                              boolean disableEIS, boolean zoomOut) {
+        super(context, cameraName, eventsHandler);
+        cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        this.disableEIS = disableEIS;
+        this.zoomOut = zoomOut;
+    }
+
+    @Override
+    protected void createCameraSession(CameraSession.CreateSessionCallback createSessionCallback,
+                                       CameraSession.Events events, Context applicationContext,
+                                       SurfaceTextureHelper surfaceTextureHelper, String cameraName, int width, int height,
+                                       int framerate) {
+
+        CameraSession.CreateSessionCallback myCallback = new CameraSession.CreateSessionCallback() {
+            @Override
+            public void onDone(CameraSession cameraSession) {
+                createSessionCallback.onDone(cameraSession);
+            }
+
+            @Override
+            public void onFailure(CameraSession.FailureType failureType, String s) {
+                createSessionCallback.onFailure(failureType, s);
+            }
+        };
+
+        ExtCamera2Session.create(myCallback, events, applicationContext, cameraManager,
+                                 surfaceTextureHelper, cameraName, width, height, framerate, disableEIS, zoomOut);
+    }
+}
diff --git a/app/src/main/java/org/webrtc/ExtCamera2Enumerator.java b/app/src/main/java/org/webrtc/ExtCamera2Enumerator.java
@@ -0,0 +1,27 @@
+package org.webrtc;
+
+import android.content.Context;
+import android.hardware.camera2.CameraManager;
+
+import org.jetbrains.annotations.Nullable;
+
+public class ExtCamera2Enumerator extends Camera2Enumerator {
+
+    final Context context;
+    @Nullable final CameraManager cameraManager;
+    private final boolean disableEIS, zoomOut;
+
+    public ExtCamera2Enumerator(Context context, boolean disableEIS, boolean zoomOut) {
+        super(context);
+        this.context = context;
+        this.disableEIS = disableEIS;
+        this.zoomOut = zoomOut;
+        this.cameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+    }
+
+    @Override
+    public CameraVideoCapturer createCapturer(String deviceName,
+                                              CameraVideoCapturer.CameraEventsHandler eventsHandler) {
+        return new ExtCamera2Capturer(context, deviceName, eventsHandler, disableEIS, zoomOut);
+    }
+}