gamepad_resampler_skeleton

There was a registration mechanism to listen to HID outputs with a
specific HID id.

However, the UHID gamepad processor handles several ids, so it will not
work. We could complexify the registration mechanism, but instead,
directly dispatch to the expected processor based on the UHID id.

Concretely, instead of passing a sc_uhid_devices instance to construct a
sc_keyboard_uhid, so that it can register itself, construct the
sc_uhid_devices with all the UHID instances (currently only
sc_keyboard_uhid) so that it can dispatch HID outputs directly.

.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 }}

README.md

@@ -2,7 +2,7 @@
 source for the project. Do not download releases from random websites, even if
 their name contains `scrcpy`.**
 
-# scrcpy (v2.7)
+# scrcpy (v2.6.1)
 
 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
 
@@ -31,14 +31,12 @@ 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)
  - [camera mirroring](doc/camera.md) (Android 12+)
  - [mirroring as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
  - physical [keyboard][hid-keyboard] and [mouse][hid-mouse] simulation (HID)
- - [gamepad](doc/gamepad.md) support
  - [OTG mode](doc/otg.md)
  - and more…
 
@@ -92,12 +90,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:
 
@@ -119,13 +111,6 @@ Here are just some common examples.
     scrcpy --otg
     ```
 
- - Control the device using gamepad controllers plugged into the computer:
-
-    ```bash
-    scrcpy --gamepad=uhid
-    scrcpy -G  # short version
-    ```
-
 ## User documentation
 
 The application provides a lot of features and configuration options. They are
@@ -137,11 +122,9 @@ documented in the following pages:
  - [Control](doc/control.md)
  - [Keyboard](doc/keyboard.md)
  - [Mouse](doc/mouse.md)
- - [Gamepad](doc/gamepad.md)
  - [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)

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
@@ -32,7 +33,6 @@ _scrcpy() {
         --keyboard=
         --kill-adb-on-close
         --legacy-paste
-        --list-apps
         --list-camera-sizes
         --list-cameras
         --list-displays
@@ -46,8 +46,6 @@ _scrcpy() {
         --mouse-bind=
         -n --no-control
         -N --no-playback
-        --new-display
-        --new-display=
         --no-audio
         --no-audio-playback
         --no-cleanup
@@ -77,9 +75,7 @@ _scrcpy() {
         --rotation=
         -s --serial=
         -S --turn-screen-off
-        --screen-off-timeout=
         --shortcut-mod=
-        --start-app=
         -t --show-touches
         --tcpip
         --tcpip=
@@ -90,7 +86,6 @@ _scrcpy() {
         --v4l2-sink=
         -v --version
         -V --verbosity=
-        --video-buffer=
         --video-codec=
         --video-codec-options=
         --video-encoder=
@@ -192,6 +187,7 @@ _scrcpy() {
         |--camera-size \
         |--crop \
         |--display-id \
+        |--display-buffer \
         |--max-fps \
         |-m|--max-size \
         |-p|--port \
@@ -201,7 +197,6 @@ _scrcpy() {
         |--tunnel-port \
         |--v4l2-buffer \
         |--v4l2-sink \
-        |--video-buffer \
         |--video-codec-options \
         |--video-encoder \
         |--tcpip \

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]'
@@ -39,7 +40,6 @@ arguments=(
     '--keyboard=[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'
     '--kill-adb-on-close[Kill adb when scrcpy terminates]'
     '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
-    '--list-apps[List Android apps installed on the device]'
     '--list-camera-sizes[List the valid camera capture sizes]'
     '--list-cameras[List cameras available on the device]'
     '--list-displays[List displays available on the device]'
@@ -52,7 +52,6 @@ arguments=(
     '--mouse-bind=[Configure bindings of secondary clicks]'
     {-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
     {-N,--no-playback}'[Disable video and audio playback]'
-    '--new-display=[Create a new display]'
     '--no-audio[Disable audio forwarding]'
     '--no-audio-playback[Disable audio playback]'
     '--no-cleanup[Disable device cleanup actions on exit]'
@@ -80,9 +79,7 @@ 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]'
     '--tcpip[\(optional \[ip\:port\]\) Configure and connect the device over TCP/IP]'
     '--time-limit=[Set the maximum mirroring time, in seconds]'
@@ -92,7 +89,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]'

app/deps/ffmpeg.sh

@@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common
 
-VERSION=7.0.2
+VERSION=7.0.1
 FILENAME=ffmpeg-$VERSION.tar.xz
 PROJECT_DIR=ffmpeg-$VERSION
-SHA256SUM=8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389
+SHA256SUM=bce9eeb0f17ef8982390b1f37711a61b4290dc8c2a0c1a37b5857e85bfb0e4ff
 
 cd "$SOURCES_DIR"
 

app/deps/sdl.sh

@@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common
 
-VERSION=2.30.7
+VERSION=2.30.5
 FILENAME=SDL-$VERSION.tar.gz
 PROJECT_DIR=SDL-release-$VERSION
-SHA256SUM=1578c96f62c9ae36b64e431b2aa0e0b0fd07c275dedbc694afc38e19056688f5
+SHA256SUM=be3ca88f8c362704627a0bc5406edb2cd6cc6ba463596d81ebb7c2f18763d3bf
 
 cd "$SOURCES_DIR"
 

app/meson.build

@@ -5,7 +5,6 @@ src = [
     'src/adb/adb_parser.c',
     'src/adb/adb_tunnel.c',
     'src/audio_player.c',
-    'src/audio_regulator.c',
     'src/cli.c',
     'src/clock.c',
     'src/compat.c',
@@ -23,7 +22,6 @@ src = [
     'src/frame_buffer.c',
     'src/input_manager.c',
     'src/keyboard_sdk.c',
-    'src/mouse_capture.c',
     'src/mouse_sdk.c',
     'src/opengl.c',
     'src/options.c',
@@ -37,6 +35,7 @@ src = [
     'src/hid/hid_gamepad.c',
     'src/hid/hid_keyboard.c',
     'src/hid/hid_mouse.c',
+    'src/resampler/gamepad_resampler.c',
     'src/trait/frame_source.c',
     'src/trait/packet_source.c',
     'src/uhid/gamepad_uhid.c',
@@ -167,6 +166,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)
 

app/scrcpy-windows.rc

@@ -13,7 +13,7 @@ BEGIN
       VALUE "LegalCopyright", "Romain Vimont, Genymobile"
       VALUE "OriginalFilename", "scrcpy.exe"
       VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "2.7"
+      VALUE "ProductVersion", "2.6.1"
     END
   END
   BLOCK "VarFileInfo"

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.
@@ -179,9 +185,9 @@ Select how to send gamepad inputs to the device.
 
 Possible values are "disabled", "uhid" and "aoa":
 
- - "disabled" does not send gamepad inputs to the device.
- - "uhid" simulates physical HID gamepads using the Linux HID kernel module on the device.
- - "aoa" simulates physical HID gamepads using the AOAv2 protocol. It may only work over USB.
+ - "disabled" does not send keyboard inputs to the device.
+ - "uhid" simulates a physical HID gamepad using the Linux HID kernel module on the device.
+ - "aoa" simulates a physical HID gamepad using the AOAv2 protocol. It may only work over USB.
 
 Also see \fB\-\-keyboard\f and R\fB\-\-mouse\fR.
 .TP
@@ -221,10 +227,6 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S
 
 This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.
 
-.TP
-.B \-\-list\-apps
-List Android apps installed on the device.
-
 .TP
 .B \-\-list\-camera\-sizes
 List the valid camera capture sizes.
@@ -312,18 +314,6 @@ Disable device control (mirror the device in read\-only).
 .B \-N, \-\-no\-playback
 Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video\-playback \-\-no\-audio\-playback\fR).
 
-.TP
-\fB\-\-new\-display\fR[=[\fIwidth\fRx\fIheight\fR][/\fIdpi\fR]]
-Create a new display with the specified resolution and density. If not provided, they default to the main display dimensions and DPI, and \fB\-\-max\-size\fR is considered.
-
-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
-
 .TP
 .B \-\-no\-audio
 Disable audio forwarding.
@@ -488,22 +478,6 @@ For example, to use either LCtrl or LSuper for scrcpy shortcuts, pass "lctrl,lsu
 
 Default is "lalt,lsuper" (left-Alt or left-Super).
 
-.TP
-.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):
-
-    scrcpy --start-app=?firefox
-
-Add a '+' prefix to force-stop before starting the app:
-
-    scrcpy --new-display --start-app=+org.mozilla.firefox
-
-Both prefixes can be used, in that order:
-
-    scrcpy --start-app=+?firefox
-
 .TP
 .B \-t, \-\-show\-touches
 Enable "show touches" on start, restore the initial value on exit.
@@ -554,15 +528,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 +637,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)
@@ -765,11 +727,7 @@ Pinch-to-zoom and rotate from the center of the screen
 
 .TP
 .B Shift+click-and-move
-Tilt vertically (slide with 2 fingers)
-
-.TP
-.B Ctrl+Shift+click-and-move
-Tilt horizontally (slide with 2 fingers)
+Tilt (slide vertically with two fingers)
 
 .TP
 .B Drag & drop APK file

app/src/audio_player.c

@@ -1,23 +1,138 @@
 #include "audio_player.h"
 
+#include <libavcodec/avcodec.h>
+#include <libavutil/opt.h>
+
 #include "util/log.h"
 
+#define SC_AUDIO_PLAYER_NDEBUG // comment to debug
+
+/**
+ * Real-time audio player with configurable latency
+ *
+ * As input, the player regularly receives AVFrames of decoded audio samples.
+ * As output, an SDL callback regularly requests audio samples to be played.
+ * In the middle, an audio buffer stores the samples produced but not consumed
+ * yet.
+ *
+ * The goal of the player is to feed the audio output with a latency as low as
+ * possible while avoiding buffer underrun (i.e. not being able to provide
+ * samples when requested).
+ *
+ * The player aims to feed the audio output with as little latency as possible
+ * while avoiding buffer underrun. To achieve this, it attempts to maintain the
+ * average buffering (the number of samples present in the buffer) around a
+ * target value. If this target buffering is too low, then buffer underrun will
+ * occur frequently. If it is too high, then latency will become unacceptable.
+ * This target value is configured using the scrcpy option --audio-buffer.
+ *
+ * The player cannot adjust the sample input rate (it receives samples produced
+ * in real-time) or the sample output rate (it must provide samples as
+ * requested by the audio output callback). Therefore, it may only apply
+ * compensation by resampling (converting _m_ input samples to _n_ output
+ * samples).
+ *
+ * The compensation itself is applied by libswresample (FFmpeg). It is
+ * configured using swr_set_compensation(). An important work for the player
+ * is to estimate the compensation value regularly and apply it.
+ *
+ * The estimated buffering level is the result of averaging the "natural"
+ * buffering (samples are produced and consumed by blocks, so it must be
+ * smoothed), and making instant adjustments resulting of its own actions
+ * (explicit compensation and silence insertion on underflow), which are not
+ * smoothed.
+ *
+ * Buffer underflow events can occur when packets arrive too late. In that case,
+ * the player inserts silence. Once the packets finally arrive (late), one
+ * strategy could be to drop the samples that were replaced by silence, in
+ * order to keep a minimal latency. However, dropping samples in case of buffer
+ * underflow is inadvisable, as it would temporarily increase the underflow
+ * even more and cause very noticeable audio glitches.
+ *
+ * Therefore, the player doesn't drop any sample on underflow. The compensation
+ * mechanism will absorb the delay introduced by the inserted silence.
+ */
+
 /** Downcast frame_sink to sc_audio_player */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_audio_player, frame_sink)
 
+#define SC_AV_SAMPLE_FMT AV_SAMPLE_FMT_FLT
 #define SC_SDL_SAMPLE_FMT AUDIO_F32
 
+#define TO_BYTES(SAMPLES) sc_audiobuf_to_bytes(&ap->buf, (SAMPLES))
+#define TO_SAMPLES(BYTES) sc_audiobuf_to_samples(&ap->buf, (BYTES))
+
 static void SDLCALL
 sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
     struct sc_audio_player *ap = userdata;
 
+    // This callback is called with the lock used by SDL_LockAudioDevice()
+
     assert(len_int > 0);
     size_t len = len_int;
+    uint32_t count = TO_SAMPLES(len);
 
-    assert(len % ap->audioreg.sample_size == 0);
-    uint32_t out_samples = len / ap->audioreg.sample_size;
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+    LOGD("[Audio] SDL callback requests %" PRIu32 " samples", count);
+#endif
 
-    sc_audio_regulator_pull(&ap->audioreg, stream, out_samples);
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (!played) {
+        uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
+        // Wait until the buffer is filled up to at least target_buffering
+        // before playing
+        if (buffered_samples < ap->target_buffering) {
+            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
+                 " samples", count);
+            // Delay playback starting to reach the target buffering. Fill the
+            // whole buffer with silence (len is small compared to the
+            // arbitrary margin value).
+            memset(stream, 0, len);
+            return;
+        }
+    }
+
+    uint32_t read = sc_audiobuf_read(&ap->buf, stream, count);
+
+    if (read < count) {
+        uint32_t silence = count - read;
+        // Insert silence. In theory, the inserted silent samples replace the
+        // missing real samples, which will arrive later, so they should be
+        // dropped to keep the latency minimal. However, this would cause very
+        // audible glitches, so let the clock compensation restore the target
+        // latency.
+        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
+             silence);
+        memset(stream + TO_BYTES(read), 0, TO_BYTES(silence));
+
+        bool received = atomic_load_explicit(&ap->received,
+                                             memory_order_relaxed);
+        if (received) {
+            // Inserting additional samples immediately increases buffering
+            atomic_fetch_add_explicit(&ap->underflow, silence,
+                                      memory_order_relaxed);
+        }
+    }
+
+    atomic_store_explicit(&ap->played, true, memory_order_relaxed);
+}
+
+static uint8_t *
+sc_audio_player_get_swr_buf(struct sc_audio_player *ap, uint32_t min_samples) {
+    size_t min_buf_size = TO_BYTES(min_samples);
+    if (min_buf_size > ap->swr_buf_alloc_size) {
+        size_t new_size = min_buf_size + 4096;
+        uint8_t *buf = realloc(ap->swr_buf, new_size);
+        if (!buf) {
+            LOG_OOM();
+            // Could not realloc to the requested size
+            return NULL;
+        }
+        ap->swr_buf = buf;
+        ap->swr_buf_alloc_size = new_size;
+    }
+
+    return ap->swr_buf;
 }
 
 static bool
@@ -25,21 +140,209 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
                                 const AVFrame *frame) {
     struct sc_audio_player *ap = DOWNCAST(sink);
 
-    return sc_audio_regulator_push(&ap->audioreg, frame);
+    SwrContext *swr_ctx = ap->swr_ctx;
+
+    int64_t swr_delay = swr_get_delay(swr_ctx, ap->sample_rate);
+    // No need to av_rescale_rnd(), input and output sample rates are the same.
+    // Add more space (256) for clock compensation.
+    int dst_nb_samples = swr_delay + frame->nb_samples + 256;
+
+    uint8_t *swr_buf = sc_audio_player_get_swr_buf(ap, dst_nb_samples);
+    if (!swr_buf) {
+        return false;
+    }
+
+    int ret = swr_convert(swr_ctx, &swr_buf, dst_nb_samples,
+                          (const uint8_t **) frame->data, frame->nb_samples);
+    if (ret < 0) {
+        LOGE("Resampling failed: %d", ret);
+        return false;
+    }
+
+    // swr_convert() returns the number of samples which would have been
+    // written if the buffer was big enough.
+    uint32_t samples = MIN(ret, dst_nb_samples);
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
+#endif
+
+    uint32_t cap = sc_audiobuf_capacity(&ap->buf);
+    if (samples > cap) {
+        // Very very unlikely: a single resampled frame should never
+        // exceed the audio buffer size (or something is very wrong).
+        // Ignore the first bytes in swr_buf to avoid memory corruption anyway.
+        swr_buf += TO_BYTES(samples - cap);
+        samples = cap;
+    }
+
+    uint32_t skipped_samples = 0;
+
+    uint32_t written = sc_audiobuf_write(&ap->buf, swr_buf, samples);
+    if (written < samples) {
+        uint32_t remaining = samples - written;
+
+        // All samples that could be written without locking have been written,
+        // now we need to lock to drop/consume old samples
+        SDL_LockAudioDevice(ap->device);
+
+        // Retry with the lock
+        written += sc_audiobuf_write(&ap->buf,
+                                     swr_buf + TO_BYTES(written),
+                                     remaining);
+        if (written < samples) {
+            remaining = samples - written;
+            // Still insufficient, drop old samples to make space
+            skipped_samples = sc_audiobuf_read(&ap->buf, NULL, remaining);
+            assert(skipped_samples == remaining);
+        }
+
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (written < samples) {
+            // Now there is enough space
+            uint32_t w = sc_audiobuf_write(&ap->buf,
+                                           swr_buf + TO_BYTES(written),
+                                           remaining);
+            assert(w == remaining);
+            (void) w;
+        }
+    }
+
+    uint32_t underflow = 0;
+    uint32_t max_buffered_samples;
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (played) {
+        underflow = atomic_exchange_explicit(&ap->underflow, 0,
+                                             memory_order_relaxed);
+
+        max_buffered_samples = ap->target_buffering
+                               + 12 * ap->output_buffer
+                               + ap->target_buffering / 10;
+    } else {
+        // SDL playback not started yet, do not accumulate more than
+        // max_initial_buffering samples, this would cause unnecessary delay
+        // (and glitches to compensate) on start.
+        max_buffered_samples = ap->target_buffering + 2 * ap->output_buffer;
+    }
+
+    uint32_t can_read = sc_audiobuf_can_read(&ap->buf);
+    if (can_read > max_buffered_samples) {
+        uint32_t skip_samples = 0;
+
+        SDL_LockAudioDevice(ap->device);
+        can_read = sc_audiobuf_can_read(&ap->buf);
+        if (can_read > max_buffered_samples) {
+            skip_samples = can_read - max_buffered_samples;
+            uint32_t r = sc_audiobuf_read(&ap->buf, NULL, skip_samples);
+            assert(r == skip_samples);
+            (void) r;
+            skipped_samples += skip_samples;
+        }
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (skip_samples) {
+            if (played) {
+                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
+                     " samples", skip_samples);
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+            } else {
+                LOGD("[Audio] Playback not started, skipping %" PRIu32
+                     " samples", skip_samples);
+#endif
+            }
+        }
+    }
+
+    atomic_store_explicit(&ap->received, true, memory_order_relaxed);
+    if (!played) {
+        // Nothing more to do
+        return true;
+    }
+
+    // Number of samples added (or removed, if negative) for compensation
+    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
+    // Inserting silence instantly increases buffering
+    int32_t inserted_silence = (int32_t) underflow;
+    // Dropping input samples instantly decreases buffering
+    int32_t dropped = (int32_t) skipped_samples;
+
+    // The compensation must apply instantly, it must not be smoothed
+    ap->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
+    if (ap->avg_buffering.avg < 0) {
+        // Since dropping samples instantly reduces buffering, the difference
+        // is applied immediately to the average value, assuming that the delay
+        // between the producer and the consumer will be caught up.
+        //
+        // However, when this assumption is not valid, the average buffering
+        // may decrease indefinitely. Prevent it to become negative to limit
+        // the consequences.
+        ap->avg_buffering.avg = 0;
+    }
+
+    // However, the buffering level must be smoothed
+    sc_average_push(&ap->avg_buffering, can_read);
+
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+    LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
+         can_read, sc_average_get(&ap->avg_buffering));
+#endif
+
+    ap->samples_since_resync += written;
+    if (ap->samples_since_resync >= ap->sample_rate) {
+        // Recompute compensation every second
+        ap->samples_since_resync = 0;
+
+        float avg = sc_average_get(&ap->avg_buffering);
+        int diff = ap->target_buffering - avg;
+
+        // Enable compensation when the difference exceeds +/- 4ms.
+        // Disable compensation when the difference is lower than +/- 1ms.
+        int threshold = ap->compensation != 0
+                      ? ap->sample_rate     / 1000  /* 1ms */
+                      : ap->sample_rate * 4 / 1000; /* 4ms */
+
+        if (abs(diff) < threshold) {
+            // Do not compensate for small values, the error is just noise
+            diff = 0;
+        } else if (diff < 0 && can_read < ap->target_buffering) {
+            // Do not accelerate if the instant buffering level is below the
+            // target, this would increase underflow
+            diff = 0;
+        }
+        // Compensate the diff over 4 seconds (but will be recomputed after 1
+        // second)
+        int distance = 4 * ap->sample_rate;
+        // Limit compensation rate to 2%
+        int abs_max_diff = distance / 50;
+        diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
+        LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
+             " compensation=%d", ap->target_buffering, avg, can_read, diff);
+
+        if (diff != ap->compensation) {
+            int ret = swr_set_compensation(swr_ctx, diff, distance);
+            if (ret < 0) {
+                LOGW("Resampling compensation failed: %d", ret);
+                // not fatal
+            } else {
+                ap->compensation = diff;
+            }
+        }
+    }
+
+    return true;
 }
 
 static bool
 sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
                                 const AVCodecContext *ctx) {
     struct sc_audio_player *ap = DOWNCAST(sink);
-
 #ifdef SCRCPY_LAVU_HAS_CHLAYOUT
-    assert(ctx->ch_layout.nb_channels > 0 && ctx->ch_layout.nb_channels < 256);
-    uint8_t nb_channels = ctx->ch_layout.nb_channels;
+    assert(ctx->ch_layout.nb_channels > 0);
+    unsigned nb_channels = ctx->ch_layout.nb_channels;
 #else
     int tmp = av_get_channel_layout_nb_channels(ctx->channel_layout);
-    assert(tmp > 0 && tmp < 256);
-    uint8_t nb_channels = tmp;
+    assert(tmp > 0);
+    unsigned nb_channels = tmp;
 #endif
 
     assert(ctx->sample_rate > 0);
@@ -47,19 +350,17 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     int out_bytes_per_sample = av_get_bytes_per_sample(SC_AV_SAMPLE_FMT);
     assert(out_bytes_per_sample > 0);
 
-    uint32_t target_buffering_samples =
-        ap->target_buffering_delay * ctx->sample_rate / SC_TICK_FREQ;
+    ap->sample_rate = ctx->sample_rate;
+    ap->nb_channels = nb_channels;
+    ap->out_bytes_per_sample = out_bytes_per_sample;
 
-    size_t sample_size = nb_channels * out_bytes_per_sample;
-    bool ok = sc_audio_regulator_init(&ap->audioreg, sample_size, ctx,
-                                      target_buffering_samples);
-    if (!ok) {
-        return false;
-    }
+    ap->target_buffering = ap->target_buffering_delay * ap->sample_rate
+                                                      / SC_TICK_FREQ;
 
-    uint64_t aout_samples = ap->output_buffer_duration * ctx->sample_rate
+    uint64_t aout_samples = ap->output_buffer_duration * ap->sample_rate
                                                        / SC_TICK_FREQ;
     assert(aout_samples <= 0xFFFF);
+    ap->output_buffer = (uint16_t) aout_samples;
 
     SDL_AudioSpec desired = {
         .freq = ctx->sample_rate,
@@ -74,10 +375,69 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     ap->device = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
     if (!ap->device) {
         LOGE("Could not open audio device: %s", SDL_GetError());
-        sc_audio_regulator_destroy(&ap->audioreg);
         return false;
     }
 
+    SwrContext *swr_ctx = swr_alloc();
+    if (!swr_ctx) {
+        LOG_OOM();
+        goto error_close_audio_device;
+    }
+    ap->swr_ctx = swr_ctx;
+
+#ifdef SCRCPY_LAVU_HAS_CHLAYOUT
+    av_opt_set_chlayout(swr_ctx, "in_chlayout", &ctx->ch_layout, 0);
+    av_opt_set_chlayout(swr_ctx, "out_chlayout", &ctx->ch_layout, 0);
+#else
+    av_opt_set_channel_layout(swr_ctx, "in_channel_layout",
+                              ctx->channel_layout, 0);
+    av_opt_set_channel_layout(swr_ctx, "out_channel_layout",
+                              ctx->channel_layout, 0);
+#endif
+
+    av_opt_set_int(swr_ctx, "in_sample_rate", ctx->sample_rate, 0);
+    av_opt_set_int(swr_ctx, "out_sample_rate", ctx->sample_rate, 0);
+
+    av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", ctx->sample_fmt, 0);
+    av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", SC_AV_SAMPLE_FMT, 0);
+
+    int ret = swr_init(swr_ctx);
+    if (ret) {
+        LOGE("Failed to initialize the resampling context");
+        goto error_free_swr_ctx;
+    }
+
+    // Use a ring-buffer of the target buffering size plus 1 second between the
+    // producer and the consumer. It's too big on purpose, to guarantee that
+    // the producer and the consumer will be able to access it in parallel
+    // without locking.
+    uint32_t audiobuf_samples = ap->target_buffering + ap->sample_rate;
+
+    size_t sample_size = ap->nb_channels * ap->out_bytes_per_sample;
+    bool ok = sc_audiobuf_init(&ap->buf, sample_size, audiobuf_samples);
+    if (!ok) {
+        goto error_free_swr_ctx;
+    }
+
+    size_t initial_swr_buf_size = TO_BYTES(4096);
+    ap->swr_buf = malloc(initial_swr_buf_size);
+    if (!ap->swr_buf) {
+        LOG_OOM();
+        goto error_destroy_audiobuf;
+    }
+    ap->swr_buf_alloc_size = initial_swr_buf_size;
+
+    // Samples are produced and consumed by blocks, so the buffering must be
+    // smoothed to get a relatively stable value.
+    sc_average_init(&ap->avg_buffering, 128);
+    ap->samples_since_resync = 0;
+
+    ap->received = false;
+    atomic_init(&ap->played, false);
+    atomic_init(&ap->received, false);
+    atomic_init(&ap->underflow, 0);
+    ap->compensation = 0;
+
     // The thread calling open() is the thread calling push(), which fills the
     // audio buffer consumed by the SDL audio thread.
     ok = sc_thread_set_priority(SC_THREAD_PRIORITY_TIME_CRITICAL);
@@ -89,6 +449,15 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     SDL_PauseAudioDevice(ap->device, 0);
 
     return true;
+
+error_destroy_audiobuf:
+    sc_audiobuf_destroy(&ap->buf);
+error_free_swr_ctx:
+    swr_free(&ap->swr_ctx);
+error_close_audio_device:
+    SDL_CloseAudioDevice(ap->device);
+
+    return false;
 }
 
 static void
@@ -99,7 +468,9 @@ sc_audio_player_frame_sink_close(struct sc_frame_sink *sink) {
     SDL_PauseAudioDevice(ap->device, 1);
     SDL_CloseAudioDevice(ap->device);
 
-    sc_audio_regulator_destroy(&ap->audioreg);
+    free(ap->swr_buf);
+    sc_audiobuf_destroy(&ap->buf);
+    swr_free(&ap->swr_ctx);
 }
 
 void

app/src/audio_player.h

@@ -5,27 +5,76 @@
 
 #include <stdatomic.h>
 #include <stdbool.h>
+#include <libavformat/avformat.h>
+#include <libswresample/swresample.h>
 #include <SDL2/SDL.h>
 
-#include "audio_regulator.h"
 #include "trait/frame_sink.h"
+#include "util/audiobuf.h"
+#include "util/average.h"
+#include "util/thread.h"
 #include "util/tick.h"
 
 struct sc_audio_player {
     struct sc_frame_sink frame_sink;
 
+    SDL_AudioDeviceID device;
+
     // The target buffering between the producer and the consumer. This value
     // is directly use for compensation.
     // Since audio capture and/or encoding on the device typically produce
     // blocks of 960 samples (20ms) or 1024 samples (~21.3ms), this target
     // value should be higher.
     sc_tick target_buffering_delay;
+    uint32_t target_buffering; // in samples
 
-    // SDL audio output buffer size
+    // SDL audio output buffer size.
     sc_tick output_buffer_duration;
+    uint16_t output_buffer;
 
-    SDL_AudioDeviceID device;
-    struct sc_audio_regulator audioreg;
+    // Audio buffer to communicate between the receiver and the SDL audio
+    // callback
+    struct sc_audiobuf buf;
+
+    // Resampler (only used from the receiver thread)
+    struct SwrContext *swr_ctx;
+
+    // The sample rate is the same for input and output
+    unsigned sample_rate;
+    // The number of channels is the same for input and output
+    unsigned nb_channels;
+    // The number of bytes per sample for a single channel
+    size_t out_bytes_per_sample;
+
+    // Target buffer for resampling (only used by the receiver thread)
+    uint8_t *swr_buf;
+    size_t swr_buf_alloc_size;
+
+    // Number of buffered samples (may be negative on underflow) (only used by
+    // the receiver thread)
+    struct sc_average avg_buffering;
+    // Count the number of samples to trigger a compensation update regularly
+    // (only used by the receiver thread)
+    uint32_t samples_since_resync;
+
+    // Number of silence samples inserted since the last received packet
+    atomic_uint_least32_t underflow;
+
+    // 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;
+
+    // Set to true the first time the SDL callback is called
+    atomic_bool played;
+
+    const struct sc_audio_player_callbacks *cbs;
+    void *cbs_userdata;
+};
+
+struct sc_audio_player_callbacks {
+    void (*on_ended)(struct sc_audio_player *ap, bool success, void *userdata);
 };
 
 void

app/src/audio_regulator.c

@@ -1,413 +0,0 @@
-#include "audio_regulator.h"
-
-#include <libavcodec/avcodec.h>
-#include <libavutil/opt.h>
-
-#include "util/log.h"
-
-//#define SC_AUDIO_REGULATOR_DEBUG // uncomment to debug
-
-/**
- * Real-time audio regulator with configurable latency
- *
- * As input, the regulator regularly receives AVFrames of decoded audio samples.
- * As output, the audio player regularly requests audio samples to be played.
- * In the middle, an audio buffer stores the samples produced but not consumed
- * yet.
- *
- * The goal of the regulator is to feed the audio player with a latency as low
- * as possible while avoiding buffer underrun (i.e. not being able to provide
- * samples when requested).
- *
- * To achieve this, it attempts to maintain the average buffering (the number
- * of samples present in the buffer) around a target value. If this target
- * buffering is too low, then buffer underrun will occur frequently. If it is
- * too high, then latency will become unacceptable. This target value is
- * configured using the scrcpy option --audio-buffer.
- *
- * The regulator cannot adjust the sample input rate (it receives samples
- * produced in real-time) or the sample output rate (it must provide samples as
- * requested by the audio player). Therefore, it may only apply compensation by
- * resampling (converting _m_ input samples to _n_ output samples).
- *
- * The compensation itself is applied by libswresample (FFmpeg). It is
- * configured using swr_set_compensation(). An important work for the regulator
- * is to estimate the compensation value regularly and apply it.
- *
- * The estimated buffering level is the result of averaging the "natural"
- * buffering (samples are produced and consumed by blocks, so it must be
- * smoothed), and making instant adjustments resulting of its own actions
- * (explicit compensation and silence insertion on underflow), which are not
- * smoothed.
- *
- * Buffer underflow events can occur when packets arrive too late. In that case,
- * the regulator inserts silence. Once the packets finally arrive (late), one
- * strategy could be to drop the samples that were replaced by silence, in
- * order to keep a minimal latency. However, dropping samples in case of buffer
- * underflow is inadvisable, as it would temporarily increase the underflow
- * even more and cause very noticeable audio glitches.
- *
- * Therefore, the regulator doesn't drop any sample on underflow. The
- * compensation mechanism will absorb the delay introduced by the inserted
- * silence.
- */
-
-#define TO_BYTES(SAMPLES) sc_audiobuf_to_bytes(&ar->buf, (SAMPLES))
-#define TO_SAMPLES(BYTES) sc_audiobuf_to_samples(&ar->buf, (BYTES))
-
-void
-sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
-                        uint32_t out_samples) {
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] Audio regulator pulls %" PRIu32 " samples", out_samples);
-#endif
-
-    // A lock is necessary in the rare case where the producer needs to drop
-    // samples already pushed (when the buffer is full)
-    sc_mutex_lock(&ar->mutex);
-
-    bool played = atomic_load_explicit(&ar->played, memory_order_relaxed);
-    if (!played) {
-        uint32_t buffered_samples = sc_audiobuf_can_read(&ar->buf);
-        // Wait until the buffer is filled up to at least target_buffering
-        // before playing
-        if (buffered_samples < ar->target_buffering) {
-            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
-                 " samples", out_samples);
-            // Delay playback starting to reach the target buffering. Fill the
-            // whole buffer with silence (len is small compared to the
-            // arbitrary margin value).
-            memset(out, 0, out_samples * ar->sample_size);
-            sc_mutex_unlock(&ar->mutex);
-            return;
-        }
-    }
-
-    uint32_t read = sc_audiobuf_read(&ar->buf, out, out_samples);
-
-    sc_mutex_unlock(&ar->mutex);
-
-    if (read < out_samples) {
-        uint32_t silence = out_samples - read;
-        // Insert silence. In theory, the inserted silent samples replace the
-        // missing real samples, which will arrive later, so they should be
-        // dropped to keep the latency minimal. However, this would cause very
-        // audible glitches, so let the clock compensation restore the target
-        // latency.
-        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
-             silence);
-        memset(out + TO_BYTES(read), 0, TO_BYTES(silence));
-
-        bool received = atomic_load_explicit(&ar->received,
-                                             memory_order_relaxed);
-        if (received) {
-            // Inserting additional samples immediately increases buffering
-            atomic_fetch_add_explicit(&ar->underflow, silence,
-                                      memory_order_relaxed);
-        }
-    }
-
-    atomic_store_explicit(&ar->played, true, memory_order_relaxed);
-}
-
-static uint8_t *
-sc_audio_regulator_get_swr_buf(struct sc_audio_regulator *ar,
-                               uint32_t min_samples) {
-    size_t min_buf_size = TO_BYTES(min_samples);
-    if (min_buf_size > ar->swr_buf_alloc_size) {
-        size_t new_size = min_buf_size + 4096;
-        uint8_t *buf = realloc(ar->swr_buf, new_size);
-        if (!buf) {
-            LOG_OOM();
-            // Could not realloc to the requested size
-            return NULL;
-        }
-        ar->swr_buf = buf;
-        ar->swr_buf_alloc_size = new_size;
-    }
-
-    return ar->swr_buf;
-}
-
-bool
-sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
-    SwrContext *swr_ctx = ar->swr_ctx;
-
-    int64_t swr_delay = swr_get_delay(swr_ctx, ar->sample_rate);
-    // No need to av_rescale_rnd(), input and output sample rates are the same.
-    // Add more space (256) for clock compensation.
-    int dst_nb_samples = swr_delay + frame->nb_samples + 256;
-
-    uint8_t *swr_buf = sc_audio_regulator_get_swr_buf(ar, dst_nb_samples);
-    if (!swr_buf) {
-        return false;
-    }
-
-    int ret = swr_convert(swr_ctx, &swr_buf, dst_nb_samples,
-                          (const uint8_t **) frame->data, frame->nb_samples);
-    if (ret < 0) {
-        LOGE("Resampling failed: %d", ret);
-        return false;
-    }
-
-    // swr_convert() returns the number of samples which would have been
-    // written if the buffer was big enough.
-    uint32_t samples = MIN(ret, dst_nb_samples);
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
-#endif
-
-    uint32_t cap = sc_audiobuf_capacity(&ar->buf);
-    if (samples > cap) {
-        // Very very unlikely: a single resampled frame should never
-        // exceed the audio buffer size (or something is very wrong).
-        // Ignore the first bytes in swr_buf to avoid memory corruption anyway.
-        swr_buf += TO_BYTES(samples - cap);
-        samples = cap;
-    }
-
-    uint32_t skipped_samples = 0;
-
-    uint32_t written = sc_audiobuf_write(&ar->buf, swr_buf, samples);
-    if (written < samples) {
-        uint32_t remaining = samples - written;
-
-        // All samples that could be written without locking have been written,
-        // now we need to lock to drop/consume old samples
-        sc_mutex_lock(&ar->mutex);
-
-        // Retry with the lock
-        written += sc_audiobuf_write(&ar->buf,
-                                     swr_buf + TO_BYTES(written),
-                                     remaining);
-        if (written < samples) {
-            remaining = samples - written;
-            // Still insufficient, drop old samples to make space
-            skipped_samples = sc_audiobuf_read(&ar->buf, NULL, remaining);
-            assert(skipped_samples == remaining);
-        }
-
-        sc_mutex_unlock(&ar->mutex);
-
-        if (written < samples) {
-            // Now there is enough space
-            uint32_t w = sc_audiobuf_write(&ar->buf,
-                                           swr_buf + TO_BYTES(written),
-                                           remaining);
-            assert(w == remaining);
-            (void) w;
-        }
-    }
-
-    uint32_t underflow = 0;
-    uint32_t max_buffered_samples;
-    bool played = atomic_load_explicit(&ar->played, memory_order_relaxed);
-    if (played) {
-        underflow = atomic_exchange_explicit(&ar->underflow, 0,
-                                             memory_order_relaxed);
-
-        max_buffered_samples = ar->target_buffering * 11 / 10
-                             + 60 * ar->sample_rate / 1000 /* 60 ms */;
-    } else {
-        // Playback not started yet, do not accumulate more than
-        // max_initial_buffering samples, this would cause unnecessary delay
-        // (and glitches to compensate) on start.
-        max_buffered_samples = ar->target_buffering
-                             + 10 * ar->sample_rate / 1000 /* 10 ms */;
-    }
-
-    uint32_t can_read = sc_audiobuf_can_read(&ar->buf);
-    if (can_read > max_buffered_samples) {
-        uint32_t skip_samples = 0;
-
-        sc_mutex_lock(&ar->mutex);
-        can_read = sc_audiobuf_can_read(&ar->buf);
-        if (can_read > max_buffered_samples) {
-            skip_samples = can_read - max_buffered_samples;
-            uint32_t r = sc_audiobuf_read(&ar->buf, NULL, skip_samples);
-            assert(r == skip_samples);
-            (void) r;
-            skipped_samples += skip_samples;
-        }
-        sc_mutex_unlock(&ar->mutex);
-
-        if (skip_samples) {
-            if (played) {
-                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
-                     " samples", skip_samples);
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-            } else {
-                LOGD("[Audio] Playback not started, skipping %" PRIu32
-                     " samples", skip_samples);
-#endif
-            }
-        }
-    }
-
-    atomic_store_explicit(&ar->received, true, memory_order_relaxed);
-    if (!played) {
-        // Nothing more to do
-        return true;
-    }
-
-    // Number of samples added (or removed, if negative) for compensation
-    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
-    // Inserting silence instantly increases buffering
-    int32_t inserted_silence = (int32_t) underflow;
-    // Dropping input samples instantly decreases buffering
-    int32_t dropped = (int32_t) skipped_samples;
-
-    // The compensation must apply instantly, it must not be smoothed
-    ar->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
-    if (ar->avg_buffering.avg < 0) {
-        // Since dropping samples instantly reduces buffering, the difference
-        // is applied immediately to the average value, assuming that the delay
-        // between the producer and the consumer will be caught up.
-        //
-        // However, when this assumption is not valid, the average buffering
-        // may decrease indefinitely. Prevent it to become negative to limit
-        // the consequences.
-        ar->avg_buffering.avg = 0;
-    }
-
-    // However, the buffering level must be smoothed
-    sc_average_push(&ar->avg_buffering, can_read);
-
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
-         can_read, sc_average_get(&ar->avg_buffering));
-#endif
-
-    ar->samples_since_resync += written;
-    if (ar->samples_since_resync >= ar->sample_rate) {
-        // Recompute compensation every second
-        ar->samples_since_resync = 0;
-
-        float avg = sc_average_get(&ar->avg_buffering);
-        int diff = ar->target_buffering - avg;
-
-        // Enable compensation when the difference exceeds +/- 4ms.
-        // Disable compensation when the difference is lower than +/- 1ms.
-        int threshold = ar->compensation_active
-                      ? ar->sample_rate     / 1000  /* 1ms */
-                      : ar->sample_rate * 4 / 1000; /* 4ms */
-
-        if (abs(diff) < threshold) {
-            // Do not compensate for small values, the error is just noise
-            diff = 0;
-        } else if (diff < 0 && can_read < ar->target_buffering) {
-            // Do not accelerate if the instant buffering level is below the
-            // target, this would increase underflow
-            diff = 0;
-        }
-        // Compensate the diff over 4 seconds (but will be recomputed after 1
-        // second)
-        int distance = 4 * ar->sample_rate;
-        // Limit compensation rate to 2%
-        int abs_max_diff = distance / 50;
-        diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
-        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;
-        }
-    }
-
-    return true;
-}
-
-bool
-sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
-                        const AVCodecContext *ctx, uint32_t target_buffering) {
-    SwrContext *swr_ctx = swr_alloc();
-    if (!swr_ctx) {
-        LOG_OOM();
-        return false;
-    }
-    ar->swr_ctx = swr_ctx;
-
-#ifdef SCRCPY_LAVU_HAS_CHLAYOUT
-    av_opt_set_chlayout(swr_ctx, "in_chlayout", &ctx->ch_layout, 0);
-    av_opt_set_chlayout(swr_ctx, "out_chlayout", &ctx->ch_layout, 0);
-#else
-    av_opt_set_channel_layout(swr_ctx, "in_channel_layout",
-                              ctx->channel_layout, 0);
-    av_opt_set_channel_layout(swr_ctx, "out_channel_layout",
-                              ctx->channel_layout, 0);
-#endif
-
-    av_opt_set_int(swr_ctx, "in_sample_rate", ctx->sample_rate, 0);
-    av_opt_set_int(swr_ctx, "out_sample_rate", ctx->sample_rate, 0);
-
-    av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", ctx->sample_fmt, 0);
-    av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", SC_AV_SAMPLE_FMT, 0);
-
-    int ret = swr_init(swr_ctx);
-    if (ret) {
-        LOGE("Failed to initialize the resampling context");
-        goto error_free_swr_ctx;
-    }
-
-    bool ok = sc_mutex_init(&ar->mutex);
-    if (!ok) {
-        goto error_free_swr_ctx;
-    }
-
-    ar->target_buffering = target_buffering;
-    ar->sample_size = sample_size;
-    ar->sample_rate = ctx->sample_rate;
-
-    // Use a ring-buffer of the target buffering size plus 1 second between the
-    // producer and the consumer. It's too big on purpose, to guarantee that
-    // the producer and the consumer will be able to access it in parallel
-    // without locking.
-    uint32_t audiobuf_samples = target_buffering + ar->sample_rate;
-
-    ok = sc_audiobuf_init(&ar->buf, sample_size, audiobuf_samples);
-    if (!ok) {
-        goto error_destroy_mutex;
-    }
-
-    size_t initial_swr_buf_size = TO_BYTES(4096);
-    ar->swr_buf = malloc(initial_swr_buf_size);
-    if (!ar->swr_buf) {
-        LOG_OOM();
-        goto error_destroy_audiobuf;
-    }
-    ar->swr_buf_alloc_size = initial_swr_buf_size;
-
-    // Samples are produced and consumed by blocks, so the buffering must be
-    // smoothed to get a relatively stable value.
-    sc_average_init(&ar->avg_buffering, 128);
-    ar->samples_since_resync = 0;
-
-    ar->received = false;
-    atomic_init(&ar->played, false);
-    atomic_init(&ar->received, false);
-    atomic_init(&ar->underflow, 0);
-    ar->compensation_active = false;
-
-    return true;
-
-error_destroy_audiobuf:
-    sc_audiobuf_destroy(&ar->buf);
-error_destroy_mutex:
-    sc_mutex_destroy(&ar->mutex);
-error_free_swr_ctx:
-    swr_free(&ar->swr_ctx);
-
-    return false;
-}
-
-void
-sc_audio_regulator_destroy(struct sc_audio_regulator *ar) {
-    free(ar->swr_buf);
-    sc_audiobuf_destroy(&ar->buf);
-    sc_mutex_destroy(&ar->mutex);
-    swr_free(&ar->swr_ctx);
-}

app/src/audio_regulator.h

@@ -1,71 +0,0 @@
-#ifndef SC_AUDIO_REGULATOR_H
-#define SC_AUDIO_REGULATOR_H
-
-#include "common.h"
-
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <libavcodec/avcodec.h>
-#include <libswresample/swresample.h>
-#include "util/audiobuf.h"
-#include "util/average.h"
-#include "util/thread.h"
-
-#define SC_AV_SAMPLE_FMT AV_SAMPLE_FMT_FLT
-
-struct sc_audio_regulator {
-    sc_mutex mutex;
-
-    // Target buffering between the producer and the consumer (in samples)
-    uint32_t target_buffering;
-
-    // Audio buffer to communicate between the receiver and the player
-    struct sc_audiobuf buf;
-
-    // Resampler (only used from the receiver thread)
-    struct SwrContext *swr_ctx;
-
-    // The sample rate is the same for input and output
-    uint32_t sample_rate;
-    // The number of bytes per sample (for all channels)
-    size_t sample_size;
-
-    // Target buffer for resampling (only used by the receiver thread)
-    uint8_t *swr_buf;
-    size_t swr_buf_alloc_size;
-
-    // Number of buffered samples (may be negative on underflow) (only used by
-    // the receiver thread)
-    struct sc_average avg_buffering;
-    // Count the number of samples to trigger a compensation update regularly
-    // (only used by the receiver thread)
-    uint32_t samples_since_resync;
-
-    // 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;
-
-    // Set to true the first time a sample is received
-    atomic_bool received;
-
-    // Set to true the first time samples are pulled by the player
-    atomic_bool played;
-};
-
-bool
-sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
-                        const AVCodecContext *ctx, uint32_t target_buffering);
-
-void
-sc_audio_regulator_destroy(struct sc_audio_regulator *ar);
-
-bool
-sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame);
-
-void
-sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
-                        uint32_t samples);
-
-#endif

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,
@@ -103,10 +102,6 @@ enum {
     OPT_NO_MOUSE_HOVER,
     OPT_AUDIO_DUP,
     OPT_GAMEPAD,
-    OPT_NEW_DISPLAY,
-    OPT_LIST_APPS,
-    OPT_START_APP,
-    OPT_SCREEN_OFF_TIMEOUT,
 };
 
 struct sc_option {
@@ -323,10 +318,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,
@@ -387,10 +384,10 @@ static const struct sc_option options[] = {
         .text = "Select how to send gamepad inputs to the device.\n"
                 "Possible values are \"disabled\", \"uhid\" and \"aoa\".\n"
                 "\"disabled\" does not send gamepad inputs to the device.\n"
-                "\"uhid\" simulates physical HID gamepads using the Linux UHID "
-                "kernel module on the device.\n"
-                "\"aoa\" simulates physical gamepads using the AOAv2 protocol."
-                "It may only work over USB.\n"
+                "\"uhid\" simulates a physical HID gamepad using the Linux "
+                "UHID kernel module on the device.\n"
+                "\"aoa\" simulates a physical gamepad using the AOAv2 "
+                "protocol. It may only work over USB.\n"
                 "Also see --keyboard and --mouse.",
     },
     {
@@ -445,11 +442,6 @@ static const struct sc_option options[] = {
                 "This is a workaround for some devices not behaving as "
                 "expected when setting the device clipboard programmatically.",
     },
-    {
-        .longopt_id = OPT_LIST_APPS,
-        .longopt = "list-apps",
-        .text = "List Android apps installed on the device.",
-    },
     {
         .longopt_id = OPT_LIST_CAMERAS,
         .longopt = "list-cameras",
@@ -565,21 +557,6 @@ static const struct sc_option options[] = {
         .text = "Disable video and audio playback on the computer (equivalent "
                 "to --no-video-playback --no-audio-playback).",
     },
-    {
-        .longopt_id = OPT_NEW_DISPLAY,
-        .longopt = "new-display",
-        .argdesc = "[<width>x<height>][/<dpi>]",
-        .optional_arg = true,
-        .text = "Create a new display with the specified resolution and "
-                "density. If not provided, they default to the main display "
-                "dimensions and DPI, and --max-size is considered.\n"
-                "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",
-    },
     {
         .longopt_id = OPT_NO_AUDIO,
         .longopt = "no-audio",
@@ -794,13 +771,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",
@@ -814,20 +784,6 @@ static const struct sc_option options[] = {
                 "shortcuts, pass \"lctrl,lsuper\".\n"
                 "Default is \"lalt,lsuper\" (left-Alt or left-Super).",
     },
-    {
-        .longopt_id = OPT_START_APP,
-        .longopt = "start-app",
-        .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"
-                "    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"
-                "Both prefixes can be used, in that order:\n"
-                "    scrcpy --start-app=+?firefox",
-    },
     {
         .shortopt = 't',
         .longopt = "show-touches",
@@ -905,20 +861,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 +977,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)",
@@ -1129,11 +1072,7 @@ static const struct sc_shortcut shortcuts[] = {
     },
     {
         .shortcuts = { "Shift+click-and-move" },
-        .text = "Tilt vertically (slide with 2 fingers)",
-    },
-    {
-        .shortcuts = { "Ctrl+Shift+click-and-move" },
-        .text = "Tilt horizontally (slide with 2 fingers)",
+        .text = "Tilt (slide vertically with two fingers)",
     },
     {
         .shortcuts = { "Drag & drop APK file" },
@@ -1552,6 +1491,18 @@ parse_max_size(const char *s, uint16_t *max_size) {
     return true;
 }
 
+static bool
+parse_max_fps(const char *s, uint16_t *max_fps) {
+    long value;
+    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "max fps");
+    if (!ok) {
+        return false;
+    }
+
+    *max_fps = (uint16_t) value;
+    return true;
+}
+
 static bool
 parse_buffering_time(const char *s, sc_tick *tick) {
     long value;
@@ -2163,20 +2114,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")) {
@@ -2339,7 +2276,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                      "--keyboard=uhid instead.");
                 return false;
             case OPT_MAX_FPS:
-                opts->max_fps = optarg;
+                if (!parse_max_fps(optarg, &opts->max_fps)) {
+                    return false;
+                }
                 break;
             case 'm':
                 if (!parse_max_size(optarg, &opts->max_size)) {
@@ -2583,11 +2522,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;
@@ -2670,9 +2605,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             case OPT_LIST_CAMERA_SIZES:
                 opts->list |= SC_OPTION_LIST_CAMERA_SIZES;
                 break;
-            case OPT_LIST_APPS:
-                opts->list |= SC_OPTION_LIST_APPS;
-                break;
             case OPT_REQUIRE_AUDIO:
                 opts->require_audio = true;
                 break;
@@ -2746,18 +2678,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                     return false;
                 }
                 break;
-            case OPT_NEW_DISPLAY:
-                opts->new_display = optarg ? optarg : "";
-                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 +2776,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 +2786,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,20 +2805,27 @@ 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;
             }
         } else if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_UHID_OR_AOA) {
             opts->mouse_input_mode = otg ? SC_MOUSE_INPUT_MODE_AOA
-                                         : SC_MOUSE_INPUT_MODE_UHID;
+                                         : SC_MOUSE_INPUT_MODE_SDK;
         } else if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK
                     && !opts->video_playback) {
             LOGE("SDK mouse mode requires video playback. Try --mouse=uhid.");
             return false;
         }
-        if (opts->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_UHID_OR_AOA) {
+
+        if (opts->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_AUTO) {
+            // UHID does not work on all devices (with old Android
+            // versions), so it cannot be enabled by default
+            opts->gamepad_input_mode = otg ? SC_GAMEPAD_INPUT_MODE_AOA
+                                           : SC_GAMEPAD_INPUT_MODE_DISABLED;
+        } else if (opts->gamepad_input_mode
+                == SC_GAMEPAD_INPUT_MODE_UHID_OR_AOA) {
             opts->gamepad_input_mode = otg ? SC_GAMEPAD_INPUT_MODE_AOA
                                            : SC_GAMEPAD_INPUT_MODE_UHID;
         }
@@ -2939,25 +2865,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");
@@ -2978,17 +2885,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             return false;
         }
 
-        enum sc_gamepad_input_mode gmode = opts->gamepad_input_mode;
-        if (gmode != SC_GAMEPAD_INPUT_MODE_AOA
-                && gmode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
-            LOGE("In OTG mode, --gamepad only supports aoa or disabled.");
-            return false;
-        }
-
         if (kmode == SC_KEYBOARD_INPUT_MODE_DISABLED
-                && mmode == SC_MOUSE_INPUT_MODE_DISABLED
-                && gmode == SC_GAMEPAD_INPUT_MODE_DISABLED) {
-            LOGE("Cannot not disable all inputs in OTG mode.");
+                && mmode == SC_MOUSE_INPUT_MODE_DISABLED) {
+            LOGE("Could not disable both keyboard and mouse in OTG mode.");
             return false;
         }
     }
@@ -3029,18 +2928,18 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         }
 
         if (opts->camera_id && opts->camera_facing != SC_CAMERA_FACING_ANY) {
-            LOGE("Cannot specify both --camera-id and --camera-facing");
+            LOGE("Could not specify both --camera-id and --camera-facing");
             return false;
         }
 
         if (opts->camera_size) {
             if (opts->max_size) {
-                LOGE("Cannot specify both --camera-size and -m/--max-size");
+                LOGE("Could not specify both --camera-size and -m/--max-size");
                 return false;
             }
 
             if (opts->camera_ar) {
-                LOGE("Cannot specify both --camera-size and --camera-ar");
+                LOGE("Could not specify both --camera-size and --camera-ar");
                 return false;
             }
         }
@@ -3064,11 +2963,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         return false;
     }
 
-    if (opts->display_id != 0 && opts->new_display) {
-        LOGE("Cannot specify both --display-id and --new-display");
-        return false;
-    }
-
     if (opts->audio && opts->audio_source == SC_AUDIO_SOURCE_AUTO) {
         // Select the audio source according to the video source
         if (opts->video_source == SC_VIDEO_SOURCE_DISPLAY) {
@@ -3186,23 +3080,19 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
 
     if (!opts->control) {
         if (opts->turn_screen_off) {
-            LOGE("Cannot request to turn screen off if control is disabled");
+            LOGE("Could not request to turn screen off if control is disabled");
             return false;
         }
         if (opts->stay_awake) {
-            LOGE("Cannot request to stay awake if control is disabled");
+            LOGE("Could not request to stay awake if control is disabled");
             return false;
         }
         if (opts->show_touches) {
-            LOGE("Cannot request to show touches if control is disabled");
+            LOGE("Could not request to show touches if control is disabled");
             return false;
         }
         if (opts->power_off_on_close) {
-            LOGE("Cannot request power off on close if control is disabled");
-            return false;
-        }
-        if (opts->start_app) {
-            LOGE("Cannot start an Android app if control is disabled");
+            LOGE("Could not request power off on close if control is disabled");
             return false;
         }
     }
@@ -3227,7 +3117,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         // OTG mode is compatible with only very few options.
         // Only report obvious errors.
         if (opts->record_filename) {
-            LOGE("OTG mode: cannot record");
+            LOGE("OTG mode: could not record");
             return false;
         }
         if (opts->turn_screen_off) {

app/src/clock.c

@@ -4,7 +4,7 @@
 
 #include "util/log.h"
 
-//#define SC_CLOCK_DEBUG // uncomment to debug
+#define SC_CLOCK_NDEBUG // comment to debug
 
 #define SC_CLOCK_RANGE 32
 
@@ -21,12 +21,10 @@ sc_clock_update(struct sc_clock *clock, sc_tick system, sc_tick stream) {
     }
 
     sc_tick offset = system - stream;
-    unsigned clock_weight = clock->range - 1;
-    unsigned value_weight = SC_CLOCK_RANGE - clock->range + 1;
-    clock->offset = (clock->offset * clock_weight + offset * value_weight)
-                  / SC_CLOCK_RANGE;
+    clock->offset = ((clock->range - 1) * clock->offset + offset)
+                  / clock->range;
 
-#ifdef SC_CLOCK_DEBUG
+#ifndef SC_CLOCK_NDEBUG
     LOGD("Clock estimation: pts + %" PRItick, clock->offset);
 #endif
 }

app/src/compat.h

@@ -8,7 +8,7 @@
 #include <libavutil/version.h>
 #include <SDL2/SDL_version.h>
 
-#ifndef _WIN32
+#ifndef __WIN32
 # define PRIu64_ PRIu64
 # define SC_PRIsizet "zu"
 #else

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",
@@ -72,34 +83,15 @@ write_position(uint8_t *buf, const struct sc_position *position) {
     sc_write16be(&buf[10], position->screen_size.height);
 }
 
-// Write truncated string, and return the size
+// write length (4 bytes) + string (non null-terminated)
 static size_t
-write_string_payload(uint8_t *payload, const char *utf8, size_t max_len) {
-    if (!utf8) {
-        return 0;
-    }
+write_string(const char *utf8, size_t max_len, uint8_t *buf) {
     size_t len = sc_str_utf8_truncation_index(utf8, max_len);
-    memcpy(payload, utf8, len);
-    return len;
-}
-
-// Write length (4 bytes) + string (non null-terminated)
-static size_t
-write_string(uint8_t *buf, const char *utf8, size_t max_len) {
-    size_t len = write_string_payload(buf + 4, utf8, max_len);
     sc_write32be(buf, len);
+    memcpy(&buf[4], utf8, len);
     return 4 + len;
 }
 
-// Write length (1 byte) + string (non null-terminated)
-static size_t
-write_string_tiny(uint8_t *buf, const char *utf8, size_t max_len) {
-    assert(max_len <= 0xFF);
-    size_t len = write_string_payload(buf + 1, utf8, max_len);
-    buf[0] = len;
-    return 1 + len;
-}
-
 size_t
 sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
     buf[0] = msg->type;
@@ -111,8 +103,9 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
             sc_write32be(&buf[10], msg->inject_keycode.metastate);
             return 14;
         case SC_CONTROL_MSG_TYPE_INJECT_TEXT: {
-            size_t len = write_string(&buf[1], msg->inject_text.text,
-                                      SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
+            size_t len =
+                write_string(msg->inject_text.text,
+                             SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH, &buf[1]);
             return 1 + len;
         }
         case SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT:
@@ -144,26 +137,19 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
         case SC_CONTROL_MSG_TYPE_SET_CLIPBOARD:
             sc_write64be(&buf[1], msg->set_clipboard.sequence);
             buf[9] = !!msg->set_clipboard.paste;
-            size_t len = write_string(&buf[10], msg->set_clipboard.text,
-                                      SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH);
+            size_t len = write_string(msg->set_clipboard.text,
+                                      SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH,
+                                      &buf[10]);
             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);
-
-            size_t index = 3;
-            index += write_string_tiny(&buf[index], msg->uhid_create.name, 127);
-
-            sc_write16be(&buf[index], msg->uhid_create.report_desc_size);
-            index += 2;
-
-            memcpy(&buf[index], msg->uhid_create.report_desc,
-                                msg->uhid_create.report_desc_size);
-            index += msg->uhid_create.report_desc_size;
-
-            return index;
+            sc_write16be(&buf[3], msg->uhid_create.report_desc_size);
+            memcpy(&buf[5], msg->uhid_create.report_desc,
+                            msg->uhid_create.report_desc_size);
+            return 5 + msg->uhid_create.report_desc_size;
         case SC_CONTROL_MSG_TYPE_UHID_INPUT:
             sc_write16be(&buf[1], msg->uhid_input.id);
             sc_write16be(&buf[3], msg->uhid_input.size);
@@ -172,16 +158,11 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
         case SC_CONTROL_MSG_TYPE_UHID_DESTROY:
             sc_write16be(&buf[1], msg->uhid_destroy.id);
             return 3;
-        case SC_CONTROL_MSG_TYPE_START_APP: {
-            size_t len = write_string_tiny(&buf[1], msg->start_app.name, 255);
-            return 1 + len;
-        }
         case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
         case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
         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 +239,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");
@@ -274,15 +255,10 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
         case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
             LOG_CMSG("rotate device");
             break;
-        case SC_CONTROL_MSG_TYPE_UHID_CREATE: {
-            // Quote only if name is not null
-            const char *name = msg->uhid_create.name;
-            const char *quote = name ? "\"" : "";
-            LOG_CMSG("UHID create [%" PRIu16 "] name=%s%s%s "
-                     "report_desc_size=%" PRIu16, msg->uhid_create.id,
-                     quote, name, quote, msg->uhid_create.report_desc_size);
+        case SC_CONTROL_MSG_TYPE_UHID_CREATE:
+            LOG_CMSG("UHID create [%" PRIu16 "] report_desc_size=%" PRIu16,
+                     msg->uhid_create.id, msg->uhid_create.report_desc_size);
             break;
-        }
         case SC_CONTROL_MSG_TYPE_UHID_INPUT: {
             char *hex = sc_str_to_hex_string(msg->uhid_input.data,
                                              msg->uhid_input.size);
@@ -302,12 +278,6 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
         case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
             LOG_CMSG("open hard keyboard settings");
             break;
-        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;
@@ -333,9 +303,6 @@ sc_control_msg_destroy(struct sc_control_msg *msg) {
         case SC_CONTROL_MSG_TYPE_SET_CLIPBOARD:
             free(msg->set_clipboard.text);
             break;
-        case SC_CONTROL_MSG_TYPE_START_APP:
-            free(msg->start_app.name);
-            break;
         default:
             // do nothing
             break;

app/src/control_msg.h

@@ -35,14 +35,18 @@ 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,11 +94,10 @@ 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
             uint16_t report_desc_size;
             const uint8_t *report_desc; // pointer to static data
         } uhid_create;
@@ -106,9 +109,6 @@ struct sc_control_msg {
         struct {
             uint16_t id;
         } uhid_destroy;
-        struct {
-            char *name;
-        } start_app;
     };
 };
 

app/src/controller.c

@@ -116,7 +116,7 @@ sc_controller_push_msg(struct sc_controller *controller,
             LOG_OOM();
         }
     }
-    // Otherwise, the msg is discarded
+    // Otherwise (if the queue is full), the msg is discarded
 
     sc_mutex_unlock(&controller->mutex);
 

app/src/delay_buffer.c

@@ -8,6 +8,8 @@
 
 #include "util/log.h"
 
+#define SC_BUFFERING_NDEBUG // comment to debug
+
 /** Downcast frame_sink to sc_delay_buffer */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_delay_buffer, frame_sink)
 
@@ -78,7 +80,7 @@ run_buffering(void *data) {
             goto stopped;
         }
 
-#ifdef SC_BUFFERING_DEBUG
+#ifndef SC_BUFFERING_NDEBUG
         LOGD("Buffering: %" PRItick ";%" PRItick ";%" PRItick,
              pts, dframe.push_date, sc_tick_now());
 #endif
@@ -132,7 +134,6 @@ sc_delay_buffer_frame_sink_open(struct sc_frame_sink *sink,
 
     sc_clock_init(&db->clock);
     sc_vecdeque_init(&db->queue);
-    db->stopped = false;
 
     if (!sc_frame_source_sinks_open(&db->frame_source, ctx)) {
         goto error_destroy_wait_cond;
@@ -205,7 +206,7 @@ sc_delay_buffer_frame_sink_push(struct sc_frame_sink *sink,
         return false;
     }
 
-#ifdef SC_BUFFERING_DEBUG
+#ifndef SC_BUFFERING_NDEBUG
     dframe.push_date = sc_tick_now();
 #endif
 

app/src/delay_buffer.h

@@ -12,14 +12,12 @@
 #include "util/tick.h"
 #include "util/vecdeque.h"
 
-//#define SC_BUFFERING_DEBUG // uncomment to debug
-
 // forward declarations
 typedef struct AVFrame AVFrame;
 
 struct sc_delayed_frame {
     AVFrame *frame;
-#ifdef SC_BUFFERING_DEBUG
+#ifndef NDEBUG
     sc_tick push_date;
 #endif
 };

app/src/events.c

@@ -38,7 +38,7 @@ sc_post_to_main_thread(sc_runnable_fn run, void *userdata) {
             LOGD("Could not post runnable to main thread (filtered)");
         } else {
             assert(ret < 0);
-            LOGW("Could not post runnable to main thread: %s", SDL_GetError());
+            LOGW("Coud not post to main thread: %s", SDL_GetError());
         }
         return false;
     }

app/src/events.h

@@ -5,7 +5,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL2/SDL_events.h>
+#include <SDL_events.h>
 
 enum {
     SC_EVENT_NEW_FRAME = SDL_USEREVENT,

app/src/hid/hid_event.h

@@ -15,7 +15,6 @@ struct sc_hid_input {
 
 struct sc_hid_open {
     uint16_t hid_id;
-    const char *name; // pointer to static memory
     const uint8_t *report_desc; // pointer to static memory
     size_t report_desc_size;
 };

app/src/hid/hid_gamepad.c

@@ -6,17 +6,17 @@
 #include "util/binary.h"
 #include "util/log.h"
 
-// 2x2 bytes for left stick (X, Y)
-// 2x2 bytes for right stick (Z, Rz)
-// 2x2 bytes for L2/R2 triggers
+// 2 bytes for left stick (X, Y)
+// 2 bytes for right stick (Z, Rz)
+// 2 bytes for L2/R2 triggers
 // 2 bytes for buttons + padding,
 // 1 byte for hat switch (dpad) + padding
 #define SC_HID_GAMEPAD_EVENT_SIZE 15
 
 // The ->buttons field stores the state for all buttons, but only some of them
-// (the 16 LSB) must be transmitted "as is". The DPAD (hat switch) buttons are
-// stored locally in the MSB of this field, but not transmitted as is: they are
-// transformed to generate another specific byte.
+// (the 16 LSB) must be transmitted "as is". The DPAD (hat switch) are stored
+// locally in the MSB, but not transmitted as is: they are transformed to
+// generate another specific byte.
 #define SC_HID_BUTTONS_MASK 0xFFFF
 
 // outside SC_HID_BUTTONS_MASK
@@ -26,7 +26,7 @@
 #define SC_GAMEPAD_BUTTONS_BIT_DPAD_RIGHT UINT32_C(0x80000)
 
 /**
- * Gamepad descriptor manually crafted to transmit the input reports.
+ * Gamepad descriptor manually crafted to transmit the events.
  *
  * The HID specification is available here:
  * <https://www.usb.org/document-library/device-class-definition-hid-111>
@@ -117,6 +117,7 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
     // Input (Data, Variable, Null State): 4-bit value
     0x81, 0x42,
 
+
     // End Collection
     0xC0,
 
@@ -125,7 +126,7 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
 };
 
 /**
- * A gamepad HID input report is 15 bytes long:
+ * A gamepad HID event is 15 bytes long:
  *  - bytes 0-3:   left stick state
  *  - bytes 4-7:   right stick state
  *  - bytes 8-11:  L2/R2 triggers state
@@ -134,28 +135,28 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
  *
  *                  +---------------+
  *         byte 0:  |. . . . . . . .|
- *                  |               | left stick x (0-65535, little-endian)
+ *                  |               | left stick x state (0-65535)
  *         byte 1:  |. . . . . . . .|
  *                  +---------------+
  *         byte 2:  |. . . . . . . .|
- *                  |               | left stick y (0-65535, little-endian)
+ *                  |               | left stick y state (0-65535)
  *         byte 3:  |. . . . . . . .|
  *                  +---------------+
  *         byte 4:  |. . . . . . . .|
- *                  |               | right stick x (0-65535, little-endian)
+ *                  |               | right stick x state (0-65535)
  *         byte 5:  |. . . . . . . .|
  *                  +---------------+
  *         byte 6:  |. . . . . . . .|
- *                  |               | right stick y (0-65535, little-endian)
+ *                  |               | right stick y state (0-65535)
  *         byte 7:  |. . . . . . . .|
  *                  +---------------+
  *         byte 8:  |. . . . . . . .|
- *                  |               | L2 trigger (0-32767, little-endian)
- *         byte 9:  |0 . . . . . . .|
+ *                  |               | L2 trigger state (0-65535)
+ *         byte 9:  |. . . . . . . .|
  *                  +---------------+
  *        byte 10:  |. . . . . . . .|
- *                  |               | R2 trigger (0-32767, little-endian)
- *        byte 11:  |0 . . . . . . .|
+ *                  |               | R2 trigger state (0-65535)
+ *        byte 11:  |. . . . . . . .|
  *                  +---------------+
  *
  *                   ,--------------- SC_GAMEPAD_BUTTON_RIGHT_SHOULDER
@@ -243,14 +244,8 @@ sc_hid_gamepad_generate_open(struct sc_hid_gamepad *hid,
 
     sc_hid_gamepad_slot_init(&hid->slots[slot_idx], gamepad_id);
 
-    SDL_GameController* game_controller =
-        SDL_GameControllerFromInstanceID(gamepad_id);
-    assert(game_controller);
-    const char *name = SDL_GameControllerName(game_controller);
-
     uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
     hid_open->hid_id = hid_id;
-    hid_open->name = name;
     hid_open->report_desc = SC_HID_GAMEPAD_REPORT_DESC;
     hid_open->report_desc_size = sizeof(SC_HID_GAMEPAD_REPORT_DESC);
 

app/src/hid/hid_gamepad.h

@@ -9,7 +9,7 @@
 #include "input_events.h"
 
 #define SC_MAX_GAMEPADS 8
-#define SC_HID_ID_GAMEPAD_FIRST 3
+#define SC_HID_ID_GAMEPAD_FIRST 2
 #define SC_HID_ID_GAMEPAD_LAST (SC_HID_ID_GAMEPAD_FIRST + SC_MAX_GAMEPADS - 1)
 
 struct sc_hid_gamepad_slot {

app/src/hid/hid_keyboard.c

@@ -125,7 +125,7 @@ static const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
 };
 
 /**
- * A keyboard HID input report is 8 bytes long:
+ * A keyboard HID event is 8 bytes long:
  *
  *  - byte 0: modifiers (1 flag per modifier key, 8 possible modifier keys)
  *  - byte 1: reserved (always 0)
@@ -335,7 +335,6 @@ sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,
 
 void sc_hid_keyboard_generate_open(struct sc_hid_open *hid_open) {
     hid_open->hid_id = SC_HID_ID_KEYBOARD;
-    hid_open->name = NULL; // No name specified after "scrcpy"
     hid_open->report_desc = SC_HID_KEYBOARD_REPORT_DESC;
     hid_open->report_desc_size = sizeof(SC_HID_KEYBOARD_REPORT_DESC);
 }

app/src/hid/hid_mouse.c

@@ -14,7 +14,7 @@
  * <https://www.usb.org/document-library/hid-usage-tables-15>
  * §4 Generic Desktop Page (0x01) (p32)
  */
-static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
+const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
     // Usage Page (Generic Desktop)
     0x05, 0x01,
     // Usage (Mouse)
@@ -81,7 +81,7 @@ static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
 };
 
 /**
- * A mouse HID input report is 4 bytes long:
+ * A mouse HID event is 4 bytes long:
  *
  *  - byte 0: buttons state
  *  - byte 1: relative x motion (signed byte from -127 to 127)
@@ -190,7 +190,6 @@ sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,
 
 void sc_hid_mouse_generate_open(struct sc_hid_open *hid_open) {
     hid_open->hid_id = SC_HID_ID_MOUSE;
-    hid_open->name = NULL; // No name specified after "scrcpy"
     hid_open->report_desc = SC_HID_MOUSE_REPORT_DESC;
     hid_open->report_desc_size = sizeof(SC_HID_MOUSE_REPORT_DESC);
 }

app/src/input_events.h

@@ -516,7 +516,7 @@ sc_gamepad_device_event_type_from_sdl_type(uint32_t type) {
 static inline enum sc_gamepad_axis
 sc_gamepad_axis_from_sdl(uint8_t axis) {
     if (axis <= SDL_CONTROLLER_AXIS_TRIGGERRIGHT) {
-        // SC_GAMEPAD_AXIS_* constants are initialized from
+        // SDL_GAMEPAD_AXIS_* constants are initialized from
         // SDL_CONTROLLER_AXIS_*
         return axis;
     }

app/src/input_manager.c

@@ -5,9 +5,53 @@
 
 #include "input_events.h"
 #include "screen.h"
-#include "shortcut_mod.h"
 #include "util/log.h"
 
+#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
+
+static inline uint16_t
+to_sdl_mod(uint8_t shortcut_mod) {
+    uint16_t sdl_mod = 0;
+    if (shortcut_mod & SC_SHORTCUT_MOD_LCTRL) {
+        sdl_mod |= KMOD_LCTRL;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RCTRL) {
+        sdl_mod |= KMOD_RCTRL;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_LALT) {
+        sdl_mod |= KMOD_LALT;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RALT) {
+        sdl_mod |= KMOD_RALT;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_LSUPER) {
+        sdl_mod |= KMOD_LGUI;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RSUPER) {
+        sdl_mod |= KMOD_RGUI;
+    }
+    return sdl_mod;
+}
+
+static bool
+is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
+    // keep only the relevant modifier keys
+    sdl_mod &= SC_SDL_SHORTCUT_MODS_MASK;
+
+    // at least one shortcut mod pressed?
+    return sdl_mod & im->sdl_shortcut_mods;
+}
+
+static bool
+is_shortcut_key(struct sc_input_manager *im, SDL_Keycode keycode) {
+    return (im->sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
+        || (im->sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
+        || (im->sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
+        || (im->sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
+        || (im->sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
+        || (im->sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
+}
+
 void
 sc_input_manager_init(struct sc_input_manager *im,
                       const struct sc_input_manager_params *params) {
@@ -29,7 +73,7 @@ sc_input_manager_init(struct sc_input_manager *im,
     im->legacy_paste = params->legacy_paste;
     im->clipboard_autosync = params->clipboard_autosync;
 
-    im->sdl_shortcut_mods = sc_shortcut_mods_to_sdl(params->shortcut_mods);
+    im->sdl_shortcut_mods = to_sdl_mod(params->shortcut_mods);
 
     im->vfinger_down = false;
     im->vfinger_invert_x = false;
@@ -203,12 +247,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 +329,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) {
@@ -313,8 +346,7 @@ sc_input_manager_process_text_input(struct sc_input_manager *im,
         return;
     }
 
-    if (sc_shortcut_mods_is_shortcut_mod(im->sdl_shortcut_mods,
-                                         SDL_GetModState())) {
+    if (is_shortcut_mod(im, SDL_GetModState())) {
         // A shortcut must never generate text events
         return;
     }
@@ -370,7 +402,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
     bool paused = im->screen->paused;
     bool video = im->screen->video;
 
-    SDL_Keycode sdl_keycode = event->keysym.sym;
+    SDL_Keycode keycode = event->keysym.sym;
     uint16_t mod = event->keysym.mod;
     bool down = event->type == SDL_KEYDOWN;
     bool ctrl = event->keysym.mod & KMOD_CTRL;
@@ -381,23 +413,22 @@ sc_input_manager_process_key(struct sc_input_manager *im,
     // press/release is a modifier key.
     // The second condition is necessary to ignore the release of the modifier
     // key (because in this case mod is 0).
-    uint16_t mods = im->sdl_shortcut_mods;
-    bool is_shortcut = sc_shortcut_mods_is_shortcut_mod(mods, mod)
-                    || sc_shortcut_mods_is_shortcut_key(mods, sdl_keycode);
+    bool is_shortcut = is_shortcut_mod(im, mod)
+                    || is_shortcut_key(im, keycode);
 
     if (down && !repeat) {
-        if (sdl_keycode == im->last_keycode && mod == im->last_mod) {
+        if (keycode == im->last_keycode && mod == im->last_mod) {
             ++im->key_repeat;
         } else {
             im->key_repeat = 0;
-            im->last_keycode = sdl_keycode;
+            im->last_keycode = keycode;
             im->last_mod = mod;
         }
     }
 
     if (is_shortcut) {
         enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
-        switch (sdl_keycode) {
+        switch (keycode) {
             case SDLK_h:
                 if (im->kp && !shift && !repeat && !paused) {
                     action_home(im, action);
@@ -426,8 +457,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:
@@ -503,7 +536,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                 return;
             case SDLK_f:
                 if (video && !shift && !repeat && down) {
-                    sc_screen_toggle_fullscreen(im->screen);
+                    sc_screen_switch_fullscreen(im->screen);
                 }
                 return;
             case SDLK_w:
@@ -533,12 +566,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:
@@ -558,7 +587,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
     }
 
     uint64_t ack_to_wait = SC_SEQUENCE_INVALID;
-    bool is_ctrl_v = ctrl && !shift && sdl_keycode == SDLK_v && down && !repeat;
+    bool is_ctrl_v = ctrl && !shift && keycode == SDLK_v && down && !repeat;
     if (im->clipboard_autosync && is_ctrl_v) {
         if (im->legacy_paste) {
             // inject the text as input events
@@ -586,20 +615,10 @@ sc_input_manager_process_key(struct sc_input_manager *im,
         }
     }
 
-    enum sc_keycode keycode = sc_keycode_from_sdl(sdl_keycode);
-    if (keycode == SC_KEYCODE_UNKNOWN) {
-        return;
-    }
-
-    enum sc_scancode scancode = sc_scancode_from_sdl(event->keysym.scancode);
-    if (scancode == SC_SCANCODE_UNKNOWN) {
-        return;
-    }
-
     struct sc_key_event evt = {
         .action = sc_action_from_sdl_keyboard_type(event->type),
-        .keycode = keycode,
-        .scancode = scancode,
+        .keycode = sc_keycode_from_sdl(event->keysym.sym),
+        .scancode = sc_scancode_from_sdl(event->keysym.scancode),
         .repeat = event->repeat,
         .mods_state = sc_mods_state_from_sdl(event->keysym.mod),
     };
@@ -722,10 +741,6 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
     bool down = event->type == SDL_MOUSEBUTTONDOWN;
 
     enum sc_mouse_button button = sc_mouse_button_from_sdl(event->button);
-    if (button == SC_MOUSE_BUTTON_UNKNOWN) {
-        return;
-    }
-
     if (!down) {
         // Mark the button as released
         im->mouse_buttons_state &= ~button;
@@ -807,14 +822,14 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
     }
 
     bool change_vfinger = event->button == SDL_BUTTON_LEFT &&
-            ((down && !im->vfinger_down && (ctrl_pressed || shift_pressed)) ||
+            ((down && !im->vfinger_down && (ctrl_pressed ^ shift_pressed)) ||
              (!down && im->vfinger_down));
     bool use_finger = im->vfinger_down || change_vfinger;
 
     struct sc_mouse_click_event evt = {
         .position = sc_input_manager_get_position(im, event->x, event->y),
         .action = sc_action_from_sdl_mousebutton_type(event->type),
-        .button = button,
+        .button = sc_mouse_button_from_sdl(event->button),
         .pointer_id = use_finger ? SC_POINTER_ID_GENERIC_FINGER
                                  : SC_POINTER_ID_MOUSE,
         .buttons_state = im->mouse_buttons_state,
@@ -839,28 +854,16 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
     // In other words, the center of the rotation/scaling is the center of the
     // screen.
     //
-    // To simulate a vertical tilt gesture (a vertical slide with two fingers),
-    // Shift can be used instead of Ctrl. The "virtual finger" has a position
+    // To simulate a tilt gesture (a vertical slide with two fingers), Shift
+    // can be used instead of Ctrl. The "virtual finger" has a position
     // inverted with respect to the vertical axis of symmetry in the middle of
     // the screen.
-    //
-    // To simulate a horizontal tilt gesture (a horizontal slide with two
-    // fingers), Ctrl+Shift can be used. The "virtual finger" has a position
-    // inverted with respect to the horizontal axis of symmetry in the middle
-    // of the screen. It is expected to be less frequently used, that's why the
-    // one-mod shortcuts are assigned to rotation and vertical tilt.
     if (change_vfinger) {
         struct sc_point mouse =
             sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                                  event->y);
         if (down) {
-            // Ctrl  Shift     invert_x  invert_y
-            // ----  ----- ==> --------  --------
-            //   0     0           0         0      -
-            //   0     1           1         0      vertical tilt
-            //   1     0           1         1      rotate
-            //   1     1           0         1      horizontal tilt
-            im->vfinger_invert_x = ctrl_pressed ^ shift_pressed;
+            im->vfinger_invert_x = ctrl_pressed || shift_pressed;
             im->vfinger_invert_y = ctrl_pressed;
         }
         struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
@@ -947,15 +950,10 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
 
 static void
 sc_input_manager_process_gamepad_axis(struct sc_input_manager *im,
-                                      const SDL_ControllerAxisEvent *event) {
-    enum sc_gamepad_axis axis = sc_gamepad_axis_from_sdl(event->axis);
-    if (axis == SC_GAMEPAD_AXIS_UNKNOWN) {
-        return;
-    }
-
+                                       const SDL_ControllerAxisEvent *event) {
     struct sc_gamepad_axis_event evt = {
         .gamepad_id = event->which,
-        .axis = axis,
+        .axis = sc_gamepad_axis_from_sdl(event->axis),
         .value = event->value,
     };
     im->gp->ops->process_gamepad_axis(im->gp, &evt);
@@ -964,15 +962,10 @@ sc_input_manager_process_gamepad_axis(struct sc_input_manager *im,
 static void
 sc_input_manager_process_gamepad_button(struct sc_input_manager *im,
                                        const SDL_ControllerButtonEvent *event) {
-    enum sc_gamepad_button button = sc_gamepad_button_from_sdl(event->button);
-    if (button == SC_GAMEPAD_BUTTON_UNKNOWN) {
-        return;
-    }
-
     struct sc_gamepad_button_event evt = {
         .gamepad_id = event->which,
         .action = sc_action_from_sdl_controllerbutton_type(event->type),
-        .button = button,
+        .button = sc_gamepad_button_from_sdl(event->button),
     };
     im->gp->ops->process_gamepad_button(im->gp, &evt);
 }

app/src/keyboard_sdk.c

@@ -45,10 +45,6 @@ convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
         {SC_KEYCODE_RCTRL,     AKEYCODE_CTRL_RIGHT},
         {SC_KEYCODE_LSHIFT,    AKEYCODE_SHIFT_LEFT},
         {SC_KEYCODE_RSHIFT,    AKEYCODE_SHIFT_RIGHT},
-        {SC_KEYCODE_LALT,      AKEYCODE_ALT_LEFT},
-        {SC_KEYCODE_RALT,      AKEYCODE_ALT_RIGHT},
-        {SC_KEYCODE_LGUI,      AKEYCODE_META_LEFT},
-        {SC_KEYCODE_RGUI,      AKEYCODE_META_RIGHT},
     };
 
     // Numpad navigation keys.
@@ -170,7 +166,11 @@ convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
         return false;
     }
 
-    // Handle letters and space
+    if (mod & (SC_MOD_LALT | SC_MOD_RALT | SC_MOD_LGUI | SC_MOD_RGUI)) {
+        return false;
+    }
+
+    // if ALT and META are not pressed, also handle letters and space
     entry = SC_INTMAP_FIND_ENTRY(alphaspace_keys, from);
     if (entry) {
         *to = entry->value;

app/src/mouse_capture.c

@@ -1,123 +0,0 @@
-#include "mouse_capture.h"
-
-#include "shortcut_mod.h"
-#include "util/log.h"
-
-void
-sc_mouse_capture_init(struct sc_mouse_capture *mc, SDL_Window *window,
-                      uint8_t shortcut_mods) {
-    mc->window = window;
-    mc->sdl_mouse_capture_keys = sc_shortcut_mods_to_sdl(shortcut_mods);
-    mc->mouse_capture_key_pressed = SDLK_UNKNOWN;
-}
-
-static inline bool
-sc_mouse_capture_is_capture_key(struct sc_mouse_capture *mc, SDL_Keycode key) {
-    return sc_shortcut_mods_is_shortcut_key(mc->sdl_mouse_capture_keys, key);
-}
-
-bool
-sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
-                              const SDL_Event *event) {
-    switch (event->type) {
-        case SDL_WINDOWEVENT:
-            if (event->window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
-                sc_mouse_capture_set_active(mc, false);
-                return true;
-            }
-            break;
-        case SDL_KEYDOWN: {
-            SDL_Keycode key = event->key.keysym.sym;
-            if (sc_mouse_capture_is_capture_key(mc, key)) {
-                if (!mc->mouse_capture_key_pressed) {
-                    mc->mouse_capture_key_pressed = key;
-                } else {
-                    // Another mouse capture key has been pressed, cancel
-                    // mouse (un)capture
-                    mc->mouse_capture_key_pressed = 0;
-                }
-                // Mouse capture keys are never forwarded to the device
-                return true;
-            }
-            break;
-        }
-        case SDL_KEYUP: {
-            SDL_Keycode key = event->key.keysym.sym;
-            SDL_Keycode cap = mc->mouse_capture_key_pressed;
-            mc->mouse_capture_key_pressed = 0;
-            if (sc_mouse_capture_is_capture_key(mc, key)) {
-                if (key == cap) {
-                    // A mouse capture key has been pressed then released:
-                    // toggle the capture mouse mode
-                    sc_mouse_capture_toggle(mc);
-                }
-                // Mouse capture keys are never forwarded to the device
-                return true;
-            }
-            break;
-        }
-        case SDL_MOUSEWHEEL:
-        case SDL_MOUSEMOTION:
-        case SDL_MOUSEBUTTONDOWN:
-            if (!sc_mouse_capture_is_active(mc)) {
-                // The mouse will be captured on SDL_MOUSEBUTTONUP, so consume
-                // the event
-                return true;
-            }
-            break;
-        case SDL_MOUSEBUTTONUP:
-            if (!sc_mouse_capture_is_active(mc)) {
-                sc_mouse_capture_set_active(mc, true);
-                return true;
-            }
-            break;
-        case SDL_FINGERMOTION:
-        case SDL_FINGERDOWN:
-        case SDL_FINGERUP:
-            // Touch events are not compatible with relative mode
-            // (coordinates are not relative), so consume the event
-            return true;
-    }
-
-    return false;
-}
-
-void
-sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture) {
-#ifdef __APPLE__
-    // Workaround for SDL bug on macOS:
-    // <https://github.com/libsdl-org/SDL/issues/5340>
-    if (capture) {
-        int mouse_x, mouse_y;
-        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
-
-        int x, y, w, h;
-        SDL_GetWindowPosition(mc->window, &x, &y);
-        SDL_GetWindowSize(mc->window, &w, &h);
-
-        bool outside_window = mouse_x < x || mouse_x >= x + w
-                           || mouse_y < y || mouse_y >= y + h;
-        if (outside_window) {
-            SDL_WarpMouseInWindow(mc->window, w / 2, h / 2);
-        }
-    }
-#else
-    (void) mc;
-#endif
-    if (SDL_SetRelativeMouseMode(capture)) {
-        LOGE("Could not set relative mouse mode to %s: %s",
-             capture ? "true" : "false", SDL_GetError());
-    }
-}
-
-bool
-sc_mouse_capture_is_active(struct sc_mouse_capture *mc) {
-    (void) mc;
-    return SDL_GetRelativeMouseMode();
-}
-
-void
-sc_mouse_capture_toggle(struct sc_mouse_capture *mc) {
-    bool new_value = !sc_mouse_capture_is_active(mc);
-    sc_mouse_capture_set_active(mc, new_value);
-}

app/src/mouse_capture.h

@@ -1,38 +0,0 @@
-#ifndef SC_MOUSE_CAPTURE_H
-#define SC_MOUSE_CAPTURE_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include <SDL2/SDL.h>
-
-struct sc_mouse_capture {
-    SDL_Window *window;
-    uint16_t sdl_mouse_capture_keys;
-
-    // To enable/disable mouse capture, a mouse capture key (LALT, LGUI or
-    // RGUI) must be pressed. This variable tracks the pressed capture key.
-    SDL_Keycode mouse_capture_key_pressed;
-
-};
-
-void
-sc_mouse_capture_init(struct sc_mouse_capture *mc, SDL_Window *window,
-                      uint8_t shortcut_mods);
-
-void
-sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture);
-
-bool
-sc_mouse_capture_is_active(struct sc_mouse_capture *mc);
-
-void
-sc_mouse_capture_toggle(struct sc_mouse_capture *mc);
-
-// Return true if it consumed the event
-bool
-sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
-                              const SDL_Event *event);
-
-#endif

app/src/options.c

@@ -23,7 +23,7 @@ const struct scrcpy_options scrcpy_options_default = {
     .record_format = SC_RECORD_FORMAT_AUTO,
     .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_AUTO,
     .mouse_input_mode = SC_MOUSE_INPUT_MODE_AUTO,
-    .gamepad_input_mode = SC_GAMEPAD_INPUT_MODE_DISABLED,
+    .gamepad_input_mode = SC_GAMEPAD_INPUT_MODE_AUTO,
     .mouse_bindings = {
         .pri = {
             .right_click = SC_MOUSE_BINDING_AUTO,
@@ -49,7 +49,7 @@ const struct scrcpy_options scrcpy_options_default = {
     .max_size = 0,
     .video_bit_rate = 0,
     .audio_bit_rate = 0,
-    .max_fps = NULL,
+    .max_fps = 0,
     .lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
     .display_orientation = SC_ORIENTATION_0,
     .record_orientation = SC_ORIENTATION_0,
@@ -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,
@@ -104,8 +103,6 @@ const struct scrcpy_options scrcpy_options_default = {
     .window = true,
     .mouse_hover = true,
     .audio_dup = false,
-    .new_display = NULL,
-    .start_app = NULL,
 };
 
 enum sc_orientation

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,
@@ -161,8 +159,9 @@ enum sc_mouse_input_mode {
 };
 
 enum sc_gamepad_input_mode {
-    SC_GAMEPAD_INPUT_MODE_DISABLED,
+    SC_GAMEPAD_INPUT_MODE_AUTO,
     SC_GAMEPAD_INPUT_MODE_UHID_OR_AOA, // normal vs otg mode
+    SC_GAMEPAD_INPUT_MODE_DISABLED,
     SC_GAMEPAD_INPUT_MODE_UHID,
     SC_GAMEPAD_INPUT_MODE_AOA,
 };
@@ -252,7 +251,7 @@ struct scrcpy_options {
     uint16_t max_size;
     uint32_t video_bit_rate;
     uint32_t audio_bit_rate;
-    const char *max_fps; // float to be parsed by the server
+    uint16_t max_fps;
     enum sc_lock_video_orientation lock_video_orientation;
     enum sc_orientation display_orientation;
     enum sc_orientation record_orientation;
@@ -261,11 +260,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;
@@ -307,13 +305,10 @@ struct scrcpy_options {
 #define SC_OPTION_LIST_DISPLAYS 0x2
 #define SC_OPTION_LIST_CAMERAS 0x4
 #define SC_OPTION_LIST_CAMERA_SIZES 0x8
-#define SC_OPTION_LIST_APPS 0x10
     uint8_t list;
     bool window;
     bool mouse_hover;
     bool audio_dup;
-    const char *new_display; // [<width>x<height>][/<dpi>] parsed by the server
-    const char *start_app;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/receiver.c

@@ -9,7 +9,6 @@
 #include "events.h"
 #include "util/log.h"
 #include "util/str.h"
-#include "util/thread.h"
 
 struct sc_uhid_output_task_data {
     struct sc_uhid_devices *uhid_devices;
@@ -44,8 +43,6 @@ sc_receiver_destroy(struct sc_receiver *receiver) {
 
 static void
 task_set_clipboard(void *userdata) {
-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
-
     char *text = userdata;
 
     char *current = SDL_GetClipboardText();
@@ -53,18 +50,17 @@ task_set_clipboard(void *userdata) {
     SDL_free(current);
     if (same) {
         LOGD("Computer clipboard unchanged");
-    } else {
-        LOGI("Device clipboard copied");
-        SDL_SetClipboardText(text);
+        free(text);
+        return;
     }
 
+    LOGI("Device clipboard copied");
+    SDL_SetClipboardText(text);
     free(text);
 }
 
 static void
 task_uhid_output(void *userdata) {
-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
-
     struct sc_uhid_output_task_data *data = userdata;
 
     sc_uhid_devices_process_hid_output(data->uhid_devices, data->id, data->data,
@@ -121,6 +117,11 @@ process_msg(struct sc_receiver *receiver, struct sc_device_msg *msg) {
                 }
             }
 
+            // This is a programming error to receive this message if there is
+            // no uhid_devices instance
+            assert(receiver->uhid_devices);
+
+            // Also check at runtime (do not trust the server)
             if (!receiver->uhid_devices) {
                 LOGE("Received unexpected HID output message");
                 sc_device_msg_destroy(msg);

app/src/resampler/gamepad_resampler.c

@@ -0,0 +1,141 @@
+#include "gamepad_resampler.h"
+
+#include <assert.h>
+
+#include "input_events.h"
+#include "util/log.h"
+
+/** Downcast gamepad processor to sc_gamepad_resampler */
+#define DOWNCAST(GP) \
+    container_of(GP, struct sc_gamepad_resampler, gamepad_processor)
+
+static void
+sc_gamepad_processor_slot_init(struct sc_gamepad_resampler_slot *slot,
+                               uint32_t gamepad_id) {
+    assert(gamepad_id != SC_GAMEPAD_ID_INVALID);
+    slot->gamepad_id = gamepad_id;
+    slot->buttons = 0;
+    slot->axis_left_x = 0;
+    slot->axis_left_y = 0;
+    slot->axis_right_x = 0;
+    slot->axis_right_y = 0;
+    slot->axis_left_trigger = 0;
+    slot->axis_right_trigger = 0;
+}
+
+static ssize_t
+sc_gamepad_processor_slot_find(struct sc_gamepad_resampler *resampler,
+                               uint32_t gamepad_id) {
+    for (size_t i = 0; i < SC_MAX_GAMEPADS; ++i) {
+        if (gamepad_id == resampler->slots[i].gamepad_id) {
+            // found
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+static void
+sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
+                                const struct sc_gamepad_device_event *event) {
+    struct sc_gamepad_resampler *resampler = DOWNCAST(gp);
+
+    if (event->type == SC_GAMEPAD_DEVICE_ADDED) {
+
+    } else {
+        assert(event->type == SC_GAMEPAD_DEVICE_REMOVED);
+    }
+}
+
+static void
+sc_gamepad_processor_process_gamepad_axis(struct sc_gamepad_processor *gp,
+                                const struct sc_gamepad_axis_event *event) {
+    struct sc_gamepad_resampler *resampler = DOWNCAST(gp);
+
+}
+
+static void
+sc_gamepad_processor_process_gamepad_button(struct sc_gamepad_processor *gp,
+                                const struct sc_gamepad_button_event *event) {
+    struct sc_gamepad_resampler *resampler = DOWNCAST(gp);
+
+}
+
+static void
+sc_gamepad_resampler_trigger(void *userdata) {
+    struct sc_gamepad_resampler *resampler = userdata;
+
+    sc_tick now = sc_tick_now();
+
+    for (size_t i = 0; i < SC_MAX_GAMEPADS; ++i) {
+        struct sc_gamepad_resampler_slot *slot = &resampler->slots[i];
+        if (slot->gamepad_id != SC_GAMEPAD_ID_INVALID
+                && slot->deadline != SC_TICK_INVALID
+                && slot->deadline - now >= resampler->min_interval) {
+
+        }
+    }
+}
+
+static int
+run_resampler(void *data) {
+
+    return 0;
+}
+
+bool
+sc_gamepad_resampler_init(struct sc_gamepad_resampler *resampler,
+                          struct sc_gamepad_processor *delegate,
+                          sc_tick min_interval) {
+    bool ok = sc_mutex_init(&resampler->mutex);
+    if (!ok) {
+        return false;
+    }
+
+    ok = sc_cond_init(&resampler->cond);
+    if (!ok) {
+        goto error_destroy_mutex;
+    }
+
+    ok = sc_thread_create(&resampler->thread, run_resampler, "scrcpy-gp-rs",
+                          resampler);
+    if (!ok) {
+        LOGE("Could not start gamepad resampler thread");
+        goto error_destroy_cond;
+    }
+
+    static const struct sc_gamepad_processor_ops ops = {
+        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
+        .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
+        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
+    };
+
+    resampler->gamepad_processor.ops = &ops;
+
+    resampler->delegate = delegate;
+    resampler->min_interval = min_interval;
+    resampler->stopped = false;
+
+    for (size_t i = 0; i < SC_MAX_GAMEPADS; ++i) {
+        resampler->slots[i].gamepad_id = SC_GAMEPAD_ID_INVALID;
+    }
+
+    return true;
+
+error_destroy_mutex:
+    sc_mutex_destroy(&resampler->mutex);
+error_destroy_cond:
+    sc_cond_destroy(&resampler->cond);
+
+    return false;
+}
+
+void
+sc_gamepad_resampler_stop(struct sc_gamepad_resampler *resampler);
+
+void
+sc_gamepad_resampler_join(struct sc_gamepad_resampler *resampler);
+
+void
+sc_gamepad_resampler_destroy(struct sc_gamepad_resampler *resampler);

app/src/resampler/gamepad_resampler.h

@@ -0,0 +1,53 @@
+#ifndef SC_GAMEPAD_RESAMPLER_H
+#define SC_GAMEPAD_RESAMPLER_H
+
+#include "common.h"
+
+#include <stdbool.h>
+
+#include "hid/hid_gamepad.h" // for SC_MAX_GAMEPADS
+#include "trait/gamepad_processor.h"
+#include "util/thread.h"
+#include "util/tick.h"
+
+struct sc_gamepad_resampler_slot {
+    uint32_t gamepad_id;
+    sc_tick deadline;
+    uint32_t buttons;
+    uint16_t axis_left_x;
+    uint16_t axis_left_y;
+    uint16_t axis_right_x;
+    uint16_t axis_right_y;
+    uint16_t axis_left_trigger;
+    uint16_t axis_right_trigger;
+};
+
+struct sc_gamepad_resampler {
+    struct sc_gamepad_processor gamepad_processor; // gamepad processor trait
+
+    struct sc_gamepad_processor *delegate;
+    sc_tick min_interval;
+
+    sc_mutex mutex;
+    sc_cond cond;
+    sc_thread thread;
+    bool stopped;
+
+    struct sc_gamepad_resampler_slot slots[SC_MAX_GAMEPADS];
+};
+
+bool
+sc_gamepad_resampler_init(struct sc_gamepad_resampler *resampler,
+                          struct sc_gamepad_processor *delegate,
+                          sc_tick min_interval);
+
+void
+sc_gamepad_resampler_stop(struct sc_gamepad_resampler *resampler);
+
+void
+sc_gamepad_resampler_join(struct sc_gamepad_resampler *resampler);
+
+void
+sc_gamepad_resampler_destroy(struct sc_gamepad_resampler *resampler);
+
+#endif

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;
@@ -65,8 +65,8 @@ struct scrcpy {
     struct sc_aoa aoa;
     // sequence/ack helper to synchronize clipboard and Ctrl+v via HID
     struct sc_acksync acksync;
-#endif
     struct sc_uhid_devices uhid_devices;
+#endif
     union {
         struct sc_keyboard_sdk keyboard_sdk;
         struct sc_keyboard_uhid keyboard_uhid;
@@ -136,10 +136,6 @@ sdl_set_hints(const char *render_driver) {
     if (!SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0")) {
         LOGW("Could not disable minimize on focus loss");
     }
-
-    if (!SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1")) {
-        LOGW("Could not allow joystick background events");
-    }
 }
 
 static void
@@ -189,12 +185,11 @@ event_loop(struct scrcpy *s) {
             case SDL_QUIT:
                 LOGD("User requested to quit");
                 return SCRCPY_EXIT_SUCCESS;
-            case SC_EVENT_RUN_ON_MAIN_THREAD: {
+            case SC_EVENT_RUN_ON_MAIN_THREAD:
                 sc_runnable_fn run = event.user.data1;
                 void *userdata = event.user.data2;
                 run(userdata);
                 break;
-            }
             default:
                 if (!sc_screen_handle_event(&s->screen, &event)) {
                     return SCRCPY_EXIT_FAILURE;
@@ -428,11 +423,9 @@ 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,
-        .new_display = options->new_display,
         .video = options->video,
         .audio = options->audio,
         .audio_dup = options->audio_dup,
@@ -731,6 +724,7 @@ aoa_complete:
 #endif
 
         struct sc_keyboard_uhid *uhid_keyboard = NULL;
+        struct sc_gamepad_uhid *uhid_gamepad = NULL;
 
         if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_SDK) {
             sc_keyboard_sdk_init(&s->keyboard_sdk, &s->controller,
@@ -765,8 +759,8 @@ aoa_complete:
         }
 
         struct sc_uhid_devices *uhid_devices = NULL;
-        if (uhid_keyboard) {
-            sc_uhid_devices_init(&s->uhid_devices, uhid_keyboard);
+        if (uhid_keyboard || uhid_gamepad) {
+            sc_uhid_devices_init(&s->uhid_devices, uhid_keyboard, uhid_gamepad);
             uhid_devices = &s->uhid_devices;
         }
 
@@ -816,11 +810,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 +868,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'");
         }
     }
 
@@ -903,30 +897,11 @@ aoa_complete:
         timeout_started = true;
     }
 
-    if (options->control
-            && options->gamepad_input_mode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
+    bool use_gamepads = true;
+    if (use_gamepads) {
         init_sdl_gamepads();
     }
 
-    if (options->control && options->start_app) {
-        assert(controller);
-
-        char *name = strdup(options->start_app);
-        if (!name) {
-            LOG_OOM();
-            goto end;
-        }
-
-        struct sc_control_msg msg;
-        msg.type = SC_CONTROL_MSG_TYPE_START_APP;
-        msg.start_app.name = name;
-
-        if (!sc_controller_push_msg(controller, &msg)) {
-            LOGW("Could not request start app '%s'", name);
-            free(name);
-        }
-    }
-
     ret = event_loop(s);
     terminate_event_loop();
     LOGD("quit...");

app/src/screen.c

@@ -162,6 +162,47 @@ sc_screen_is_relative_mode(struct sc_screen *screen) {
     return screen->im.mp && screen->im.mp->relative_mode;
 }
 
+static void
+sc_screen_set_mouse_capture(struct sc_screen *screen, bool capture) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(screen->window, &x, &y);
+        SDL_GetWindowSize(screen->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(screen->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) screen;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
+        LOGE("Could not set relative mouse mode to %s: %s",
+             capture ? "true" : "false", SDL_GetError());
+    }
+}
+
+static inline bool
+sc_screen_get_mouse_capture(struct sc_screen *screen) {
+    (void) screen;
+    return SDL_GetRelativeMouseMode();
+}
+
+static inline void
+sc_screen_toggle_mouse_capture(struct sc_screen *screen) {
+    (void) screen;
+    bool new_value = !sc_screen_get_mouse_capture(screen);
+    sc_screen_set_mouse_capture(screen, new_value);
+}
+
 static void
 sc_screen_update_content_rect(struct sc_screen *screen) {
     assert(screen->video);
@@ -258,12 +299,6 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink,
 
     struct sc_screen *screen = DOWNCAST(sink);
 
-    if (ctx->width <= 0 || ctx->width > 0xFFFF
-            || ctx->height <= 0 || ctx->height > 0xFFFF) {
-        LOGE("Invalid video size: %dx%d", ctx->width, ctx->height);
-        return false;
-    }
-
     assert(ctx->width > 0 && ctx->width <= 0xFFFF);
     assert(ctx->height > 0 && ctx->height <= 0xFFFF);
     // screen->frame_size is never used before the event is pushed, and the
@@ -274,6 +309,7 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink,
     // Post the event on the UI thread (the texture must be created from there)
     bool ok = sc_push_event(SC_EVENT_SCREEN_INIT_SIZE);
     if (!ok) {
+        LOGW("Could not post init size event: %s", SDL_GetError());
         return false;
     }
 
@@ -315,6 +351,7 @@ sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
         // Post the event on the UI thread
         bool ok = sc_push_event(SC_EVENT_NEW_FRAME);
         if (!ok) {
+            LOGW("Could not post new frame event: %s", SDL_GetError());
             return false;
         }
     }
@@ -330,6 +367,7 @@ sc_screen_init(struct sc_screen *screen,
     screen->fullscreen = false;
     screen->maximized = false;
     screen->minimized = false;
+    screen->mouse_capture_key_pressed = 0;
     screen->paused = false;
     screen->resume_frame = NULL;
     screen->orientation = SC_ORIENTATION_0;
@@ -444,9 +482,6 @@ sc_screen_init(struct sc_screen *screen,
 
     sc_input_manager_init(&screen->im, &im_params);
 
-    // Initialize even if not used for simplicity
-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
 #ifdef CONTINUOUS_RESIZING_WORKAROUND
     if (screen->video) {
         SDL_AddEventWatch(event_watcher, screen);
@@ -467,7 +502,7 @@ sc_screen_init(struct sc_screen *screen,
 
     if (!screen->video && sc_screen_is_relative_mode(screen)) {
         // Capture mouse immediately if video mirroring is disabled
-        sc_mouse_capture_set_active(&screen->mc, true);
+        sc_screen_set_mouse_capture(screen, true);
     }
 
     return true;
@@ -499,7 +534,7 @@ sc_screen_show_initial_window(struct sc_screen *screen) {
     SDL_SetWindowPosition(screen->window, x, y);
 
     if (screen->req.fullscreen) {
-        sc_screen_toggle_fullscreen(screen);
+        sc_screen_switch_fullscreen(screen);
     }
 
     if (screen->req.start_fps_counter) {
@@ -674,7 +709,7 @@ sc_screen_apply_frame(struct sc_screen *screen) {
 
         if (sc_screen_is_relative_mode(screen)) {
             // Capture mouse on start
-            sc_mouse_capture_set_active(&screen->mc, true);
+            sc_screen_set_mouse_capture(screen, true);
         }
     }
 
@@ -735,7 +770,7 @@ sc_screen_set_paused(struct sc_screen *screen, bool paused) {
 }
 
 void
-sc_screen_toggle_fullscreen(struct sc_screen *screen) {
+sc_screen_switch_fullscreen(struct sc_screen *screen) {
     assert(screen->video);
 
     uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
@@ -798,8 +833,15 @@ sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
                                             content_size.height);
 }
 
+static inline bool
+sc_screen_is_mouse_capture_key(SDL_Keycode key) {
+    return key == SDLK_LALT || key == SDLK_LGUI || key == SDLK_RGUI;
+}
+
 bool
 sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
+    bool relative_mode = sc_screen_is_relative_mode(screen);
+
     switch (event->type) {
         case SC_EVENT_SCREEN_INIT_SIZE: {
             // The initial size is passed via screen->frame_size
@@ -857,14 +899,69 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
                     apply_pending_resize(screen);
                     sc_screen_render(screen, true);
                     break;
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    if (relative_mode) {
+                        sc_screen_set_mouse_capture(screen, false);
+                    }
+                    break;
             }
             return true;
-    }
-
-    if (sc_screen_is_relative_mode(screen)
-            && sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
-        return true;
+        case SDL_KEYDOWN:
+            if (relative_mode) {
+                SDL_Keycode key = event->key.keysym.sym;
+                if (sc_screen_is_mouse_capture_key(key)) {
+                    if (!screen->mouse_capture_key_pressed) {
+                        screen->mouse_capture_key_pressed = key;
+                    } else {
+                        // Another mouse capture key has been pressed, cancel
+                        // mouse (un)capture
+                        screen->mouse_capture_key_pressed = 0;
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return true;
+                }
+            }
+            break;
+        case SDL_KEYUP:
+            if (relative_mode) {
+                SDL_Keycode key = event->key.keysym.sym;
+                SDL_Keycode cap = screen->mouse_capture_key_pressed;
+                screen->mouse_capture_key_pressed = 0;
+                if (sc_screen_is_mouse_capture_key(key)) {
+                    if (key == cap) {
+                        // A mouse capture key has been pressed then released:
+                        // toggle the capture mouse mode
+                        sc_screen_toggle_mouse_capture(screen);
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return true;
+                }
+            }
+            break;
+        case SDL_MOUSEWHEEL:
+        case SDL_MOUSEMOTION:
+        case SDL_MOUSEBUTTONDOWN:
+            if (relative_mode && !sc_screen_get_mouse_capture(screen)) {
+                // Do not forward to input manager, the mouse will be captured
+                // on SDL_MOUSEBUTTONUP
+                return true;
+            }
+            break;
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
+            if (relative_mode) {
+                // Touch events are not compatible with relative mode
+                // (coordinates are not relative)
+                return true;
+            }
+            break;
+        case SDL_MOUSEBUTTONUP:
+            if (relative_mode && !sc_screen_get_mouse_capture(screen)) {
+                sc_screen_set_mouse_capture(screen, true);
+                return true;
+            }
+            break;
     }
 
     sc_input_manager_handle_event(&screen->im, event);

app/src/screen.h

@@ -13,7 +13,6 @@
 #include "fps_counter.h"
 #include "frame_buffer.h"
 #include "input_manager.h"
-#include "mouse_capture.h"
 #include "opengl.h"
 #include "options.h"
 #include "trait/key_processor.h"
@@ -31,7 +30,6 @@ struct sc_screen {
 
     struct sc_display display;
     struct sc_input_manager im;
-    struct sc_mouse_capture mc; // only used in mouse relative mode
     struct sc_frame_buffer fb;
     struct sc_fps_counter fps_counter;
 
@@ -63,6 +61,10 @@ struct sc_screen {
     bool maximized;
     bool minimized;
 
+    // To enable/disable mouse capture, a mouse capture key (LALT, LGUI or
+    // RGUI) must be pressed. This variable tracks the pressed capture key.
+    SDL_Keycode mouse_capture_key_pressed;
+
     AVFrame *frame;
 
     bool paused;
@@ -124,9 +126,9 @@ sc_screen_destroy(struct sc_screen *screen);
 void
 sc_screen_hide_window(struct sc_screen *screen);
 
-// toggle the fullscreen mode
+// switch the fullscreen mode
 void
-sc_screen_toggle_fullscreen(struct sc_screen *screen);
+sc_screen_switch_fullscreen(struct sc_screen *screen);
 
 // resize window to optimal size (remove black borders)
 void

app/src/server.c

@@ -66,6 +66,56 @@ get_server_path(void) {
     return server_path;
 }
 
+static void
+sc_server_params_destroy(struct sc_server_params *params) {
+    // The server stores a copy of the params provided by the user
+    free((char *) params->req_serial);
+    free((char *) params->crop);
+    free((char *) params->video_codec_options);
+    free((char *) params->audio_codec_options);
+    free((char *) params->video_encoder);
+    free((char *) params->audio_encoder);
+    free((char *) params->tcpip_dst);
+    free((char *) params->camera_id);
+    free((char *) params->camera_ar);
+}
+
+static bool
+sc_server_params_copy(struct sc_server_params *dst,
+                      const struct sc_server_params *src) {
+    *dst = *src;
+
+    // The params reference user-allocated memory, so we must copy them to
+    // handle them from another thread
+
+#define COPY(FIELD) do { \
+    dst->FIELD = NULL; \
+    if (src->FIELD) { \
+        dst->FIELD = strdup(src->FIELD); \
+        if (!dst->FIELD) { \
+            goto error; \
+        } \
+    } \
+} while(0)
+
+    COPY(req_serial);
+    COPY(crop);
+    COPY(video_codec_options);
+    COPY(audio_codec_options);
+    COPY(video_encoder);
+    COPY(audio_encoder);
+    COPY(tcpip_dst);
+    COPY(camera_id);
+    COPY(camera_ar);
+#undef COPY
+
+    return true;
+
+error:
+    sc_server_params_destroy(dst);
+    return false;
+}
+
 static bool
 push_server(struct sc_intr *intr, const char *serial) {
     char *server_path = get_server_path();
@@ -168,42 +218,6 @@ sc_server_get_audio_source_name(enum sc_audio_source audio_source) {
     }
 }
 
-static bool
-validate_string(const char *s) {
-    // The parameters values are passed as command line arguments to adb, so
-    // they must either be properly escaped, or they must not contain any
-    // special shell characters.
-    // Since they are not properly escaped on Windows anyway (see
-    // sys/win/process.c), just forbid special shell characters.
-    if (strpbrk(s, " ;'\"*$?&`#\\|<>[]{}()!~\r\n")) {
-        LOGE("Invalid server param: [%s]", s);
-        return false;
-    }
-
-    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 +236,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;
@@ -254,11 +260,6 @@ execute_server(struct sc_server *server,
         } \
         cmd[count++] = p; \
     } while(0)
