Use camera prepare() step

For consistency with screen capture. Refs b60e174
Genymobile · Nov 15, 2024 · df74cce · df74cce
1 parent 91373d9
commit df74cce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
@@ -80,14 +80,21 @@ protected void init() throws IOException {
                 throw new IOException("No matching camera found");
             }
 
+            Ln.i("Using camera '" + cameraId + "'");
+            cameraDevice = openCamera(cameraId);
+        } catch (CameraAccessException | InterruptedException e) {
+            throw new IOException(e);
+        }
+    }
+
+    @Override
+    public void prepare() throws IOException {
+        try {
             size = selectSize(cameraId, explicitSize, maxSize, aspectRatio, highSpeed);
             if (size == null) {
                 throw new IOException("Could not select camera size");
             }
-
-            Ln.i("Using camera '" + cameraId + "'");
-            cameraDevice = openCamera(cameraId);
-        } catch (CameraAccessException | InterruptedException e) {
+        } catch (CameraAccessException e) {
             throw new IOException(e);
         }
     }
@@ -232,13 +239,7 @@ public boolean setMaxSize(int maxSize) {
         }
 
         this.maxSize = maxSize;
-        try {
-            size = selectSize(cameraId, null, maxSize, aspectRatio, highSpeed);
-            return size != null;
-        } catch (CameraAccessException e) {
-            Ln.w("Could not select camera size", e);
-            return false;
-        }
+        return true;
     }
 
     @SuppressLint("MissingPermission")

diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
@@ -46,7 +46,7 @@ public final void init(CaptureListener listener) throws ConfigurationException,
     /**
      * Called once before each capture starts, before {@link #getSize()}.
      */
-    public void prepare() throws ConfigurationException {
+    public void prepare() throws ConfigurationException, IOException {
         // empty by default
     }