Add --list-cameras

Add an option to list the device cameras.

Co-authored-by: Romain Vimont <rom@rom1v.com>

server/src/main/java/com/genymobile/scrcpy/CameraCapture.java

@@ -1,197 +0,0 @@
-package com.genymobile.scrcpy;
-
-import com.genymobile.scrcpy.wrappers.ServiceManager;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.graphics.Rect;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.params.OutputConfiguration;
-import android.hardware.camera2.params.SessionConfiguration;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.MediaCodec;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.Log;
-import android.view.Surface;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-public class CameraCapture extends SurfaceCapture {
-
-    private static final Executor EXECUTOR = Executors.newSingleThreadExecutor();
-
-    private final String cameraId;
-
-    private HandlerThread cameraThread;
-    private Handler cameraHandler;
-    private CameraDevice cameraDevice;
-    private int maxSize;
-
-    public CameraCapture(String cameraId, int maxSize) {
-        this.cameraId = cameraId;
-        this.maxSize = maxSize;
-    }
-
-    @Override
-    public void init() throws IOException {
-        cameraThread = new HandlerThread("camera");
-        cameraThread.start();
-        cameraHandler = new Handler(cameraThread.getLooper());
-
-        try {
-            cameraDevice = openCamera(cameraId);
-        } catch (CameraAccessException | InterruptedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public void start(Surface surface) throws IOException {
-        try {
-            CameraCaptureSession session = createCaptureSession(cameraDevice, surface);
-            CaptureRequest.Builder requestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
-            requestBuilder.addTarget(surface);
-            CaptureRequest request = requestBuilder.build();
-            setRepeatingRequest(session, request);
-        } catch (CameraAccessException | InterruptedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public void release() {
-        if (cameraDevice != null) {
-            cameraDevice.close();
-        }
-        if (cameraThread != null) {
-            cameraThread.quitSafely();
-        }
-    }
-
-    @Override
-    public Size getSize() {
-        return new Size(1920, 1080);
-    }
-
-    @Override
-    public void setMaxSize(int size) {
-        maxSize = size;
-    }
-
-    @SuppressLint("MissingPermission")
-    @TargetApi(Build.VERSION_CODES.S)
-    private CameraDevice openCamera(String id) throws CameraAccessException, InterruptedException {
-        Ln.v("Open Camera: " + id);
-
-        CompletableFuture<CameraDevice> future = new CompletableFuture<>();
-        ServiceManager.getCameraManager().openCamera(id, new CameraDevice.StateCallback() {
-            @Override
-            public void onOpened(CameraDevice camera) {
-                Ln.v("Open Camera Success");
-                future.complete(camera);
-            }
-
-            @Override
-            public void onDisconnected(CameraDevice camera) {
-                Ln.w("Camera disconnected");
-                // TODO
-            }
-
-            @Override
-            public void onError(CameraDevice camera, int error) {
-                int cameraAccessExceptionErrorCode;
-                switch (error) {
-                    case CameraDevice.StateCallback.ERROR_CAMERA_IN_USE:
-                        cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_IN_USE;
-                        break;
-                    case CameraDevice.StateCallback.ERROR_MAX_CAMERAS_IN_USE:
-                        cameraAccessExceptionErrorCode = CameraAccessException.MAX_CAMERAS_IN_USE;
-                        break;
-                    case CameraDevice.StateCallback.ERROR_CAMERA_DISABLED:
-                        cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_DISABLED;
-                        break;
-                    case CameraDevice.StateCallback.ERROR_CAMERA_DEVICE:
-                    case CameraDevice.StateCallback.ERROR_CAMERA_SERVICE:
-                    default:
-                        cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_ERROR;
-                        break;
-                }
-                future.completeExceptionally(new CameraAccessException(cameraAccessExceptionErrorCode));
-            }
-        }, cameraHandler);
-
-        try {
-            return future.get();
-        } catch (ExecutionException e) {
-            throw (CameraAccessException) e.getCause();
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.S)
-    private CameraCaptureSession createCaptureSession(CameraDevice camera, Surface surface) throws CameraAccessException, InterruptedException {
-        Ln.d("Create Capture Session");
-
-        CompletableFuture<CameraCaptureSession> future = new CompletableFuture<>();
-        // replace by createCaptureSession(SessionConfiguration)
-        OutputConfiguration outputConfig = new OutputConfiguration(surface);
-        List<OutputConfiguration> outputs = Arrays.asList(outputConfig);
-        SessionConfiguration sessionConfig = new SessionConfiguration(SessionConfiguration.SESSION_REGULAR, outputs, EXECUTOR,
-                new CameraCaptureSession.StateCallback() {
-                    @Override
-                    public void onConfigured(CameraCaptureSession session) {
-                        Ln.d("Create Capture Session Success");
-                        future.complete(session);
-                    }
-
-                    @Override
-                    public void onConfigureFailed(CameraCaptureSession session) {
-                        future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
-                    }
-                });
-
-        camera.createCaptureSession(sessionConfig);
-
-        try {
-            return future.get();
-        } catch (ExecutionException e) {
-            throw (CameraAccessException) e.getCause();
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.S)
-    private void setRepeatingRequest(CameraCaptureSession session, CaptureRequest request) throws CameraAccessException, InterruptedException {
-        CompletableFuture<Void> future = new CompletableFuture<>();
-        session.setRepeatingRequest(request, new CameraCaptureSession.CaptureCallback() {
-            @Override
-            public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, long timestamp, long frameNumber) {
-                future.complete(null);
-            }
-
-            @Override
-            public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request, CaptureFailure failure) {
-                future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
-            }
-        }, cameraHandler);
-
-        try {
-            future.get();
-        } catch (ExecutionException e) {
-            throw (CameraAccessException) e.getCause();
-        }
-    }
-}

server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java

@@ -23,18 +23,6 @@ public class ScreenCapture extends SurfaceCapture implements Device.RotationList
         device.setFoldListener(this);
     }
 
-    @Override
-    public void start(Surface surface) {
-        ScreenInfo screenInfo = device.getScreenInfo();
-        Rect contentRect = screenInfo.getContentRect();
-
-        // does not include the locked video orientation
-        Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
-        int videoRotation = screenInfo.getVideoRotation();
-        int layerStack = device.getLayerStack();
-        setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
-    }
-
     @Override
     public void release() {
         device.setRotationListener(null);
@@ -52,6 +40,18 @@ public class ScreenCapture extends SurfaceCapture implements Device.RotationList
         device.setMaxSize(size);
     }
 
+    @Override
+    public void setSurface(Surface surface) {
+        ScreenInfo screenInfo = device.getScreenInfo();
+        Rect contentRect = screenInfo.getContentRect();
+
+        // does not include the locked video orientation
+        Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
+        int videoRotation = screenInfo.getVideoRotation();
+        int layerStack = device.getLayerStack();
+        setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
+    }
+
     @Override
     public void onFoldChanged(int displayId, boolean folded) {
         requestReset();

server/src/main/java/com/genymobile/scrcpy/Server.java

@@ -134,9 +134,8 @@ public final class Server {
             if (video) {
                 Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
                         options.getSendFrameMeta());
-                CameraCapture capture = new CameraCapture("0", 1920);
-                //ScreenCapture screenCapture = new ScreenCapture(device);
-                SurfaceEncoder screenEncoder = new SurfaceEncoder(capture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
+                ScreenCapture screenCapture = new ScreenCapture(device);
+                SurfaceEncoder screenEncoder = new SurfaceEncoder(screenCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
                         options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
                 asyncProcessors.add(screenEncoder);
             }

server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java

@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;
 
 import android.view.Surface;
 
-import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -32,20 +31,13 @@ public abstract class SurfaceCapture {
     /**
      * Called once before the capture starts.
      */
-    public abstract void init() throws IOException;
+    public abstract void init();
 
     /**
      * Called after the capture ends (if and only if {@link #init()} has been called).
      */
     public abstract void release();
 
-    /**
-     * Start the capture to the target surface.
-     *
-     * @param surface the surface which will be encoded
-     */
-    public abstract void start(Surface surface) throws IOException;
-
     /**
      * Return the video size
      *
@@ -59,4 +51,11 @@ public abstract class SurfaceCapture {
      * @param size Maximum size
      */
     public abstract void setMaxSize(int size);
+
+    /**
+     * Set the target surface.
+     *
+     * @param surface the surface which will be encoded
+     */
+    public abstract void setSurface(Surface surface);
 }

server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java

@@ -1,8 +1,13 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.wrappers.SurfaceControl;
+
+import android.graphics.Rect;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
+import android.os.Build;
+import android.os.IBinder;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.view.Surface;
@@ -69,7 +74,7 @@ public class SurfaceEncoder implements AsyncProcessor {
                     mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
                     surface = mediaCodec.createInputSurface();
 
-                    capture.start(surface);
+                    capture.setSurface(surface);
 
                     mediaCodec.start();
 
@@ -233,6 +238,25 @@ public class SurfaceEncoder implements AsyncProcessor {
         return format;
     }
 
+    private static IBinder createDisplay() {
+        // Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
+        // On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
+        boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S".equals(
+                Build.VERSION.CODENAME));
+        return SurfaceControl.createDisplay("scrcpy", secure);
+    }
+
+    private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect, int layerStack) {
+        SurfaceControl.openTransaction();
+        try {
+            SurfaceControl.setDisplaySurface(display, surface);
+            SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
+            SurfaceControl.setDisplayLayerStack(display, layerStack);
+        } finally {
+            SurfaceControl.closeTransaction();
+        }
+    }
+
     @Override
     public void start(TerminationListener listener) {
         thread = new Thread(() -> {

server/src/main/java/com/genymobile/scrcpy/Workarounds.java

@@ -32,7 +32,7 @@ public final class Workarounds {
         Workarounds.prepareMainLooper();
 
         boolean mustFillAppInfo = false;
-        boolean mustFillBaseContext = true;
+        boolean mustFillBaseContext = false;
         boolean mustFillAppContext = false;
 
         if (Build.BRAND.equalsIgnoreCase("meizu")) {