From fb97bb813e07340a9a0cf756de278f143fe99275 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Tue, 10 Oct 2023 21:15:43 +0200 Subject: [PATCH] Camera WIP hardcode to make it work --- .../src/main/java/com/genymobile/scrcpy/CameraCapture.java | 2 +- server/src/main/java/com/genymobile/scrcpy/Server.java | 5 +++-- server/src/main/java/com/genymobile/scrcpy/Workarounds.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java index ccffe3f8..709c122a 100644 --- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java +++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java @@ -85,7 +85,7 @@ public class CameraCapture extends SurfaceCapture { @Override public Size getSize() { - return null; + return new Size(1920, 1080); } @Override diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java index 74b0dbbb..e0a5b8ec 100644 --- a/server/src/main/java/com/genymobile/scrcpy/Server.java +++ b/server/src/main/java/com/genymobile/scrcpy/Server.java @@ -134,8 +134,9 @@ public final class Server { if (video) { Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(), options.getSendFrameMeta()); - ScreenCapture screenCapture = new ScreenCapture(device); - SurfaceEncoder screenEncoder = new SurfaceEncoder(screenCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(), + CameraCapture capture = new CameraCapture("0", 1920); + //ScreenCapture screenCapture = new ScreenCapture(device); + SurfaceEncoder screenEncoder = new SurfaceEncoder(capture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(), options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError()); asyncProcessors.add(screenEncoder); } diff --git a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java index b8aa2b7e..626da8af 100644 --- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java +++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java @@ -32,7 +32,7 @@ public final class Workarounds { Workarounds.prepareMainLooper(); boolean mustFillAppInfo = false; - boolean mustFillBaseContext = false; + boolean mustFillBaseContext = true; boolean mustFillAppContext = false; if (Build.BRAND.equalsIgnoreCase("meizu")) {