-#define VALIDATE_STRING(s) do { \
-        if (!validate_string(s)) { \
-            goto end; \
-        } \
-    } while(0)
 
     ADD_PARAM("scid=%08x", params->scid);
     ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
@@ -300,8 +301,7 @@ execute_server(struct sc_server *server,
         ADD_PARAM("max_size=%" PRIu16, params->max_size);
     }
     if (params->max_fps) {
-        VALIDATE_STRING(params->max_fps);
-        ADD_PARAM("max_fps=%s", params->max_fps);
+        ADD_PARAM("max_fps=%" PRIu16, params->max_fps);
     }
     if (params->lock_video_orientation != SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
         ADD_PARAM("lock_video_orientation=%" PRIi8,
@@ -311,7 +311,6 @@ execute_server(struct sc_server *server,
         ADD_PARAM("tunnel_forward=true");
     }
     if (params->crop) {
-        VALIDATE_STRING(params->crop);
         ADD_PARAM("crop=%s", params->crop);
     }
     if (!params->control) {
@@ -322,11 +321,9 @@ execute_server(struct sc_server *server,
         ADD_PARAM("display_id=%" PRIu32, params->display_id);
     }
     if (params->camera_id) {
-        VALIDATE_STRING(params->camera_id);
         ADD_PARAM("camera_id=%s", params->camera_id);
     }
     if (params->camera_size) {
-        VALIDATE_STRING(params->camera_size);
         ADD_PARAM("camera_size=%s", params->camera_size);
     }
     if (params->camera_facing != SC_CAMERA_FACING_ANY) {
@@ -334,7 +331,6 @@ execute_server(struct sc_server *server,
             sc_server_get_camera_facing_name(params->camera_facing));
     }
     if (params->camera_ar) {
-        VALIDATE_STRING(params->camera_ar);
         ADD_PARAM("camera_ar=%s", params->camera_ar);
     }
     if (params->camera_fps) {
@@ -349,25 +345,16 @@ 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);
     }
     if (params->audio_codec_options) {
-        VALIDATE_STRING(params->audio_codec_options);
         ADD_PARAM("audio_codec_options=%s", params->audio_codec_options);
     }
     if (params->video_encoder) {
-        VALIDATE_STRING(params->video_encoder);
         ADD_PARAM("video_encoder=%s", params->video_encoder);
     }
     if (params->audio_encoder) {
-        VALIDATE_STRING(params->audio_encoder);
         ADD_PARAM("audio_encoder=%s", params->audio_encoder);
     }
     if (params->power_off_on_close) {
@@ -389,10 +376,6 @@ execute_server(struct sc_server *server,
         // By default, power_on is true
         ADD_PARAM("power_on=false");
     }
-    if (params->new_display) {
-        VALIDATE_STRING(params->new_display);
-        ADD_PARAM("new_display=%s", params->new_display);
-    }
     if (params->list & SC_OPTION_LIST_ENCODERS) {
         ADD_PARAM("list_encoders=true");
     }
@@ -405,9 +388,6 @@ execute_server(struct sc_server *server,
     if (params->list & SC_OPTION_LIST_CAMERA_SIZES) {
         ADD_PARAM("list_camera_sizes=true");
     }
-    if (params->list & SC_OPTION_LIST_APPS) {
-        ADD_PARAM("list_apps=true");
-    }
 
 #undef ADD_PARAM
 
@@ -490,18 +470,22 @@ connect_to_server(struct sc_server *server, unsigned attempts, sc_tick delay,
 bool
 sc_server_init(struct sc_server *server, const struct sc_server_params *params,
               const struct sc_server_callbacks *cbs, void *cbs_userdata) {
-    // The allocated data in params (const char *) must remain valid until the
-    // end of the program
-    server->params = *params;
-
-    bool ok = sc_mutex_init(&server->mutex);
+    bool ok = sc_server_params_copy(&server->params, params);
     if (!ok) {
+        LOG_OOM();
+        return false;
+    }
+
+    ok = sc_mutex_init(&server->mutex);
+    if (!ok) {
+        sc_server_params_destroy(&server->params);
         return false;
     }
 
     ok = sc_cond_init(&server->cond_stopped);
     if (!ok) {
         sc_mutex_destroy(&server->mutex);
+        sc_server_params_destroy(&server->params);
         return false;
     }
 
@@ -509,6 +493,7 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
     if (!ok) {
         sc_cond_destroy(&server->cond_stopped);
         sc_mutex_destroy(&server->mutex);
+        sc_server_params_destroy(&server->params);
         return false;
     }
 
@@ -645,14 +630,6 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
         }
     }
 
-    if (control_socket != SC_SOCKET_NONE) {
-        // Disable Nagle's algorithm for the control socket
-        // (it only impacts the sending side, so it is useless to set it
-        // for the other sockets)
-        bool ok = net_set_tcp_nodelay(control_socket, true);
-        (void) ok; // error already logged
-    }
-
     // we don't need the adb tunnel anymore
     sc_adb_tunnel_close(tunnel, &server->intr, serial,
                         server->device_socket_name);
@@ -1147,6 +1124,7 @@ sc_server_destroy(struct sc_server *server) {
 
     free(server->serial);
     free(server->device_socket_name);
+    sc_server_params_destroy(&server->params);
     sc_intr_destroy(&server->intr);
     sc_cond_destroy(&server->cond_stopped);
     sc_mutex_destroy(&server->mutex);

app/src/server.h

@@ -44,12 +44,10 @@ struct sc_server_params {
     uint16_t max_size;
     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;
+    uint16_t max_fps;
     int8_t lock_video_orientation;
     bool control;
     uint32_t display_id;
-    const char *new_display;
     bool video;
     bool audio;
     bool audio_dup;

app/src/shortcut_mod.h

@@ -1,60 +0,0 @@
-#ifndef SC_SHORTCUT_MOD_H
-#define SC_SHORTCUT_MOD_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <SDL2/SDL_keycode.h>
-
-#include "options.h"
-
-#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
-
-// input: OR of enum sc_shortcut_mod
-// output: OR of SDL_Keymod
-static inline uint16_t
-sc_shortcut_mods_to_sdl(uint8_t shortcut_mods) {
-    uint16_t sdl_mod = 0;
-    if (shortcut_mods & SC_SHORTCUT_MOD_LCTRL) {
-        sdl_mod |= KMOD_LCTRL;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RCTRL) {
-        sdl_mod |= KMOD_RCTRL;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_LALT) {
-        sdl_mod |= KMOD_LALT;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RALT) {
-        sdl_mod |= KMOD_RALT;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_LSUPER) {
-        sdl_mod |= KMOD_LGUI;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RSUPER) {
-        sdl_mod |= KMOD_RGUI;
-    }
-    return sdl_mod;
-}
-
-static inline bool
-sc_shortcut_mods_is_shortcut_mod(uint16_t sdl_shortcut_mods, uint16_t sdl_mod) {
-    // sdl_shortcut_mods must be within the mask
-    assert(!(sdl_shortcut_mods & ~SC_SDL_SHORTCUT_MODS_MASK));
-
-    // at least one shortcut mod pressed?
-    return sdl_mod & sdl_shortcut_mods;
-}
-
-static inline bool
-sc_shortcut_mods_is_shortcut_key(uint16_t sdl_shortcut_mods,
-                                 SDL_Keycode keycode) {
-    return (sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
-        || (sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
-        || (sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
-        || (sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
-        || (sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
-        || (sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
-}
-
-#endif

app/src/uhid/gamepad_uhid.c

@@ -3,6 +3,7 @@
 #include "hid/hid_gamepad.h"
 #include "input_events.h"
 #include "util/log.h"
+#include "util/str.h"
 
 /** Downcast gamepad processor to sc_gamepad_uhid */
 #define DOWNCAST(GP) container_of(GP, struct sc_gamepad_uhid, gamepad_processor)
@@ -30,7 +31,6 @@ sc_gamepad_uhid_send_open(struct sc_gamepad_uhid *gamepad,
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
     msg.uhid_create.id = hid_open->hid_id;
-    msg.uhid_create.name = hid_open->name;
     msg.uhid_create.report_desc = hid_open->report_desc;
     msg.uhid_create.report_desc_size = hid_open->report_desc_size;
 
@@ -106,6 +106,22 @@ sc_gamepad_processor_process_gamepad_button(struct sc_gamepad_processor *gp,
 
 }
 
+void
+sc_gamepad_uhid_process_hid_output(struct sc_gamepad_uhid *gamepad,
+                                   uint16_t hid_id, const uint8_t *data,
+                                   size_t size) {
+    (void) gamepad;
+    char *hex = sc_str_to_hex_string(data, size);
+    if (hex) {
+        LOGI("==== HID output [%" PRIu16 "] %s", hid_id, hex);
+        free(hex);
+    } else {
+        LOGI("==== HID output [%" PRIu16 "]", hid_id);
+    }
+
+    // TODO
+}
+
 void
 sc_gamepad_uhid_init(struct sc_gamepad_uhid *gamepad,
                      struct sc_controller *controller) {

app/src/uhid/gamepad_uhid.h

@@ -20,4 +20,9 @@ void
 sc_gamepad_uhid_init(struct sc_gamepad_uhid *mouse,
                      struct sc_controller *controller);
 
+void
+sc_gamepad_uhid_process_hid_output(struct sc_gamepad_uhid *gamepad,
+                                   uint16_t hid_id, const uint8_t *data,
+                                   size_t size);
+
 #endif

app/src/uhid/keyboard_uhid.c

@@ -141,7 +141,6 @@ sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
     msg.uhid_create.id = SC_HID_ID_KEYBOARD;
-    msg.uhid_create.name = hid_open.name;
     msg.uhid_create.report_desc = hid_open.report_desc;
     msg.uhid_create.report_desc_size = hid_open.report_desc_size;
     if (!sc_controller_push_msg(controller, &msg)) {

app/src/uhid/mouse_uhid.c

@@ -81,7 +81,6 @@ sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
     msg.uhid_create.id = SC_HID_ID_MOUSE;
-    msg.uhid_create.name = hid_open.name;
     msg.uhid_create.report_desc = hid_open.report_desc;
     msg.uhid_create.report_desc_size = hid_open.report_desc_size;
     if (!sc_controller_push_msg(controller, &msg)) {

app/src/uhid/uhid_output.c

@@ -4,12 +4,15 @@
 #include <inttypes.h>
 
 #include "uhid/keyboard_uhid.h"
+#include "uhid/gamepad_uhid.h"
 #include "util/log.h"
 
 void
 sc_uhid_devices_init(struct sc_uhid_devices *devices,
-                     struct sc_keyboard_uhid *keyboard) {
+                     struct sc_keyboard_uhid *keyboard,
+                     struct sc_gamepad_uhid *gamepad) {
     devices->keyboard = keyboard;
+    devices->gamepad = gamepad;
 }
 
 void
@@ -21,6 +24,13 @@ sc_uhid_devices_process_hid_output(struct sc_uhid_devices *devices, uint16_t id,
         } else {
             LOGW("Unexpected keyboard HID output without UHID keyboard");
         }
+    } else if (id >= SC_HID_ID_GAMEPAD_FIRST && id <= SC_HID_ID_GAMEPAD_LAST) {
+        if (devices->gamepad) {
+            sc_gamepad_uhid_process_hid_output(devices->gamepad, id, data,
+                                               size);
+        } else {
+            LOGW("Unexpected gamepad HID output without UHID gamepad");
+        }
     } else {
         LOGW("HID output ignored for id %" PRIu16, id);
     }

app/src/uhid/uhid_output.h

@@ -14,11 +14,13 @@
 
 struct sc_uhid_devices {
     struct sc_keyboard_uhid *keyboard;
+    struct sc_gamepad_uhid *gamepad;
 };
 
 void
 sc_uhid_devices_init(struct sc_uhid_devices *devices,
-                     struct sc_keyboard_uhid *keyboard);
+                     struct sc_keyboard_uhid *keyboard,
+                     struct sc_gamepad_uhid *gamepad);
 
 void
 sc_uhid_devices_process_hid_output(struct sc_uhid_devices *devices, uint16_t id,

app/src/usb/aoa_hid.c

@@ -51,7 +51,7 @@ sc_hid_open_log(const struct sc_hid_open *hid_open) {
 static void
 sc_hid_close_log(const struct sc_hid_close *hid_close) {
     // HID close: [00]
-    LOGV("HID close: [%" PRIu16 "]", hid_close->hid_id);
+    LOGV("HD close: [%" PRIu16 "]", hid_close->hid_id);
 }
 
 bool
@@ -227,11 +227,8 @@ sc_aoa_push_input_with_ack_to_wait(struct sc_aoa *aoa,
     }
 
     sc_mutex_lock(&aoa->mutex);
-
-    bool pushed = false;
-
-    size_t size = sc_vecdeque_size(&aoa->queue);
-    if (size < SC_AOA_EVENT_QUEUE_LIMIT) {
+    bool full = sc_vecdeque_is_full(&aoa->queue);
+    if (!full) {
         bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
 
         struct sc_aoa_event *aoa_event =
@@ -239,17 +236,16 @@ sc_aoa_push_input_with_ack_to_wait(struct sc_aoa *aoa,
         aoa_event->type = SC_AOA_EVENT_TYPE_INPUT;
         aoa_event->input.hid = *hid_input;
         aoa_event->input.ack_to_wait = ack_to_wait;
-        pushed = true;
 
         if (was_empty) {
             sc_cond_signal(&aoa->event_cond);
         }
     }
-    // Otherwise, the event is discarded
+    // Otherwise (if the queue is full), the event is discarded
 
     sc_mutex_unlock(&aoa->mutex);
 
-    return pushed;
+    return !full;
 }
 
 bool
@@ -293,7 +289,7 @@ sc_aoa_push_close(struct sc_aoa *aoa, const struct sc_hid_close *hid_close) {
     sc_mutex_lock(&aoa->mutex);
     bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
 
-    // a CLOSE event is non-droppable, so push it to the queue even above the
+    // an OPEN event is non-droppable, so push it to the queue even above the
     // SC_AOA_EVENT_QUEUE_LIMIT
     struct sc_aoa_event *aoa_event = sc_vecdeque_push_hole(&aoa->queue);
     if (!aoa_event) {

app/src/usb/aoa_hid.h

@@ -1,8 +1,6 @@
 #ifndef SC_AOA_HID_H
 #define SC_AOA_HID_H
 
-#include "common.h"
-
 #include <stdint.h>
 #include <stdbool.h>
 

app/src/usb/scrcpy_otg.c

@@ -22,7 +22,10 @@ sc_usb_on_disconnected(struct sc_usb *usb, void *userdata) {
     (void) usb;
     (void) userdata;
 
-    sc_push_event(SC_EVENT_USB_DEVICE_DISCONNECTED);
+    bool ok = sc_push_event(SC_EVENT_USB_DEVICE_DISCONNECTED);
+    if (!ok) {
+        LOGE("Could not post USB disconnection event: %s", SDL_GetError());
+    }
 }
 
 static enum scrcpy_exit_code
@@ -58,10 +61,6 @@ scrcpy_otg(struct scrcpy_options *options) {
         LOGW("Could not enable linear filtering");
     }
 
-    if (!SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1")) {
-        LOGW("Could not allow joystick background events");
-    }
-
     // Minimal SDL initialization
     if (SDL_Init(SDL_INIT_EVENTS)) {
         LOGE("Could not initialize SDL: %s", SDL_GetError());
@@ -185,7 +184,6 @@ scrcpy_otg(struct scrcpy_options *options) {
         .window_width = options->window_width,
         .window_height = options->window_height,
         .window_borderless = options->window_borderless,
-        .shortcut_mods = options->shortcut_mods,
     };
 
     ok = sc_screen_otg_init(&s->screen_otg, &params);

app/src/usb/screen_otg.c

@@ -4,6 +4,47 @@
 #include "options.h"
 #include "util/log.h"
 
+static void
+sc_screen_otg_set_mouse_capture(struct sc_screen_otg *screen, bool capture) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(screen->window, &x, &y);
+        SDL_GetWindowSize(screen->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(screen->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) screen;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
+        LOGE("Could not set relative mouse mode to %s: %s",
+             capture ? "true" : "false", SDL_GetError());
+    }
+}
+
+static inline bool
+sc_screen_otg_get_mouse_capture(struct sc_screen_otg *screen) {
+    (void) screen;
+    return SDL_GetRelativeMouseMode();
+}
+
+static inline void
+sc_screen_otg_toggle_mouse_capture(struct sc_screen_otg *screen) {
+    (void) screen;
+    bool new_value = !sc_screen_otg_get_mouse_capture(screen);
+    sc_screen_otg_set_mouse_capture(screen, new_value);
+}
+
 static void
 sc_screen_otg_render(struct sc_screen_otg *screen) {
     SDL_RenderClear(screen->renderer);
@@ -20,6 +61,8 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
     screen->mouse = params->mouse;
     screen->gamepad = params->gamepad;
 
+    screen->mouse_capture_key_pressed = 0;
+
     const char *title = params->window_title;
     assert(title);
 
@@ -70,11 +113,9 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
         LOGW("Could not load icon");
     }
 
-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
     if (screen->mouse) {
         // Capture mouse on start
-        sc_mouse_capture_set_active(&screen->mc, true);
+        sc_screen_otg_set_mouse_capture(screen, true);
     }
 
     return true;
@@ -96,6 +137,11 @@ sc_screen_otg_destroy(struct sc_screen_otg *screen) {
     SDL_DestroyWindow(screen->window);
 }
 
+static inline bool
+sc_screen_otg_is_mouse_capture_key(SDL_Keycode key) {
+    return key == SDLK_LALT || key == SDLK_LGUI || key == SDLK_RGUI;
+}
+
 static void
 sc_screen_otg_process_key(struct sc_screen_otg *screen,
                              const SDL_KeyboardEvent *event) {
@@ -218,14 +264,9 @@ sc_screen_otg_process_gamepad_axis(struct sc_screen_otg *screen,
     assert(screen->gamepad);
     struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
 
-    enum sc_gamepad_axis axis = sc_gamepad_axis_from_sdl(event->axis);
-    if (axis == SC_GAMEPAD_AXIS_UNKNOWN) {
-        return;
-    }
-
     struct sc_gamepad_axis_event evt = {
         .gamepad_id = event->which,
-        .axis = axis,
+        .axis = sc_gamepad_axis_from_sdl(event->axis),
         .value = event->value,
     };
     gp->ops->process_gamepad_axis(gp, &evt);
@@ -237,61 +278,90 @@ sc_screen_otg_process_gamepad_button(struct sc_screen_otg *screen,
     assert(screen->gamepad);
     struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
 
-    enum sc_gamepad_button button = sc_gamepad_button_from_sdl(event->button);
-    if (button == SC_GAMEPAD_BUTTON_UNKNOWN) {
-        return;
-    }
-
     struct sc_gamepad_button_event evt = {
         .gamepad_id = event->which,
         .action = sc_action_from_sdl_controllerbutton_type(event->type),
-        .button = button,
+        .button = sc_gamepad_button_from_sdl(event->button),
     };
     gp->ops->process_gamepad_button(gp, &evt);
 }
 
 void
 sc_screen_otg_handle_event(struct sc_screen_otg *screen, SDL_Event *event) {
-    if (sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
-        return;
-    }
-
     switch (event->type) {
         case SDL_WINDOWEVENT:
             switch (event->window.event) {
                 case SDL_WINDOWEVENT_EXPOSED:
                     sc_screen_otg_render(screen);
                     break;
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    if (screen->mouse) {
+                        sc_screen_otg_set_mouse_capture(screen, false);
+                    }
+                    break;
             }
             return;
         case SDL_KEYDOWN:
+            if (screen->mouse) {
+                SDL_Keycode key = event->key.keysym.sym;
+                if (sc_screen_otg_is_mouse_capture_key(key)) {
+                    if (!screen->mouse_capture_key_pressed) {
+                        screen->mouse_capture_key_pressed = key;
+                    } else {
+                        // Another mouse capture key has been pressed, cancel
+                        // mouse (un)capture
+                        screen->mouse_capture_key_pressed = 0;
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return;
+                }
+            }
+
             if (screen->keyboard) {
                 sc_screen_otg_process_key(screen, &event->key);
             }
             break;
         case SDL_KEYUP:
+            if (screen->mouse) {
+                SDL_Keycode key = event->key.keysym.sym;
+                SDL_Keycode cap = screen->mouse_capture_key_pressed;
+                screen->mouse_capture_key_pressed = 0;
+                if (sc_screen_otg_is_mouse_capture_key(key)) {
+                    if (key == cap) {
+                        // A mouse capture key has been pressed then released:
+                        // toggle the capture mouse mode
+                        sc_screen_otg_toggle_mouse_capture(screen);
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return;
+                }
+            }
+
             if (screen->keyboard) {
                 sc_screen_otg_process_key(screen, &event->key);
             }
             break;
         case SDL_MOUSEMOTION:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                 sc_screen_otg_process_mouse_motion(screen, &event->motion);
             }
             break;
         case SDL_MOUSEBUTTONDOWN:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                 sc_screen_otg_process_mouse_button(screen, &event->button);
             }
             break;
         case SDL_MOUSEBUTTONUP:
             if (screen->mouse) {
-                sc_screen_otg_process_mouse_button(screen, &event->button);
+                if (sc_screen_otg_get_mouse_capture(screen)) {
+                    sc_screen_otg_process_mouse_button(screen, &event->button);
+                } else {
+                    sc_screen_otg_set_mouse_capture(screen, true);
+                }
             }
             break;
         case SDL_MOUSEWHEEL:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                 sc_screen_otg_process_mouse_wheel(screen, &event->wheel);
             }
             break;

app/src/usb/screen_otg.h

@@ -8,7 +8,6 @@
 
 #include "keyboard_aoa.h"
 #include "mouse_aoa.h"
-#include "mouse_capture.h"
 #include "gamepad_aoa.h"
 
 struct sc_screen_otg {
@@ -20,7 +19,8 @@ struct sc_screen_otg {
     SDL_Renderer *renderer;
     SDL_Texture *texture;
 
-    struct sc_mouse_capture mc;
+    // See equivalent mechanism in screen.h
+    SDL_Keycode mouse_capture_key_pressed;
 };
 
 struct sc_screen_otg_params {
@@ -35,7 +35,6 @@ struct sc_screen_otg_params {
     uint16_t window_width;
     uint16_t window_height;
     bool window_borderless;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
 };
 
 bool

app/src/util/binary.h

@@ -44,7 +44,7 @@ sc_write64be(uint8_t *buf, uint64_t value) {
 static inline void
 sc_write64le(uint8_t *buf, uint64_t value) {
     sc_write32le(buf, (uint32_t) value);
-    sc_write32le(&buf[4], value >> 32);
+    sc_write32le(buf, value >> 32);
 }
 
 static inline uint16_t

app/src/util/net.c

@@ -15,7 +15,6 @@
 # include <sys/types.h>
 # include <sys/socket.h>
 # include <netinet/in.h>
-# include <netinet/tcp.h>
 # include <arpa/inet.h>
 # include <unistd.h>
 # include <fcntl.h>
@@ -274,22 +273,6 @@ net_close(sc_socket socket) {
 #endif
 }
 
-bool
-net_set_tcp_nodelay(sc_socket socket, bool tcp_nodelay) {
-    sc_raw_socket raw_sock = unwrap(socket);
-
-    int value = tcp_nodelay ? 1 : 0;
-    int ret = setsockopt(raw_sock, IPPROTO_TCP, TCP_NODELAY,
-                         (const void *) &value, sizeof(value));
-    if (ret == -1) {
-        net_perror("setsockopt(TCP_NODELAY)");
-        return false;
-    }
-
-    assert(ret == 0);
-    return true;
-}
-
 bool
 net_parse_ipv4(const char *s, uint32_t *ipv4) {
     struct in_addr addr;

app/src/util/net.h

@@ -67,10 +67,6 @@ net_interrupt(sc_socket socket);
 bool
 net_close(sc_socket socket);
 
-// Disable Nagle's algorithm (if tcp_nodelay is true)
-bool
-net_set_tcp_nodelay(sc_socket socket, bool tcp_nodelay);
-
 /**
  * Parse `ip` "xxx.xxx.xxx.xxx" to an IPv4 host representation
  */

app/src/util/tick.h

@@ -9,15 +9,17 @@ typedef int64_t sc_tick;
 #define PRItick PRIi64
 #define SC_TICK_FREQ 1000000 // microsecond
 
+#define SC_TICK_INVALID INT64_MIN
+
 // To be adapted if SC_TICK_FREQ changes
-#define SC_TICK_TO_NS(tick) ((sc_tick) (tick) * 1000)
-#define SC_TICK_TO_US(tick) ((sc_tick) tick)
-#define SC_TICK_TO_MS(tick) ((sc_tick) (tick) / 1000)
-#define SC_TICK_TO_SEC(tick) ((sc_tick) (tick) / 1000000)
-#define SC_TICK_FROM_NS(ns) ((sc_tick) (ns) / 1000)
-#define SC_TICK_FROM_US(us) ((sc_tick) us)
-#define SC_TICK_FROM_MS(ms) ((sc_tick) (ms) * 1000)
-#define SC_TICK_FROM_SEC(sec) ((sc_tick) (sec) * 1000000)
+#define SC_TICK_TO_NS(tick) ((tick) * 1000)
+#define SC_TICK_TO_US(tick) (tick)
+#define SC_TICK_TO_MS(tick) ((tick) / 1000)
+#define SC_TICK_TO_SEC(tick) ((tick) / 1000000)
+#define SC_TICK_FROM_NS(ns) ((ns) / 1000)
+#define SC_TICK_FROM_US(us) (us)
+#define SC_TICK_FROM_MS(ms) ((ms) * 1000)
+#define SC_TICK_FROM_SEC(sec) ((sec) * 1000000)
 
 sc_tick
 sc_tick_now(void);

app/src/util/timeout.c

@@ -62,7 +62,6 @@ void
 sc_timeout_stop(struct sc_timeout *timeout) {
     sc_mutex_lock(&timeout->mutex);
     timeout->stopped = true;
-    sc_cond_signal(&timeout->cond);
     sc_mutex_unlock(&timeout->mutex);
 }
 

app/tests/test_binary.c

@@ -42,44 +42,6 @@ static void test_write64be(void) {
     assert(buf[7] == 0xEF);
 }
 
-static void test_write16le(void) {
-    uint16_t val = 0xABCD;
-    uint8_t buf[2];
-
-    sc_write16le(buf, val);
-
-    assert(buf[0] == 0xCD);
-    assert(buf[1] == 0xAB);
-}
-
-static void test_write32le(void) {
-    uint32_t val = 0xABCD1234;
-    uint8_t buf[4];
-
-    sc_write32le(buf, val);
-
-    assert(buf[0] == 0x34);
-    assert(buf[1] == 0x12);
-    assert(buf[2] == 0xCD);
-    assert(buf[3] == 0xAB);
-}
-
-static void test_write64le(void) {
-    uint64_t val = 0xABCD1234567890EF;
-    uint8_t buf[8];
-
-    sc_write64le(buf, val);
-
-    assert(buf[0] == 0xEF);
-    assert(buf[1] == 0x90);
-    assert(buf[2] == 0x78);
-    assert(buf[3] == 0x56);
-    assert(buf[4] == 0x34);
-    assert(buf[5] == 0x12);
-    assert(buf[6] == 0xCD);
-    assert(buf[7] == 0xAB);
-}
-
 static void test_read16be(void) {
     uint8_t buf[2] = {0xAB, 0xCD};
 
@@ -146,10 +108,6 @@ int main(int argc, char *argv[]) {
     test_read32be();
     test_read64be();
 
-    test_write16le();
-    test_write32le();
-    test_write64le();
-
     test_float_to_u16fp();
     test_float_to_i16fp();
     return 0;

app/tests/test_cli.c

@@ -78,7 +78,7 @@ static void test_options(void) {
     assert(opts->video_bit_rate == 5000000);
     assert(!strcmp(opts->crop, "100:200:300:400"));
     assert(opts->fullscreen);
-    assert(!strcmp(opts->max_fps, "30"));
+    assert(opts->max_fps == 30);
     assert(opts->max_size == 1024);
     assert(opts->lock_video_orientation == 2);
     assert(opts->port_range.first == 1234);

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)));
 }
@@ -329,7 +329,6 @@ static void test_serialize_uhid_create(void) {
         .type = SC_CONTROL_MSG_TYPE_UHID_CREATE,
         .uhid_create = {
             .id = 42,
-            .name = "ABC",
             .report_desc_size = sizeof(report_desc),
             .report_desc = report_desc,
         },
@@ -337,14 +336,12 @@ static void test_serialize_uhid_create(void) {
 
     uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
     size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 20);
+    assert(size == 16);
 
     const uint8_t expected[] = {
         SC_CONTROL_MSG_TYPE_UHID_CREATE,
         0, 42, // id
-        3, // name size
-        65, 66, 67, // "ABC"
-        0, 11, // report desc size
+        0, 11, // size
         1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
@@ -407,21 +404,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 +420,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;
 }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.1'
+        classpath 'com.android.tools.build:gradle:8.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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),

doc/build.md

@@ -233,10 +233,10 @@ install` must be run as root)._
 
 #### Option 2: Use prebuilt server
 
- - [`scrcpy-server-v2.7`][direct-scrcpy-server]  
-   <sub>SHA-256: `a23c5659f36c260f105c022d27bcb3eafffa26070e7baa9eda66d01377a1adba`</sub>
+ - [`scrcpy-server-v2.6.1`][direct-scrcpy-server]  
+   <sub>SHA-256: `ca7ab50b2e25a0e5af7599c30383e365983fa5b808e65ce2e1c1bba5bfe8dc3b`</sub>
 
-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-server-v2.7
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.6.1/scrcpy-server-v2.6.1
 
 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:

doc/control.md

@@ -94,18 +94,14 @@ the content (if supported by the app) relative to the center of the screen.
 
 https://github.com/Genymobile/scrcpy/assets/543275/26c4a920-9805-43f1-8d4c-608752d04767
 
-To simulate a vertical tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.
+To simulate a tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.
 
 https://github.com/Genymobile/scrcpy/assets/543275/1e252341-4a90-4b29-9d11-9153b324669f
 
-Similarly, to simulate a horizontal tilt gesture:
-<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+_click-and-move-left-or-right_.
-
 Technically, _scrcpy_ generates additional touch events from a "virtual finger"
 at a location inverted through the center of the screen. When pressing
 <kbd>Ctrl</kbd> the _x_ and _y_ coordinates are inverted. Using <kbd>Shift</kbd>
-only inverts _x_, whereas using <kbd>Ctrl</kbd>+<kbd>Shift</kbd> only inverts
-_y_.
+only inverts _x_.
 
 This only works for the default mouse mode (`--mouse=sdk`).
 

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

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
-```

doc/gamepad.md

@@ -1,58 +0,0 @@
-# Gamepad
-
-Several gamepad input modes are available:
-
- - `--gamepad=disabled` (default)
- - `--gamepad=uhid` (or `-G`): simulates physical HID gamepads using the UHID
-   kernel module on the device
- - `--gamepad=aoa`: simulates physical HID gamepads using the AOAv2 protocol
-
-
-## Physical gamepad simulation
-
-Two modes allow to simulate physical HID gamepads on the device, one for each
-physical gamepad plugged into the computer.
-
-
-### UHID
-
-This mode simulates physical HID gamepads using the [UHID] kernel module on the
-device.
-
-[UHID]: https://kernel.org/doc/Documentation/hid/uhid.txt
-
-To enable UHID gamepads, use:
-
-```bash
-scrcpy --gamepad=uhid
-scrcpy -G  # short version
-```
-
-Note: UHID may not work on old Android versions due to permission errors.
-
-
-### AOA
-
-This mode simulates physical HID gamepads using the [AOAv2] protocol.
-
-[AOAv2]: https://source.android.com/devices/accessories/aoa2#hid-support
-
-To enable AOA gamepads, use:
-
-```bash
-scrcpy --gamepad=aoa
-```
-
-Contrary to the other mode, it works at the USB level directly (so it only works
-over USB).
-
-It does not use the scrcpy server, and does not require `adb` (USB debugging).
-Therefore, it is possible to control the device (but not mirror) even with USB
-debugging disabled (see [OTG](otg.md)).
-
-Note: For some reason, in this mode, Android detects multiple physical gamepads
-as a single misbehaving one. Use UHID if you need multiple gamepads.
-
-Note: On Windows, it may only work in [OTG mode](otg.md), not while mirroring
-(it is not possible to open a USB device if it is already open by another
-process like the _adb daemon_).

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
@@ -53,8 +53,6 @@ scrcpy --mouse=uhid
 scrcpy -M  # short version
 ```
 
-Note: UHID may not work on old Android versions due to permission errors.
-
 
 ### AOA
 

doc/otg.md

@@ -6,18 +6,16 @@ was a [physical keyboard] and/or a [physical mouse] connected to the Android
 device (see [keyboard](keyboard.md) and [mouse](mouse.md)).
 
 [physical keyboard]: keyboard.md#physical-keyboard-simulation
-[physical mouse]: mouse.md#physical-mouse-simulation
+[physical mouse]: physical-keyboard-simulation
 
 A special mode (OTG) allows to control the device using AOA
-[keyboard](keyboard.md#aoa), [mouse](mouse.md#aoa) and
-[gamepad](gamepad.md#aoa), without using _adb_ at all (so USB debugging is not
-necessary). In this mode, video and audio are disabled, and `--keyboard=aoa` and
-`--mouse=aoa` are implicitly set. However, gamepads are disabled by default, so
-`--gamepad=aoa` (or `-G` in OTG mode) must be explicitly set.
+[keyboard](keyboard.md#aoa) and [mouse](mouse.md#aoa), without using _adb_ at
+all (so USB debugging is not necessary). In this mode, video and audio are
+disabled, and `--keyboard=aoa and `--mouse=aoa` are implicitly set.
 
-Therefore, it is possible to run _scrcpy_ with only physical keyboard, mouse and
-gamepad simulation, as if the computer keyboard, mouse and gamepads were plugged
-directly to the device via an OTG cable.
+Therefore, it is possible to run _scrcpy_ with only physical keyboard and mouse
+simulation, as if the computer keyboard and mouse were plugged directly to the
+device via an OTG cable.
 
 To enable OTG mode:
 
@@ -34,13 +32,6 @@ scrcpy --otg --keyboard=disabled
 scrcpy --otg --mouse=disabled
 ```
 
-and to enable gamepads:
-
-```bash
-scrcpy --otg --gamepad=aoa
-scrcpy --otg -G  # short version
-```
-
 It only works if the device is connected over USB.
 
 ## OTG issues on Windows
@@ -59,9 +50,9 @@ is enabled, then OTG mode is not necessary.
 Instead, disable video and audio, and select UHID (or AOA):
 
 ```bash
-scrcpy --no-video --no-audio --keyboard=uhid --mouse=uhid --gamepad=uhid
-scrcpy --no-video --no-audio -KMG  # short version
-scrcpy --no-video --no-audio --keyboard=aoa --mouse=aoa --gamepad=aoa
+scrcpy --no-video --no-audio --keyboard=uhid --mouse=uhid
+scrcpy --no-video --no-audio -KM  # short version
+scrcpy --no-video --no-audio --keyboard=aoa --mouse=aoa
 ```
 
 One benefit of UHID is that it also works wirelessly.

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_
@@ -54,8 +53,7 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
  | Open keyboard settings (HID keyboard only)  | <kbd>MOD</kbd>+<kbd>k</kbd>
  | Enable/disable FPS counter (on stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
  | Pinch-to-zoom/rotate                        | <kbd>Ctrl</kbd>+_click-and-move_
- | Tilt vertically (slide with 2 fingers)      | <kbd>Shift</kbd>+_click-and-move_
- | Tilt horizontally (slide with 2 fingers)    | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+_click-and-move_
+ | Tilt (slide vertically with 2 fingers)      | <kbd>Shift</kbd>+_click-and-move_
  | Drag & drop APK file                        | Install APK from computer
  | Drag & drop non-APK file                    | [Push file to device](control.md#push-file-to-device)
 

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
 ```
 
 

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
-```

doc/windows.md

@@ -4,14 +4,14 @@
 
 Download the [latest release]:
 
- - [`scrcpy-win64-v2.7.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `5910bc18d5a16f42d84185ddc7e16a4cee6a6f5f33451559c1a1d6d0099bd5f5`</sub>
- - [`scrcpy-win32-v2.7.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `ef4daf89d500f33d78b830625536ecb18481429dd94433e7634c824292059d06`</sub>
+ - [`scrcpy-win64-v2.6.1.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `041fc3abf8578ddcead5a8c4a8be8960b7c4d45b21d3370ee2683605e86a728c`</sub>
+ - [`scrcpy-win32-v2.6.1.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `17a5d4d17230b4c90fad45af6395efda9aea287a03c04e6b4ecc9ceb8134ea04`</sub>
 
 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-win64-v2.7.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-win32-v2.7.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.6.1/scrcpy-win64-v2.6.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.6.1/scrcpy-win32-v2.6.1.zip
 
 and extract it.
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-# https://gradle.org/release-checksums/
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

install_release.sh

@@ -2,8 +2,8 @@
 set -e
 
 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-server-v2.7
-PREBUILT_SERVER_SHA256=a23c5659f36c260f105c022d27bcb3eafffa26070e7baa9eda66d01377a1adba
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.6.1/scrcpy-server-v2.6.1
+PREBUILT_SERVER_SHA256=ca7ab50b2e25a0e5af7599c30383e365983fa5b808e65ce2e1c1bba5bfe8dc3b
 
 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server

meson.build

@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '2.7',
+        version: '2.6.1',
         meson_version: '>= 0.48',
         default_options: [
             'c_std=c11',

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')

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)/"

server/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     namespace 'com.genymobile.scrcpy'
-    compileSdk 35
+    compileSdk 34
     defaultConfig {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
-        targetSdkVersion 35
-        versionCode 20700
-        versionName "2.7"
+        targetSdkVersion 34
+        versionCode 20601
+        versionName "2.6.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

server/build_without_gradle.sh

@@ -12,10 +12,10 @@
 set -e
 
 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=2.7
+SCRCPY_VERSION_NAME=2.6.1
 
-PLATFORM=${ANDROID_PLATFORM:-35}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-35.0.0}
+PLATFORM=${ANDROID_PLATFORM:-34}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
 BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"
 
 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
@@ -45,15 +45,10 @@ EOF
 
 echo "Generating java from aidl..."
 cd "$SERVER_DIR/src/main/aidl"
-"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" -I. android/view/IRotationWatcher.aidl
-"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" -I. \
+"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" android/view/IRotationWatcher.aidl
+"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" \
     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 \
-)
+"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" android/view/IDisplayFoldListener.aidl
 
 SRC=( \
     com/genymobile/scrcpy/*.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..."

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
-}

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

@@ -1,32 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.os.Build;
-
-/**
- * Android version code constants, done right.
- * <p/>
- * <a href="https://apilevels.com/">API levels</a>
- */
-public final class AndroidVersions {
-
-    private AndroidVersions() {
-        // not instantiable
-    }
-
-    public static final int API_21_ANDROID_5_0 = Build.VERSION_CODES.LOLLIPOP;
-    public static final int API_22_ANDROID_5_1 = Build.VERSION_CODES.LOLLIPOP_MR1;
-    public static final int API_23_ANDROID_6_0 = Build.VERSION_CODES.M;
-    public static final int API_24_ANDROID_7_0 = Build.VERSION_CODES.N;
-    public static final int API_25_ANDROID_7_1 = Build.VERSION_CODES.N_MR1;
-    public static final int API_26_ANDROID_8_0 = Build.VERSION_CODES.O;
-    public static final int API_27_ANDROID_8_1 = Build.VERSION_CODES.O_MR1;
-    public static final int API_28_ANDROID_9 = Build.VERSION_CODES.P;
-    public static final int API_29_ANDROID_10 = Build.VERSION_CODES.Q;
-    public static final int API_30_ANDROID_11 = Build.VERSION_CODES.R;
-    public static final int API_31_ANDROID_12 = Build.VERSION_CODES.S;
-    public static final int API_32_ANDROID_12L = Build.VERSION_CODES.S_V2;
-    public static final int API_33_ANDROID_13 = Build.VERSION_CODES.TIRAMISU;
-    public static final int API_34_ANDROID_14 = Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
-    public static final int API_35_ANDROID_15 = Build.VERSION_CODES.VANILLA_ICE_CREAM;
-
-}

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,13 @@ 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);
+            } else if (restoreNormalPowerMode) {
+                Ln.i("Restoring normal power mode");
+                Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
             }
         }
 

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

@@ -1,14 +1,10 @@
 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.Build;
 import android.os.Process;
 
 public final class FakeContext extends ContextWrapper {
@@ -22,38 +18,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());
     }
@@ -68,7 +32,7 @@ public final class FakeContext extends ContextWrapper {
         return PACKAGE_NAME;
     }
 
-    @TargetApi(AndroidVersions.API_31_ANDROID_12)
+    @TargetApi(Build.VERSION_CODES.S)
     @Override
     public AttributionSource getAttributionSource() {
         AttributionSource.Builder builder = new AttributionSource.Builder(Process.SHELL_UID);
@@ -86,9 +50,4 @@ public final class FakeContext extends ContextWrapper {
     public Context getApplicationContext() {
         return this;
     }
-
-    @Override
-    public ContentResolver getContentResolver() {
-        return contentResolver;
-    }
 }

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

@@ -2,8 +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;
 import com.genymobile.scrcpy.util.Ln;
@@ -31,8 +29,8 @@ public class Options {
     private boolean audioDup;
     private int videoBitRate = 8000000;
     private int audioBitRate = 128000;
-    private float maxFps;
-    private int lockVideoOrientation = Device.LOCK_VIDEO_ORIENTATION_UNLOCKED;
+    private int maxFps;
+    private int lockVideoOrientation = -1;
     private boolean tunnelForward;
     private Rect crop;
     private boolean control = true;
@@ -45,7 +43,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;
 
@@ -57,13 +54,10 @@ public class Options {
     private boolean cleanup = true;
     private boolean powerOn = true;
 
-    private NewDisplay newDisplay;
-
     private boolean listEncoders;
     private boolean listDisplays;
     private boolean listCameras;
     private boolean listCameraSizes;
-    private boolean listApps;
 
     // Options not used by the scrcpy client, but useful to use scrcpy-server directly
     private boolean sendDeviceMeta = true; // send device name and size
@@ -119,7 +113,7 @@ public class Options {
         return audioBitRate;
     }
 
-    public float getMaxFps() {
+    public int getMaxFps() {
         return maxFps;
     }
 
@@ -175,10 +169,6 @@ public class Options {
         return stayAwake;
     }
 
-    public int getScreenOffTimeout() {
-        return screenOffTimeout;
-    }
-
     public List<CodecOption> getVideoCodecOptions() {
         return videoCodecOptions;
     }
@@ -215,12 +205,8 @@ public class Options {
         return powerOn;
     }
 
-    public NewDisplay getNewDisplay() {
-        return newDisplay;
-    }
-
     public boolean getList() {
-        return listEncoders || listDisplays || listCameras || listCameraSizes || listApps;
+        return listEncoders || listDisplays || listCameras || listCameraSizes;
     }
 
     public boolean getListEncoders() {
@@ -239,10 +225,6 @@ public class Options {
         return listCameraSizes;
     }
 
-    public boolean getListApps() {
-        return listApps;
-    }
-
     public boolean getSendDeviceMeta() {
         return sendDeviceMeta;
     }
@@ -259,10 +241,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) {
@@ -343,7 +321,7 @@ public class Options {
                     options.audioBitRate = Integer.parseInt(value);
                     break;
                 case "max_fps":
-                    options.maxFps = parseFloat("max_fps", value);
+                    options.maxFps = Integer.parseInt(value);
                     break;
                 case "lock_video_orientation":
                     options.lockVideoOrientation = Integer.parseInt(value);
@@ -368,12 +346,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;
@@ -416,9 +388,6 @@ public class Options {
                 case "list_camera_sizes":
                     options.listCameraSizes = Boolean.parseBoolean(value);
                     break;
-                case "list_apps":
-                    options.listApps = Boolean.parseBoolean(value);
-                    break;
                 case "camera_id":
                     if (!value.isEmpty()) {
                         options.cameraId = value;
@@ -449,9 +418,6 @@ public class Options {
                 case "camera_high_speed":
                     options.cameraHighSpeed = Boolean.parseBoolean(value);
                     break;
-                case "new_display":
-                    options.newDisplay = parseNewDisplay(value);
-                    break;
                 case "send_device_meta":
                     options.sendDeviceMeta = Boolean.parseBoolean(value);
                     break;
@@ -479,11 +445,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;
     }
 
@@ -495,14 +456,8 @@ public class Options {
         }
         int width = Integer.parseInt(tokens[0]);
         int height = Integer.parseInt(tokens[1]);
-        if (width <= 0 || height <= 0) {
-            throw new IllegalArgumentException("Invalid crop size: " + width + "x" + height);
-        }
         int x = Integer.parseInt(tokens[2]);
         int y = Integer.parseInt(tokens[3]);
-        if (x < 0 || y < 0) {
-            throw new IllegalArgumentException("Invalid crop offset: " + x + ":" + y);
-        }
         return new Rect(x, y, x + width, y + height);
     }
 
@@ -514,9 +469,6 @@ public class Options {
         }
         int width = Integer.parseInt(tokens[0]);
         int height = Integer.parseInt(tokens[1]);
-        if (width <= 0 || height <= 0) {
-            throw new IllegalArgumentException("Invalid non-positive size dimension: \"" + size + "\"");
-        }
         return new Size(width, height);
     }
 
@@ -535,44 +487,4 @@ public class Options {
         float floatAr = Float.parseFloat(tokens[0]);
         return CameraAspectRatio.fromFloat(floatAr);
     }
-
-    private static float parseFloat(String key, String value) {
-        try {
-            return Float.parseFloat(value);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException("Invalid float value for " + key + ": \"" + value + "\"");
-        }
-    }
-
-    private static NewDisplay parseNewDisplay(String newDisplay) {
-        // Possible inputs:
-        //  - "" (empty string)
-        //  - "<width>x<height>/<dpi>"
-        //  - "<width>x<height>"
-        //  - "/<dpi>"
-        if (newDisplay.isEmpty()) {
-            return new NewDisplay();
-        }
-
-        String[] tokens = newDisplay.split("/");
-
-        Size size;
-        if (!tokens[0].isEmpty()) {
-            size = parseSize(tokens[0]);
-        } else {
-            size = null;
-        }
-
-        int dpi;
-        if (tokens.length >= 2) {
-            dpi = Integer.parseInt(tokens[1]);
-            if (dpi <= 0) {
-                throw new IllegalArgumentException("Invalid non-positive dpi: " + tokens[1]);
-            }
-        } else {
-            dpi = 0;
-        }
-
-        return new NewDisplay(size, dpi);
-    }
 }

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

@@ -9,20 +9,22 @@ import com.genymobile.scrcpy.audio.AudioRawRecorder;
 import com.genymobile.scrcpy.audio.AudioSource;
 import com.genymobile.scrcpy.control.ControlChannel;
 import com.genymobile.scrcpy.control.Controller;
+import com.genymobile.scrcpy.control.DeviceMessage;
 import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.DesktopConnection;
 import com.genymobile.scrcpy.device.Device;
-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;
 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 +75,63 @@ 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) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S && 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;
 
         if (options.getCleanup()) {
-            cleanUp = CleanUp.start(options);
+            cleanUp = CleanUp.configure(options.getDisplayId());
+            initThread = startInitThread(options, cleanUp);
         }
 
         int scid = options.getScid();
@@ -113,6 +140,9 @@ public final class Server {
         boolean video = options.getVideo();
         boolean audio = options.getAudio();
         boolean sendDummyByte = options.getSendDummyByte();
+        boolean camera = video && options.getVideoSource() == VideoSource.CAMERA;
+
+        final Device device = camera ? null : new Device(options);
 
         Workarounds.apply();
 
@@ -124,11 +154,13 @@ public final class Server {
                 connection.sendDeviceMeta(Device.getDeviceName());
             }
 
-            Controller controller = null;
-
             if (control) {
                 ControlChannel controlChannel = connection.getControlChannel();
-                controller = new Controller(controlChannel, cleanUp, options);
+                Controller controller = new Controller(device, controlChannel, cleanUp, options.getClipboardAutosync(), options.getPowerOn());
+                device.setClipboardListener(text -> {
+                    DeviceMessage msg = DeviceMessage.createClipboard(text);
+                    controller.getSender().send(msg);
+                });
                 asyncProcessors.add(controller);
             }
 
@@ -147,7 +179,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 +190,14 @@ 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);
-                    } else {
-                        assert options.getDisplayId() != Device.DISPLAY_ID_NONE;
-                        surfaceCapture = new ScreenCapture(controller, options);
-                    }
+                    surfaceCapture = new ScreenCapture(device);
                 } 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 +209,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 +219,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 +233,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 {
@@ -251,11 +282,6 @@ public final class Server {
                 Workarounds.apply();
                 Ln.i(LogUtils.buildCameraListMessage(options.getListCameraSizes()));
             }
-            if (options.getListApps()) {
-                Workarounds.apply();
-                Ln.i("Processing Android apps... (this may take some time)");
-                Ln.i(LogUtils.buildAppListMessage());
-            }
             // Just print the requested data, do not mirror
             return;
         }

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

@@ -52,7 +52,7 @@ public final class Workarounds {
     }
 
     public static void apply() {
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_31_ANDROID_12) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             // On some Samsung devices, DisplayManagerGlobal.getDisplayInfoLocked() calls ActivityThread.currentActivityThread().getConfiguration(),
             // which requires a non-null ConfigurationController.
             // ConfigurationController was introduced in Android 12, so do not attempt to set it on lower versions.
@@ -155,7 +155,7 @@ public final class Workarounds {
         }
     }
 
-    @TargetApi(AndroidVersions.API_30_ANDROID_11)
+    @TargetApi(Build.VERSION_CODES.R)
     @SuppressLint("WrongConstant,MissingPermission")
     public static AudioRecord createAudioRecord(int source, int sampleRate, int channelConfig, int channels, int channelMask, int encoding) throws
             AudioCaptureException {
@@ -226,7 +226,7 @@ public final class Workarounds {
             int[] session = new int[]{AudioManager.AUDIO_SESSION_ID_GENERATE};
 
             int initResult;
-            if (Build.VERSION.SDK_INT < AndroidVersions.API_31_ANDROID_12) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
                 // private native final int native_setup(Object audiorecord_this,
                 // Object /*AudioAttributes*/ attributes,
                 // int[] sampleRate, int channelMask, int channelIndexMask, int audioFormat,
@@ -252,7 +252,7 @@ public final class Workarounds {
                     Method getParcelMethod = attributionSourceState.getClass().getDeclaredMethod("getParcel");
                     Parcel attributionSourceParcel = (Parcel) getParcelMethod.invoke(attributionSourceState);
 
-                    if (Build.VERSION.SDK_INT < AndroidVersions.API_34_ANDROID_14) {
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
                         // private native int native_setup(Object audiorecordThis,
                         // Object /*AudioAttributes*/ attributes,
                         // int[] sampleRate, int channelMask, int channelIndexMask, int audioFormat,

server/src/main/java/com/genymobile/scrcpy/audio/AudioDirectCapture.java

@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy.audio;
 
-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.FakeContext;
 import com.genymobile.scrcpy.Workarounds;
 import com.genymobile.scrcpy.util.Ln;
@@ -46,22 +45,19 @@ public class AudioDirectCapture implements AudioCapture {
         }
     }
 
-    @TargetApi(AndroidVersions.API_23_ANDROID_6_0)
+    @TargetApi(Build.VERSION_CODES.M)
     @SuppressLint({"WrongConstant", "MissingPermission"})
     private static AudioRecord createAudioRecord(int audioSource) {
         AudioRecord.Builder builder = new AudioRecord.Builder();
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_31_ANDROID_12) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             // On older APIs, Workarounds.fillAppInfo() must be called beforehand
             builder.setContext(FakeContext.get());
         }
         builder.setAudioSource(audioSource);
         builder.setAudioFormat(AudioConfig.createAudioFormat());
         int minBufferSize = AudioRecord.getMinBufferSize(SAMPLE_RATE, CHANNEL_CONFIG, ENCODING);
-        if (minBufferSize > 0) {
-            // This buffer size does not impact latency
-            builder.setBufferSizeInBytes(8 * minBufferSize);
-        }
-
+        // This buffer size does not impact latency
+        builder.setBufferSizeInBytes(8 * minBufferSize);
         return builder.build();
     }
 
@@ -118,7 +114,7 @@ public class AudioDirectCapture implements AudioCapture {
 
     @Override
     public void checkCompatibility() throws AudioCaptureException {
-        if (Build.VERSION.SDK_INT < AndroidVersions.API_30_ANDROID_11) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             Ln.w("Audio disabled: it is not supported before Android 11");
             throw new AudioCaptureException();
         }
@@ -126,7 +122,7 @@ public class AudioDirectCapture implements AudioCapture {
 
     @Override
     public void start() throws AudioCaptureException {
-        if (Build.VERSION.SDK_INT == AndroidVersions.API_30_ANDROID_11) {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
             startWorkaroundAndroid11();
             try {
                 tryStartRecording(5, 100);
@@ -147,7 +143,7 @@ public class AudioDirectCapture implements AudioCapture {
     }
 
     @Override
-    @TargetApi(AndroidVersions.API_24_ANDROID_7_0)
+    @TargetApi(Build.VERSION_CODES.N)
     public int read(ByteBuffer outDirectBuffer, MediaCodec.BufferInfo outBufferInfo) {
         return reader.read(outDirectBuffer, outBufferInfo);
     }

server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java

@@ -1,16 +1,14 @@
 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;
 import com.genymobile.scrcpy.util.CodecOption;
 import com.genymobile.scrcpy.util.CodecUtils;
+import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.util.IO;
 import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.device.Streamer;
 
 import android.annotation.TargetApi;
 import android.media.MediaCodec;
@@ -68,12 +66,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) {
@@ -95,7 +93,7 @@ public final class AudioEncoder implements AsyncProcessor {
         return format;
     }
 
-    @TargetApi(AndroidVersions.API_24_ANDROID_7_0)
+    @TargetApi(Build.VERSION_CODES.N)
     private void inputThread(MediaCodec mediaCodec, AudioCapture capture) throws IOException, InterruptedException {
         final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
 
@@ -177,9 +175,9 @@ public final class AudioEncoder implements AsyncProcessor {
         }
     }
 
-    @TargetApi(AndroidVersions.API_23_ANDROID_6_0)
+    @TargetApi(Build.VERSION_CODES.M)
     private void encode() throws IOException, ConfigurationException, AudioCaptureException {
-        if (Build.VERSION.SDK_INT < AndroidVersions.API_30_ANDROID_11) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             Ln.w("Audio disabled: it is not supported before Android 11");
             streamer.writeDisableStream(false);
             return;
@@ -289,13 +287,7 @@ public final class AudioEncoder implements AsyncProcessor {
         if (encoderName != null) {
             Ln.d("Creating audio encoder by name: '" + encoderName + "'");
             try {
-                MediaCodec mediaCodec = MediaCodec.createByCodecName(encoderName);
-                String mimeType = Codec.getMimeType(mediaCodec);
-                if (!codec.getMimeType().equals(mimeType)) {
-                    Ln.e("Audio encoder type for \"" + encoderName + "\" (" + mimeType + ") does not match codec type (" + codec.getMimeType() + ")");
-                    throw new ConfigurationException("Incorrect encoder type: " + encoderName);
-                }
-                return mediaCodec;
+                return MediaCodec.createByCodecName(encoderName);
             } catch (IllegalArgumentException e) {
                 Ln.e("Audio encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildAudioEncoderListMessage());
                 throw new ConfigurationException("Unknown encoder: " + encoderName);
@@ -316,7 +308,7 @@ public final class AudioEncoder implements AsyncProcessor {
     }
 
     private final class EncoderCallback extends MediaCodec.Callback {
-        @TargetApi(AndroidVersions.API_24_ANDROID_7_0)
+        @TargetApi(Build.VERSION_CODES.N)
         @Override
         public void onInputBufferAvailable(MediaCodec codec, int index) {
             try {

server/src/main/java/com/genymobile/scrcpy/audio/AudioPlaybackCapture.java

@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy.audio;
 
-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.FakeContext;
 import com.genymobile.scrcpy.util.Ln;
 
@@ -109,7 +108,7 @@ public final class AudioPlaybackCapture implements AudioCapture {
 
     @Override
     public void checkCompatibility() throws AudioCaptureException {
-        if (Build.VERSION.SDK_INT < AndroidVersions.API_33_ANDROID_13) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             Ln.w("Audio disabled: audio playback capture source not supported before Android 13");
             throw new AudioCaptureException();
         }
@@ -131,7 +130,7 @@ public final class AudioPlaybackCapture implements AudioCapture {
     }
 
     @Override
-    @TargetApi(AndroidVersions.API_24_ANDROID_7_0)
+    @TargetApi(Build.VERSION_CODES.N)
     public int read(ByteBuffer outDirectBuffer, MediaCodec.BufferInfo outBufferInfo) {
         return reader.read(outDirectBuffer, outBufferInfo);
     }

server/src/main/java/com/genymobile/scrcpy/audio/AudioRawRecorder.java

@@ -1,10 +1,9 @@
 package com.genymobile.scrcpy.audio;
 
-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.AsyncProcessor;
-import com.genymobile.scrcpy.device.Streamer;
 import com.genymobile.scrcpy.util.IO;
 import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Streamer;
 
 import android.media.MediaCodec;
 import android.os.Build;
@@ -25,7 +24,7 @@ public final class AudioRawRecorder implements AsyncProcessor {
     }
 
     private void record() throws IOException, AudioCaptureException {
-        if (Build.VERSION.SDK_INT < AndroidVersions.API_30_ANDROID_11) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             Ln.w("Audio disabled: it is not supported before Android 11");
             streamer.writeDisableStream(false);
             return;

server/src/main/java/com/genymobile/scrcpy/audio/AudioRecordReader.java

@@ -1,12 +1,12 @@
 package com.genymobile.scrcpy.audio;
 
-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.util.Ln;
 
 import android.annotation.TargetApi;
 import android.media.AudioRecord;
 import android.media.AudioTimestamp;
 import android.media.MediaCodec;
+import android.os.Build;
 
 import java.nio.ByteBuffer;
 
@@ -26,7 +26,7 @@ public class AudioRecordReader {
         this.recorder = recorder;
     }
 
-    @TargetApi(AndroidVersions.API_24_ANDROID_7_0)
+    @TargetApi(Build.VERSION_CODES.N)
     public int read(ByteBuffer outDirectBuffer, MediaCodec.BufferInfo outBufferInfo) {
         int r = recorder.read(outDirectBuffer, AudioConfig.MAX_READ_SIZE);
         if (r <= 0) {

server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java

@@ -17,14 +17,12 @@ 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 +33,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 +48,6 @@ public final class ControlMessage {
     private long sequence;
     private int id;
     private byte[] data;
-    private boolean on;
 
     private ControlMessage() {
     }
@@ -118,10 +115,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;
     }
 
@@ -131,11 +131,10 @@ public final class ControlMessage {
         return msg;
     }
 
-    public static ControlMessage createUhidCreate(int id, String name, byte[] reportDesc) {
+    public static ControlMessage createUhidCreate(int id, byte[] reportDesc) {
         ControlMessage msg = new ControlMessage();
         msg.type = TYPE_UHID_CREATE;
         msg.id = id;
-        msg.text = name;
         msg.data = reportDesc;
         return msg;
     }
@@ -155,13 +154,6 @@ public final class ControlMessage {
         return msg;
     }
 
-    public static ControlMessage createStartApp(String name) {
-        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_START_APP;
-        msg.text = name;
-        return msg;
-    }
-
     public int getType() {
         return type;
     }
@@ -233,8 +225,4 @@ public final class ControlMessage {
     public byte[] getData() {
         return data;
     }
-
-    public boolean getOn() {
-        return on;
-    }
 }

server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java

@@ -1,7 +1,7 @@
 package com.genymobile.scrcpy.control;
 
-import com.genymobile.scrcpy.device.Position;
 import com.genymobile.scrcpy.util.Binary;
+import com.genymobile.scrcpy.device.Position;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
@@ -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();
@@ -54,8 +53,6 @@ public class ControlMessageReader {
                 return parseUhidInput();
             case ControlMessage.TYPE_UHID_DESTROY:
                 return parseUhidDestroy();
-            case ControlMessage.TYPE_START_APP:
-                return parseStartApp();
             default:
                 throw new ControlProtocolException("Unknown event type: " + type);
         }
@@ -78,14 +75,9 @@ public class ControlMessageReader {
         return value;
     }
 
-    private String parseString(int sizeBytes) throws IOException {
-        assert sizeBytes > 0 && sizeBytes <= 4;
-        byte[] data = parseByteArray(sizeBytes);
-        return new String(data, StandardCharsets.UTF_8);
-    }
-
     private String parseString() throws IOException {
-        return parseString(4);
+        byte[] data = parseByteArray(4);
+        return new String(data, StandardCharsets.UTF_8);
     }
 
     private byte[] parseByteArray(int sizeBytes) throws IOException {
@@ -135,16 +127,15 @@ 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 {
         int id = dis.readUnsignedShort();
-        String name = parseString(1);
         byte[] data = parseByteArray(2);
-        return ControlMessage.createUhidCreate(id, name, data);
+        return ControlMessage.createUhidCreate(id, data);
     }
 
     private ControlMessage parseUhidInput() throws IOException {
@@ -158,11 +149,6 @@ public class ControlMessageReader {
         return ControlMessage.createUhidDestroy(id);
     }
 
-    private ControlMessage parseStartApp() throws IOException {
-        String name = parseString(1);
-        return ControlMessage.createStartApp(name);
-    }
-
     private Position parsePosition() throws IOException {
         int x = dis.readInt();
         int y = dis.readInt();

server/src/main/java/com/genymobile/scrcpy/control/Controller.java

@@ -1,22 +1,14 @@
 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.util.Ln;
 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;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
-import android.content.IOnPrimaryClipChangedListener;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
@@ -26,40 +18,11 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 
-public class Controller implements AsyncProcessor, VirtualDisplayListener {
-
-    /*
-     * For event injection, there are two display ids:
-     *  - the displayId passed to the constructor (which comes from --display-id passed by the client, 0 for the main display);
-     *  - the virtualDisplayId used for mirroring, notified by the capture instance via the VirtualDisplayListener interface.
-     *
-     * (In case the ScreenCapture uses the "SurfaceControl API", then both ids are equals, but this is an implementation detail.)
-     *
-     * In order to make events work correctly in all cases:
-     *  - virtualDisplayId must be used for events relative to the display (mouse and touch events with coordinates);
-     *  - displayId must be used for other events (like key events).
-     *
-     * If a new separate virtual display is created (using --new-display), then displayId == Device.DISPLAY_ID_NONE. In that case, all events are
-     * sent to the virtual display id.
-     */
-
-    private static final class DisplayData {
-        private final int virtualDisplayId;
-        private final PositionMapper positionMapper;
-
-        private DisplayData(int virtualDisplayId, PositionMapper positionMapper) {
-            this.virtualDisplayId = virtualDisplayId;
-            this.positionMapper = positionMapper;
-        }
-    }
+public class Controller implements AsyncProcessor {
 
     private static final int DEFAULT_DEVICE_ID = 0;
 
@@ -67,14 +30,12 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
     private static final int POINTER_ID_MOUSE = -1;
 
     private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-    private ExecutorService startAppExecutor;
 
     private Thread thread;
 
     private UhidManager uhidManager;
 
-    private final int displayId;
-    private final boolean supportsInputEvents;
+    private final Device device;
     private final ControlChannel controlChannel;
     private final CleanUp cleanUp;
     private final DeviceMessageSender sender;
@@ -83,73 +44,21 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
     private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
 
-    private final AtomicBoolean isSettingClipboard = new AtomicBoolean();
-
-    private final AtomicReference<DisplayData> displayData = new AtomicReference<>();
-    private final Object displayDataAvailable = new Object(); // condition variable
-
     private long lastTouchDown;
     private final PointersState pointersState = new PointersState();
     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(Device device, ControlChannel controlChannel, CleanUp cleanUp, boolean clipboardAutosync, boolean powerOn) {
+        this.device = device;
         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);
-
-        supportsInputEvents = Device.supportsInputEvents(displayId);
-        if (!supportsInputEvents) {
-            Ln.w("Input events are not supported for secondary displays before Android 10");
-        }
-
-        if (clipboardAutosync) {
-            // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
-            ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
-            if (clipboardManager != null) {
-                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
-                    @Override
-                    public void dispatchPrimaryClipChanged() {
-                        if (isSettingClipboard.get()) {
-                            // This is a notification for the change we are currently applying, ignore it
-                            return;
-                        }
-                        String text = Device.getClipboardText();
-                        if (text != null) {
-                            DeviceMessage msg = DeviceMessage.createClipboard(text);
-                            sender.send(msg);
-                        }
-                    }
-                });
-            } else {
-                Ln.w("No clipboard manager, copy-paste between device and computer will not work");
-            }
-        }
-    }
-
-    @Override
-    public void onNewVirtualDisplay(int virtualDisplayId, PositionMapper positionMapper) {
-        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() {
@@ -175,8 +84,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
     private void control() throws IOException {
         // on start, power on the device
-        if (powerOn && displayId == 0 && !Device.isScreenOn(displayId)) {
-            Device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, displayId, Device.INJECT_MODE_ASYNC);
+        if (powerOn && !Device.isScreenOn()) {
+            device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, Device.INJECT_MODE_ASYNC);
 
             // dirty hack
             // After POWER is injected, the device is powered on asynchronously.
@@ -229,6 +138,10 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
         sender.join();
     }
 
+    public DeviceMessageSender getSender() {
+        return sender;
+    }
+
     private boolean handleEvent() throws IOException {
         ControlMessage msg;
         try {
@@ -240,27 +153,27 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         switch (msg.getType()) {
             case ControlMessage.TYPE_INJECT_KEYCODE:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                     injectKeycode(msg.getAction(), msg.getKeycode(), msg.getRepeat(), msg.getMetaState());
                 }
                 break;
             case ControlMessage.TYPE_INJECT_TEXT:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                     injectText(msg.getText());
                 }
                 break;
             case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                     injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getActionButton(), msg.getButtons());
                 }
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                     injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll(), msg.getButtons());
                 }
                 break;
             case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                     pressBackOrTurnScreenOn(msg.getAction());
                 }
                 break;
@@ -279,16 +192,25 @@ 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 (device.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:
-                Device.rotateDevice(getActionDisplayId());
+                device.rotateDevice();
                 break;
             case ControlMessage.TYPE_UHID_CREATE:
-                getUhidManager().open(msg.getId(), msg.getText(), msg.getData());
+                getUhidManager().open(msg.getId(), msg.getData());
                 break;
             case ControlMessage.TYPE_UHID_INPUT:
                 getUhidManager().writeInput(msg.getId(), msg.getData());
@@ -299,12 +221,6 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
             case ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
                 openHardKeyboardSettings();
                 break;
-            case ControlMessage.TYPE_START_APP:
-                startAppAsync(msg.getText());
-                break;
-            case ControlMessage.TYPE_RESET_VIDEO:
-                resetVideo();
-                break;
             default:
                 // do nothing
         }
@@ -313,11 +229,10 @@ 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);
+        return device.injectKeyEvent(action, keycode, repeat, metaState, Device.INJECT_MODE_ASYNC);
     }
 
     private boolean injectChar(char c) {
@@ -327,10 +242,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
         if (events == null) {
             return false;
         }
-
-        int actionDisplayId = getActionDisplayId();
         for (KeyEvent event : events) {
-            if (!Device.injectEvent(event, actionDisplayId, Device.INJECT_MODE_ASYNC)) {
+            if (!device.injectEvent(event, Device.INJECT_MODE_ASYNC)) {
                 return false;
             }
         }
@@ -352,12 +265,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
-        @SuppressWarnings("checkstyle:HiddenField")
-        DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a touch event without a display";
-
-        Point point = displayData.positionMapper.map(position);
+        Point point = device.getPhysicalPoint(position);
         if (point == null) {
             Ln.w("Ignore touch event, it was generated for a different device size");
             return false;
@@ -410,13 +318,13 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
          *
          * Otherwise, Chrome does not work properly: <https://github.com/Genymobile/scrcpy/issues/3635>
          */
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_23_ANDROID_6_0 && source == InputDevice.SOURCE_MOUSE) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && source == InputDevice.SOURCE_MOUSE) {
             if (action == MotionEvent.ACTION_DOWN) {
                 if (actionButton == buttons) {
                     // First button pressed: ACTION_DOWN
                     MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(downEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!device.injectEvent(downEvent, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -427,7 +335,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(pressEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(pressEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!device.injectEvent(pressEvent, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -441,7 +349,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(releaseEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!device.injectEvent(releaseEvent, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -449,7 +357,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                     // Last button released: ACTION_UP
                     MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(upEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!device.injectEvent(upEvent, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -460,20 +368,14 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                 DEFAULT_DEVICE_ID, 0, source, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 
     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
-        @SuppressWarnings("checkstyle:HiddenField")
-        DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a scroll event without a display";
-
-        Point point = displayData.positionMapper.map(position);
+        Point point = device.getPhysicalPoint(position);
         if (point == null) {
-            Ln.w("Ignore scroll event, it was generated for a different device size");
+            // ignore event
             return false;
         }
 
@@ -488,22 +390,22 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                 DEFAULT_DEVICE_ID, 0, InputDevice.SOURCE_MOUSE, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 
     /**
-     * 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)) {
-            return injectKeyEvent(action, KeyEvent.KEYCODE_BACK, 0, 0, Device.INJECT_MODE_ASYNC);
+        if (Device.isScreenOn()) {
+            return device.injectKeyEvent(action, KeyEvent.KEYCODE_BACK, 0, 0, Device.INJECT_MODE_ASYNC);
         }
 
         // Screen is off
@@ -513,19 +415,18 @@ 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);
+        return device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, Device.INJECT_MODE_ASYNC);
     }
 
     private void getClipboard(int copyKey) {
         // On Android >= 7, press the COPY or CUT key if requested
-        if (copyKey != ControlMessage.COPY_KEY_NONE && Build.VERSION.SDK_INT >= AndroidVersions.API_24_ANDROID_7_0 && supportsInputEvents) {
+        if (copyKey != ControlMessage.COPY_KEY_NONE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && device.supportsInputEvents()) {
             int key = copyKey == ControlMessage.COPY_KEY_COPY ? KeyEvent.KEYCODE_COPY : KeyEvent.KEYCODE_CUT;
             // Wait until the event is finished, to ensure that the clipboard text we read just after is the correct one
-            pressReleaseKeycode(key, Device.INJECT_MODE_WAIT_FOR_FINISH);
+            device.pressReleaseKeycode(key, Device.INJECT_MODE_WAIT_FOR_FINISH);
         }
 
         // If clipboard autosync is enabled, then the device clipboard is synchronized to the computer clipboard whenever it changes, in
@@ -541,16 +442,14 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
     }
 
     private boolean setClipboard(String text, boolean paste, long sequence) {
-        isSettingClipboard.set(true);
-        boolean ok = Device.setClipboardText(text);
-        isSettingClipboard.set(false);
+        boolean ok = device.setClipboardText(text);
         if (ok) {
             Ln.i("Device clipboard set");
         }
 
         // On Android >= 7, also press the PASTE key if requested
-        if (paste && Build.VERSION.SDK_INT >= AndroidVersions.API_24_ANDROID_7_0 && supportsInputEvents) {
-            pressReleaseKeycode(KeyEvent.KEYCODE_PASTE, Device.INJECT_MODE_ASYNC);
+        if (paste && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && device.supportsInputEvents()) {
+            device.pressReleaseKeycode(KeyEvent.KEYCODE_PASTE, Device.INJECT_MODE_ASYNC);
         }
 
         if (sequence != ControlMessage.SEQUENCE_INVALID) {
@@ -566,137 +465,4 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
         Intent intent = new Intent("android.settings.HARD_KEYBOARD_SETTINGS");
         ServiceManager.getActivityManager().startActivity(intent);
     }
-
-    private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState, int injectMode) {
-        return Device.injectKeyEvent(action, keyCode, repeat, metaState, getActionDisplayId(), injectMode);
-    }
-
-    private boolean pressReleaseKeycode(int keyCode, int injectMode) {
-        return Device.pressReleaseKeycode(keyCode, getActionDisplayId(), injectMode);
-    }
-
-    private int getActionDisplayId() {
-        if (displayId != Device.DISPLAY_ID_NONE) {
-            // Real screen mirrored, use the source display id
-            return displayId;
-        }
-
-        // Virtual display created by --new-display, use the virtualDisplayId
-        DisplayData data = displayData.get();
-        if (data == null) {
-            // If no virtual display id is initialized yet, use the main display id
-            return 0;
-        }
-
-        return data.virtualDisplayId;
-    }
-
-    private void startAppAsync(String name) {
-        if (startAppExecutor == null) {
-            startAppExecutor = Executors.newSingleThreadExecutor();
-        }
-
-        // Listing and selecting the app may take a lot of time
-        startAppExecutor.submit(() -> startApp(name));
-    }
-
-    private void startApp(String name) {
-        boolean forceStopBeforeStart = name.startsWith("+");
-        if (forceStopBeforeStart) {
-            name = name.substring(1);
-        }
-
-        DeviceApp app;
-        boolean searchByName = name.startsWith("?");
-        if (searchByName) {
-            name = name.substring(1);
-
-            Ln.i("Processing Android apps... (this may take some time)");
-            List<DeviceApp> apps = Device.findByName(name);
-            if (apps.isEmpty()) {
-                Ln.w("No app found for name \"" + name + "\"");
-                return;
-            }
-
-            if (apps.size() > 1) {
-                String title = "No unique app found for name \"" + name + "\":";
-                Ln.w(LogUtils.buildAppListMessage(title, apps));
-                return;
-            }
-
-            app = apps.get(0);
-        } else {
-            app = Device.findByPackageName(name);
-            if (app == null) {
-                Ln.w("No app found for package \"" + name + "\"");
-                return;
-            }
-        }
-
-        int startAppDisplayId = getStartAppDisplayId();
-        if (startAppDisplayId == Device.DISPLAY_ID_NONE) {
-            Ln.e("No known display id to start app \"" + name + "\"");
-            return;
-        }
-
-        Ln.i("Starting app \"" + app.getName() + "\" [" + app.getPackageName() + "] on display " + startAppDisplayId + "...");
-        Device.startApp(app.getPackageName(), startAppDisplayId, forceStopBeforeStart);
-    }
-
-    private int getStartAppDisplayId() {
-        if (displayId != Device.DISPLAY_ID_NONE) {
-            return displayId;
-        }
-
-        // Mirroring a new virtual display id (using --new-display-id feature)
-        try {
-            // Wait for at most 1 second until a virtual display id is known
-            DisplayData data = waitDisplayData(1000);
-            if (data != null) {
-                return data.virtualDisplayId;
-            }
-        } catch (InterruptedException e) {
-            // do nothing
-        }
-
-        // No display id available
-        return Device.DISPLAY_ID_NONE;
-    }
-
-    private DisplayData waitDisplayData(long timeoutMillis) throws InterruptedException {
-        long deadline = System.currentTimeMillis() + timeoutMillis;
-
-        synchronized (displayDataAvailable) {
-            DisplayData data = displayData.get();
-            while (data == null) {
-                long timeout = deadline - System.currentTimeMillis();
-                if (timeout < 0) {
-                    return null;
-                }
-                displayDataAvailable.wait(timeout);
-                data = displayData.get();
-            }
-
-            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();
-        }
-    }
 }

server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java

@@ -1,48 +0,0 @@
-package com.genymobile.scrcpy.control;
-
-import com.genymobile.scrcpy.device.Point;
-import com.genymobile.scrcpy.device.Position;
-import com.genymobile.scrcpy.device.Size;
-import com.genymobile.scrcpy.video.ScreenInfo;
-
-import android.graphics.Rect;
-
-public final class PositionMapper {
-
-    private final Size videoSize;
-    private final Rect contentRect;
-    private final int coordsRotation;
-
-    public PositionMapper(Size videoSize, Rect contentRect, int videoRotation) {
-        this.videoSize = videoSize;
-        this.contentRect = contentRect;
-        this.coordsRotation = reverseRotation(videoRotation);
-    }
-
-    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());
-    }
-
-    private static int reverseRotation(int rotation) {
-        return (4 - rotation) % 4;
-    }
-
-    public Point map(Position position) {
-        // reverse the video rotation to apply the events
-        Position devicePosition = position.rotate(coordsRotation);
-
-        Size clientVideoSize = devicePosition.getScreenSize();
-        if (!videoSize.equals(clientVideoSize)) {
-            // The client sends a click relative to a video with wrong dimensions,
-            // the device may have been rotated since the event was generated, so ignore the event
-            return null;
-        }
-
-        Point point = devicePosition.getPoint();
-        int convertedX = contentRect.left + point.getX() * contentRect.width() / videoSize.getWidth();
-        int convertedY = contentRect.top + point.getY() * contentRect.height() / videoSize.getHeight();
-        return new Point(convertedX, convertedY);
-    }
-}

server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java

@@ -1,8 +1,6 @@
 package com.genymobile.scrcpy.control;
 
-import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.util.StringUtils;
 
 import android.os.Build;
 import android.os.HandlerThread;
@@ -39,7 +37,7 @@ public final class UhidManager {
 
     public UhidManager(DeviceMessageSender sender) {
         this.sender = sender;
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_23_ANDROID_6_0) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             HandlerThread thread = new HandlerThread("UHidManager");
             thread.start();
             queue = thread.getLooper().getQueue();
@@ -48,7 +46,7 @@ public final class UhidManager {
         }
     }
 
-    public void open(int id, String name, byte[] reportDesc) throws IOException {
+    public void open(int id, byte[] reportDesc) throws IOException {
         try {
             FileDescriptor fd = Os.open("/dev/uhid", OsConstants.O_RDWR, 0);
             try {
@@ -58,7 +56,7 @@ public final class UhidManager {
                     close(old);
                 }
 
-                byte[] req = buildUhidCreate2Req(name, reportDesc);
+                byte[] req = buildUhidCreate2Req(reportDesc);
                 Os.write(fd, req, 0, req.length);
 
                 registerUhidListener(id, fd);
@@ -72,7 +70,7 @@ public final class UhidManager {
     }
 
     private void registerUhidListener(int id, FileDescriptor fd) {
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_23_ANDROID_6_0) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             queue.addOnFileDescriptorEventListener(fd, MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT, (fd2, events) -> {
                 try {
                     buffer.clear();
@@ -98,7 +96,7 @@ public final class UhidManager {
     }
 
     private void unregisterUhidListener(FileDescriptor fd) {
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_23_ANDROID_6_0) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             queue.removeOnFileDescriptorEventListener(fd);
         }
     }
@@ -148,7 +146,7 @@ public final class UhidManager {
         }
     }
 
-    private static byte[] buildUhidCreate2Req(String name, byte[] reportDesc) {
+    private static byte[] buildUhidCreate2Req(byte[] reportDesc) {
         /*
          * struct uhid_event {
          *     uint32_t type;
@@ -173,14 +171,8 @@ public final class UhidManager {
         byte[] empty = new byte[256];
         ByteBuffer buf = ByteBuffer.allocate(280 + reportDesc.length).order(ByteOrder.nativeOrder());
         buf.putInt(UHID_CREATE2);
-
-        String actualName = name.isEmpty() ? "scrcpy" : "scrcpy: " + name;
-        byte[] utf8Name = actualName.getBytes(StandardCharsets.UTF_8);
-        int len = StringUtils.getUtf8TruncationIndex(utf8Name, 127);
-        assert len <= 127;
-        buf.put(utf8Name, 0, len);
-        buf.put(empty, 0, 256 - len);
-
+        buf.put("scrcpy".getBytes(StandardCharsets.US_ASCII));
+        buf.put(empty, 0, 256 - "scrcpy".length());
         buf.putShort((short) reportDesc.length);
         buf.putShort(BUS_VIRTUAL);
         buf.putInt(0); // vendor id