Listen to display changed events

Replace RotationWatcher and DisplayFoldListener by a single DisplayListener, which is notified whenever the display size or dpi changes. Still use the old version specifically for Android 14, where DisplayListener may be broken (it is fixed in recent Android 14 upgrades), until we receive the first DisplayListener event (which proves that it works). Refs #4469 <https://github.com/Genymobile/scrcpy/pull/4469> Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
Use explicit constants in @TargetApi
2026-02-26 08:14:55 +01:00 · 2024-10-22 09:51:38 +02:00 · 2024-10-21 18:58:49 +02:00 · 2024-10-21 18:52:05 +02:00 · 2024-10-21 18:52:05 +02:00 · 2024-10-21 18:52:05 +02:00
54 changed files with 618 additions and 1309 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,147 +0,0 @@
-name: Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      name:
-        description: 'Version name (default is ref name)'
-
-jobs:
-  build-scrcpy-server:
-    runs-on: ubuntu-latest
-    env:
-      GRADLE: gradle  # use native gradle instead of ./gradlew in release.mk
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Test scrcpy-server
-        run: make -f release.mk test-server
-
-      - name: Build scrcpy-server
-        run: make -f release.mk build-server
-
-      - name: Upload scrcpy-server artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: scrcpy-server
-          path: build-server/server/scrcpy-server
-
-  test-client:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
-             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
-             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev
-
-      - name: Build
-        run: |
-          meson setup d -Db_sanitize=address,undefined
-
-      - name: Test
-        run: |
-          meson test -Cd
-
-  build-win32:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
-             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
-             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
-             mingw-w64 mingw-w64-tools libz-mingw-w64-dev
-
-      - name: Workaround for old meson version run by Github Actions
-        run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt
-
-      - name: Build scrcpy win32
-        run: make -f release.mk build-win32
-
-      - name: Upload build-win32 artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-win32-intermediate
-          path: build-win32/dist/
-
-  build-win64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
-             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
-             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
-             mingw-w64 mingw-w64-tools libz-mingw-w64-dev
-
-      - name: Workaround for old meson version run by Github Actions
-        run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt
-
-      - name: Build scrcpy win64
-        run: make -f release.mk build-win64
-
-      - name: Upload build-win64 artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-win64-intermediate
-          path: build-win64/dist/
-
-  package:
-    needs:
-      - build-scrcpy-server
-      - build-win32
-      - build-win64
-    runs-on: ubuntu-latest
-    env:
-      # $VERSION is used by release.mk
-      VERSION: ${{ github.event.inputs.name || github.ref_name }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download scrcpy-server
-        uses: actions/download-artifact@v4
-        with:
-          name: scrcpy-server
-          path: build-server/server/
-
-      - name: Download build-win32
-        uses: actions/download-artifact@v4
-        with:
-          name: build-win32-intermediate
-          path: build-win32/dist/
-
-      - name: Download build-win64
-        uses: actions/download-artifact@v4
-        with:
-          name: build-win64-intermediate
-          path: build-win64/dist/
-
-      - name: Package
-        run: make -f release.mk package
-
-      - name: Upload release artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: scrcpy-release-${{ env.VERSION }}
-          path: release-${{ env.VERSION }}
--- a/README.md
+++ b/README.md
@@ -31,7 +31,6 @@ It focuses on:
 Its features include:
 - [audio forwarding](doc/audio.md) (Android 11+)
 - [recording](doc/recording.md)
- - [virtual display](doc/virtual_display.md)
 - mirroring with [Android device screen off](doc/device.md#turn-screen-off)
 - [copy-paste](doc/control.md#copy-paste) in both directions
 - [configurable quality](doc/video.md)
@@ -92,12 +91,6 @@ Here are just some common examples.
    scrcpy --video-codec=h265 -m1920 --max-fps=60 --no-audio -K  # short version
    ```

- - Start VLC in a new virtual display (separate from the device display):
-
-    ```bash
-    scrcpy --new-display=1920x1080 --start-app=org.videolan.vlc
-    ```
-
 - Record the device camera in H.265 at 1920x1080 (and microphone) to an MP4
   file:

@@ -141,7 +134,6 @@ documented in the following pages:
 - [Device](doc/device.md)
 - [Window](doc/window.md)
 - [Recording](doc/recording.md)
- - [Virtual display](doc/virtual_displays.md)
 - [Tunnels](doc/tunnels.md)
 - [OTG](doc/otg.md)
 - [Camera](doc/camera.md)
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -20,6 +20,7 @@ _scrcpy() {
        --crop=
        -d --select-usb
        --disable-screensaver
+        --display-buffer=
        --display-id=
        --display-orientation=
        -e --select-tcpip
@@ -77,7 +78,6 @@ _scrcpy() {
        --rotation=
        -s --serial=
        -S --turn-screen-off
-        --screen-off-timeout=
        --shortcut-mod=
        --start-app=
        -t --show-touches
@@ -90,7 +90,6 @@ _scrcpy() {
        --v4l2-sink=
        -v --version
        -V --verbosity=
-        --video-buffer=
        --video-codec=
        --video-codec-options=
        --video-encoder=
@@ -192,6 +191,7 @@ _scrcpy() {
        |--camera-size \
        |--crop \
        |--display-id \
+        |--display-buffer \
        |--max-fps \
        |-m|--max-size \
        |-p|--port \
@@ -201,7 +201,6 @@ _scrcpy() {
        |--tunnel-port \
        |--v4l2-buffer \
        |--v4l2-sink \
-        |--video-buffer \
        |--video-codec-options \
        |--video-encoder \
        |--tcpip \
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -27,6 +27,7 @@ arguments=(
    '--crop=[\[width\:height\:x\:y\] Crop the device screen on the server]'
    {-d,--select-usb}'[Use USB device]'
    '--disable-screensaver[Disable screensaver while scrcpy is running]'
+    '--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
    '--display-id=[Specify the display id to mirror]'
    '--display-orientation=[Set the initial display orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
    {-e,--select-tcpip}'[Use TCP/IP device]'
@@ -80,7 +81,6 @@ arguments=(
    '--require-audio=[Make scrcpy fail if audio is enabled but does not work]'
    {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
    {-S,--turn-screen-off}'[Turn the device screen off immediately]'
-    '--screen-off-timeout=[Set the screen off timeout in seconds]'
    '--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
    '--start-app=[Start an Android app]'
    {-t,--show-touches}'[Show physical touches]'
@@ -92,7 +92,6 @@ arguments=(
    '--v4l2-sink=[\[\/dev\/videoN\] Output to v4l2loopback device]'
    {-v,--version}'[Print the version of scrcpy]'
    {-V,--verbosity=}'[Set the log level]:verbosity:(verbose debug info warn error)'
-    '--video-buffer=[Add a buffering delay \(in milliseconds\) before displaying video frames]'
    '--video-codec=[Select the video codec]:codec:(h264 h265 av1)'
    '--video-codec-options=[Set a list of comma-separated key\:type=value options for the device video encoder]'
    '--video-encoder=[Use a specific MediaCodec video encoder]'
--- a/app/meson.build
+++ b/app/meson.build
@@ -167,6 +167,9 @@ conf.set('DEFAULT_LOCAL_PORT_RANGE_LAST', '27199')
 # run a server debugger and wait for a client to be attached
 conf.set('SERVER_DEBUGGER', get_option('server_debugger'))

+# select the debugger method ('old' for Android < 9, 'new' for Android >= 9)
+conf.set('SERVER_DEBUGGER_METHOD_NEW', get_option('server_debugger_method') == 'new')
+
 # enable V4L2 support (linux only)
 conf.set('HAVE_V4L2', v4l2_support)

--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -139,6 +139,12 @@ Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).
 .BI "\-\-disable\-screensaver"
 Disable screensaver while scrcpy is running.

+.TP
+.BI "\-\-display\-buffer " ms
+Add a buffering delay (in milliseconds) before displaying. This increases latency to compensate for jitter.
+
+Default is 0 (no buffering).
+
 .TP
 .BI "\-\-display\-id " id
 Specify the device display id to mirror.
@@ -320,9 +326,8 @@ Examples:

    \-\-new\-display=1920x1080
    \-\-new\-display=1920x1080/420
-    \-\-new\-display         # main display size and density
-    \-\-new\-display -m1920  # scaled to fit a max size of 1920
-    \-\-new\-display=/240    # main display size and 240 dpi
+    \-\-new\-display       # default screen size and density
+    \-\-new\-display=240   # default screen size and 240 dpi

 .TP
 .B \-\-no\-audio
@@ -492,7 +497,7 @@ Default is "lalt,lsuper" (left-Alt or left-Super).
 .BI "\-\-start\-app " name
 Start an Android app, by its exact package name.

-Add a '?' prefix to select an app whose name starts with the given name, case-insensitive (retrieving app names on the device may take some time):
+Add a '?' prefix to select an app whose name starts with the given name, case-insensitive (it may take some time to retrieve the app names on the device):

    scrcpy --start-app=?firefox

@@ -554,15 +559,7 @@ It requires to lock the video orientation (see \fB\-\-lock\-video\-orientation\f
 .BI "\-\-v4l2-buffer " ms
 Add a buffering delay (in milliseconds) before pushing frames. This increases latency to compensate for jitter.

-This option is similar to \fB\-\-video\-buffer\fR, but specific to V4L2 sink.
-
-Default is 0 (no buffering).
-
-.TP
-.BI "\-\-video\-buffer " ms
-Add a buffering delay (in milliseconds) before displaying video frames.
-
-This increases latency to compensate for jitter.
+This option is similar to \fB\-\-display\-buffer\fR, but specific to V4L2 sink.

 Default is 0 (no buffering).

@@ -671,10 +668,6 @@ Pause or re-pause display
 .B MOD+Shift+z
 Unpause display

-.TP
-.B MOD+Shift+r
-Reset video capture/encoding
-
 .TP
 .B MOD+g
 Resize window to 1:1 (pixel\-perfect)
--- a/app/src/audio_regulator.c
+++ b/app/src/audio_regulator.c
@@ -288,7 +288,7 @@ sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {

        // Enable compensation when the difference exceeds +/- 4ms.
        // Disable compensation when the difference is lower than +/- 1ms.
-        int threshold = ar->compensation_active
+        int threshold = ar->compensation != 0
                      ? ar->sample_rate     / 1000  /* 1ms */
                      : ar->sample_rate * 4 / 1000; /* 4ms */

@@ -309,12 +309,14 @@ sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
        LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
             " compensation=%d", ar->target_buffering, avg, can_read, diff);

-        int ret = swr_set_compensation(swr_ctx, diff, distance);
-        if (ret < 0) {
-            LOGW("Resampling compensation failed: %d", ret);
-            // not fatal
-        } else {
-            ar->compensation_active = diff != 0;
+        if (diff != ar->compensation) {
+            int ret = swr_set_compensation(swr_ctx, diff, distance);
+            if (ret < 0) {
+                LOGW("Resampling compensation failed: %d", ret);
+                // not fatal
+            } else {
+                ar->compensation = diff;
+            }
        }
    }

@@ -390,7 +392,7 @@ sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
    atomic_init(&ar->played, false);
    atomic_init(&ar->received, false);
    atomic_init(&ar->underflow, 0);
-    ar->compensation_active = false;
+    ar->compensation = 0;

    return true;

--- a/app/src/audio_regulator.h
+++ b/app/src/audio_regulator.h
@@ -44,8 +44,8 @@ struct sc_audio_regulator {
    // Number of silence samples inserted since the last received packet
    atomic_uint_least32_t underflow;

-    // Non-zero compensation applied (only used by the receiver thread)
-    bool compensation_active;
+    // Current applied compensation value (only used by the receiver thread)
+    int compensation;

    // Set to true the first time a sample is received
    atomic_bool received;
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -50,7 +50,6 @@ enum {
    OPT_POWER_OFF_ON_CLOSE,
    OPT_V4L2_SINK,
    OPT_DISPLAY_BUFFER,
-    OPT_VIDEO_BUFFER,
    OPT_V4L2_BUFFER,
    OPT_TUNNEL_HOST,
    OPT_TUNNEL_PORT,
@@ -106,7 +105,6 @@ enum {
    OPT_NEW_DISPLAY,
    OPT_LIST_APPS,
    OPT_START_APP,
-    OPT_SCREEN_OFF_TIMEOUT,
 };

 struct sc_option {
@@ -323,10 +321,12 @@ static const struct sc_option options[] = {
        .argdesc = "id",
    },
    {
-        // deprecated
        .longopt_id = OPT_DISPLAY_BUFFER,
        .longopt = "display-buffer",
        .argdesc = "ms",
+        .text = "Add a buffering delay (in milliseconds) before displaying. "
+                "This increases latency to compensate for jitter.\n"
+                "Default is 0 (no buffering).",
    },
    {
        .longopt_id = OPT_DISPLAY_ID,
@@ -576,9 +576,8 @@ static const struct sc_option options[] = {
                "Examples:\n"
                "    --new-display=1920x1080\n"
                "    --new-display=1920x1080/420  # force 420 dpi\n"
-                "    --new-display         # main display size and density\n"
-                "    --new-display -m1920  # scaled to fit a max size of 1920\n"
-                "    --new-display=/240    # main display size and 240 dpi",
+                "    --new-display       # default screen size and density\n"
+                "    --new-display=240   # default screen size and 240 dpi",
    },
    {
        .longopt_id = OPT_NO_AUDIO,
@@ -794,13 +793,6 @@ static const struct sc_option options[] = {
        .longopt = "turn-screen-off",
        .text = "Turn the device screen off immediately.",
    },
-    {
-        .longopt_id = OPT_SCREEN_OFF_TIMEOUT,
-        .longopt = "screen-off-timeout",
-        .argdesc = "seconds",
-        .text = "Set the screen off timeout while scrcpy is running (restore "
-                "the initial value on exit).",
-    },
    {
        .longopt_id = OPT_SHORTCUT_MOD,
        .longopt = "shortcut-mod",
@@ -820,8 +812,8 @@ static const struct sc_option options[] = {
        .argdesc = "name",
        .text = "Start an Android app, by its exact package name.\n"
                "Add a '?' prefix to select an app whose name starts with the "
-                "given name, case-insensitive (retrieving app names on the "
-                "device may take some time):\n"
+                "given name, case-insensitive (it may take some time to "
+                "retrieve the app names on the device):\n"
                "    scrcpy --start-app=?firefox\n"
                "Add a '+' prefix to force-stop before starting the app:\n"
                "    scrcpy --new-display --start-app=+org.mozilla.firefox\n"
@@ -905,20 +897,11 @@ static const struct sc_option options[] = {
        .argdesc = "ms",
        .text = "Add a buffering delay (in milliseconds) before pushing "
                "frames. This increases latency to compensate for jitter.\n"
-                "This option is similar to --video-buffer, but specific to "
+                "This option is similar to --display-buffer, but specific to "
                "V4L2 sink.\n"
                "Default is 0 (no buffering).\n"
                "This option is only available on Linux.",
    },
-    {
-        .longopt_id = OPT_VIDEO_BUFFER,
-        .longopt = "video-buffer",
-        .argdesc = "ms",
-        .text = "Add a buffering delay (in milliseconds) before displaying "
-                "video frames.\n"
-                "This increases latency to compensate for jitter.\n"
-                "Default is 0 (no buffering).",
-    },
    {
        .longopt_id = OPT_VIDEO_CODEC,
        .longopt = "video-codec",
@@ -1030,10 +1013,6 @@ static const struct sc_shortcut shortcuts[] = {
        .shortcuts = { "MOD+Shift+z" },
        .text = "Unpause display",
    },
-    {
-        .shortcuts = { "MOD+Shift+r" },
-        .text = "Reset video capture/encoding",
-    },
    {
        .shortcuts = { "MOD+g" },
        .text = "Resize window to 1:1 (pixel-perfect)",
@@ -2163,20 +2142,6 @@ parse_time_limit(const char *s, sc_tick *tick) {
    return true;
 }

-static bool
-parse_screen_off_timeout(const char *s, sc_tick *tick) {
-    long value;
-    // value in seconds, but must fit in 31 bits in milliseconds
-    bool ok = parse_integer_arg(s, &value, false, 0, 0x7FFFFFFF / 1000,
-                                "screen off timeout");
-    if (!ok) {
-        return false;
-    }
-
-    *tick = SC_TICK_FROM_SEC(value);
-    return true;
-}
-
 static bool
 parse_pause_on_exit(const char *s, enum sc_pause_on_exit *pause_on_exit) {
    if (!s || !strcmp(s, "true")) {
@@ -2583,11 +2548,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                opts->power_off_on_close = true;
                break;
            case OPT_DISPLAY_BUFFER:
-                LOGW("--display-buffer is deprecated, use --video-buffer "
-                     "instead.");
-                // fall through
-            case OPT_VIDEO_BUFFER:
-                if (!parse_buffering_time(optarg, &opts->video_buffer)) {
+                if (!parse_buffering_time(optarg, &opts->display_buffer)) {
                    return false;
                }
                break;
@@ -2747,17 +2708,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                }
                break;
            case OPT_NEW_DISPLAY:
-                opts->new_display = optarg ? optarg : "";
+                opts->new_display = optarg ? optarg : "auto";
                break;
            case OPT_START_APP:
                opts->start_app = optarg;
                break;
-            case OPT_SCREEN_OFF_TIMEOUT:
-                if (!parse_screen_off_timeout(optarg,
-                                              &opts->screen_off_timeout)) {
-                    return false;
-                }
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -2856,8 +2811,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.
@@ -2867,7 +2821,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }

    if (opts->v4l2_buffer && !opts->v4l2_device) {
-        LOGE("V4L2 buffer value without V4L2 sink");
+        LOGE("V4L2 buffer value without V4L2 sink\n");
        return false;
    }
 #endif
@@ -2886,8 +2840,8 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            if (otg) {
                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_AOA;
            } else if (!opts->video_playback) {
-                LOGI("No video mirroring, SDK mouse disabled");
-                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_DISABLED;
+                LOGI("No video mirroring, mouse mode switched to UHID");
+                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_UHID;
            } else {
                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_SDK;
            }
@@ -2939,25 +2893,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        }
    }

-    if (opts->new_display) {
-        if (opts->video_source != SC_VIDEO_SOURCE_DISPLAY) {
-            LOGE("--new-display is only available with --video-source=display");
-            return false;
-        }
-
-        if (!opts->video) {
-            LOGE("--new-display is incompatible with --no-video");
-            return false;
-        }
-
-        if (opts->max_size && opts->new_display[0] != '\0'
-                           && opts->new_display[0] != '/') {
-            // An explicit size is defined (not "" nor "/<dpi>")
-            LOGE("Cannot specify both --new-display size and -m/--max-size");
-            return false;
-        }
-    }
-
    if (otg) {
        if (!opts->control) {
            LOGE("--no-control is not allowed in OTG mode");
@@ -3028,6 +2963,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            return false;
        }

+        if (opts->new_display) {
+            LOGE("--new-display is only available with --video-source=display");
+            return false;
+        }
+
        if (opts->camera_id && opts->camera_facing != SC_CAMERA_FACING_ANY) {
            LOGE("Cannot specify both --camera-id and --camera-facing");
            return false;
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -22,6 +22,9 @@
 #define MOTIONEVENT_ACTION_LABEL(value) \
    ENUM_TO_LABEL(android_motionevent_action_labels, value)

+#define SCREEN_POWER_MODE_LABEL(value) \
+    ENUM_TO_LABEL(screen_power_mode_labels, value)
+
 static const char *const android_keyevent_action_labels[] = {
    "down",
    "up",
@@ -44,6 +47,14 @@ static const char *const android_motionevent_action_labels[] = {
    "btn-release",
 };

+static const char *const screen_power_mode_labels[] = {
+    "off",
+    "doze",
+    "normal",
+    "doze-suspend",
+    "suspend",
+};
+
 static const char *const copy_key_labels[] = {
    "none",
    "copy",
@@ -147,8 +158,8 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
            size_t len = write_string(&buf[10], msg->set_clipboard.text,
                                      SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH);
            return 10 + len;
-        case SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER:
-            buf[1] = msg->set_display_power.on;
+        case SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
+            buf[1] = msg->set_screen_power_mode.mode;
            return 2;
        case SC_CONTROL_MSG_TYPE_UHID_CREATE:
            sc_write16be(&buf[1], msg->uhid_create.id);
@@ -181,7 +192,6 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
        case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:
        case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
        case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
-        case SC_CONTROL_MSG_TYPE_RESET_VIDEO:
            // no additional data
            return 1;
        default:
@@ -258,9 +268,9 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
                     msg->set_clipboard.paste ? "paste" : "nopaste",
                     msg->set_clipboard.text);
            break;
-        case SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER:
-            LOG_CMSG("display power %s",
-                     msg->set_display_power.on ? "on" : "off");
+        case SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
+            LOG_CMSG("power mode %s",
+                     SCREEN_POWER_MODE_LABEL(msg->set_screen_power_mode.mode));
            break;
        case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
            LOG_CMSG("expand notification panel");
@@ -305,9 +315,6 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
        case SC_CONTROL_MSG_TYPE_START_APP:
            LOG_CMSG("start app \"%s\"", msg->start_app.name);
            break;
-        case SC_CONTROL_MSG_TYPE_RESET_VIDEO:
-            LOG_CMSG("reset video");
-            break;
        default:
            LOG_CMSG("unknown type: %u", (unsigned) msg->type);
            break;
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -35,14 +35,19 @@ enum sc_control_msg_type {
    SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS,
    SC_CONTROL_MSG_TYPE_GET_CLIPBOARD,
    SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
-    SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER,
+    SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
    SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
    SC_CONTROL_MSG_TYPE_UHID_CREATE,
    SC_CONTROL_MSG_TYPE_UHID_INPUT,
    SC_CONTROL_MSG_TYPE_UHID_DESTROY,
    SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
    SC_CONTROL_MSG_TYPE_START_APP,
-    SC_CONTROL_MSG_TYPE_RESET_VIDEO,
+};
+
+enum sc_screen_power_mode {
+    // see <https://android.googlesource.com/platform/frameworks/base.git/+/pie-release-2/core/java/android/view/SurfaceControl.java#305>
+    SC_SCREEN_POWER_MODE_OFF = 0,
+    SC_SCREEN_POWER_MODE_NORMAL = 2,
 };

 enum sc_copy_key {
@@ -90,8 +95,8 @@ struct sc_control_msg {
            bool paste;
        } set_clipboard;
        struct {
-            bool on;
-        } set_display_power;
+            enum sc_screen_power_mode mode;
+        } set_screen_power_mode;
        struct {
            uint16_t id;
            const char *name; // pointer to static data
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -203,12 +203,13 @@ set_device_clipboard(struct sc_input_manager *im, bool paste,
 }

 static void
-set_display_power(struct sc_input_manager *im, bool on) {
+set_screen_power_mode(struct sc_input_manager *im,
+                      enum sc_screen_power_mode mode) {
    assert(im->controller);

    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER;
-    msg.set_display_power.on = on;
+    msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
+    msg.set_screen_power_mode.mode = mode;

    if (!sc_controller_push_msg(im->controller, &msg)) {
        LOGW("Could not request 'set screen power mode'");
@@ -284,18 +285,6 @@ open_hard_keyboard_settings(struct sc_input_manager *im) {
    }
 }

-static void
-reset_video(struct sc_input_manager *im) {
-    assert(im->controller);
-
-    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_RESET_VIDEO;
-
-    if (!sc_controller_push_msg(im->controller, &msg)) {
-        LOGW("Could not request reset video");
-    }
-}
-
 static void
 apply_orientation_transform(struct sc_input_manager *im,
                            enum sc_orientation transform) {
@@ -426,8 +415,10 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                return;
            case SDLK_o:
                if (control && !repeat && down && !paused) {
-                    bool on = shift;
-                    set_display_power(im, on);
+                    enum sc_screen_power_mode mode = shift
+                                                   ? SC_SCREEN_POWER_MODE_NORMAL
+                                                   : SC_SCREEN_POWER_MODE_OFF;
+                    set_screen_power_mode(im, mode);
                }
                return;
            case SDLK_z:
@@ -533,12 +524,8 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_r:
-                if (control && !repeat && down && !paused) {
-                    if (shift) {
-                        reset_video(im);
-                    } else {
-                        rotate_device(im);
-                    }
+                if (control && !shift && !repeat && down && !paused) {
+                    rotate_device(im);
                }
                return;
            case SDLK_k:
--- a/app/src/options.c
+++ b/app/src/options.c
@@ -58,11 +58,10 @@ const struct scrcpy_options scrcpy_options_default = {
    .window_width = 0,
    .window_height = 0,
    .display_id = 0,
-    .video_buffer = 0,
+    .display_buffer = 0,
    .audio_buffer = -1, // depends on the audio format,
    .audio_output_buffer = SC_TICK_FROM_MS(5),
    .time_limit = 0,
-    .screen_off_timeout = -1,
 #ifdef HAVE_V4L2
    .v4l2_device = NULL,
    .v4l2_buffer = 0,
--- 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 starts
    SC_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,
@@ -261,11 +259,10 @@ struct scrcpy_options {
    uint16_t window_width;
    uint16_t window_height;
    uint32_t display_id;
-    sc_tick video_buffer;
+    sc_tick display_buffer;
    sc_tick audio_buffer;
    sc_tick audio_output_buffer;
    sc_tick time_limit;
-    sc_tick screen_off_timeout;
 #ifdef HAVE_V4L2
    const char *v4l2_device;
    sc_tick v4l2_buffer;
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -53,7 +53,7 @@ struct scrcpy {
    struct sc_decoder video_decoder;
    struct sc_decoder audio_decoder;
    struct sc_recorder recorder;
-    struct sc_delay_buffer video_buffer;
+    struct sc_delay_buffer display_buffer;
 #ifdef HAVE_V4L2
    struct sc_v4l2_sink v4l2_sink;
    struct sc_delay_buffer v4l2_buffer;
@@ -428,7 +428,6 @@ scrcpy(struct scrcpy_options *options) {
        .video_bit_rate = options->video_bit_rate,
        .audio_bit_rate = options->audio_bit_rate,
        .max_fps = options->max_fps,
-        .screen_off_timeout = options->screen_off_timeout,
        .lock_video_orientation = options->lock_video_orientation,
        .control = options->control,
        .display_id = options->display_id,
@@ -816,11 +815,11 @@ aoa_complete:

        if (options->video_playback) {
            struct sc_frame_source *src = &s->video_decoder.frame_source;
-            if (options->video_buffer) {
-                sc_delay_buffer_init(&s->video_buffer,
-                                     options->video_buffer, true);
-                sc_frame_source_add_sink(src, &s->video_buffer.frame_sink);
-                src = &s->video_buffer.frame_source;
+            if (options->display_buffer) {
+                sc_delay_buffer_init(&s->display_buffer,
+                                     options->display_buffer, true);
+                sc_frame_source_add_sink(src, &s->display_buffer.frame_sink);
+                src = &s->display_buffer.frame_source;
            }

            sc_frame_source_add_sink(src, &s->screen.frame_sink);
@@ -874,11 +873,11 @@ aoa_complete:
    // everything is set up
    if (options->control && options->turn_screen_off) {
        struct sc_control_msg msg;
-        msg.type = SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER;
-        msg.set_display_power.on = false;
+        msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
+        msg.set_screen_power_mode.mode = SC_SCREEN_POWER_MODE_OFF;

        if (!sc_controller_push_msg(&s->controller, &msg)) {
-            LOGW("Could not request 'set display power'");
+            LOGW("Could not request 'set screen power mode'");
        }
    }

--- a/app/src/server.c
+++ b/app/src/server.c
@@ -183,27 +183,6 @@ validate_string(const char *s) {
    return true;
 }

-static uint16_t
-get_device_sdk_version(struct sc_server *server) {
-    struct sc_intr *intr = &server->intr;
-
-    char *sdk_version =
-        sc_adb_getprop(intr, server->serial, "ro.build.version.sdk",
-                       SC_ADB_SILENT);
-    if (!sdk_version) {
-        return 0;
-    }
-
-    long value;
-    bool ok = sc_str_parse_integer(sdk_version, &value);
-    free(sdk_version);
-    if (!ok || value < 0 || value > 0xFFFF) {
-        return 0;
-    }
-
-    return value;
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
               const struct sc_server_params *params) {
@@ -222,26 +201,18 @@ execute_server(struct sc_server *server,
    cmd[count++] = "app_process";

 #ifdef SERVER_DEBUGGER
-    uint16_t sdk_version = get_device_sdk_version(server);
-    if (!sdk_version) {
-        LOGE("Could not determine SDK version");
-        return 0;
-    }
-
 # define SERVER_DEBUGGER_PORT "5005"
-    const char *dbg;
-    if (sdk_version < 28) {
-        // Android < 9
-        dbg = "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
-              SERVER_DEBUGGER_PORT;
-    } else {
-        // Android >= 9
-        dbg = "-XjdwpProvider:internal -XjdwpOptions:transport=dt_socket,"
-              "suspend=y,server=y,address=" SERVER_DEBUGGER_PORT;
-    }
-    cmd[count++] = dbg;
+    cmd[count++] =
+# ifdef SERVER_DEBUGGER_METHOD_NEW
+        /* Android 9 and above */
+        "-XjdwpProvider:internal -XjdwpOptions:transport=dt_socket,suspend=y,"
+        "server=y,address="
+# else
+        /* Android 8 and below */
+        "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
+# endif
+            SERVER_DEBUGGER_PORT;
 #endif
-
    cmd[count++] = "/"; // unused
    cmd[count++] = "com.genymobile.scrcpy.Server";
    cmd[count++] = SCRCPY_VERSION;
@@ -349,11 +320,6 @@ execute_server(struct sc_server *server,
    if (params->stay_awake) {
        ADD_PARAM("stay_awake=true");
    }
-    if (params->screen_off_timeout != -1) {
-        assert(params->screen_off_timeout >= 0);
-        uint64_t ms = SC_TICK_TO_MS(params->screen_off_timeout);
-        ADD_PARAM("screen_off_timeout=%" PRIu64, ms);
-    }
    if (params->video_codec_options) {
        VALIDATE_STRING(params->video_codec_options);
        ADD_PARAM("video_codec_options=%s", params->video_codec_options);
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -45,7 +45,6 @@ struct sc_server_params {
    uint32_t video_bit_rate;
    uint32_t audio_bit_rate;
    const char *max_fps; // float to be parsed by the server
-    sc_tick screen_off_timeout;
    int8_t lock_video_orientation;
    bool control;
    uint32_t display_id;
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -289,11 +289,11 @@ static void test_serialize_set_clipboard_long(void) {
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

-static void test_serialize_set_display_power(void) {
+static void test_serialize_set_screen_power_mode(void) {
    struct sc_control_msg msg = {
-        .type = SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER,
-        .set_display_power = {
-            .on = true,
+        .type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
+        .set_screen_power_mode = {
+            .mode = SC_SCREEN_POWER_MODE_NORMAL,
        },
    };

@@ -302,8 +302,8 @@ static void test_serialize_set_display_power(void) {
    assert(size == 2);

    const uint8_t expected[] = {
-        SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER,
-        0x01, // true
+        SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
+        0x02, // SC_SCREEN_POWER_MODE_NORMAL
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -407,21 +407,6 @@ static void test_serialize_open_hard_keyboard(void) {
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

-static void test_serialize_reset_video(void) {
-    struct sc_control_msg msg = {
-        .type = SC_CONTROL_MSG_TYPE_RESET_VIDEO,
-    };
-
-    uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 1);
-
-    const uint8_t expected[] = {
-        SC_CONTROL_MSG_TYPE_RESET_VIDEO,
-    };
-    assert(!memcmp(buf, expected, sizeof(expected)));
-}
-
 int main(int argc, char *argv[]) {
    (void) argc;
    (void) argv;
@@ -438,12 +423,11 @@ int main(int argc, char *argv[]) {
    test_serialize_get_clipboard();
    test_serialize_set_clipboard();
    test_serialize_set_clipboard_long();
-    test_serialize_set_display_power();
+    test_serialize_set_screen_power_mode();
    test_serialize_rotate_device();
    test_serialize_uhid_create();
    test_serialize_uhid_input();
    test_serialize_uhid_destroy();
    test_serialize_open_hard_keyboard();
-    test_serialize_reset_video();
    return 0;
 }
--- a/doc/audio.md
+++ b/doc/audio.md
@@ -170,7 +170,7 @@ latency (for both [video](video.md#buffering) and audio) might be preferable to
 avoid glitches and smooth the playback:

 ```
-scrcpy --video-buffer=200 --audio-buffer=200
+scrcpy --display-buffer=200 --audio-buffer=200
 ```

 It is also possible to configure another audio buffer (the audio output buffer),
--- a/doc/develop.md
+++ b/doc/develop.md
@@ -21,9 +21,9 @@ the client and on the server.
 If video is enabled, then the server sends a raw video stream (H.264 by default)
 of the device screen, with some additional headers for each packet. The client
 decodes the video frames, and displays them as soon as possible, without
-buffering (unless `--video-buffer=delay` is specified) to minimize latency. The
-client is not aware of the device rotation (which is handled by the server), it
-just knows the dimensions of the video frames it receives.
+buffering (unless `--display-buffer=delay` is specified) to minimize latency.
+The client is not aware of the device rotation (which is handled by the server),
+it just knows the dimensions of the video frames it receives.

 Similarly, if audio is enabled, then the server sends a raw audio stream (OPUS
 by default) of the device audio output (or the microphone if
--- a/doc/device.md
+++ b/doc/device.md
@@ -18,21 +18,6 @@ The initial state is restored when _scrcpy_ is closed.
 If the device is not plugged in (i.e. only connected over TCP/IP),
 `--stay-awake` has no effect (this is the Android behavior).

-This changes the value of [`stay_on_while_plugged_in`], setting which can be
-changed manually:
-
-[`stay_on_while_plugged_in`]: https://developer.android.com/reference/android/provider/Settings.Global#STAY_ON_WHILE_PLUGGED_IN
-
-
-```bash
-# get the current show_touches value
-adb shell settings get global stay_on_while_plugged_in
-# enable for AC/USB/wireless chargers
-adb shell settings put global stay_on_while_plugged_in 7
-# disable
-adb shell settings put global stay_on_while_plugged_in 0
-```
-

 ## Turn screen off

@@ -61,40 +46,6 @@ scrcpy --turn-screen-off --stay-awake
 scrcpy -Sw   # short version
 ```

-Since Android 15, it is possible to change this setting manually:
-
-```
-# turn screen off (0 for main display)
-adb shell cmd display power-off 0
-# turn screen on
-adb shell cmd display power-on 0
-```
-
-
-## Screen off timeout
-
-The Android screen automatically turns off after some delay.
-
-To change this delay while scrcpy is running:
-
-```bash
-scrcpy --screen-off-timeout=300  # 300 seconds (5 minutes)
-```
-
-The initial value is restored on exit.
-
-It is possible to change this setting manually:
-
-```bash
-# get the current screen_off_timeout value
-adb shell settings get system screen_off_timeout
-# set a new value (in milliseconds)
-adb shell settings put system screen_off_timeout 30000
-```
-
-Note that the Android value is in milliseconds, but the scrcpy command line
-argument is in seconds.
-

 ## Show touches

@@ -111,16 +62,6 @@ scrcpy -t   # short version

 Note that it only shows _physical_ touches (by a finger on the device).

-It is possible to change this setting manually:
-
-```bash
-# get the current show_touches value
-adb shell settings get system show_touches
-# enable show_touches
-adb shell settings put system show_touches 1
-# disable show_touches
-adb shell settings put system show_touches 0
-```

 ## Power off on close

@@ -137,48 +78,3 @@ By default, on start, the device is powered on. To prevent this behavior:
 ```bash
 scrcpy --no-power-on
 ```
-
-
-## Start Android app
-
-To list the Android apps installed on the device:
-
-```bash
-scrcpy --list-apps
-```
-
-An app, selected by its package name, can be launched on start:
-
-```
-scrcpy --start-app=org.mozilla.firefox
-```
-
-This feature can be used to run an app in a [virtual
-display](virtual_display.md):
-
-```
-scrcpy --new-display=1920x1080 --start-app=org.videolan.vlc
-```
-
-The app can be optionally forced-stop before being started, by adding a `+`
-prefix:
-
-```
-scrcpy --start-app=+org.mozilla.firefox
-```
-
-For convenience, it is also possible to select an app by its name, by adding a
-`?` prefix:
-
-```
-scrcpy --start-app=?firefox
-```
-
-But retrieving app names may take some time (sometimes several seconds), so
-passing the package name is recommended.
-
-The `+` and `?` prefixes can be combined (in that order):
-
-```
-scrcpy --start-app=+?firefox
-```
--- a/doc/mouse.md
+++ b/doc/mouse.md
@@ -34,9 +34,9 @@ Two modes allow to simulate a physical HID mouse on the device.
 In these modes, the computer mouse is "captured": the mouse pointer disappears
 from the computer and appears on the Android device instead.

-The [shortcut mod](shortcuts.md) (either <kbd>Alt</kbd> or <kbd>Super</kbd> by
-default) toggle (disable or enable) the mouse capture. Use one of them to give
-the control of the mouse back to the computer.
+Special capture keys, either <kbd>Alt</kbd> or <kbd>Super</kbd>, toggle
+(disable or enable) the mouse capture. Use one of them to give the control of
+the mouse back to the computer.


 ### UHID
--- a/doc/shortcuts.md
+++ b/doc/shortcuts.md
@@ -30,7 +30,6 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Flip display vertically                     | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>↑</kbd> _(up)_ \| <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>↓</kbd> _(down)_
 | Pause or re-pause display                   | <kbd>MOD</kbd>+<kbd>z</kbd>
 | Unpause display                             | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>z</kbd>
- | Reset video capture/encoding                | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>r</kbd>
 | Resize window to 1:1 (pixel-perfect)        | <kbd>MOD</kbd>+<kbd>g</kbd>
 | Resize window to remove black borders       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-left-click¹_
 | Click on `HOME`                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Middle-click_
--- a/doc/video.md
+++ b/doc/video.md
@@ -189,15 +189,15 @@ The configuration is available independently for the display,
 [v4l2 sinks](video.md#video4linux) and [audio](audio.md#buffering) playback.

 ```bash
-scrcpy --video-buffer=50     # add 50ms buffering for video playback
-scrcpy --audio-buffer=200    # set 200ms buffering for audio playback
+scrcpy --display-buffer=50   # add 50ms buffering for display
 scrcpy --v4l2-buffer=300     # add 300ms buffering for v4l2 sink
+scrcpy --audio-buffer=200    # set 200ms buffering for audio playback
 ```

 They can be applied simultaneously:

 ```bash
-scrcpy --video-buffer=50 --v4l2-buffer=300
+scrcpy --display-buffer=50 --v4l2-buffer=300
 ```


--- a/doc/virtual_display.md
+++ b/doc/virtual_display.md
@@ -1,26 +0,0 @@
-# Virtual display
-
-## New display
-
-To mirror a new virtual display instead of the device screen:
-
-```bash
-scrcpy --new-display=1920x1080
-scrcpy --new-display=1920x1080/420  # force 420 dpi
-scrcpy --new-display         # use the main display size and density
-scrcpy --new-display -m1920  # ... scaled to fit a max size of 1920
-scrcpy --new-display=/240    # use the main display size and 240 dpi
-```
-
-## Start app
-
-On some devices, a launcher is available in the virtual display.
-
-When no launcher is available, the virtual display is empty. In that case, you
-must [start an Android app](device.md#start-android-app).
-
-For example:
-
-```bash
-scrcpy --new-display=1920x1080 --start-app=org.videolan.vlc
-```
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,5 +3,6 @@ option('compile_server', type: 'boolean', value: true, description: 'Build the s
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
+option('server_debugger_method', type: 'combo', choices: ['old', 'new'], value: 'new', description: 'Select the debugger method (Android < 9: "old", Android >= 9: "new")')
 option('v4l2', type: 'boolean', value: true, description: 'Enable V4L2 feature when supported')
 option('usb', type: 'boolean', value: true, description: 'Enable HID/OTG features when supported')
--- a/release.mk
+++ b/release.mk
@@ -9,12 +9,13 @@
 # the server to the device.

 .PHONY: default clean \
-	test test-client test-server \
+	test \
 	build-server \
-	prepare-deps-win32 prepare-deps-win64 \
+	prepare-deps \
 	build-win32 build-win64 \
+	dist-win32 dist-win64 \
 	zip-win32 zip-win64 \
-	package release
+	release

 GRADLE ?= ./gradlew

@@ -25,7 +26,7 @@ WIN64_BUILD_DIR := build-win64

 VERSION ?= $(shell git describe --tags --exclude='*install-release' --always)

-ZIP := zip
+DIST := dist
 WIN32_TARGET_DIR := scrcpy-win32-$(VERSION)
 WIN64_TARGET_DIR := scrcpy-win64-$(VERSION)
 WIN32_TARGET := $(WIN32_TARGET_DIR).zip
@@ -33,28 +34,33 @@ WIN64_TARGET := $(WIN64_TARGET_DIR).zip

 RELEASE_DIR := release-$(VERSION)

-release: clean test build-server build-win32 build-win64 package
+release: clean test build-server zip-win32 zip-win64
+	mkdir -p "$(RELEASE_DIR)"
+	cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \
+		"$(RELEASE_DIR)/scrcpy-server-$(VERSION)"
+	cp "$(DIST)/$(WIN32_TARGET)" "$(RELEASE_DIR)"
+	cp "$(DIST)/$(WIN64_TARGET)" "$(RELEASE_DIR)"
+	cd "$(RELEASE_DIR)" && \
+		sha256sum "scrcpy-server-$(VERSION)" \
+			"scrcpy-win32-$(VERSION).zip" \
+			"scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt
+	@echo "Release generated in $(RELEASE_DIR)/"

 clean:
 	$(GRADLE) clean
-	rm -rf "$(ZIP)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \
+	rm -rf "$(DIST)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \
 		"$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)"

-test-client:
+test:
 	[ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \
 		meson setup "$(TEST_BUILD_DIR)" -Db_sanitize=address )
 	ninja -C "$(TEST_BUILD_DIR)"
-
-test-server:
 	$(GRADLE) -p server check

-test: test-client test-server
-
 build-server:
-	$(GRADLE) -p server assembleRelease
-	mkdir -p "$(SERVER_BUILD_DIR)/server"
-	cp server/build/outputs/apk/release/server-release-unsigned.apk \
-		"$(SERVER_BUILD_DIR)/server/scrcpy-server"
+	[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \
+		meson setup "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )
+	ninja -C "$(SERVER_BUILD_DIR)"

 prepare-deps-win32:
 	@app/deps/adb.sh win32
@@ -80,15 +86,6 @@ build-win32: prepare-deps-win32
 		-Dcompile_server=false \
 		-Dportable=true
 	ninja -C "$(WIN32_BUILD_DIR)"
-	# Group intermediate outputs into a 'dist' directory
-	mkdir -p "$(WIN32_BUILD_DIR)/dist"
-	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(WIN32_BUILD_DIR)/dist/"
-	cp app/data/scrcpy-console.bat "$(WIN32_BUILD_DIR)/dist/"
-	cp app/data/scrcpy-noconsole.vbs "$(WIN32_BUILD_DIR)/dist/"
-	cp app/data/icon.png "$(WIN32_BUILD_DIR)/dist/"
-	cp app/data/open_a_terminal_here.bat "$(WIN32_BUILD_DIR)/dist/"
-	cp app/deps/work/install/win32/bin/*.dll "$(WIN32_BUILD_DIR)/dist/"
-	cp app/deps/work/install/win32/bin/adb.exe "$(WIN32_BUILD_DIR)/dist/"

 build-win64: prepare-deps-win64
 	rm -rf "$(WIN64_BUILD_DIR)"
@@ -102,40 +99,33 @@ build-win64: prepare-deps-win64
 		-Dcompile_server=false \
 		-Dportable=true
 	ninja -C "$(WIN64_BUILD_DIR)"
-	# Group intermediate outputs into a 'dist' directory
-	mkdir -p "$(WIN64_BUILD_DIR)/dist"
-	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(WIN64_BUILD_DIR)/dist/"
-	cp app/data/scrcpy-console.bat "$(WIN64_BUILD_DIR)/dist/"
-	cp app/data/scrcpy-noconsole.vbs "$(WIN64_BUILD_DIR)/dist/"
-	cp app/data/icon.png "$(WIN64_BUILD_DIR)/dist/"
-	cp app/data/open_a_terminal_here.bat "$(WIN64_BUILD_DIR)/dist/"
-	cp app/deps/work/install/win64/bin/*.dll "$(WIN64_BUILD_DIR)/dist/"
-	cp app/deps/work/install/win64/bin/adb.exe "$(WIN64_BUILD_DIR)/dist/"

-zip-win32:
-	mkdir -p "$(ZIP)/$(WIN32_TARGET_DIR)"
-	cp -r "$(WIN32_BUILD_DIR)/dist/." "$(ZIP)/$(WIN32_TARGET_DIR)/"
-	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(ZIP)/$(WIN32_TARGET_DIR)/"
-	cd "$(ZIP)"; \
+dist-win32: build-server build-win32
+	mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/deps/work/install/win32/bin/*.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/deps/work/install/win32/bin/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
+
+dist-win64: build-server build-win64
+	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/deps/work/install/win64/bin/*.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/deps/work/install/win64/bin/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
+
+zip-win32: dist-win32
+	cd "$(DIST)"; \
 		zip -r "$(WIN32_TARGET)" "$(WIN32_TARGET_DIR)"
-	rm -rf "$(ZIP)/$(WIN32_TARGET_DIR)"

-zip-win64:
-	mkdir -p "$(ZIP)/$(WIN64_TARGET_DIR)"
-	cp -r "$(WIN64_BUILD_DIR)/dist/." "$(ZIP)/$(WIN64_TARGET_DIR)/"
-	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(ZIP)/$(WIN64_TARGET_DIR)/"
-	cd "$(ZIP)"; \
+zip-win64: dist-win64
+	cd "$(DIST)"; \
 		zip -r "$(WIN64_TARGET)" "$(WIN64_TARGET_DIR)"
-	rm -rf "$(ZIP)/$(WIN64_TARGET_DIR)"
-
-package: zip-win32 zip-win64
-	mkdir -p "$(RELEASE_DIR)"
-	cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \
-		"$(RELEASE_DIR)/scrcpy-server-$(VERSION)"
-	cp "$(ZIP)/$(WIN32_TARGET)" "$(RELEASE_DIR)"
-	cp "$(ZIP)/$(WIN64_TARGET)" "$(RELEASE_DIR)"
-	cd "$(RELEASE_DIR)" && \
-		sha256sum "scrcpy-server-$(VERSION)" \
-			"scrcpy-win32-$(VERSION).zip" \
-			"scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt
-	@echo "Release generated in $(RELEASE_DIR)/"
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -50,11 +50,6 @@ cd "$SERVER_DIR/src/main/aidl"
    android/content/IOnPrimaryClipChangedListener.aidl
 "$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" -I. android/view/IDisplayFoldListener.aidl

-# Fake sources to expose hidden Android types to the project
-FAKE_SRC=( \
-    android/content/*java \
-)
-
 SRC=( \
    com/genymobile/scrcpy/*.java \
    com/genymobile/scrcpy/audio/*.java \
@@ -73,11 +68,10 @@ done

 echo "Compiling java sources..."
 cd ../java
-javac -encoding UTF-8 -bootclasspath "$ANDROID_JAR" \
+javac -bootclasspath "$ANDROID_JAR" \
    -cp "$LAMBDA_JAR:$GEN_DIR" \
    -d "$CLASSES_DIR" \
    -source 1.8 -target 1.8 \
-    ${FAKE_SRC[@]} \
    ${SRC[@]}

 echo "Dexing..."
--- a/server/src/main/java/android/content/IContentProvider.java
+++ b/server/src/main/java/android/content/IContentProvider.java
@@ -1,5 +0,0 @@
-package android.content;
-
-public interface IContentProvider {
-    // android.content.IContentProvider is hidden, this is a fake one to expose the type to the project
-}
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -5,8 +5,6 @@ import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.util.Settings;
 import com.genymobile.scrcpy.util.SettingsException;

-import android.os.BatteryManager;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -18,132 +16,59 @@ import java.io.OutputStream;
 */
 public final class CleanUp {

-    // Dynamic options
-    private static final int PENDING_CHANGE_DISPLAY_POWER = 1 << 0;
-    private int pendingChanges;
-    private boolean pendingRestoreDisplayPower;
+    private static final int MSG_TYPE_MASK = 0b11;
+    private static final int MSG_TYPE_RESTORE_STAY_ON = 0;
+    private static final int MSG_TYPE_DISABLE_SHOW_TOUCHES = 1;
+    private static final int MSG_TYPE_RESTORE_NORMAL_POWER_MODE = 2;
+    private static final int MSG_TYPE_POWER_OFF_SCREEN = 3;

-    private Thread thread;
+    private static final int MSG_PARAM_SHIFT = 2;

-    private CleanUp(Options options) {
-        thread = new Thread(() -> runCleanUp(options), "cleanup");
-        thread.start();
+    private final OutputStream out;
+
+    public CleanUp(OutputStream out) {
+        this.out = out;
    }

-    public static CleanUp start(Options options) {
-        return new CleanUp(options);
-    }
-
-    public void interrupt() {
-        thread.interrupt();
-    }
-
-    public void join() throws InterruptedException {
-        thread.join();
-    }
-
-    private void runCleanUp(Options options) {
-        boolean disableShowTouches = false;
-        if (options.getShowTouches()) {
-            try {
-                String oldValue = Settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
-                // If "show touches" was disabled, it must be disabled back on clean up
-                disableShowTouches = !"1".equals(oldValue);
-            } catch (SettingsException e) {
-                Ln.e("Could not change \"show_touches\"", e);
-            }
-        }
-
-        int restoreStayOn = -1;
-        if (options.getStayAwake()) {
-            int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
-            try {
-                String oldValue = Settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
-                try {
-                    int currentStayOn = Integer.parseInt(oldValue);
-                    // Restore only if the current value is different
-                    if (currentStayOn != stayOn) {
-                        restoreStayOn = currentStayOn;
-                    }
-                } catch (NumberFormatException e) {
-                    // ignore
-                }
-            } catch (SettingsException e) {
-                Ln.e("Could not change \"stay_on_while_plugged_in\"", e);
-            }
-        }
-
-        int restoreScreenOffTimeout = -1;
-        int screenOffTimeout = options.getScreenOffTimeout();
-        if (screenOffTimeout != -1) {
-            try {
-                String oldValue = Settings.getAndPutValue(Settings.TABLE_SYSTEM, "screen_off_timeout", String.valueOf(screenOffTimeout));
-                try {
-                    int currentScreenOffTimeout = Integer.parseInt(oldValue);
-                    // Restore only if the current value is different
-                    if (currentScreenOffTimeout != screenOffTimeout) {
-                        restoreScreenOffTimeout = currentScreenOffTimeout;
-                    }
-                } catch (NumberFormatException e) {
-                    // ignore
-                }
-            } catch (SettingsException e) {
-                Ln.e("Could not change \"screen_off_timeout\"", e);
-            }
-        }
-
-        boolean powerOffScreen = options.getPowerOffScreenOnClose();
-        int displayId = options.getDisplayId();
-
-        try {
-            run(displayId, restoreStayOn, disableShowTouches, powerOffScreen, restoreScreenOffTimeout);
-        } catch (InterruptedException e) {
-            // ignore
-        } catch (IOException e) {
-            Ln.e("Clean up I/O exception", e);
-        }
-    }
-
-    private void run(int displayId, int restoreStayOn, boolean disableShowTouches, boolean powerOffScreen, int restoreScreenOffTimeout)
-            throws IOException, InterruptedException {
-        String[] cmd = {
-                "app_process",
-                "/",
-                CleanUp.class.getName(),
-                String.valueOf(displayId),
-                String.valueOf(restoreStayOn),
-                String.valueOf(disableShowTouches),
-                String.valueOf(powerOffScreen),
-                String.valueOf(restoreScreenOffTimeout),
-        };
+    public static CleanUp configure(int displayId) throws IOException {
+        String[] cmd = {"app_process", "/", CleanUp.class.getName(), String.valueOf(displayId)};

        ProcessBuilder builder = new ProcessBuilder(cmd);
        builder.environment().put("CLASSPATH", Server.SERVER_PATH);
        Process process = builder.start();
-        OutputStream out = process.getOutputStream();
+        return new CleanUp(process.getOutputStream());
+    }

-        while (true) {
-            int localPendingChanges;
-            boolean localPendingRestoreDisplayPower;
-            synchronized (this) {
-                while (pendingChanges == 0) {
-                    wait();
-                }
-                localPendingChanges = pendingChanges;
-                localPendingRestoreDisplayPower = pendingRestoreDisplayPower;
-                pendingChanges = 0;
-            }
-            if ((localPendingChanges & PENDING_CHANGE_DISPLAY_POWER) != 0) {
-                out.write(localPendingRestoreDisplayPower ? 1 : 0);
-                out.flush();
-            }
+    private boolean sendMessage(int type, int param) {
+        assert (type & ~MSG_TYPE_MASK) == 0;
+        int msg = type | param << MSG_PARAM_SHIFT;
+        try {
+            out.write(msg);
+            out.flush();
+            return true;
+        } catch (IOException e) {
+            Ln.w("Could not configure cleanup (type=" + type + ", param=" + param + ")", e);
+            return false;
        }
    }

-    public synchronized void setRestoreDisplayPower(boolean restoreDisplayPower) {
-        pendingRestoreDisplayPower = restoreDisplayPower;
-        pendingChanges |= PENDING_CHANGE_DISPLAY_POWER;
-        notify();
+    public boolean setRestoreStayOn(int restoreValue) {
+        // Restore the value (between 0 and 7), -1 to not restore
+        // <https://developer.android.com/reference/android/provider/Settings.Global#STAY_ON_WHILE_PLUGGED_IN>
+        assert restoreValue >= -1 && restoreValue <= 7;
+        return sendMessage(MSG_TYPE_RESTORE_STAY_ON, restoreValue & 0b1111);
+    }
+
+    public boolean setDisableShowTouches(boolean disableOnExit) {
+        return sendMessage(MSG_TYPE_DISABLE_SHOW_TOUCHES, disableOnExit ? 1 : 0);
+    }
+
+    public boolean setRestoreNormalPowerMode(boolean restoreOnExit) {
+        return sendMessage(MSG_TYPE_RESTORE_NORMAL_POWER_MODE, restoreOnExit ? 1 : 0);
+    }
+
+    public boolean setPowerOffScreen(boolean powerOffScreenOnExit) {
+        return sendMessage(MSG_TYPE_POWER_OFF_SCREEN, powerOffScreenOnExit ? 1 : 0);
    }

    public static void unlinkSelf() {
@@ -158,21 +83,35 @@ public final class CleanUp {
        unlinkSelf();

        int displayId = Integer.parseInt(args[0]);
-        int restoreStayOn = Integer.parseInt(args[1]);
-        boolean disableShowTouches = Boolean.parseBoolean(args[2]);
-        boolean powerOffScreen = Boolean.parseBoolean(args[3]);
-        int restoreScreenOffTimeout = Integer.parseInt(args[4]);

-        // Dynamic option
-        boolean restoreDisplayPower = false;
+        int restoreStayOn = -1;
+        boolean disableShowTouches = false;
+        boolean restoreNormalPowerMode = false;
+        boolean powerOffScreen = false;

        try {
            // Wait for the server to die
            int msg;
            while ((msg = System.in.read()) != -1) {
-                // Only restore display power
-                assert msg == 0 || msg == 1;
-                restoreDisplayPower = msg != 0;
+                int type = msg & MSG_TYPE_MASK;
+                int param = msg >> MSG_PARAM_SHIFT;
+                switch (type) {
+                    case MSG_TYPE_RESTORE_STAY_ON:
+                        restoreStayOn = param > 7 ? -1 : param;
+                        break;
+                    case MSG_TYPE_DISABLE_SHOW_TOUCHES:
+                        disableShowTouches = param != 0;
+                        break;
+                    case MSG_TYPE_RESTORE_NORMAL_POWER_MODE:
+                        restoreNormalPowerMode = param != 0;
+                        break;
+                    case MSG_TYPE_POWER_OFF_SCREEN:
+                        powerOffScreen = param != 0;
+                        break;
+                    default:
+                        Ln.w("Unexpected msg type: " + type);
+                        break;
+                }
            }
        } catch (IOException e) {
            // Expected when the server is dead
@@ -198,22 +137,15 @@ public final class CleanUp {
            }
        }

-        if (restoreScreenOffTimeout != -1) {
-            Ln.i("Restoring \"screen off timeout\"");
-            try {
-                Settings.putValue(Settings.TABLE_SYSTEM, "screen_off_timeout", String.valueOf(restoreScreenOffTimeout));
-            } catch (SettingsException e) {
-                Ln.e("Could not restore \"screen_off_timeout\"", e);
-            }
-        }
-
-        if (displayId != Device.DISPLAY_ID_NONE && Device.isScreenOn(displayId)) {
+        if (Device.isScreenOn()) {
            if (powerOffScreen) {
-                Ln.i("Power off screen");
-                Device.powerOffScreen(displayId);
-            } else if (restoreDisplayPower) {
-                Ln.i("Restoring display power");
-                Device.setDisplayPower(displayId, true);
+                if (displayId != Device.DISPLAY_ID_NONE) {
+                    Ln.i("Power off screen");
+                    Device.powerOffScreen(displayId);
+                }
+            } else if (restoreNormalPowerMode) {
+                Ln.i("Restoring normal power mode");
+                Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
            }
        }

--- a/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
+++ b/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
@@ -1,14 +1,9 @@
 package com.genymobile.scrcpy;

-import com.genymobile.scrcpy.wrappers.ServiceManager;
-
 import android.annotation.TargetApi;
 import android.content.AttributionSource;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.content.IContentProvider;
-import android.os.Binder;
 import android.os.Process;

 public final class FakeContext extends ContextWrapper {
@@ -22,38 +17,6 @@ public final class FakeContext extends ContextWrapper {
        return INSTANCE;
    }

-    private final ContentResolver contentResolver = new ContentResolver(this) {
-        @SuppressWarnings({"unused", "ProtectedMemberInFinalClass"})
-        // @Override (but super-class method not visible)
-        protected IContentProvider acquireProvider(Context c, String name) {
-            return ServiceManager.getActivityManager().getContentProviderExternal(name, new Binder());
-        }
-
-        @SuppressWarnings("unused")
-        // @Override (but super-class method not visible)
-        public boolean releaseProvider(IContentProvider icp) {
-            return false;
-        }
-
-        @SuppressWarnings({"unused", "ProtectedMemberInFinalClass"})
-        // @Override (but super-class method not visible)
-        protected IContentProvider acquireUnstableProvider(Context c, String name) {
-            return null;
-        }
-
-        @SuppressWarnings("unused")
-        // @Override (but super-class method not visible)
-        public boolean releaseUnstableProvider(IContentProvider icp) {
-            return false;
-        }
-
-        @SuppressWarnings("unused")
-        // @Override (but super-class method not visible)
-        public void unstableProviderDied(IContentProvider icp) {
-            // ignore
-        }
-    };
-
    private FakeContext() {
        super(Workarounds.getSystemContext());
    }
@@ -86,9 +49,4 @@ public final class FakeContext extends ContextWrapper {
    public Context getApplicationContext() {
        return this;
    }
-
-    @Override
-    public ContentResolver getContentResolver() {
-        return contentResolver;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;

 import com.genymobile.scrcpy.audio.AudioCodec;
 import com.genymobile.scrcpy.audio.AudioSource;
-import com.genymobile.scrcpy.device.Device;
 import com.genymobile.scrcpy.device.NewDisplay;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.CodecOption;
@@ -32,7 +31,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;
@@ -45,7 +44,6 @@ public class Options {
    private boolean cameraHighSpeed;
    private boolean showTouches;
    private boolean stayAwake;
-    private int screenOffTimeout = -1;
    private List<CodecOption> videoCodecOptions;
    private List<CodecOption> audioCodecOptions;

@@ -175,10 +173,6 @@ public class Options {
        return stayAwake;
    }

-    public int getScreenOffTimeout() {
-        return screenOffTimeout;
-    }
-
    public List<CodecOption> getVideoCodecOptions() {
        return videoCodecOptions;
    }
@@ -259,10 +253,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) {
@@ -368,12 +358,6 @@ public class Options {
                case "stay_awake":
                    options.stayAwake = Boolean.parseBoolean(value);
                    break;
-                case "screen_off_timeout":
-                    options.screenOffTimeout = Integer.parseInt(value);
-                    if (options.screenOffTimeout < -1) {
-                        throw new IllegalArgumentException("Invalid screen off timeout: " + options.screenOffTimeout);
-                    }
-                    break;
                case "video_codec_options":
                    options.videoCodecOptions = CodecOption.parse(value);
                    break;
@@ -479,11 +463,6 @@ public class Options {
            }
        }

-        if (options.newDisplay != null) {
-            assert options.displayId == 0 : "Must not set both displayId and newDisplay";
-            options.displayId = Device.DISPLAY_ID_NONE;
-        }
-
        return options;
    }

@@ -545,12 +524,8 @@ public class Options {
    }

    private static NewDisplay parseNewDisplay(String newDisplay) {
-        // Possible inputs:
-        //  - "" (empty string)
-        //  - "<width>x<height>/<dpi>"
-        //  - "<width>x<height>"
-        //  - "/<dpi>"
-        if (newDisplay.isEmpty()) {
+        // input format: "auto", or "<width>x<height>", or "<width>x<height>:<dpi>"
+        if ("auto".equals(newDisplay)) {
            return new NewDisplay();
        }

--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -16,6 +16,8 @@ import com.genymobile.scrcpy.device.NewDisplay;
 import com.genymobile.scrcpy.device.Streamer;
 import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.util.Settings;
+import com.genymobile.scrcpy.util.SettingsException;
 import com.genymobile.scrcpy.video.CameraCapture;
 import com.genymobile.scrcpy.video.NewDisplayCapture;
 import com.genymobile.scrcpy.video.ScreenCapture;
@@ -23,6 +25,7 @@ import com.genymobile.scrcpy.video.SurfaceCapture;
 import com.genymobile.scrcpy.video.SurfaceEncoder;
 import com.genymobile.scrcpy.video.VideoSource;

+import android.os.BatteryManager;
 import android.os.Build;

 import java.io.File;
@@ -73,38 +76,66 @@ public final class Server {
        // not instantiable
    }

+    private static void initAndCleanUp(Options options, CleanUp cleanUp) {
+        // This method is called from its own thread, so it may only configure cleanup actions which are NOT dynamic (i.e. they are configured once
+        // and for all, they cannot be changed from another thread)
+
+        if (options.getShowTouches()) {
+            try {
+                String oldValue = Settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
+                // If "show touches" was disabled, it must be disabled back on clean up
+                if (!"1".equals(oldValue)) {
+                    if (!cleanUp.setDisableShowTouches(true)) {
+                        Ln.e("Could not disable show touch on exit");
+                    }
+                }
+            } catch (SettingsException e) {
+                Ln.e("Could not change \"show_touches\"", e);
+            }
+        }
+
+        if (options.getStayAwake()) {
+            int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
+            try {
+                String oldValue = Settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
+                try {
+                    int restoreStayOn = Integer.parseInt(oldValue);
+                    if (restoreStayOn != stayOn) {
+                        // Restore only if the current value is different
+                        if (!cleanUp.setRestoreStayOn(restoreStayOn)) {
+                            Ln.e("Could not restore stay on on exit");
+                        }
+                    }
+                } catch (NumberFormatException e) {
+                    // ignore
+                }
+            } catch (SettingsException e) {
+                Ln.e("Could not change \"stay_on_while_plugged_in\"", e);
+            }
+        }
+
+        if (options.getPowerOffScreenOnClose()) {
+            if (!cleanUp.setPowerOffScreen(true)) {
+                Ln.e("Could not power off screen on exit");
+            }
+        }
+    }
+
    private static void scrcpy(Options options) throws IOException, ConfigurationException {
        if (Build.VERSION.SDK_INT < AndroidVersions.API_31_ANDROID_12 && options.getVideoSource() == VideoSource.CAMERA) {
            Ln.e("Camera mirroring is not supported before Android 12");
            throw new ConfigurationException("Camera mirroring is not supported");
        }

-        if (Build.VERSION.SDK_INT < AndroidVersions.API_29_ANDROID_10 && options.getNewDisplay() != null) {
-            Ln.e("New virtual display is not supported before Android 10");
-            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;
+        Thread initThread = null;
+
+        NewDisplay newDisplay = options.getNewDisplay();
+        int displayId = newDisplay == null ? options.getDisplayId() : Device.DISPLAY_ID_NONE;

        if (options.getCleanup()) {
-            cleanUp = CleanUp.start(options);
+            cleanUp = CleanUp.configure(displayId);
+            initThread = startInitThread(options, cleanUp);
        }

        int scid = options.getScid();
@@ -128,7 +159,7 @@ public final class Server {

            if (control) {
                ControlChannel controlChannel = connection.getControlChannel();
-                controller = new Controller(controlChannel, cleanUp, options);
+                controller = new Controller(displayId, controlChannel, cleanUp, options.getClipboardAutosync(), options.getPowerOn());
                asyncProcessors.add(controller);
            }

@@ -147,7 +178,8 @@ public final class Server {
                if (audioCodec == AudioCodec.RAW) {
                    audioRecorder = new AudioRawRecorder(audioCapture, audioStreamer);
                } else {
-                    audioRecorder = new AudioEncoder(audioCapture, audioStreamer, options);
+                    audioRecorder = new AudioEncoder(audioCapture, audioStreamer, options.getAudioBitRate(), options.getAudioCodecOptions(),
+                            options.getAudioEncoder());
                }
                asyncProcessors.add(audioRecorder);
            }
@@ -157,22 +189,20 @@ public final class Server {
                        options.getSendFrameMeta());
                SurfaceCapture surfaceCapture;
                if (options.getVideoSource() == VideoSource.DISPLAY) {
-                    NewDisplay newDisplay = options.getNewDisplay();
                    if (newDisplay != null) {
-                        surfaceCapture = new NewDisplayCapture(controller, options);
+                        surfaceCapture = new NewDisplayCapture(controller, newDisplay, options.getMaxSize());
                    } else {
-                        assert options.getDisplayId() != Device.DISPLAY_ID_NONE;
-                        surfaceCapture = new ScreenCapture(controller, options);
+                        assert displayId != Device.DISPLAY_ID_NONE;
+                        surfaceCapture = new ScreenCapture(controller, displayId, options.getMaxSize(), options.getCrop(),
+                                options.getLockVideoOrientation());
                    }
                } else {
-                    surfaceCapture = new CameraCapture(options);
+                    surfaceCapture = new CameraCapture(options.getCameraId(), options.getCameraFacing(), options.getCameraSize(),
+                            options.getMaxSize(), options.getCameraAspectRatio(), options.getCameraFps(), options.getCameraHighSpeed());
                }
-                SurfaceEncoder surfaceEncoder = new SurfaceEncoder(surfaceCapture, videoStreamer, options);
+                SurfaceEncoder surfaceEncoder = new SurfaceEncoder(surfaceCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
+                        options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
                asyncProcessors.add(surfaceEncoder);
-
-                if (controller != null) {
-                    controller.setSurfaceCapture(surfaceCapture);
-                }
            }

            Completion completion = new Completion(asyncProcessors.size());
@@ -184,8 +214,8 @@ public final class Server {

            completion.await();
        } finally {
-            if (cleanUp != null) {
-                cleanUp.interrupt();
+            if (initThread != null) {
+                initThread.interrupt();
            }
            for (AsyncProcessor asyncProcessor : asyncProcessors) {
                asyncProcessor.stop();
@@ -194,8 +224,8 @@ public final class Server {
            connection.shutdown();

            try {
-                if (cleanUp != null) {
-                    cleanUp.join();
+                if (initThread != null) {
+                    initThread.join();
                }
                for (AsyncProcessor asyncProcessor : asyncProcessors) {
                    asyncProcessor.join();
@@ -208,6 +238,12 @@ public final class Server {
        }
    }

+    private static Thread startInitThread(final Options options, final CleanUp cleanUp) {
+        Thread thread = new Thread(() -> initAndCleanUp(options, cleanUp), "init-cleanup");
+        thread.start();
+        return thread;
+    }
+
    public static void main(String... args) {
        int status = 0;
        try {
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy.audio;

 import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.AsyncProcessor;
-import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.Streamer;
 import com.genymobile.scrcpy.util.Codec;
@@ -68,12 +67,12 @@ public final class AudioEncoder implements AsyncProcessor {

    private boolean ended;

-    public AudioEncoder(AudioCapture capture, Streamer streamer, Options options) {
+    public AudioEncoder(AudioCapture capture, Streamer streamer, int bitRate, List<CodecOption> codecOptions, String encoderName) {
        this.capture = capture;
        this.streamer = streamer;
-        this.bitRate = options.getAudioBitRate();
-        this.codecOptions = options.getAudioCodecOptions();
-        this.encoderName = options.getAudioEncoder();
+        this.bitRate = bitRate;
+        this.codecOptions = codecOptions;
+        this.encoderName = encoderName;
    }

    private static MediaFormat createFormat(String mimeType, int bitRate, List<CodecOption> codecOptions) {
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
@@ -17,14 +17,13 @@ public final class ControlMessage {
    public static final int TYPE_COLLAPSE_PANELS = 7;
    public static final int TYPE_GET_CLIPBOARD = 8;
    public static final int TYPE_SET_CLIPBOARD = 9;
-    public static final int TYPE_SET_DISPLAY_POWER = 10;
+    public static final int TYPE_SET_SCREEN_POWER_MODE = 10;
    public static final int TYPE_ROTATE_DEVICE = 11;
    public static final int TYPE_UHID_CREATE = 12;
    public static final int TYPE_UHID_INPUT = 13;
    public static final int TYPE_UHID_DESTROY = 14;
    public static final int TYPE_OPEN_HARD_KEYBOARD_SETTINGS = 15;
    public static final int TYPE_START_APP = 16;
-    public static final int TYPE_RESET_VIDEO = 17;

    public static final long SEQUENCE_INVALID = 0;

@@ -35,7 +34,7 @@ public final class ControlMessage {
    private int type;
    private String text;
    private int metaState; // KeyEvent.META_*
-    private int action; // KeyEvent.ACTION_* or MotionEvent.ACTION_*
+    private int action; // KeyEvent.ACTION_* or MotionEvent.ACTION_* or POWER_MODE_*
    private int keycode; // KeyEvent.KEYCODE_*
    private int actionButton; // MotionEvent.BUTTON_*
    private int buttons; // MotionEvent.BUTTON_*
@@ -50,7 +49,6 @@ public final class ControlMessage {
    private long sequence;
    private int id;
    private byte[] data;
-    private boolean on;

    private ControlMessage() {
    }
@@ -118,10 +116,13 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createSetDisplayPower(boolean on) {
+    /**
+     * @param mode one of the {@code Device.SCREEN_POWER_MODE_*} constants
+     */
+    public static ControlMessage createSetScreenPowerMode(int mode) {
        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_SET_DISPLAY_POWER;
-        msg.on = on;
+        msg.type = TYPE_SET_SCREEN_POWER_MODE;
+        msg.action = mode;
        return msg;
    }

@@ -233,8 +234,4 @@ public final class ControlMessage {
    public byte[] getData() {
        return data;
    }
-
-    public boolean getOn() {
-        return on;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@@ -39,14 +39,13 @@ public class ControlMessageReader {
                return parseGetClipboard();
            case ControlMessage.TYPE_SET_CLIPBOARD:
                return parseSetClipboard();
-            case ControlMessage.TYPE_SET_DISPLAY_POWER:
-                return parseSetDisplayPower();
+            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
+                return parseSetScreenPowerMode();
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_EXPAND_SETTINGS_PANEL:
            case ControlMessage.TYPE_COLLAPSE_PANELS:
            case ControlMessage.TYPE_ROTATE_DEVICE:
            case ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
-            case ControlMessage.TYPE_RESET_VIDEO:
                return ControlMessage.createEmpty(type);
            case ControlMessage.TYPE_UHID_CREATE:
                return parseUhidCreate();
@@ -135,9 +134,9 @@ public class ControlMessageReader {
        return ControlMessage.createSetClipboard(sequence, text, paste);
    }

-    private ControlMessage parseSetDisplayPower() throws IOException {
-        boolean on = dis.readBoolean();
-        return ControlMessage.createSetDisplayPower(on);
+    private ControlMessage parseSetScreenPowerMode() throws IOException {
+        int mode = dis.readUnsignedByte();
+        return ControlMessage.createSetScreenPowerMode(mode);
    }

    private ControlMessage parseUhidCreate() throws IOException {
--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@@ -3,14 +3,12 @@ package com.genymobile.scrcpy.control;
 import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.AsyncProcessor;
 import com.genymobile.scrcpy.CleanUp;
-import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.device.Device;
 import com.genymobile.scrcpy.device.DeviceApp;
 import com.genymobile.scrcpy.device.Point;
 import com.genymobile.scrcpy.device.Position;
 import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.util.LogUtils;
-import com.genymobile.scrcpy.video.SurfaceCapture;
 import com.genymobile.scrcpy.video.VirtualDisplayListener;
 import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.InputManager;
@@ -93,20 +91,18 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    private final MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
    private final MotionEvent.PointerCoords[] pointerCoords = new MotionEvent.PointerCoords[PointersState.MAX_POINTERS];

-    private boolean keepDisplayPowerOff;
+    private boolean keepPowerModeOff;

-    // Used for resetting video encoding on RESET_VIDEO message
-    private SurfaceCapture surfaceCapture;
-
-    public Controller(ControlChannel controlChannel, CleanUp cleanUp, Options options) {
-        this.displayId = options.getDisplayId();
+    public Controller(int displayId, ControlChannel controlChannel, CleanUp cleanUp, boolean clipboardAutosync, boolean powerOn) {
+        this.displayId = displayId;
        this.controlChannel = controlChannel;
        this.cleanUp = cleanUp;
-        this.clipboardAutosync = options.getClipboardAutosync();
-        this.powerOn = options.getPowerOn();
+        this.clipboardAutosync = clipboardAutosync;
+        this.powerOn = powerOn;
        initPointers();
        sender = new DeviceMessageSender(controlChannel);

+        // main display or any display on Android >= Q
        supportsInputEvents = Device.supportsInputEvents(displayId);
        if (!supportsInputEvents) {
            Ln.w("Input events are not supported for secondary displays before Android 10");
@@ -141,17 +137,12 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        DisplayData data = new DisplayData(virtualDisplayId, positionMapper);
        DisplayData old = this.displayData.getAndSet(data);
        if (old == null) {
-            // The very first time the Controller is notified of a new virtual display
            synchronized (displayDataAvailable) {
                displayDataAvailable.notify();
            }
        }
    }

-    public void setSurfaceCapture(SurfaceCapture surfaceCapture) {
-        this.surfaceCapture = surfaceCapture;
-    }
-
    private UhidManager getUhidManager() {
        if (uhidManager == null) {
            uhidManager = new UhidManager(sender);
@@ -175,7 +166,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

    private void control() throws IOException {
        // on start, power on the device
-        if (powerOn && displayId == 0 && !Device.isScreenOn(displayId)) {
+        if (powerOn && displayId != Device.DISPLAY_ID_NONE && !Device.isScreenOn()) {
            Device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, displayId, Device.INJECT_MODE_ASYNC);

            // dirty hack
@@ -279,9 +270,18 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
            case ControlMessage.TYPE_SET_CLIPBOARD:
                setClipboard(msg.getText(), msg.getPaste(), msg.getSequence());
                break;
-            case ControlMessage.TYPE_SET_DISPLAY_POWER:
-                if (supportsInputEvents && displayId != Device.DISPLAY_ID_NONE) {
-                    setDisplayPower(msg.getOn());
+            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
+                if (supportsInputEvents) {
+                    int mode = msg.getAction();
+                    boolean setPowerModeOk = Device.setScreenPowerMode(mode);
+                    if (setPowerModeOk) {
+                        keepPowerModeOff = mode == Device.POWER_MODE_OFF;
+                        Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
+                        if (cleanUp != null) {
+                            boolean mustRestoreOnExit = mode != Device.POWER_MODE_NORMAL;
+                            cleanUp.setRestoreNormalPowerMode(mustRestoreOnExit);
+                        }
+                    }
                }
                break;
            case ControlMessage.TYPE_ROTATE_DEVICE:
@@ -302,9 +302,6 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
            case ControlMessage.TYPE_START_APP:
                startAppAsync(msg.getText());
                break;
-            case ControlMessage.TYPE_RESET_VIDEO:
-                resetVideo();
-                break;
            default:
                // do nothing
        }
@@ -313,9 +310,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    }

    private boolean injectKeycode(int action, int keycode, int repeat, int metaState) {
-        if (keepDisplayPowerOff && action == KeyEvent.ACTION_UP && (keycode == KeyEvent.KEYCODE_POWER || keycode == KeyEvent.KEYCODE_WAKEUP)) {
-            assert displayId != Device.DISPLAY_ID_NONE;
-            scheduleDisplayPowerOff(displayId);
+        if (keepPowerModeOff && action == KeyEvent.ACTION_UP && (keycode == KeyEvent.KEYCODE_POWER || keycode == KeyEvent.KEYCODE_WAKEUP)) {
+            schedulePowerModeOff();
        }
        return injectKeyEvent(action, keycode, repeat, metaState, Device.INJECT_MODE_ASYNC);
    }
@@ -352,7 +348,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int actionButton, int buttons) {
        long now = SystemClock.uptimeMillis();

-        // it hides the field on purpose, to read it with atomic access
+        // it hides the field on purpose, to read it from the atomic once
        @SuppressWarnings("checkstyle:HiddenField")
        DisplayData displayData = this.displayData.get();
        assert displayData != null : "Cannot receive a touch event without a display";
@@ -466,7 +462,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
        long now = SystemClock.uptimeMillis();

-        // it hides the field on purpose, to read it with atomic access
+        // it hides the field on purpose, to read it from the atomic once
        @SuppressWarnings("checkstyle:HiddenField")
        DisplayData displayData = this.displayData.get();
        assert displayData != null : "Cannot receive a scroll event without a display";
@@ -492,17 +488,17 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    }

    /**
-     * Schedule a call to set display power to off after a small delay.
+     * Schedule a call to set power mode to off after a small delay.
     */
-    private static void scheduleDisplayPowerOff(int displayId) {
+    private static void schedulePowerModeOff() {
        EXECUTOR.schedule(() -> {
-            Ln.i("Forcing display off");
-            Device.setDisplayPower(displayId, false);
+            Ln.i("Forcing screen off");
+            Device.setScreenPowerMode(Device.POWER_MODE_OFF);
        }, 200, TimeUnit.MILLISECONDS);
    }

    private boolean pressBackOrTurnScreenOn(int action) {
-        if (displayId == Device.DISPLAY_ID_NONE || Device.isScreenOn(displayId)) {
+        if (Device.isScreenOn()) {
            return injectKeyEvent(action, KeyEvent.KEYCODE_BACK, 0, 0, Device.INJECT_MODE_ASYNC);
        }

@@ -513,9 +509,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
            return true;
        }

-        if (keepDisplayPowerOff) {
-            assert displayId != Device.DISPLAY_ID_NONE;
-            scheduleDisplayPowerOff(displayId);
+        if (keepPowerModeOff) {
+            schedulePowerModeOff();
        }
        return pressReleaseKeycode(KeyEvent.KEYCODE_POWER, Device.INJECT_MODE_ASYNC);
    }
@@ -680,23 +675,4 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
            return data;
        }
    }
-
-    private void setDisplayPower(boolean on) {
-        boolean setDisplayPowerOk = Device.setDisplayPower(displayId, on);
-        if (setDisplayPowerOk) {
-            keepDisplayPowerOff = !on;
-            Ln.i("Device display turned " + (on ? "on" : "off"));
-            if (cleanUp != null) {
-                boolean mustRestoreOnExit = !on;
-                cleanUp.setRestoreDisplayPower(mustRestoreOnExit);
-            }
-        }
-    }
-
-    private void resetVideo() {
-        if (surfaceCapture != null) {
-            Ln.i("Video capture reset");
-            surfaceCapture.requestInvalidate();
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
@@ -20,9 +20,7 @@ public final class PositionMapper {
    }

    public static PositionMapper from(ScreenInfo screenInfo) {
-        // ignore the locked video orientation, the events will apply in coordinates considered in the physical device orientation
-        Size videoSize = screenInfo.getUnlockedVideoSize();
-        return new PositionMapper(videoSize, screenInfo.getContentRect(), screenInfo.getVideoRotation());
+        return new PositionMapper(screenInfo.getUnlockedVideoSize(), screenInfo.getContentRect(), screenInfo.getVideoRotation());
    }

    private static int reverseRotation(int rotation) {
--- 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 instantiable
@@ -54,7 +52,6 @@ public final class Device {
    }

    public static boolean supportsInputEvents(int displayId) {
-        // main display or any display on Android >= 10
        return displayId == 0 || Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10;
    }

@@ -82,9 +79,8 @@ public final class Device {
                && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0, displayId, injectMode);
    }

-    public static boolean isScreenOn(int displayId) {
-        assert displayId != DISPLAY_ID_NONE;
-        return ServiceManager.getPowerManager().isScreenOn(displayId);
+    public static boolean isScreenOn() {
+        return ServiceManager.getPowerManager().isScreenOn();
    }

    public static void expandNotificationPanel() {
@@ -129,13 +125,10 @@ public final class Device {
        return clipboardManager.setText(text);
    }

-    public static boolean setDisplayPower(int displayId, boolean on) {
-        assert displayId != Device.DISPLAY_ID_NONE;
-
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
-            return ServiceManager.getDisplayManager().requestDisplayPower(displayId, on);
-        }
-
+    /**
+     * @param mode one of the {@code POWER_MODE_*} constants
+     */
+    public static boolean setScreenPowerMode(int mode) {
        boolean applyToMultiPhysicalDisplays = Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10;

        if (applyToMultiPhysicalDisplays
@@ -148,7 +141,6 @@ public final class Device {
            applyToMultiPhysicalDisplays = false;
        }

-        int mode = on ? POWER_MODE_NORMAL : POWER_MODE_OFF;
        if (applyToMultiPhysicalDisplays) {
            // On Android 14, these internal methods have been moved to DisplayControl
            boolean useDisplayControl =
@@ -182,7 +174,7 @@ public final class Device {
    public static boolean powerOffScreen(int displayId) {
        assert displayId != DISPLAY_ID_NONE;

-        if (!isScreenOn(displayId)) {
+        if (!isScreenOn()) {
            return true;
        }
        return pressReleaseKeycode(KeyEvent.KEYCODE_POWER, displayId, Device.INJECT_MODE_ASYNC);
@@ -236,7 +228,7 @@ public final class Device {
    private static List<ApplicationInfo> getLaunchableApps(PackageManager pm) {
        List<ApplicationInfo> result = new ArrayList<>();
        for (ApplicationInfo appInfo : pm.getInstalledApplications(PackageManager.GET_META_DATA)) {
-            if (appInfo.enabled && getLaunchIntent(pm, appInfo.packageName) != null) {
+            if (getLaunchIntent(pm, appInfo.packageName) != null) {
                result.add(appInfo);
            }
        }
@@ -256,7 +248,7 @@ public final class Device {
    private static DeviceApp toApp(PackageManager pm, ApplicationInfo appInfo) {
        String name = pm.getApplicationLabel(appInfo).toString();
        boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
-        return new DeviceApp(appInfo.packageName, name, system);
+        return new DeviceApp(appInfo.packageName, name, system, appInfo.enabled);
    }

    @SuppressLint("QueryPermissionsNeeded")
@@ -279,10 +271,12 @@ public final class Device {

        PackageManager pm = FakeContext.get().getPackageManager();
        for (ApplicationInfo appInfo : getLaunchableApps(pm)) {
-            String name = pm.getApplicationLabel(appInfo).toString();
-            if (name.toLowerCase(Locale.getDefault()).startsWith(searchName)) {
-                boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
-                result.add(new DeviceApp(appInfo.packageName, name, system));
+            if (appInfo.enabled) {
+                String name = pm.getApplicationLabel(appInfo).toString();
+                if (name.toLowerCase(Locale.getDefault()).startsWith(searchName)) {
+                    boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+                    result.add(new DeviceApp(appInfo.packageName, name, system, appInfo.enabled));
+                }
            }
        }

--- a/server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java
@@ -5,11 +5,13 @@ public final class DeviceApp {
    private final String packageName;
    private final String name;
    private final boolean system;
+    private final boolean enabled;

-    public DeviceApp(String packageName, String name, boolean system) {
+    public DeviceApp(String packageName, String name, boolean system, boolean enabled) {
        this.packageName = packageName;
        this.name = name;
        this.system = system;
+        this.enabled = enabled;
    }

    public String getPackageName() {
@@ -23,4 +25,8 @@ public final class DeviceApp {
    public boolean isSystem() {
        return system;
    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/device/Size.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Size.java
@@ -52,6 +52,6 @@ public final class Size {

    @Override
    public String toString() {
-        return "Size{" + width + 'x' + height + '}';
+        return "Size{" + "width=" + width + ", height=" + height + '}';
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/CodecUtils.java
@@ -1,5 +1,8 @@
 package com.genymobile.scrcpy.util;

+import com.genymobile.scrcpy.audio.AudioCodec;
+import com.genymobile.scrcpy.video.VideoCodec;
+
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaFormat;
@@ -10,6 +13,24 @@ import java.util.List;

 public final class CodecUtils {

+    public static final class DeviceEncoder {
+        private final Codec codec;
+        private final MediaCodecInfo info;
+
+        DeviceEncoder(Codec codec, MediaCodecInfo info) {
+            this.codec = codec;
+            this.info = info;
+        }
+
+        public Codec getCodec() {
+            return codec;
+        }
+
+        public MediaCodecInfo getInfo() {
+            return info;
+        }
+    }
+
    private CodecUtils() {
        // not instantiable
    }
@@ -26,7 +47,7 @@ public final class CodecUtils {
        }
    }

-    public static MediaCodecInfo[] getEncoders(MediaCodecList codecs, String mimeType) {
+    private static MediaCodecInfo[] getEncoders(MediaCodecList codecs, String mimeType) {
        List<MediaCodecInfo> result = new ArrayList<>();
        for (MediaCodecInfo codecInfo : codecs.getCodecInfos()) {
            if (codecInfo.isEncoder() && Arrays.asList(codecInfo.getSupportedTypes()).contains(mimeType)) {
@@ -35,4 +56,26 @@ public final class CodecUtils {
        }
        return result.toArray(new MediaCodecInfo[result.size()]);
    }
+
+    public static List<DeviceEncoder> listVideoEncoders() {
+        List<DeviceEncoder> encoders = new ArrayList<>();
+        MediaCodecList codecs = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        for (VideoCodec codec : VideoCodec.values()) {
+            for (MediaCodecInfo info : getEncoders(codecs, codec.getMimeType())) {
+                encoders.add(new DeviceEncoder(codec, info));
+            }
+        }
+        return encoders;
+    }
+
+    public static List<DeviceEncoder> listAudioEncoders() {
+        List<DeviceEncoder> encoders = new ArrayList<>();
+        MediaCodecList codecs = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        for (AudioCodec codec : AudioCodec.values()) {
+            for (MediaCodecInfo info : getEncoders(codecs, codec.getMimeType())) {
+                encoders.add(new DeviceEncoder(codec, info));
+            }
+        }
+        return encoders;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
@@ -1,26 +1,19 @@
 package com.genymobile.scrcpy.util;

-import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.audio.AudioCodec;
 import com.genymobile.scrcpy.device.Device;
 import com.genymobile.scrcpy.device.DeviceApp;
 import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.Size;
-import com.genymobile.scrcpy.video.VideoCodec;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 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.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.MediaCodec;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
-import android.os.Build;
 import android.util.Range;

 import java.util.Collections;
@@ -35,54 +28,32 @@ public final class LogUtils {
        // not instantiable
    }

-    private static String buildEncoderListMessage(String type, Codec[] codecs) {
-        StringBuilder builder = new StringBuilder("List of ").append(type).append(" encoders:");
-        MediaCodecList codecList = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-        for (Codec codec : codecs) {
-            MediaCodecInfo[] encoders = CodecUtils.getEncoders(codecList, codec.getMimeType());
-            for (MediaCodecInfo info : encoders) {
-                int lineStart = builder.length();
-                builder.append("\n    --").append(type).append("-codec=").append(codec.getName());
-                builder.append(" --").append(type).append("-encoder=").append(info.getName());
-                if (Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10) {
-                    int lineLength = builder.length() - lineStart;
-                    final int column = 70;
-                    if (lineLength < column) {
-                        int padding = column - lineLength;
-                        builder.append(String.format("%" + padding + "s", " "));
-                    }
-                    builder.append(" (").append(getHwCodecType(info)).append(')');
-                    if (info.isVendor()) {
-                        builder.append(" [vendor]");
-                    }
-                    if (info.isAlias()) {
-                        builder.append(" (alias for ").append(info.getCanonicalName()).append(')');
-                    }
-                }
-
+    public static String buildVideoEncoderListMessage() {
+        StringBuilder builder = new StringBuilder("List of video encoders:");
+        List<CodecUtils.DeviceEncoder> videoEncoders = CodecUtils.listVideoEncoders();
+        if (videoEncoders.isEmpty()) {
+            builder.append("\n    (none)");
+        } else {
+            for (CodecUtils.DeviceEncoder encoder : videoEncoders) {
+                builder.append("\n    --video-codec=").append(encoder.getCodec().getName());
+                builder.append(" --video-encoder=").append(encoder.getInfo().getName());
            }
        }
-
        return builder.toString();
    }

-    public static String buildVideoEncoderListMessage() {
-        return buildEncoderListMessage("video", VideoCodec.values());
-    }
-
    public static String buildAudioEncoderListMessage() {
-        return buildEncoderListMessage("audio", AudioCodec.values());
-    }
-
-    @TargetApi(AndroidVersions.API_29_ANDROID_10)
-    private static String getHwCodecType(MediaCodecInfo info) {
-        if (info.isSoftwareOnly()) {
-            return "sw";
+        StringBuilder builder = new StringBuilder("List of audio encoders:");
+        List<CodecUtils.DeviceEncoder> audioEncoders = CodecUtils.listAudioEncoders();
+        if (audioEncoders.isEmpty()) {
+            builder.append("\n    (none)");
+        } else {
+            for (CodecUtils.DeviceEncoder encoder : audioEncoders) {
+                builder.append("\n    --audio-codec=").append(encoder.getCodec().getName());
+                builder.append(" --audio-encoder=").append(encoder.getInfo().getName());
+            }
        }
-        if (info.isHardwareAccelerated()) {
-            return "hw";
-        }
-        return "hybrid";
+        return builder.toString();
    }

    public static String buildDisplayListMessage() {
@@ -203,7 +174,6 @@ public final class LogUtils {
        //  1. system flag (system apps are before non-system apps)
        //  2. name
        //  3. package name
-        // Comparator.comparing() was introduced in API 24, so it cannot be used here to simplify the code
        Collections.sort(apps, (thisApp, otherApp) -> {
            // System apps first
            int cmp = -Boolean.compare(thisApp.isSystem(), otherApp.isSystem());
@@ -236,7 +206,10 @@ public final class LogUtils {
            } else {
                builder.append("\n   ").append(String.format("%" + column + "s", " "));
            }
-            builder.append(" ").append(app.getPackageName());
+            builder.append(" [").append(app.getPackageName()).append(']');
+            if (!app.isEnabled()) {
+                builder.append(" (disabled)");
+            }
        }

        return builder.toString();
--- a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java
@@ -1,12 +1,9 @@
 package com.genymobile.scrcpy.video;

 import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.Options;
-import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.HandlerExecutor;
 import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.util.LogUtils;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

 import android.annotation.SuppressLint;
@@ -59,18 +56,19 @@ public class CameraCapture extends SurfaceCapture {

    private final AtomicBoolean disconnected = new AtomicBoolean();

-    public CameraCapture(Options options) {
-        this.explicitCameraId = options.getCameraId();
-        this.cameraFacing = options.getCameraFacing();
-        this.explicitSize = options.getCameraSize();
-        this.maxSize = options.getMaxSize();
-        this.aspectRatio = options.getCameraAspectRatio();
-        this.fps = options.getCameraFps();
-        this.highSpeed = options.getCameraHighSpeed();
+    public CameraCapture(String explicitCameraId, CameraFacing cameraFacing, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio, int fps,
+            boolean highSpeed) {
+        this.explicitCameraId = explicitCameraId;
+        this.cameraFacing = cameraFacing;
+        this.explicitSize = explicitSize;
+        this.maxSize = maxSize;
+        this.aspectRatio = aspectRatio;
+        this.fps = fps;
+        this.highSpeed = highSpeed;
    }

    @Override
-    protected void init() throws ConfigurationException, IOException {
+    public void init() throws IOException {
        cameraThread = new HandlerThread("camera");
        cameraThread.start();
        cameraHandler = new Handler(cameraThread.getLooper());
@@ -79,7 +77,12 @@ public class CameraCapture extends SurfaceCapture {
        try {
            cameraId = selectCamera(explicitCameraId, cameraFacing);
            if (cameraId == null) {
-                throw new ConfigurationException("No matching camera found");
+                throw new IOException("No matching camera found");
+            }
+
+            size = selectSize(cameraId, explicitSize, maxSize, aspectRatio, highSpeed);
+            if (size == null) {
+                throw new IOException("Could not select camera size");
            }

            Ln.i("Using camera '" + cameraId + "'");
@@ -89,30 +92,14 @@ public class CameraCapture extends SurfaceCapture {
        }
    }

-    @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");
-            }
-        } catch (CameraAccessException e) {
-            throw new IOException(e);
-        }
-    }
-
-    private static String selectCamera(String explicitCameraId, CameraFacing cameraFacing) throws CameraAccessException, ConfigurationException {
-        CameraManager cameraManager = ServiceManager.getCameraManager();
-
-        String[] cameraIds = cameraManager.getCameraIdList();
+    private static String selectCamera(String explicitCameraId, CameraFacing cameraFacing) throws CameraAccessException {
        if (explicitCameraId != null) {
-            if (!Arrays.asList(cameraIds).contains(explicitCameraId)) {
-                Ln.e("Camera with id " + explicitCameraId + " not found\n" + LogUtils.buildCameraListMessage(false));
-                throw new ConfigurationException("Camera id not found");
-            }
            return explicitCameraId;
        }

+        CameraManager cameraManager = ServiceManager.getCameraManager();
+
+        String[] cameraIds = cameraManager.getCameraIdList();
        if (cameraFacing == null) {
            // Use the first one
            return cameraIds.length > 0 ? cameraIds[0] : null;
@@ -245,7 +232,13 @@ public class CameraCapture extends SurfaceCapture {
        }

        this.maxSize = maxSize;
-        return true;
+        try {
+            size = selectSize(cameraId, null, maxSize, aspectRatio, highSpeed);
+            return size != null;
+        } catch (CameraAccessException e) {
+            Ln.w("Could not select camera size", e);
+            return false;
+        }
    }

    @SuppressLint("MissingPermission")
@@ -263,7 +256,7 @@ public class CameraCapture extends SurfaceCapture {
            public void onDisconnected(CameraDevice camera) {
                Ln.w("Camera disconnected");
                disconnected.set(true);
-                invalidate();
+                requestReset();
            }

            @Override
@@ -362,9 +355,4 @@ public class CameraCapture extends SurfaceCapture {
    public boolean isClosed() {
        return disconnected.get();
    }
-
-    @Override
-    public void requestInvalidate() {
-        // do nothing (the user could not request a reset anyway for now, since there is no controller for camera mirroring)
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/CaptureReset.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/CaptureReset.java
@@ -1,33 +0,0 @@
-package com.genymobile.scrcpy.video;
-
-import android.media.MediaCodec;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class CaptureReset implements SurfaceCapture.CaptureListener {
-
-    private final AtomicBoolean reset = new AtomicBoolean();
-
-    // Current instance of MediaCodec to "interrupt" on reset
-    private MediaCodec runningMediaCodec;
-
-    public boolean consumeReset() {
-        return reset.getAndSet(false);
-    }
-
-    public synchronized void reset() {
-        reset.set(true);
-        if (runningMediaCodec != null) {
-            runningMediaCodec.signalEndOfInputStream();
-        }
-    }
-
-    public synchronized void setRunningMediaCodec(MediaCodec runningMediaCodec) {
-        this.runningMediaCodec = runningMediaCodec;
-    }
-
-    @Override
-    public void onInvalidated() {
-        reset();
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
@@ -1,7 +1,6 @@
 package com.genymobile.scrcpy.video;

 import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.control.PositionMapper;
 import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.NewDisplay;
@@ -15,13 +14,9 @@ import android.hardware.display.VirtualDisplay;
 import android.os.Build;
 import android.view.Surface;

-import java.io.IOException;
-
 public class NewDisplayCapture extends SurfaceCapture {

    // Internal fields copied from android.hardware.display.DisplayManager
-    private static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;
-    private static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
    private static final int VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH = 1 << 6;
    private static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 1 << 7;
    private static final int VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL = 1 << 8;
@@ -44,15 +39,14 @@ public class NewDisplayCapture extends SurfaceCapture {
    private Size size;
    private int dpi;

-    public NewDisplayCapture(VirtualDisplayListener vdListener, Options options) {
+    public NewDisplayCapture(VirtualDisplayListener vdListener, NewDisplay newDisplay, int maxSize) {
        this.vdListener = vdListener;
-        this.newDisplay = options.getNewDisplay();
-        assert newDisplay != null;
-        this.maxSize = options.getMaxSize();
+        this.newDisplay = newDisplay;
+        this.maxSize = maxSize;
    }

    @Override
-    protected void init() {
+    public void init() {
        size = newDisplay.getSize();
        dpi = newDisplay.getDpi();
        if (size == null || dpi == 0) {
@@ -78,11 +72,17 @@ public class NewDisplayCapture extends SurfaceCapture {
        }
    }

-    public void startNew(Surface surface) {
+    @Override
+    public void start(Surface surface) {
+        if (virtualDisplay != null) {
+            virtualDisplay.release();
+            virtualDisplay = null;
+        }
+
        int virtualDisplayId;
        try {
-            int flags = VIRTUAL_DISPLAY_FLAG_PUBLIC
-                    | VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
+            int flags = DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC
+                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
                    | VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH
                    | VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT
                    | VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
@@ -93,35 +93,27 @@ public class NewDisplayCapture extends SurfaceCapture {
                        | VIRTUAL_DISPLAY_FLAG_ALWAYS_UNLOCKED
                        | VIRTUAL_DISPLAY_FLAG_TOUCH_FEEDBACK_DISABLED;
                if (Build.VERSION.SDK_INT >= AndroidVersions.API_34_ANDROID_14) {
-                    flags |= VIRTUAL_DISPLAY_FLAG_OWN_FOCUS
-                            | VIRTUAL_DISPLAY_FLAG_DEVICE_DISPLAY_GROUP;
+                     flags |= VIRTUAL_DISPLAY_FLAG_OWN_FOCUS
+                             | VIRTUAL_DISPLAY_FLAG_DEVICE_DISPLAY_GROUP;
                }
            }
            virtualDisplay = ServiceManager.getDisplayManager()
                    .createNewVirtualDisplay("scrcpy", size.getWidth(), size.getHeight(), dpi, surface, flags);
            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
-            Ln.i("New display: " + size.getWidth() + "x" + size.getHeight() + "/" + dpi + " (id=" + virtualDisplayId + ")");
+            Ln.i("New display id: " + virtualDisplayId);
        } catch (Exception e) {
            Ln.e("Could not create display", e);
            throw new AssertionError("Could not create display");
        }

        if (vdListener != null) {
+            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
            Rect contentRect = new Rect(0, 0, size.getWidth(), size.getHeight());
            PositionMapper positionMapper = new PositionMapper(size, contentRect, 0);
            vdListener.onNewVirtualDisplay(virtualDisplayId, positionMapper);
        }
    }

-    @Override
-    public void start(Surface surface) throws IOException {
-        if (virtualDisplay == null) {
-            startNew(surface);
-        } else {
-            virtualDisplay.setSurface(surface);
-        }
-    }
-
    @Override
    public void release() {
        if (virtualDisplay != null) {
@@ -151,9 +143,4 @@ public class NewDisplayCapture extends SurfaceCapture {
        int num = size.getMax();
        return initialDpi * num / den;
    }
-
-    @Override
-    public void requestInvalidate() {
-        invalidate();
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
@@ -1,10 +1,7 @@
 package com.genymobile.scrcpy.video;

 import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.control.PositionMapper;
-import com.genymobile.scrcpy.device.ConfigurationException;
-import com.genymobile.scrcpy.device.Device;
 import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.Ln;
@@ -34,29 +31,25 @@ public class ScreenCapture extends SurfaceCapture {
    private DisplayInfo displayInfo;
    private ScreenInfo screenInfo;

-    // Source display size (before resizing/crop) for the current session
-    private Size sessionDisplaySize;
-
    private IBinder display;
    private VirtualDisplay virtualDisplay;

    private DisplayManager.DisplayListenerHandle displayListenerHandle;
    private HandlerThread handlerThread;

-    // On Android 14, the DisplayListener may be broken (it never sends events). This is fixed in recent Android 14 upgrades, but we can't really
-    // detect it directly, so register a RotationWatcher and a DisplayFoldListener as a fallback, until we receive the first event from
-    // DisplayListener (which proves that it works).
+    // On Android 14, the DisplayListener may be broken (it never send events). This is fixed in recent Android 14 upgrades, but we can't really know.
+    // So register a RotationWatcher and a DisplayFoldListener as a fallback, until we receive the first event from DisplayListener (which proves
+    // that it works).
    private boolean displayListenerWorks; // only accessed from the display listener thread
    private IRotationWatcher rotationWatcher;
    private IDisplayFoldListener displayFoldListener;

-    public ScreenCapture(VirtualDisplayListener vdListener, Options options) {
+    public ScreenCapture(VirtualDisplayListener vdListener, int displayId, int maxSize, Rect crop, int lockVideoOrientation) {
        this.vdListener = vdListener;
-        this.displayId = options.getDisplayId();
-        assert displayId != Device.DISPLAY_ID_NONE;
-        this.maxSize = options.getMaxSize();
-        this.crop = options.getCrop();
-        this.lockVideoOrientation = options.getLockVideoOrientation();
+        this.displayId = displayId;
+        this.maxSize = maxSize;
+        this.crop = crop;
+        this.lockVideoOrientation = lockVideoOrientation;
    }

    @Override
@@ -69,9 +62,6 @@ public class ScreenCapture extends SurfaceCapture {
        handlerThread.start();
        Handler handler = new Handler(handlerThread.getLooper());
        displayListenerHandle = ServiceManager.getDisplayManager().registerDisplayListener(displayId -> {
-            if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                Ln.v("ScreenCapture: onDisplayChanged(" + displayId + ")");
-            }
            if (Build.VERSION.SDK_INT == AndroidVersions.API_34_ANDROID_14) {
                if (!displayListenerWorks) {
                    // On the first display listener event, we know it works, we can unregister the fallbacks
@@ -80,53 +70,23 @@ public class ScreenCapture extends SurfaceCapture {
                }
            }
            if (this.displayId == displayId) {
-                DisplayInfo di = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
-                if (di == null) {
-                    Ln.w("DisplayInfo for " + displayId + " cannot be retrieved");
-                    // We can't compare with the current size, so reset unconditionally
-                    if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                        Ln.v("ScreenCapture: requestReset(): " + getSessionDisplaySize() + " -> (unknown)");
-                    }
-                    setSessionDisplaySize(null);
-                    invalidate();
-                } else {
-                    Size size = di.getSize();
-
-                    // The field is hidden on purpose, to read it with synchronization
-                    @SuppressWarnings("checkstyle:HiddenField")
-                    Size sessionDisplaySize = getSessionDisplaySize(); // synchronized
-
-                    // .equals() also works if sessionDisplaySize == null
-                    if (!size.equals(sessionDisplaySize)) {
-                        // Reset only if the size is different
-                        if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                            Ln.v("ScreenCapture: requestReset(): " + sessionDisplaySize + " -> " + size);
-                        }
-                        // Set the new size immediately, so that a future onDisplayChanged() event called before the asynchronous prepare()
-                        // considers that the current size is the requested size (to avoid a duplicate requestReset())
-                        setSessionDisplaySize(size);
-                        invalidate();
-                    } else if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                        Ln.v("ScreenCapture: Size not changed (" + size + "): do not requestReset()");
-                    }
-                }
+                requestReset();
            }
        }, handler);
    }

    @Override
-    public void prepare() throws ConfigurationException {
+    public void prepare() {
        displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
        if (displayInfo == null) {
            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
-            throw new ConfigurationException("Unknown display id: " + displayId);
+            throw new AssertionError("Display " + display + " not found");
        }

        if ((displayInfo.getFlags() & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
        }

-        setSessionDisplaySize(displayInfo.getSize());
        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), displayInfo.getSize(), crop, maxSize, lockVideoOrientation);
    }

@@ -141,16 +101,17 @@ public class ScreenCapture extends SurfaceCapture {
            virtualDisplay = null;
        }

+        Size displaySize = screenInfo.getVideoSize();
+
        int virtualDisplayId;
        PositionMapper positionMapper;
        try {
-            Size videoSize = screenInfo.getVideoSize();
            virtualDisplay = ServiceManager.getDisplayManager()
-                    .createVirtualDisplay("scrcpy", videoSize.getWidth(), videoSize.getHeight(), displayId, surface);
+                    .createVirtualDisplay("scrcpy", displaySize.getWidth(), displaySize.getHeight(), displayId, surface);
            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
-            Rect contentRect = new Rect(0, 0, videoSize.getWidth(), videoSize.getHeight());
+            Rect contentRect = new Rect(0, 0, displaySize.getWidth(), displaySize.getHeight());
            // The position are relative to the virtual display, not the original display
-            positionMapper = new PositionMapper(videoSize, contentRect, 0);
+            positionMapper = new PositionMapper(displaySize, contentRect, 0);
            Ln.d("Display: using DisplayManager API");
        } catch (Exception displayManagerException) {
            try {
@@ -184,16 +145,8 @@ public class ScreenCapture extends SurfaceCapture {
        if (Build.VERSION.SDK_INT == AndroidVersions.API_34_ANDROID_14) {
            unregisterDisplayListenerFallbacks();
        }
-
        handlerThread.quitSafely();
-        handlerThread = null;
-
-        // displayListenerHandle may be null if registration failed
-        if (displayListenerHandle != null) {
-            ServiceManager.getDisplayManager().unregisterDisplayListener(displayListenerHandle);
-            displayListenerHandle = null;
-        }
-
+        ServiceManager.getDisplayManager().unregisterDisplayListener(displayListenerHandle);
        if (display != null) {
            SurfaceControl.destroyDisplay(display);
            display = null;
@@ -234,48 +187,28 @@ public class ScreenCapture extends SurfaceCapture {
        }
    }

-    private synchronized Size getSessionDisplaySize() {
-        return sessionDisplaySize;
-    }
-
-    private synchronized void setSessionDisplaySize(Size sessionDisplaySize) {
-        this.sessionDisplaySize = sessionDisplaySize;
-    }
-
    private void registerDisplayListenerFallbacks() {
-        rotationWatcher = new IRotationWatcher.Stub() {
-            @Override
-            public void onRotationChanged(int rotation) {
-                if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                    Ln.v("ScreenCapture: onRotationChanged(" + rotation + ")");
+        if (displayId == 0) {
+            rotationWatcher = new IRotationWatcher.Stub() {
+                @Override
+                public void onRotationChanged(int rotation) {
+                    Ln.i("=== rotation");
+                    requestReset();
                }
-                invalidate();
-            }
-        };
-        ServiceManager.getWindowManager().registerRotationWatcher(rotationWatcher, displayId);
+            };
+            ServiceManager.getWindowManager().registerRotationWatcher(rotationWatcher, displayId);
+        }

        // Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10 (but implied by == API_34_ANDROID 14)
        displayFoldListener = new IDisplayFoldListener.Stub() {
-
-            private boolean first = true;
-
            @Override
            public void onDisplayFoldChanged(int displayId, boolean folded) {
-                if (first) {
-                    // An event is posted on registration to signal the initial state. Ignore it to avoid restarting encoding.
-                    first = false;
-                    return;
-                }
-
-                if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                    Ln.v("ScreenCapture: onDisplayFoldChanged(" + displayId + ", " + folded + ")");
-                }
-
                if (ScreenCapture.this.displayId != displayId) {
                    // Ignore events related to other display ids
                    return;
                }
-                invalidate();
+
+                requestReset();
            }
        };
        ServiceManager.getWindowManager().registerDisplayFoldListener(displayFoldListener);
@@ -294,9 +227,4 @@ public class ScreenCapture extends SurfaceCapture {
            }
        }
    }
-
-    @Override
-    public void requestInvalidate() {
-        invalidate();
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
@@ -63,8 +63,30 @@ public final class ScreenInfo {
        return unlockedVideoSize.rotate();
    }

+    public int getDeviceRotation() {
+        return deviceRotation;
+    }
+
+    public ScreenInfo withDeviceRotation(int newDeviceRotation) {
+        if (newDeviceRotation == deviceRotation) {
+            return this;
+        }
+        // true if changed between portrait and landscape
+        boolean orientationChanged = (deviceRotation + newDeviceRotation) % 2 != 0;
+        Rect newContentRect;
+        Size newUnlockedVideoSize;
+        if (orientationChanged) {
+            newContentRect = flipRect(contentRect);
+            newUnlockedVideoSize = unlockedVideoSize.rotate();
+        } else {
+            newContentRect = contentRect;
+            newUnlockedVideoSize = unlockedVideoSize;
+        }
+        return new ScreenInfo(newContentRect, newUnlockedVideoSize, newDeviceRotation, lockedVideoOrientation);
+    }
+
    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 orientation
            lockedVideoOrientation = rotation;
        }
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
@@ -6,37 +6,36 @@ import com.genymobile.scrcpy.device.Size;
 import android.view.Surface;

 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;

 /**
 * A video source which can be rendered on a Surface for encoding.
 */
 public abstract class SurfaceCapture {

-    public interface CaptureListener {
-        void onInvalidated();
-    }
-
-    private CaptureListener listener;
+    private final AtomicBoolean resetCapture = new AtomicBoolean();

    /**
-     * Notify the listener that the capture has been invalidated (for example, because its size changed).
+     * Request the encoding session to be restarted, for example if the capture implementation detects that the video source size has changed (on
+     * device rotation for example).
     */
-    protected void invalidate() {
-        listener.onInvalidated();
+    protected void requestReset() {
+        resetCapture.set(true);
+    }
+
+    /**
+     * Consume the reset request (intended to be called by the encoder).
+     *
+     * @return {@code true} if a reset request was pending, {@code false} otherwise.
+     */
+    public boolean consumeReset() {
+        return resetCapture.getAndSet(false);
    }

    /**
     * Called once before the first capture starts.
     */
-    public final void init(CaptureListener listener) throws ConfigurationException, IOException {
-        this.listener = listener;
-        init();
-    }
-
-    /**
-     * Called once before the first capture starts.
-     */
-    protected abstract void init() throws ConfigurationException, IOException;
+    public abstract void init() throws ConfigurationException, IOException;

    /**
     * Called after the last capture ends (if and only if {@link #init()} has been called).
@@ -46,7 +45,7 @@ public abstract class SurfaceCapture {
    /**
     * Called once before each capture starts, before {@link #getSize()}.
     */
-    public void prepare() throws ConfigurationException, IOException {
+    public void prepare() {
        // empty by default
    }

@@ -79,11 +78,4 @@ public abstract class SurfaceCapture {
    public boolean isClosed() {
        return false;
    }
-
-    /**
-     * Manually request to invalidate (typically a user request).
-     * <p>
-     * The capture implementation is free to ignore the request and do nothing.
-     */
-    public abstract void requestInvalidate();
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy.video;

 import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.AsyncProcessor;
-import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.device.Streamer;
@@ -50,16 +49,15 @@ public class SurfaceEncoder implements AsyncProcessor {
    private Thread thread;
    private final AtomicBoolean stopped = new AtomicBoolean();

-    private final CaptureReset reset = new CaptureReset();
-
-    public SurfaceEncoder(SurfaceCapture capture, Streamer streamer, Options options) {
+    public SurfaceEncoder(SurfaceCapture capture, Streamer streamer, int videoBitRate, float maxFps, List<CodecOption> codecOptions,
+            String encoderName, boolean downsizeOnError) {
        this.capture = capture;
        this.streamer = streamer;
-        this.videoBitRate = options.getVideoBitRate();
-        this.maxFps = options.getMaxFps();
-        this.codecOptions = options.getVideoCodecOptions();
-        this.encoderName = options.getVideoEncoder();
-        this.downsizeOnError = options.getDownsizeOnError();
+        this.videoBitRate = videoBitRate;
+        this.maxFps = maxFps;
+        this.codecOptions = codecOptions;
+        this.encoderName = encoderName;
+        this.downsizeOnError = downsizeOnError;
    }

    private void streamCapture() throws IOException, ConfigurationException {
@@ -67,14 +65,13 @@ public class SurfaceEncoder implements AsyncProcessor {
        MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
        MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);

-        capture.init(reset);
+        capture.init();

        try {
            boolean alive;
            boolean headerWritten = false;

            do {
-                reset.consumeReset(); // If a capture reset was requested, it is implicitly fulfilled
                capture.prepare();
                Size size = capture.getSize();
                if (!headerWritten) {
@@ -94,21 +91,7 @@ public class SurfaceEncoder implements AsyncProcessor {

                    mediaCodec.start();

-                    // Set the MediaCodec instance to "interrupt" (by signaling an EOS) on reset
-                    reset.setRunningMediaCodec(mediaCodec);
-
-                    if (stopped.get()) {
-                        alive = false;
-                    } else {
-                        boolean resetRequested = reset.consumeReset();
-                        if (!resetRequested) {
-                            // If a reset is requested during encode(), it will interrupt the encoding by an EOS
-                            encode(mediaCodec, streamer);
-                        }
-                        // The capture might have been closed internally (for example if the camera is disconnected)
-                        alive = !stopped.get() && !capture.isClosed();
-                    }
-
+                    alive = encode(mediaCodec, streamer);
                    // do not call stop() on exception, it would trigger an IllegalStateException
                    mediaCodec.stop();
                } catch (IllegalStateException | IllegalArgumentException e) {
@@ -119,7 +102,6 @@ public class SurfaceEncoder implements AsyncProcessor {
                    Ln.i("Retrying...");
                    alive = true;
                } finally {
-                    reset.setRunningMediaCodec(null);
                    mediaCodec.reset();
                    if (surface != null) {
                        surface.release();
@@ -180,16 +162,25 @@ public class SurfaceEncoder implements AsyncProcessor {
        return 0;
    }

-    private void encode(MediaCodec codec, Streamer streamer) throws IOException {
+    private boolean encode(MediaCodec codec, Streamer streamer) throws IOException {
+        boolean eof = false;
+        boolean alive = true;
        MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();

-        boolean eos;
-        do {
+        while (!capture.consumeReset() && !eof) {
+            if (stopped.get()) {
+                alive = false;
+                break;
+            }
            int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
            try {
-                eos = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
-                // On EOS, there might be data or not, depending on bufferInfo.size
-                if (outputBufferId >= 0 && bufferInfo.size > 0) {
+                if (capture.consumeReset()) {
+                    // must restart encoding with new size
+                    break;
+                }
+
+                eof = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
+                if (outputBufferId >= 0) {
                    ByteBuffer codecBuffer = codec.getOutputBuffer(outputBufferId);

                    boolean isConfig = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0;
@@ -206,7 +197,14 @@ public class SurfaceEncoder implements AsyncProcessor {
                    codec.releaseOutputBuffer(outputBufferId, false);
                }
            }
-        } while (!eos);
+        }
+
+        if (capture.isClosed()) {
+            // The capture might have been closed internally (for example if the camera is disconnected)
+            alive = false;
+        }
+
+        return !eof && alive;
    }

    private static MediaCodec createMediaCodec(Codec codec, String encoderName) throws IOException, ConfigurationException {
@@ -299,7 +297,6 @@ public class SurfaceEncoder implements AsyncProcessor {
    public void stop() {
        if (thread != null) {
            stopped.set(true);
-            reset.reset();
        }
    }

--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
@@ -6,7 +6,6 @@ import com.genymobile.scrcpy.util.Ln;

 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.content.IContentProvider;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.Bundle;
@@ -65,7 +64,7 @@ public final class ActivityManager {
    }

    @TargetApi(AndroidVersions.API_29_ANDROID_10)
-    public IContentProvider getContentProviderExternal(String name, IBinder token) {
+    private ContentProvider getContentProviderExternal(String name, IBinder token) {
        try {
            Method method = getGetContentProviderExternalMethod();
            Object[] args;
@@ -84,7 +83,11 @@ public final class ActivityManager {
            // IContentProvider provider = providerHolder.provider;
            Field providerField = providerHolder.getClass().getDeclaredField("provider");
            providerField.setAccessible(true);
-            return (IContentProvider) providerField.get(providerHolder);
+            Object provider = providerField.get(providerHolder);
+            if (provider == null) {
+                return null;
+            }
+            return new ContentProvider(this, provider, name, token);
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
            return null;
@@ -101,12 +104,7 @@ public final class ActivityManager {
    }

    public ContentProvider createSettingsProvider() {
-        IBinder token = new Binder();
-        IContentProvider provider = getContentProviderExternal("settings", token);
-        if (provider == null) {
-            return null;
-        }
-        return new ContentProvider(this, provider, "settings", token);
+        return getContentProviderExternal("settings", new Binder());
    }

    private Method getStartActivityAsUserMethod() throws NoSuchMethodException, ClassNotFoundException {
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy.wrappers;

-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.FakeContext;
 import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.Size;
@@ -8,7 +7,6 @@ import com.genymobile.scrcpy.util.Command;
 import com.genymobile.scrcpy.util.Ln;

 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.display.VirtualDisplay;
 import android.os.Handler;
@@ -47,7 +45,6 @@ public final class DisplayManager {

    private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal
    private Method createVirtualDisplayMethod;
-    private Method requestDisplayPowerMethod;

    static DisplayManager create() {
        try {
@@ -164,24 +161,6 @@ public final class DisplayManager {
        return dm.createVirtualDisplay(name, width, height, dpi, surface, flags);
    }

-    private Method getRequestDisplayPowerMethod() throws NoSuchMethodException {
-        if (requestDisplayPowerMethod == null) {
-            requestDisplayPowerMethod = manager.getClass().getMethod("requestDisplayPower", int.class, boolean.class);
-        }
-        return requestDisplayPowerMethod;
-    }
-
-    @TargetApi(AndroidVersions.API_35_ANDROID_15)
-    public boolean requestDisplayPower(int displayId, boolean on) {
-        try {
-            Method method = getRequestDisplayPowerMethod();
-            return (boolean) method.invoke(manager, displayId, on);
-        } catch (ReflectiveOperationException e) {
-            Ln.e("Could not invoke method", e);
-            return false;
-        }
-    }
-
    public DisplayListenerHandle registerDisplayListener(DisplayListener listener, Handler handler) {
        try {
            Class<?> displayListenerClass = Class.forName("android.hardware.display.DisplayManager$DisplayListener");
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
@@ -1,9 +1,7 @@
 package com.genymobile.scrcpy.wrappers;

-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.util.Ln;

-import android.os.Build;
 import android.os.IInterface;

 import java.lang.reflect.Method;
@@ -23,22 +21,14 @@ public final class PowerManager {

    private Method getIsScreenOnMethod() throws NoSuchMethodException {
        if (isScreenOnMethod == null) {
-            if (Build.VERSION.SDK_INT >= AndroidVersions.API_34_ANDROID_14) {
-                isScreenOnMethod = manager.getClass().getMethod("isDisplayInteractive", int.class);
-            } else {
-                isScreenOnMethod = manager.getClass().getMethod("isInteractive");
-            }
+            isScreenOnMethod = manager.getClass().getMethod("isInteractive");
        }
        return isScreenOnMethod;
    }

-    public boolean isScreenOn(int displayId) {
-
+    public boolean isScreenOn() {
        try {
            Method method = getIsScreenOnMethod();
-            if (Build.VERSION.SDK_INT >= AndroidVersions.API_34_ANDROID_14) {
-                return (boolean) method.invoke(manager, displayId);
-            }
            return (boolean) method.invoke(manager);
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
--- a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy.control;

+import com.genymobile.scrcpy.device.Device;
+
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import org.junit.Assert;
@@ -283,19 +285,19 @@ public class ControlMessageReaderTest {
    }

    @Test
-    public void testParseSetDisplayPower() throws IOException {
+    public void testParseSetScreenPowerMode() throws IOException {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_SET_DISPLAY_POWER);
-        dos.writeBoolean(true);
+        dos.writeByte(ControlMessage.TYPE_SET_SCREEN_POWER_MODE);
+        dos.writeByte(Device.POWER_MODE_NORMAL);
        byte[] packet = bos.toByteArray();

        ByteArrayInputStream bis = new ByteArrayInputStream(packet);
        ControlMessageReader reader = new ControlMessageReader(bis);

        ControlMessage event = reader.read();
-        Assert.assertEquals(ControlMessage.TYPE_SET_DISPLAY_POWER, event.getType());
-        Assert.assertTrue(event.getOn());
+        Assert.assertEquals(ControlMessage.TYPE_SET_SCREEN_POWER_MODE, event.getType());
+        Assert.assertEquals(Device.POWER_MODE_NORMAL, event.getAction());

        Assert.assertEquals(-1, bis.read()); // EOS
    }
Author	SHA1	Message	Date
Romain Vimont	3174ce2d5a	Listen to display changed events Replace RotationWatcher and DisplayFoldListener by a single DisplayListener, which is notified whenever the display size or dpi changes. Still use the old version specifically for Android 14, where DisplayListener may be broken (it is fixed in recent Android 14 upgrades), until we receive the first DisplayListener event (which proves that it works). Refs #4469 <https://github.com/Genymobile/scrcpy/pull/4469> Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>	2024-10-22 09:51:38 +02:00
Romain Vimont	05c80a036f	Use explicit constants in @TargetApi	2024-10-21 18:58:49 +02:00
Romain Vimont	db241065d1	Add option to start an app by its name By adding the '?' prefix, the app is searched by its name instead of its package name (it may take some time to retrieve the app names on the device): scrcpy --start-app=?firefox An app matches if its label starts with the given name, case-insensitive. If '+' is also passed to force-stop the app before starting, then the prefixes must be in that order: scrcpy --start-app=+?firefox	2024-10-21 18:52:05 +02:00
Romain Vimont	85302acf5e	Add option to force-stop app before starting The previous commit introduced: scrcpy --start-app=name By adding a '+' prefix, the app is stopped beforehand: scrcpy --start-app=+name This may be useful to start a fresh app on a new virtual display: scrcpy --new-display --start-app=+org.mozilla.firefox	2024-10-21 18:52:05 +02:00
Romain Vimont	d2989920c1	Add --start-app Add a command line option --start-app=name to start an Android app by its package name. For example: scrcpy --start-app=org.mozilla.firefox The app will be started on the correct target display: scrcpy --new-display --start-app=org.mozilla.firefox Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>	2024-10-21 18:52:05 +02:00
Romain Vimont	6ff3d9b571	Add --list-apps Add an option to list all apps installed on the device: scrcpy --list-apps	2024-10-21 18:52:05 +02:00
Romain Vimont	1ea229fc2c	Add virtual display feature Add a feature to create a new (separate) virtual display instead of mirroring the device screen: scrcpy --new-display=1920x1080 scrcpy --new-display=1920x1080/420 # force 420 dpi scrcpy --new-display # use the default screen size and density scrcpy --new-display=/240 # use the default screen size and 240 dpi Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com> Co-authored-by: anirudhb <anirudhb@users.noreply.github.com>	2024-10-21 18:52:05 +02:00
Romain Vimont	49c7d1037f	Add DPI to DisplayInfo It will be useful to automatically set an appropriate DPI for new virtual displays.	2024-10-21 18:52:05 +02:00
Romain Vimont	57b91b1fee	Inject display-related events to virtual display Mouse and touch events must be sent to the virtual display id (used for mirroring), other events (like key events) must be sent to the original display id. Co-authored-by: nightmare <mengyanshou@gmail.com>	2024-10-21 18:52:05 +02:00
Romain Vimont	49cf48614e	Send PositionMapper to Controller directly When a new capture starts, send a new PositionMapper to the Controller without using the global Device as an intermediate. Now all Device methods are static.	2024-10-21 18:52:05 +02:00
Romain Vimont	699c5c7efb	Introduce PositionMapper Extract the function to convert coordinates from video space to display space to a separate component. It only requires the data it uses, it does not need a full ScreenInfo (although it can be created from a ScreenInfo instance).	2024-10-21 18:52:05 +02:00
Romain Vimont	c20aae5331	Move clipboard management to Controller Continue to declutter the global Device.	2024-10-21 18:52:05 +02:00
Romain Vimont	7dc21e87f9	Move implicit displayId to Controller Remove from Device the functions using an implicit displayId. Move them to Controller, which knows best which displayId it must use. This will allow to properly dispatch events either to the origin display or to the virtual display created for mirroring.	2024-10-21 18:52:05 +02:00
Romain Vimont	cf3ae53e97	Add capture prepare() step Add a function called before each capture starts (before getSize() is called). This allows to compute the ScreenInfo instance once exactly when needed.	2024-10-21 18:52:05 +02:00
Romain Vimont	5c1482559a	Refactor to call getSize() only once There is no need to call capture.getSize() (provided by the SurfaceCapture implementation) twice.	2024-10-21 18:52:05 +02:00
Romain Vimont	68476b6d28	Move screen-related features out of Device.java Move the code related to screen size and rotation/fold to ScreenCapture. For now, keep the ScreenInfo instance in the Device class to communicate with the Controller, but it will be removed by further commits.	2024-10-21 18:52:05 +02:00