Display and control your Android device
Revert "Disable broken options on Android 14"
Romain Vimont89518f49adb5
diff --git a/app/src/cli.c b/app/src/cli.cindex ebf0f6f6..e67192bf 100644--- a/app/src/cli.c+++ b/app/src/cli.c@@ -2856,8 +2856,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {LOGI("Video orientation is locked for v4l2 sink. ""See --lock-video-orientation.");- opts->lock_video_orientation =- SC_LOCK_VIDEO_ORIENTATION_INITIAL_AUTO;+ opts->lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_INITIAL;}// V4L2 could not handle size change.diff --git a/app/src/options.h b/app/src/options.hindex 5662719a..9236c3f8 100644--- a/app/src/options.h+++ b/app/src/options.h@@ -134,8 +134,6 @@ enum sc_lock_video_orientation {SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,// lock the current orientation when scrcpy startsSC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,- // like SC_LOCK_VIDEO_ORIENTATION_INITIAL, but set automatically- SC_LOCK_VIDEO_ORIENTATION_INITIAL_AUTO = -3,SC_LOCK_VIDEO_ORIENTATION_0 = 0,SC_LOCK_VIDEO_ORIENTATION_90 = 3,SC_LOCK_VIDEO_ORIENTATION_180 = 2,diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.javaindex 54888827..c1620432 100644--- a/server/src/main/java/com/genymobile/scrcpy/Options.java+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java@@ -32,7 +32,7 @@ public class Options {private int videoBitRate = 8000000;private int audioBitRate = 128000;private float maxFps;- private int lockVideoOrientation = Device.LOCK_VIDEO_ORIENTATION_UNLOCKED;+ private int lockVideoOrientation = -1;private boolean tunnelForward;private Rect crop;private boolean control = true;@@ -259,10 +259,6 @@ public class Options {return sendCodecMeta;}- public void resetLockVideoOrientation() {- this.lockVideoOrientation = Device.LOCK_VIDEO_ORIENTATION_UNLOCKED;- }-@SuppressWarnings("MethodLength")public static Options parse(String... args) {if (args.length < 1) {diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex ca53d861..eb8b533a 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -85,23 +85,6 @@ public final class Server {throw new ConfigurationException("New virtual display is not supported");}- if (Build.VERSION.SDK_INT >= AndroidVersions.API_34_ANDROID_14) {- int lockVideoOrientation = options.getLockVideoOrientation();- if (lockVideoOrientation != Device.LOCK_VIDEO_ORIENTATION_UNLOCKED) {- if (lockVideoOrientation != Device.LOCK_VIDEO_ORIENTATION_INITIAL_AUTO) {- Ln.e("--lock-video-orientation is broken on Android >= 14: <https://github.com/Genymobile/scrcpy/issues/4011>");- throw new ConfigurationException("--lock-video-orientation is broken on Android >= 14");- } else {- // If the flag has been set automatically (because v4l2 sink is enabled), do not fail- Ln.w("--lock-video-orientation is ignored on Android >= 14: <https://github.com/Genymobile/scrcpy/issues/4011>");- }- }- if (options.getCrop() != null) {- Ln.e("--crop is broken on Android >= 14: <https://github.com/Genymobile/scrcpy/issues/4162>");- throw new ConfigurationException("Crop is not broken on Android >= 14");- }- }-CleanUp cleanUp = null;if (options.getCleanup()) {diff --git a/server/src/main/java/com/genymobile/scrcpy/device/Device.java b/server/src/main/java/com/genymobile/scrcpy/device/Device.javaindex e7a743f8..09c7d2b6 100644--- a/server/src/main/java/com/genymobile/scrcpy/device/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/device/Device.java@@ -42,8 +42,6 @@ public final class Device {public static final int LOCK_VIDEO_ORIENTATION_UNLOCKED = -1;public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;- // like SC_LOCK_VIDEO_ORIENTATION_INITIAL, but set automatically- public static final int LOCK_VIDEO_ORIENTATION_INITIAL_AUTO = -3;private Device() {// not instantiablediff --git a/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.javaindex 602bd8ab..cc82a654 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java@@ -64,7 +64,7 @@ public final class ScreenInfo {}public static ScreenInfo computeScreenInfo(int rotation, Size deviceSize, Rect crop, int maxSize, int lockedVideoOrientation) {- if (lockedVideoOrientation == Device.LOCK_VIDEO_ORIENTATION_INITIAL || lockedVideoOrientation == Device.LOCK_VIDEO_ORIENTATION_INITIAL_AUTO) {+ if (lockedVideoOrientation == Device.LOCK_VIDEO_ORIENTATION_INITIAL) {// The user requested to lock the video orientation to the current orientationlockedVideoOrientation = rotation;}