Terminate on controller error

This is particularly important to react to server socket disconnection since video and audio may be disabled. PR #4868 <https://github.com/Genymobile/scrcpy/pull/4868>
Update documentation for --no-window
2026-02-25 15:54:28 +01:00 · 2024-05-11 17:12:00 +02:00 · 2024-05-11 17:12:00 +02:00 · 2024-05-11 17:06:16 +02:00 · 2024-04-19 12:57:18 +02:00 · 2024-04-19 12:49:03 +02:00
66 changed files with 1411 additions and 744 deletions
--- a/FAQ.md
+++ b/FAQ.md
@@ -133,9 +133,9 @@ Try with another USB cable or plug it into another USB port. See [#281] and
 [#283]: https://github.com/Genymobile/scrcpy/issues/283


-## HID/OTG issues on Windows
+## OTG issues on Windows

-On Windows, if `scrcpy --otg` (or `--hid-keyboard`/`--hid-mouse`) results in:
+On Windows, if `scrcpy --otg` (or `--keyboard=aoa`/`--mouse=aoa`) results in:

 >     ERROR: Could not find any USB device

@@ -170,12 +170,13 @@ The default text injection method is [limited to ASCII characters][text-input].
 A trick allows to also inject some [accented characters][accented-characters],
 but that's all. See [#37].

-It is also possible to simulate a [physical keyboard][hid] (HID).
+To avoid the problem, [change the keyboard mode to simulate a physical
+keyboard][hid].

 [text-input]: https://github.com/Genymobile/scrcpy/issues?q=is%3Aopen+is%3Aissue+label%3Aunicode
 [accented-characters]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-accented-characters
 [#37]: https://github.com/Genymobile/scrcpy/issues/37
-[hid]: doc/hid-otg.md
+[hid]: doc/keyboard.md#physical-keyboard-simulation


 ## Client issues
@@ -222,7 +223,7 @@ java.lang.IllegalStateException
        at android.media.MediaCodec.native_dequeueOutputBuffer(Native Method)
 ```

-then try with another [encoder](doc/video.md#codec).
+then try with another [encoder](doc/video.md#encoder).


 ## Translations
--- a/2
+++ b/2
@@ -188,7 +188,7 @@
      identification within third-party archives.

   Copyright (C) 2018 Genymobile
-   Copyright (C) 2018-2023 Romain Vimont
+   Copyright (C) 2018-2024 Romain Vimont

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-# scrcpy (v2.3.1)
+**This GitHub repo (<https://github.com/Genymobile/scrcpy>) is the only official
+source for the project. Do not download releases from random websites, even if
+their name contains `scrcpy`.**
+
+# scrcpy (v2.4)

 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />

@@ -32,10 +36,13 @@ Its features include:
 - [configurable quality](doc/video.md)
 - [camera mirroring](doc/camera.md) (Android 12+)
 - [mirroring as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
- - [physical keyboard/mouse simulation (HID)](doc/hid-otg.md)
- - [OTG mode](doc/hid-otg.md#otg)
+ - physical [keyboard][hid-keyboard] and [mouse][hid-mouse] simulation (HID)
+ - [OTG mode](doc/otg.md)
 - and more…

+[hid-keyboard]: doc/keyboard.md#physical-keyboard-simulation
+[hid-mouse]: doc/mouse.md#physical-mouse-simulation
+
 ## Prerequisites

 The Android device requires at least API 21 (Android 5.0).
@@ -53,8 +60,7 @@ this option is set.

 [control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323

-Note that USB debugging is not required to run scrcpy in [OTG
-mode](doc/hid-otg.md#otg).
+Note that USB debugging is not required to run scrcpy in [OTG mode](doc/otg.md).


 ## Get the app
@@ -64,6 +70,41 @@ mode](doc/hid-otg.md#otg).
 - [macOS](doc/macos.md)


+## Usage examples
+
+There are a lot of options, [documented](#user-documentation) in separate pages.
+Here are just some common examples.
+
+ - Capture the screen in H.265 (better quality), limit the size to 1920, limit
+   the frame rate to 60fps, disable audio, and control the device by simulating
+   a physical keyboard:
+
+    ```bash
+    scrcpy --video-codec=h265 --max-size=1920 --max-fps=60 --no-audio --keyboard=uhid
+    scrcpy --video-codec=h265 -m1920 --max-fps=60 --no-audio -K  # short version
+    ```
+
+ - Record the device camera in H.265 at 1920x1080 (and microphone) to an MP4
+   file:
+
+    ```bash
+    scrcpy --video-source=camera --video-codec=h265 --camera-size=1920x1080 --record=file.mp4
+    ```
+
+ - Capture the device front camera and expose it as a webcam on the computer (on
+   Linux):
+
+    ```bash
+    scrcpy --video-source=camera --camera-size=1920x1080 --camera-facing=front --v4l2-sink=/dev/video2 --no-playback
+    ```
+
+ - Control the device without mirroring by simulating a physical keyboard and
+   mouse (USB debugging not required):
+
+    ```bash
+    scrcpy --otg
+    ```
+
 ## User documentation

 The application provides a lot of features and configuration options. They are
@@ -73,11 +114,13 @@ documented in the following pages:
 - [Video](doc/video.md)
 - [Audio](doc/audio.md)
 - [Control](doc/control.md)
+ - [Keyboard](doc/keyboard.md)
+ - [Mouse](doc/mouse.md)
 - [Device](doc/device.md)
 - [Window](doc/window.md)
 - [Recording](doc/recording.md)
 - [Tunnels](doc/tunnels.md)
- - [HID/OTG](doc/hid-otg.md)
+ - [OTG](doc/otg.md)
 - [Camera](doc/camera.md)
 - [Video4Linux](doc/v4l2.md)
 - [Shortcuts](doc/shortcuts.md)
@@ -130,7 +173,7 @@ work][donate]:
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2023 Romain Vimont
+    Copyright (C) 2018-2024 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -28,7 +28,7 @@ _scrcpy() {
        --forward-all-clicks
        -h --help
        -K
-        --keyboard
+        --keyboard=
        --kill-adb-on-close
        --legacy-paste
        --list-camera-sizes
@@ -118,11 +118,11 @@ _scrcpy() {
            return
            ;;
        --keyboard)
-            COMPREPLY=($(compgen -W 'disabled sdk aoa uhid' -- "$cur"))
+            COMPREPLY=($(compgen -W 'disabled sdk uhid aoa' -- "$cur"))
            return
            ;;
        --mouse)
-            COMPREPLY=($(compgen -W 'disabled sdk aoa uhid' -- "$cur"))
+            COMPREPLY=($(compgen -W 'disabled sdk uhid aoa' -- "$cur"))
            return
            ;;
        --orientation|--display-orientation)
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -35,7 +35,7 @@ arguments=(
    '--forward-all-clicks[Forward clicks to device]'
    {-h,--help}'[Print the help]'
    '-K[Use UHID keyboard (same as --keyboard=uhid)]'
-    '--keyboard[Set the keyboard input mode]:mode:(disabled sdk aoa uhid)'
+    '--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-camera-sizes[List the valid camera capture sizes]'
@@ -46,7 +46,7 @@ arguments=(
    {-m,--max-size=}'[Limit both the width and height of the video to value]'
    '-M[Use UHID mouse (same as --mouse=uhid)]'
    '--max-fps=[Limit the frame rate of screen capture]'
-    '--mouse[Set the mouse input mode]:mode:(disabled sdk aoa uhid)'
+    '--mouse[Set the mouse input mode]:mode:(disabled sdk uhid aoa)'
    {-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
    {-N,--no-playback}'[Disable video and audio playback]'
    '--no-audio[Disable audio forwarding]'
--- a/app/deps/.gitignore
+++ b/app/deps/.gitignore
@@ -0,0 +1 @@
+/work
--- a/app/deps/README
+++ b/app/deps/README
@@ -0,0 +1,27 @@
+This directory (app/deps/) contains:
+
+*.sh          : shell scripts to download and build dependencies
+
+patches/      : patches to fix dependencies (used by scripts)
+
+work/sources/ : downloaded tarballs and extracted folders
+                    ffmpeg-6.1.1.tar.xz
+                    ffmpeg-6.1.1/
+                    libusb-1.0.27.tar.gz
+                    libusb-1.0.27/
+                    ...
+work/build/   : build dirs for each dependency/version/architecture
+                    ffmpeg-6.1.1/win32/
+                    ffmpeg-6.1.1/win64/
+                    libusb-1.0.27/win32/
+                    libusb-1.0.27/win64/
+                    ...
+work/install/ : install dirs for each architexture
+                    win32/bin/
+                    win32/include/
+                    win32/lib/
+                    win32/share/
+                    win64/bin/
+                    win64/include/
+                    win64/lib/
+                    win64/share/
--- a/app/deps/adb.sh
+++ b/app/deps/adb.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -ex
+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
+cd "$DEPS_DIR"
+. common
+
+VERSION=34.0.5
+FILENAME=platform-tools_r$VERSION-windows.zip
+PROJECT_DIR=platform-tools-$VERSION
+SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571
+
+cd "$SOURCES_DIR"
+
+if [[ -d "$PROJECT_DIR" ]]
+then
+    echo "$PWD/$PROJECT_DIR" found
+else
+    get_file "https://dl.google.com/android/repository/$FILENAME" "$FILENAME" "$SHA256SUM"
+    mkdir -p "$PROJECT_DIR"
+    cd "$PROJECT_DIR"
+    ZIP_PREFIX=platform-tools
+    unzip "../$FILENAME" \
+        "$ZIP_PREFIX"/AdbWinApi.dll \
+        "$ZIP_PREFIX"/AdbWinUsbApi.dll \
+        "$ZIP_PREFIX"/adb.exe
+    mv "$ZIP_PREFIX"/* .
+    rmdir "$ZIP_PREFIX"
+fi
+
+mkdir -p "$INSTALL_DIR/$HOST/bin"
+cd "$INSTALL_DIR/$HOST/bin"
+cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/$HOST/bin/"
--- a/app/deps/common
+++ b/app/deps/common
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# This file is intended to be sourced by other scripts, not executed
+
+if [[ $# != 1 ]]
+then
+    # <host>: win32 or win64
+    echo "Syntax: $0 <host>" >&2
+    exit 1
+fi
+
+HOST="$1"
+
+if [[ "$HOST" = win32 ]]
+then
+    HOST_TRIPLET=i686-w64-mingw32
+elif [[ "$HOST" = win64 ]]
+then
+    HOST_TRIPLET=x86_64-w64-mingw32
+else
+    echo "Unsupported host: $HOST" >&2
+    exit 1
+fi
+
+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
+cd "$DEPS_DIR"
+
+PATCHES_DIR="$PWD/patches"
+
+WORK_DIR="$PWD/work"
+SOURCES_DIR="$WORK_DIR/sources"
+BUILD_DIR="$WORK_DIR/build"
+INSTALL_DIR="$WORK_DIR/install"
+
+mkdir -p "$INSTALL_DIR" "$SOURCES_DIR" "$WORK_DIR"
+
+checksum() {
+    local file="$1"
+    local sum="$2"
+    echo "$file: verifying checksum..."
+    echo "$sum  $file" | sha256sum -c
+}
+
+get_file() {
+    local url="$1"
+    local file="$2"
+    local sum="$3"
+    if [[ -f "$file" ]]
+    then
+        echo "$file: found"
+    else
+        echo "$file: not found, downloading..."
+        wget "$url" -O "$file"
+    fi
+    checksum "$file" "$sum"
+}
--- a/app/deps/ffmpeg.sh
+++ b/app/deps/ffmpeg.sh
@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+set -ex
+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
+cd "$DEPS_DIR"
+. common
+
+VERSION=6.1.1
+FILENAME=ffmpeg-$VERSION.tar.xz
+PROJECT_DIR=ffmpeg-$VERSION
+SHA256SUM=8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968
+
+cd "$SOURCES_DIR"
+
+if [[ -d "$PROJECT_DIR" ]]
+then
+    echo "$PWD/$PROJECT_DIR" found
+else
+    get_file "https://ffmpeg.org/releases/$FILENAME" "$FILENAME" "$SHA256SUM"
+    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
+    patch -d "$PROJECT_DIR" -p1 < "$PATCHES_DIR"/ffmpeg-6.1-fix-build.patch
+fi
+
+mkdir -p "$BUILD_DIR/$PROJECT_DIR"
+cd "$BUILD_DIR/$PROJECT_DIR"
+
+if [[ "$HOST" = win32 ]]
+then
+    ARCH=x86
+elif [[ "$HOST" = win64 ]]
+then
+    ARCH=x86_64
+else
+    echo "Unsupported host: $HOST" >&2
+    exit 1
+fi
+
+# -static-libgcc to avoid missing libgcc_s_dw2-1.dll
+# -static to avoid dynamic dependency to zlib
+export CFLAGS='-static-libgcc -static'
+export CXXFLAGS="$CFLAGS"
+export LDFLAGS='-static-libgcc -static'
+
+if [[ -d "$HOST" ]]
+then
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
+else
+    mkdir "$HOST"
+    cd "$HOST"
+
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --enable-cross-compile \
+        --target-os=mingw32 \
+        --arch="$ARCH" \
+        --cross-prefix="${HOST_TRIPLET}-" \
+        --cc="${HOST_TRIPLET}-gcc" \
+        --extra-cflags="-O2 -fPIC" \
+        --enable-shared \
+        --disable-static \
+        --disable-programs \
+        --disable-doc \
+        --disable-swscale \
+        --disable-postproc \
+        --disable-avfilter \
+        --disable-avdevice \
+        --disable-network \
+        --disable-everything \
+        --enable-swresample \
+        --enable-decoder=h264 \
+        --enable-decoder=hevc \
+        --enable-decoder=av1 \
+        --enable-decoder=pcm_s16le \
+        --enable-decoder=opus \
+        --enable-decoder=aac \
+        --enable-decoder=flac \
+        --enable-decoder=png \
+        --enable-protocol=file \
+        --enable-demuxer=image2 \
+        --enable-parser=png \
+        --enable-zlib \
+        --enable-muxer=matroska \
+        --enable-muxer=mp4 \
+        --enable-muxer=opus \
+        --enable-muxer=flac \
+        --enable-muxer=wav \
+        --disable-vulkan
+fi
+
+make -j
+make install
--- a/app/deps/libusb.sh
+++ b/app/deps/libusb.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -ex
+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
+cd "$DEPS_DIR"
+. common
+
+VERSION=1.0.27
+FILENAME=libusb-$VERSION.tar.gz
+PROJECT_DIR=libusb-$VERSION
+SHA256SUM=e8f18a7a36ecbb11fb820bd71540350d8f61bcd9db0d2e8c18a6fb80b214a3de
+
+cd "$SOURCES_DIR"
+
+if [[ -d "$PROJECT_DIR" ]]
+then
+    echo "$PWD/$PROJECT_DIR" found
+else
+    get_file "https://github.com/libusb/libusb/archive/refs/tags/v$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"
+    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
+fi
+
+mkdir -p "$BUILD_DIR/$PROJECT_DIR"
+cd "$BUILD_DIR/$PROJECT_DIR"
+
+export CFLAGS='-O2'
+export CXXFLAGS="$CFLAGS"
+
+if [[ -d "$HOST" ]]
+then
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
+else
+    mkdir "$HOST"
+    cd "$HOST"
+
+    "$SOURCES_DIR/$PROJECT_DIR"/bootstrap.sh
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --host="$HOST_TRIPLET" \
+        --enable-shared \
+        --disable-static
+fi
+
+make -j
+make install-strip
--- a/app/deps/patches/ffmpeg-6.1-fix-build.patch
+++ b/app/deps/patches/ffmpeg-6.1-fix-build.patch
@@ -0,0 +1,27 @@
+From 03c80197afb324da38c9b70254231e3fdcfa68fc Mon Sep 17 00:00:00 2001
+From: Romain Vimont <rom@rom1v.com>
+Date: Sun, 12 Nov 2023 17:58:50 +0100
+Subject: [PATCH] Fix FFmpeg 6.1 build
+
+Build failed on tag n6.1 With --enable-decoder=av1 but without
+--enable-muxer=av1.
+---
+ libavcodec/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 580a8d6b54..aff19b670c 100644
+--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
+@@ -249,7 +249,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER)       += atrac3plusdec.o atrac3plus.o \
+ OBJS-$(CONFIG_ATRAC9_DECODER)          += atrac9dec.o
+ OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
+ OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
+-OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o
+OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o av1_parse.o
+ OBJS-$(CONFIG_AV1_CUVID_DECODER)       += cuviddec.o
+ OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER)  += mediacodecdec.o
+ OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER)  += mediacodecenc.o
+-- 
+2.42.0
+
--- a/app/deps/sdl.sh
+++ b/app/deps/sdl.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+set -ex
+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
+cd "$DEPS_DIR"
+. common
+
+VERSION=2.28.5
+FILENAME=SDL-$VERSION.tar.gz
+PROJECT_DIR=SDL-release-$VERSION
+SHA256SUM=9f0556e4a24ef5b267010038ad9e9948b62f236d5bcc4b22179f95ef62d84023
+
+cd "$SOURCES_DIR"
+
+if [[ -d "$PROJECT_DIR" ]]
+then
+    echo "$PWD/$PROJECT_DIR" found
+else
+    get_file "https://github.com/libsdl-org/SDL/archive/refs/tags/release-$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"
+    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
+fi
+
+mkdir -p "$BUILD_DIR/$PROJECT_DIR"
+cd "$BUILD_DIR/$PROJECT_DIR"
+
+export CFLAGS='-O2'
+export CXXFLAGS="$CFLAGS"
+
+if [[ -d "$HOST" ]]
+then
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
+else
+    mkdir "$HOST"
+    cd "$HOST"
+
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --host="$HOST_TRIPLET" \
+        --enable-shared \
+        --disable-static
+fi
+
+make -j
+# There is no "make install-strip"
+make install
+# Strip manually
+${HOST_TRIPLET}-strip "$INSTALL_DIR/$HOST/bin/SDL2.dll"
--- a/app/prebuilt-deps/.gitignore
+++ b/app/prebuilt-deps/.gitignore
@@ -1 +0,0 @@
-/data
--- a/app/prebuilt-deps/common
+++ b/app/prebuilt-deps/common
@@ -1,22 +0,0 @@
-PREBUILT_DATA_DIR=data
-
-checksum() {
-    local file="$1"
-    local sum="$2"
-    echo "$file: verifying checksum..."
-    echo "$sum  $file" | sha256sum -c
-}
-
-get_file() {
-    local url="$1"
-    local file="$2"
-    local sum="$3"
-    if [[ -f "$file" ]]
-    then
-        echo "$file: found"
-    else
-        echo "$file: not found, downloading..."
-        wget "$url" -O "$file"
-    fi
-    checksum "$file" "$sum"
-}
--- a/app/prebuilt-deps/prepare-adb.sh
+++ b/app/prebuilt-deps/prepare-adb.sh
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-set -e
-DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DIR"
-. common
-mkdir -p "$PREBUILT_DATA_DIR"
-cd "$PREBUILT_DATA_DIR"
-
-DEP_DIR=platform-tools-34.0.5
-
-FILENAME=platform-tools_r34.0.5-windows.zip
-SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571
-
-if [[ -d "$DEP_DIR" ]]
-then
-    echo "$DEP_DIR" found
-    exit 0
-fi
-
-get_file "https://dl.google.com/android/repository/$FILENAME" \
-    "$FILENAME" "$SHA256SUM"
-
-mkdir "$DEP_DIR"
-cd "$DEP_DIR"
-
-ZIP_PREFIX=platform-tools
-unzip "../$FILENAME" \
-    "$ZIP_PREFIX"/AdbWinApi.dll \
-    "$ZIP_PREFIX"/AdbWinUsbApi.dll \
-    "$ZIP_PREFIX"/adb.exe
-mv "$ZIP_PREFIX"/* .
-rmdir "$ZIP_PREFIX"
--- a/app/prebuilt-deps/prepare-ffmpeg.sh
+++ b/app/prebuilt-deps/prepare-ffmpeg.sh
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -e
-DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DIR"
-. common
-mkdir -p "$PREBUILT_DATA_DIR"
-cd "$PREBUILT_DATA_DIR"
-
-VERSION=6.1-scrcpy-3
-DEP_DIR="ffmpeg-$VERSION"
-
-FILENAME="$DEP_DIR".7z
-SHA256SUM=b646d18a3d543a4e4c46881568213499f22e4454a464e1552f03f2ac9cc3a05a
-
-if [[ -d "$DEP_DIR" ]]
-then
-    echo "$DEP_DIR" found
-    exit 0
-fi
-
-get_file "https://github.com/rom1v/scrcpy-deps/releases/download/$VERSION/$FILENAME" \
-    "$FILENAME" "$SHA256SUM"
-
-mkdir "$DEP_DIR"
-cd "$DEP_DIR"
-
-ZIP_PREFIX=ffmpeg
-7z x "../$FILENAME"
-mv "$ZIP_PREFIX"/* .
-rmdir "$ZIP_PREFIX"
--- a/app/prebuilt-deps/prepare-libusb.sh
+++ b/app/prebuilt-deps/prepare-libusb.sh
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -e
-DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DIR"
-. common
-mkdir -p "$PREBUILT_DATA_DIR"
-cd "$PREBUILT_DATA_DIR"
-
-VERSION=1.0.26
-DEP_DIR="libusb-$VERSION"
-
-FILENAME="libusb-$VERSION-binaries.7z"
-SHA256SUM=9c242696342dbde9cdc47239391f71833939bf9f7aa2bbb28cdaabe890465ec5
-
-if [[ -d "$DEP_DIR" ]]
-then
-    echo "$DEP_DIR" found
-    exit 0
-fi
-
-get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/$FILENAME" \
-    "$FILENAME" "$SHA256SUM"
-
-mkdir "$DEP_DIR"
-cd "$DEP_DIR"
-
-7z x "../$FILENAME" \
-    "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
-    "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
-    "libusb-$VERSION-binaries/libusb-MinGW-x64/" \
-    "libusb-$VERSION-binaries/libusb-MinGW-x64/"
-
-mv "libusb-$VERSION-binaries/libusb-MinGW-Win32" .
-mv "libusb-$VERSION-binaries/libusb-MinGW-x64" .
-rm -rf "libusb-$VERSION-binaries"
-
-# Rename the dll to get the same library name on all platforms
-mv libusb-MinGW-Win32/bin/msys-usb-1.0.dll libusb-MinGW-Win32/bin/libusb-1.0.dll
-mv libusb-MinGW-x64/bin/msys-usb-1.0.dll libusb-MinGW-x64/bin/libusb-1.0.dll
--- a/app/prebuilt-deps/prepare-sdl.sh
+++ b/app/prebuilt-deps/prepare-sdl.sh
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DIR"
-. common
-mkdir -p "$PREBUILT_DATA_DIR"
-cd "$PREBUILT_DATA_DIR"
-
-VERSION=2.28.5
-DEP_DIR="SDL2-$VERSION"
-
-FILENAME="SDL2-devel-$VERSION-mingw.tar.gz"
-SHA256SUM=3c0c655c2ebf67cad48fead72761d1601740ded30808952c3274ba223d226c21
-
-if [[ -d "$DEP_DIR" ]]
-then
-    echo "$DEP_DIR" found
-    exit 0
-fi
-
-get_file "https://github.com/libsdl-org/SDL/releases/download/release-$VERSION/$FILENAME" \
-    "$FILENAME" "$SHA256SUM"
-
-mkdir "$DEP_DIR"
-cd "$DEP_DIR"
-
-TAR_PREFIX="$DEP_DIR" # root directory inside the tar has the same name
-tar xf "../$FILENAME" --strip-components=1 \
-    "$TAR_PREFIX"/i686-w64-mingw32/bin/SDL2.dll \
-    "$TAR_PREFIX"/i686-w64-mingw32/include/ \
-    "$TAR_PREFIX"/i686-w64-mingw32/lib/ \
-    "$TAR_PREFIX"/x86_64-w64-mingw32/bin/SDL2.dll \
-    "$TAR_PREFIX"/x86_64-w64-mingw32/include/ \
-    "$TAR_PREFIX"/x86_64-w64-mingw32/lib/ \
--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@@ -13,7 +13,7 @@ BEGIN
      VALUE "LegalCopyright", "Romain Vimont, Genymobile"
      VALUE "OriginalFilename", "scrcpy.exe"
      VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "2.3.1"
+      VALUE "ProductVersion", "2.4"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -179,19 +179,17 @@ Same as \fB\-\-keyboard=uhid\fR.
 .BI "\-\-keyboard " mode
 Select how to send keyboard inputs to the device.

-Possible values are "disabled", "sdk" and "aoa":
+Possible values are "disabled", "sdk", "uhid" and "aoa":

 - "disabled" does not send keyboard inputs to the device.
 - "sdk" uses the Android system API to deliver keyboard events to applications.
- - "aoa" simulates a physical HID keyboard using the AOAv2 protocol. It may only work over USB.
 - "uhid" simulates a physical HID keyboard using the Linux HID kernel module on the device.
+ - "aoa" simulates a physical HID keyboard using the AOAv2 protocol. It may only work over USB.

-For "aoa" and "uhid", the keyboard layout must be configured (once and for all) on the device, via Settings -> System -> Languages and input -> Physical keyboard. This settings page can be started directly using the shortcut MOD+k (except in OTG mode) or by executing:
+For "uhid" and "aoa", the keyboard layout must be configured (once and for all) on the device, via Settings -> System -> Languages and input -> Physical keyboard. This settings page can be started directly using the shortcut MOD+k (except in OTG mode), or by executing:

    adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS

-If mirroring is enabled, the shortcot MOD+k opens it.
-
 This option is only available when the HID keyboard is enabled (or a physical keyboard is connected).

 Also see \fB\-\-mouse\fR.
@@ -250,14 +248,14 @@ Limit the framerate of screen capture (officially supported since Android 10, bu
 .BI "\-\-mouse " mode
 Select how to send mouse inputs to the device.

-Possible values are "disabled", "sdk" and "aoa":
+Possible values are "disabled", "sdk", "uhid" and "aoa":

 - "disabled" does not send mouse inputs to the device.
 - "sdk" uses the Android system API to deliver mouse events to applications.
- - "aoa" simulates a physical mouse using the AOAv2 protocol. It may only work over USB.
 - "uhid" simulates a physical HID mouse using the Linux HID kernel module on the device.
+ - "aoa" simulates a physical mouse using the AOAv2 protocol. It may only work over USB.

-In "aoa" and "uhid" modes, the computer mouse is captured to control the device directly (relative mouse mode).
+In "uhid" and "aoa" modes, the computer mouse is captured to control the device directly (relative mouse mode).

 LAlt, LSuper or RSuper toggle the capture mode, to give control of the mouse back to the computer.

@@ -318,6 +316,10 @@ Disable video forwarding.
 .B \-\-no\-video\-playback
 Disable video playback on the computer.

+.TP
+.B \-\-no\-window
+Disable scrcpy window. Implies --no-video-playback and --no-control.
+
 .TP
 .BI "\-\-orientation " value
 Same as --display-orientation=value --record-orientation=value.
@@ -579,6 +581,14 @@ Flip display horizontally
 .B MOD+Shift+Up, MOD+Shift+Down
 Flip display vertically

+.TP
+.B MOD+z
+Pause or re-pause display
+
+.TP
+.B MOD+Shift+z
+Unpause display
+
 .TP
 .B MOD+g
 Resize window to 1:1 (pixel\-perfect)
@@ -716,7 +726,7 @@ Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
 .SH COPYRIGHT
 Copyright \(co 2018 Genymobile <https://www.genymobile.com>

-Copyright \(co 2018\-2023 Romain Vimont <rom@rom1v.com>
+Copyright \(co 2018\-2024 Romain Vimont <rom@rom1v.com>

 Licensed under the Apache License, Version 2.0.

--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -97,6 +97,7 @@ enum {
    OPT_MOUSE,
    OPT_HID_KEYBOARD_DEPRECATED,
    OPT_HID_MOUSE_DEPRECATED,
+    OPT_NO_WINDOW,
 };

 struct sc_option {
@@ -371,23 +372,23 @@ static const struct sc_option options[] = {
        .longopt = "keyboard",
        .argdesc = "mode",
        .text = "Select how to send keyboard inputs to the device.\n"
-                "Possible values are \"disabled\", \"sdk\", \"aoa\" and "
-                "\"uhid\".\n"
+                "Possible values are \"disabled\", \"sdk\", \"uhid\" and "
+                "\"aoa\".\n"
                "\"disabled\" does not send keyboard inputs to the device.\n"
-                "\"sdk\" uses the Android system API to deliver keyboard\n"
+                "\"sdk\" uses the Android system API to deliver keyboard "
                "events to applications.\n"
-                "\"aoa\" simulates a physical HID keyboard using the AOAv2\n"
-                "protocol. It may only work over USB.\n"
                "\"uhid\" simulates a physical HID keyboard using the Linux "
-                "UHID kernel module on the device."
-                "For \"aoa\" and \"uhid\", the keyboard layout must be "
+                "UHID kernel module on the device.\n"
+                "\"aoa\" simulates a physical keyboard using the AOAv2 "
+                "protocol. It may only work over USB.\n"
+                "For \"uhid\" and \"aoa\", the keyboard layout must be "
                "configured (once and for all) on the device, via Settings -> "
                "System -> Languages and input -> Physical keyboard. This "
                "settings page can be started directly using the shortcut "
                "MOD+k (except in OTG mode) or by executing: `adb shell am "
                "start -a android.settings.HARD_KEYBOARD_SETTINGS`.\n"
                "This option is only available when a HID keyboard is enabled "
-                "enabled (or a physical keyboard is connected).\n"
+                "(or a physical keyboard is connected).\n"
                "Also see --mouse.",
    },
    {
@@ -474,15 +475,16 @@ static const struct sc_option options[] = {
        .longopt = "mouse",
        .argdesc = "mode",
        .text = "Select how to send mouse inputs to the device.\n"
-                "Possible values are \"disabled\", \"sdk\" and \"aoa\".\n"
+                "Possible values are \"disabled\", \"sdk\", \"uhid\" and "
+                "\"aoa\".\n"
                "\"disabled\" does not send mouse inputs to the device.\n"
-                "\"sdk\" uses the Android system API to deliver mouse\n"
-                "events to applications.\n"
-                "\"aoa\" simulates a physical mouse using the AOAv2 protocol\n"
-                "It may only work over USB.\n"
+                "\"sdk\" uses the Android system API to deliver mouse events"
+                "to applications.\n"
                "\"uhid\" simulates a physical HID mouse using the Linux UHID "
-                "kernel module on the device."
-                "In \"aoa\" and \"uhid\" modes, the computer mouse is captured "
+                "kernel module on the device.\n"
+                "\"aoa\" simulates a physical mouse using the AOAv2 protocol. "
+                "It may only work over USB.\n"
+                "In \"uhid\" and \"aoa\" modes, the computer mouse is captured "
                "to control the device directly (relative mouse mode).\n"
                "LAlt, LSuper or RSuper toggle the capture mode, to give "
                "control of the mouse back to the computer.\n"
@@ -565,6 +567,12 @@ static const struct sc_option options[] = {
        .longopt = "no-video-playback",
        .text = "Disable video playback on the computer.",
    },
+    {
+        .longopt_id = OPT_NO_WINDOW,
+        .longopt = "no-window",
+        .text = "Disable scrcpy window. Implies --no-video-playback and "
+                "--no-control.",
+    },
    {
        .longopt_id = OPT_ORIENTATION,
        .longopt = "orientation",
@@ -582,7 +590,7 @@ static const struct sc_option options[] = {
                "mirroring is disabled.\n"
                "LAlt, LSuper or RSuper toggle the mouse capture mode, to give "
                "control of the mouse back to the computer.\n"
-                "Keyboard and mouse may be disabled separately using\n"
+                "Keyboard and mouse may be disabled separately using"
                "--keyboard=disabled and --mouse=disabled.\n"
                "It may only work over USB.\n"
                "See --keyboard and --mouse.",
@@ -899,6 +907,14 @@ static const struct sc_shortcut shortcuts[] = {
        .shortcuts = { "MOD+Shift+Up", "MOD+Shift+Down" },
        .text = "Flip display vertically",
    },
+    {
+        .shortcuts = { "MOD+z" },
+        .text = "Pause or re-pause display",
+    },
+    {
+        .shortcuts = { "MOD+Shift+z" },
+        .text = "Unpause display",
+    },
    {
        .shortcuts = { "MOD+g" },
        .text = "Resize window to 1:1 (pixel-perfect)",
@@ -1961,6 +1977,11 @@ parse_keyboard(const char *optarg, enum sc_keyboard_input_mode *mode) {
        return true;
    }

+    if (!strcmp(optarg, "uhid")) {
+        *mode = SC_KEYBOARD_INPUT_MODE_UHID;
+        return true;
+    }
+
    if (!strcmp(optarg, "aoa")) {
 #ifdef HAVE_USB
        *mode = SC_KEYBOARD_INPUT_MODE_AOA;
@@ -1971,12 +1992,7 @@ parse_keyboard(const char *optarg, enum sc_keyboard_input_mode *mode) {
 #endif
    }

-    if (!strcmp(optarg, "uhid")) {
-        *mode = SC_KEYBOARD_INPUT_MODE_UHID;
-        return true;
-    }
-
-    LOGE("Unsupported keyboard: %s (expected disabled, sdk, aoa or uhid)",
+    LOGE("Unsupported keyboard: %s (expected disabled, sdk, uhid and aoa)",
         optarg);
    return false;
 }
@@ -1993,6 +2009,11 @@ parse_mouse(const char *optarg, enum sc_mouse_input_mode *mode) {
        return true;
    }

+    if (!strcmp(optarg, "uhid")) {
+        *mode = SC_MOUSE_INPUT_MODE_UHID;
+        return true;
+    }
+
    if (!strcmp(optarg, "aoa")) {
 #ifdef HAVE_USB
        *mode = SC_MOUSE_INPUT_MODE_AOA;
@@ -2003,12 +2024,7 @@ parse_mouse(const char *optarg, enum sc_mouse_input_mode *mode) {
 #endif
    }

-    if (!strcmp(optarg, "uhid")) {
-        *mode = SC_MOUSE_INPUT_MODE_UHID;
-        return true;
-    }
-
-    LOGE("Unsupported mouse: %s (expected disabled, sdk, aoa or uhid)", optarg);
+    LOGE("Unsupported mouse: %s (expected disabled, sdk, uhid or aoa)", optarg);
    return false;
 }

@@ -2477,6 +2493,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_CAMERA_HIGH_SPEED:
                opts->camera_high_speed = true;
                break;
+            case OPT_NO_WINDOW:
+                opts->window = false;
+                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -2514,6 +2533,12 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    v4l2 = !!opts->v4l2_device;
 #endif

+    if (!opts->window) {
+        // Without window, there cannot be any video playback or control
+        opts->video_playback = false;
+        opts->control = false;
+    }
+
    if (!opts->video) {
        opts->video_playback = false;
        // Do not power on the device on start if video capture is disabled
@@ -2535,8 +2560,8 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        opts->audio = false;
    }

-    if (!opts->video && !opts->audio && !otg) {
-        LOGE("No video, no audio, no OTG: nothing to do");
+    if (!opts->video && !opts->audio && !opts->control && !otg) {
+        LOGE("No video, no audio, no control, no OTG: nothing to do");
        return false;
    }

@@ -2547,9 +2572,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],

    if (opts->audio_playback && opts->audio_buffer == -1) {
        if (opts->audio_codec == SC_CODEC_FLAC) {
-            // Use 50 ms audio buffer by default, but use a higher value for FLAC,
-            // which is not low latency (the default encoder produces blocks of
-            // 4096 samples, which represent ~85.333ms).
+            // Use 50 ms audio buffer by default, but use a higher value for
+            // FLAC, which is not low latency (the default encoder produces
+            // blocks of 4096 samples, which represent ~85.333ms).
            LOGI("FLAC audio: audio buffer increased to 120 ms (use "
                 "--audio-buffer to set a custom value)");
            opts->audio_buffer = SC_TICK_FROM_MS(120);
@@ -2560,6 +2585,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],

 #ifdef HAVE_V4L2
    if (v4l2) {
+        if (!opts->video) {
+            LOGE("V4L2 sink requires video capture, but --no-video was set.");
+            return false;
+        }
+
        if (opts->lock_video_orientation ==
                SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
            LOGI("Video orientation is locked for v4l2 sink. "
@@ -2579,16 +2609,33 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }
 #endif

-    if (opts->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AUTO) {
-        opts->keyboard_input_mode = otg ? SC_KEYBOARD_INPUT_MODE_AOA
-                                        : SC_KEYBOARD_INPUT_MODE_SDK;
-    }
-    if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_AUTO) {
-        opts->mouse_input_mode = otg ? SC_MOUSE_INPUT_MODE_AOA
-                                     : SC_MOUSE_INPUT_MODE_SDK;
+    if (opts->control) {
+        if (opts->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AUTO) {
+            opts->keyboard_input_mode = otg ? SC_KEYBOARD_INPUT_MODE_AOA
+                                            : SC_KEYBOARD_INPUT_MODE_SDK;
+        }
+        if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_AUTO) {
+            if (otg) {
+                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_AOA;
+            } else if (!opts->video_playback) {
+                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_SDK
+                    && !opts->video_playback) {
+            LOGE("SDK mouse mode requires video playback. Try --mouse=uhid.");
+            return false;
+        }
    }

    if (otg) {
+        if (!opts->control) {
+            LOGE("--no-control is not allowed in OTG mode");
+            return false;
+        }
+
        enum sc_keyboard_input_mode kmode = opts->keyboard_input_mode;
        if (kmode != SC_KEYBOARD_INPUT_MODE_AOA
                && kmode != SC_KEYBOARD_INPUT_MODE_DISABLED) {
@@ -2602,6 +2649,29 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            LOGE("In OTG mode, --mouse only supports aoa or disabled.");
            return false;
        }
+
+        if (kmode == SC_KEYBOARD_INPUT_MODE_DISABLED
+                && mmode == SC_MOUSE_INPUT_MODE_DISABLED) {
+            LOGE("Could not disable both keyboard and mouse in OTG mode.");
+            return false;
+        }
+    }
+
+    if (opts->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_SDK) {
+        if (opts->key_inject_mode == SC_KEY_INJECT_MODE_TEXT) {
+            LOGE("--prefer-text is specific to --keyboard=sdk");
+            return false;
+        }
+
+        if (opts->key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
+            LOGE("--raw-key-events is specific to --keyboard=sdk");
+            return false;
+        }
+
+        if (!opts->forward_key_repeat) {
+            LOGE("--no-key-repeat is specific to --keyboard=sdk");
+            return false;
+        }
    }

    if ((opts->tunnel_host || opts->tunnel_port) && !opts->force_adb_forward) {
@@ -2774,6 +2844,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }
 # endif

+    if (opts->start_fps_counter && !opts->video_playback) {
+        LOGW("--print-fps has no effect without video playback");
+        opts->start_fps_counter = false;
+    }
+
    if (otg) {
        // OTG mode is compatible with only very few options.
        // Only report obvious errors.
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -157,9 +157,6 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
            sc_write16be(&buf[3], msg->uhid_input.size);
            memcpy(&buf[5], msg->uhid_input.data, msg->uhid_input.size);
            return 5 + msg->uhid_input.size;
-        case SC_CONTROL_MSG_TYPE_SET_CAMERA_TORCH:
-            buf[1] = msg->set_camera_torch.enabled ? 1 : 0;
-            return 2;
        case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
        case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:
@@ -277,10 +274,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_SET_CAMERA_TORCH:
-            LOG_CMSG("%s camera torch",
-                     msg->set_camera_torch.enabled ? "enable" : "disable");
-            break;
        default:
            LOG_CMSG("unknown type: %u", (unsigned) msg->type);
            break;
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -41,7 +41,6 @@ enum sc_control_msg_type {
    SC_CONTROL_MSG_TYPE_UHID_CREATE,
    SC_CONTROL_MSG_TYPE_UHID_INPUT,
    SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
-    SC_CONTROL_MSG_TYPE_SET_CAMERA_TORCH,
 };

 enum sc_screen_power_mode {
@@ -107,9 +106,6 @@ struct sc_control_msg {
            uint16_t size;
            uint8_t data[SC_HID_MAX_SIZE];
        } uhid_input;
-        struct {
-            bool enabled;
-        } set_camera_torch;
    };
 };

--- a/app/src/controller.c
+++ b/app/src/controller.c
@@ -6,8 +6,19 @@

 #define SC_CONTROL_MSG_QUEUE_MAX 64

+static void
+sc_controller_receiver_on_error(struct sc_receiver *receiver, void *userdata) {
+    (void) receiver;
+
+    struct sc_controller *controller = userdata;
+    // Forward the event to the controller listener
+    controller->cbs->on_error(controller, controller->cbs_userdata);
+}
+
 bool
-sc_controller_init(struct sc_controller *controller, sc_socket control_socket) {
+sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
+                   const struct sc_controller_callbacks *cbs,
+                   void *cbs_userdata) {
    sc_vecdeque_init(&controller->queue);

    bool ok = sc_vecdeque_reserve(&controller->queue, SC_CONTROL_MSG_QUEUE_MAX);
@@ -15,7 +26,12 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket) {
        return false;
    }

-    ok = sc_receiver_init(&controller->receiver, control_socket);
+    static const struct sc_receiver_callbacks receiver_cbs = {
+        .on_error = sc_controller_receiver_on_error,
+    };
+
+    ok = sc_receiver_init(&controller->receiver, control_socket, &receiver_cbs,
+                          controller);
    if (!ok) {
        sc_vecdeque_destroy(&controller->queue);
        return false;
@@ -39,6 +55,10 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket) {
    controller->control_socket = control_socket;
    controller->stopped = false;

+    assert(cbs && cbs->on_error);
+    controller->cbs = cbs;
+    controller->cbs_userdata = cbs_userdata;
+
    return true;
 }

@@ -125,10 +145,16 @@ run_controller(void *data) {
        sc_control_msg_destroy(&msg);
        if (!ok) {
            LOGD("Could not write msg to socket");
-            break;
+            goto error;
        }
    }
+
    return 0;
+
+error:
+    controller->cbs->on_error(controller, controller->cbs_userdata);
+
+    return 1; // ignored
 }

 bool
--- a/app/src/controller.h
+++ b/app/src/controller.h
@@ -22,10 +22,19 @@ struct sc_controller {
    bool stopped;
    struct sc_control_msg_queue queue;
    struct sc_receiver receiver;
+
+    const struct sc_controller_callbacks *cbs;
+    void *cbs_userdata;
+};
+
+struct sc_controller_callbacks {
+    void (*on_error)(struct sc_controller *controller, void *userdata);
 };

 bool
-sc_controller_init(struct sc_controller *controller, sc_socket control_socket);
+sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
+                   const struct sc_controller_callbacks *cbs,
+                   void *cbs_userdata);

 void
 sc_controller_configure(struct sc_controller *controller,
--- a/app/src/display.c
+++ b/app/src/display.c
@@ -1,11 +1,34 @@
 #include "display.h"

 #include <assert.h>
+#include <libavutil/pixfmt.h>

 #include "util/log.h"

+static bool
+sc_display_init_novideo_icon(struct sc_display *display,
+                             SDL_Surface *icon_novideo) {
+    assert(icon_novideo);
+
+    if (SDL_RenderSetLogicalSize(display->renderer,
+                                 icon_novideo->w, icon_novideo->h)) {
+        LOGW("Could not set renderer logical size: %s", SDL_GetError());
+        // don't fail
+    }
+
+    display->texture = SDL_CreateTextureFromSurface(display->renderer,
+                                                    icon_novideo);
+    if (!display->texture) {
+        LOGE("Could not create texture: %s", SDL_GetError());
+        return false;
+    }
+
+    return true;
+}
+
 bool
-sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
+sc_display_init(struct sc_display *display, SDL_Window *window,
+                SDL_Surface *icon_novideo, bool mipmaps) {
    display->renderer =
        SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
    if (!display->renderer) {
@@ -59,11 +82,25 @@ sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
            LOGI("Trilinear filtering disabled");
        }
    } else if (mipmaps) {
-        LOGD("Trilinear filtering disabled (not an OpenGL renderer");
+        LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
    }

+    display->texture = NULL;
    display->pending.flags = 0;
    display->pending.frame = NULL;
+    display->has_frame = false;
+
+    if (icon_novideo) {
+        // Without video, set a static scrcpy icon as window content
+        bool ok = sc_display_init_novideo_icon(display, icon_novideo);
+        if (!ok) {
+#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
+            SDL_GL_DeleteContext(display->gl_context);
+#endif
+            SDL_DestroyRenderer(display->renderer);
+            return false;
+        }
+    }

    return true;
 }
@@ -195,9 +232,25 @@ sc_display_set_texture_size(struct sc_display *display, struct sc_size size) {
    return SC_DISPLAY_RESULT_OK;
 }

+static SDL_YUV_CONVERSION_MODE
+sc_display_to_sdl_color_range(enum AVColorRange color_range) {
+    return color_range == AVCOL_RANGE_JPEG ? SDL_YUV_CONVERSION_JPEG
+                                           : SDL_YUV_CONVERSION_AUTOMATIC;
+}
+
 static bool
 sc_display_update_texture_internal(struct sc_display *display,
                                   const AVFrame *frame) {
+    if (!display->has_frame) {
+        // First frame
+        display->has_frame = true;
+
+        // Configure YUV color range conversion
+        SDL_YUV_CONVERSION_MODE sdl_color_range =
+            sc_display_to_sdl_color_range(frame->color_range);
+        SDL_SetYUVConversionMode(sdl_color_range);
+    }
+
    int ret = SDL_UpdateYUVTexture(display->texture, NULL,
                                   frame->data[0], frame->linesize[0],
                                   frame->data[1], frame->linesize[1],
--- a/app/src/display.h
+++ b/app/src/display.h
@@ -33,6 +33,8 @@ struct sc_display {
        struct sc_size size;
        AVFrame *frame;
    } pending;
+
+    bool has_frame;
 };

 enum sc_display_result {
@@ -42,7 +44,8 @@ enum sc_display_result {
 };

 bool
-sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps);
+sc_display_init(struct sc_display *display, SDL_Window *window,
+                SDL_Surface *icon_novideo, bool mipmaps);

 void
 sc_display_destroy(struct sc_display *display);
--- a/app/src/events.h
+++ b/app/src/events.h
@@ -7,3 +7,4 @@
 #define SC_EVENT_RECORDER_ERROR           (SDL_USEREVENT + 6)
 #define SC_EVENT_SCREEN_INIT_SIZE         (SDL_USEREVENT + 7)
 #define SC_EVENT_TIME_LIMIT_REACHED       (SDL_USEREVENT + 8)
+#define SC_EVENT_CONTROLLER_ERROR         (SDL_USEREVENT + 9)
--- a/app/src/hid/hid_event.h
+++ b/app/src/hid/hid_event.h
@@ -12,7 +12,4 @@ struct sc_hid_event {
    uint8_t size;
 };

-char *
-sc_hid_event_to_string(const struct sc_hid_event *event, size_t max_data_bytes);
-
 #endif
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -330,19 +330,6 @@ open_hard_keyboard_settings(struct sc_input_manager *im) {
    }
 }

-static void
-set_camera_torch(struct sc_input_manager *im, bool enabled) {
-    assert(im->controller);
-
-    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_SET_CAMERA_TORCH;
-    msg.set_camera_torch.enabled = enabled;
-
-    if (!sc_controller_push_msg(im->controller, &msg)) {
-        LOGW("Could not request setting camera torch");
-    }
-}
-
 static void
 apply_orientation_transform(struct sc_input_manager *im,
                            enum sc_orientation transform) {
@@ -415,6 +402,8 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                             const SDL_KeyboardEvent *event) {
    // controller is NULL if --no-control is requested
    bool control = im->controller;
+    bool paused = im->screen->paused;
+    bool video = im->screen->video;

    SDL_Keycode keycode = event->keysym.sym;
    uint16_t mod = event->keysym.mod;
@@ -440,63 +429,68 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
        switch (keycode) {
            case SDLK_h:
-                if (im->kp && !shift && !repeat) {
+                if (im->kp && !shift && !repeat && !paused) {
                    action_home(im, action);
                }
                return;
            case SDLK_b: // fall-through
            case SDLK_BACKSPACE:
-                if (im->kp && !shift && !repeat) {
+                if (im->kp && !shift && !repeat && !paused) {
                    action_back(im, action);
                }
                return;
            case SDLK_s:
-                if (im->kp && !shift && !repeat) {
+                if (im->kp && !shift && !repeat && !paused) {
                    action_app_switch(im, action);
                }
                return;
            case SDLK_m:
-                if (im->kp && !shift && !repeat) {
+                if (im->kp && !shift && !repeat && !paused) {
                    action_menu(im, action);
                }
                return;
            case SDLK_p:
-                if (im->kp && !shift && !repeat) {
+                if (im->kp && !shift && !repeat && !paused) {
                    action_power(im, action);
                }
                return;
            case SDLK_o:
-                if (control && !repeat && down) {
+                if (control && !repeat && down && !paused) {
                    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:
+                if (video && down && !repeat) {
+                    sc_screen_set_paused(im->screen, !shift);
+                }
+                return;
            case SDLK_DOWN:
                if (shift) {
-                    if (!repeat & down) {
+                    if (video && !repeat && down) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_180);
                    }
-                } else if (im->kp) {
+                } else if (im->kp && !paused) {
                    // forward repeated events
                    action_volume_down(im, action);
                }
                return;
            case SDLK_UP:
                if (shift) {
-                    if (!repeat & down) {
+                    if (video && !repeat && down) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_180);
                    }
-                } else if (im->kp) {
+                } else if (im->kp && !paused) {
                    // forward repeated events
                    action_volume_up(im, action);
                }
                return;
            case SDLK_LEFT:
-                if (!repeat && down) {
+                if (video && !repeat && down) {
                    if (shift) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_0);
@@ -507,7 +501,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_RIGHT:
-                if (!repeat && down) {
+                if (video && !repeat && down) {
                    if (shift) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_0);
@@ -518,17 +512,17 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_c:
-                if (im->kp && !shift && !repeat && down) {
+                if (im->kp && !shift && !repeat && down && !paused) {
                    get_device_clipboard(im, SC_COPY_KEY_COPY);
                }
                return;
            case SDLK_x:
-                if (im->kp && !shift && !repeat && down) {
+                if (im->kp && !shift && !repeat && down && !paused) {
                    get_device_clipboard(im, SC_COPY_KEY_CUT);
                }
                return;
            case SDLK_v:
-                if (im->kp && !repeat && down) {
+                if (im->kp && !repeat && down && !paused) {
                    if (shift || im->legacy_paste) {
                        // inject the text as input events
                        clipboard_paste(im);
@@ -540,27 +534,27 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_f:
-                if (!shift && !repeat && down) {
+                if (video && !shift && !repeat && down) {
                    sc_screen_switch_fullscreen(im->screen);
                }
                return;
            case SDLK_w:
-                if (!shift && !repeat && down) {
+                if (video && !shift && !repeat && down) {
                    sc_screen_resize_to_fit(im->screen);
                }
                return;
            case SDLK_g:
-                if (!shift && !repeat && down) {
+                if (video && !shift && !repeat && down) {
                    sc_screen_resize_to_pixel_perfect(im->screen);
                }
                return;
            case SDLK_i:
-                if (!shift && !repeat && down) {
+                if (video && !shift && !repeat && down) {
                    switch_fps_counter_state(im);
                }
                return;
            case SDLK_n:
-                if (control && !repeat && down) {
+                if (control && !repeat && down && !paused) {
                    if (shift) {
                        collapse_panels(im);
                    } else if (im->key_repeat == 0) {
@@ -571,28 +565,23 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_r:
-                if (control && !shift && !repeat && down) {
+                if (control && !shift && !repeat && down && !paused) {
                    rotate_device(im);
                }
                return;
            case SDLK_k:
-                if (control && !shift && !repeat && down
+                if (control && !shift && !repeat && down && !paused
                        && im->kp && im->kp->hid) {
                    // Only if the current keyboard is hid
                    open_hard_keyboard_settings(im);
                }
                return;
-            case SDLK_l:
-                if (control && !repeat && down) {
-                    set_camera_torch(im, !shift);
-                }
-                return;
        }

        return;
    }

-    if (!im->kp) {
+    if (!im->kp || paused) {
        return;
    }

@@ -637,22 +626,33 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    im->kp->ops->process_key(im->kp, &evt, ack_to_wait);
 }

+static struct sc_position
+sc_input_manager_get_position(struct sc_input_manager *im, int32_t x,
+                                                           int32_t y) {
+    if (im->mp->relative_mode) {
+        // No absolute position
+        return (struct sc_position) {
+            .screen_size = {0, 0},
+            .point = {0, 0},
+        };
+    }
+
+    return (struct sc_position) {
+        .screen_size = im->screen->frame_size,
+        .point = sc_screen_convert_window_to_frame_coords(im->screen, x, y),
+    };
+}
+
 static void
 sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
                                      const SDL_MouseMotionEvent *event) {
-
    if (event->which == SDL_TOUCH_MOUSEID) {
        // simulated from touch events, so it's a duplicate
        return;
    }

    struct sc_mouse_motion_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point = sc_screen_convert_window_to_frame_coords(im->screen,
-                                                              event->x,
-                                                              event->y),
-        },
+        .position = sc_input_manager_get_position(im, event->x, event->y),
        .pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
                                             : POINTER_ID_GENERIC_FINGER,
        .xrel = event->xrel,
@@ -713,16 +713,16 @@ sc_input_manager_process_touch(struct sc_input_manager *im,
 static void
 sc_input_manager_process_mouse_button(struct sc_input_manager *im,
                                      const SDL_MouseButtonEvent *event) {
-    bool control = im->controller;
-
    if (event->which == SDL_TOUCH_MOUSEID) {
        // simulated from touch events, so it's a duplicate
        return;
    }

+    bool control = im->controller;
+    bool paused = im->screen->paused;
    bool down = event->type == SDL_MOUSEBUTTONDOWN;
    if (!im->forward_all_clicks) {
-        if (control) {
+        if (control && !paused) {
            enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;

            if (im->kp && event->button == SDL_BUTTON_X1) {
@@ -748,7 +748,8 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
        }

        // double-click on black borders resize to fit the device screen
-        if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
+        bool video = im->screen->video;
+        if (video && event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
            int32_t x = event->x;
            int32_t y = event->y;
            sc_screen_hidpi_scale_coords(im->screen, &x, &y);
@@ -765,19 +766,14 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
        // otherwise, send the click event to the device
    }

-    if (!im->mp) {
+    if (!im->mp || paused) {
        return;
    }

    uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);

    struct sc_mouse_click_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point = sc_screen_convert_window_to_frame_coords(im->screen,
-                                                              event->x,
-                                                              event->y),
-        },
+        .position = sc_input_manager_get_position(im, event->x, event->y),
        .action = sc_action_from_sdl_mousebutton_type(event->type),
        .button = sc_mouse_button_from_sdl(event->button),
        .pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
@@ -852,11 +848,7 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
    uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);

    struct sc_mouse_scroll_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point = sc_screen_convert_window_to_frame_coords(im->screen,
-                                                              mouse_x, mouse_y),
-        },
+        .position = sc_input_manager_get_position(im, mouse_x, mouse_y),
 #if SDL_VERSION_ATLEAST(2, 0, 18)
        .hscroll = CLAMP(event->preciseX, -1.0f, 1.0f),
        .vscroll = CLAMP(event->preciseY, -1.0f, 1.0f),
@@ -903,9 +895,10 @@ void
 sc_input_manager_handle_event(struct sc_input_manager *im,
                              const SDL_Event *event) {
    bool control = im->controller;
+    bool paused = im->screen->paused;
    switch (event->type) {
        case SDL_TEXTINPUT:
-            if (!im->kp) {
+            if (!im->kp || paused) {
                break;
            }
            sc_input_manager_process_text_input(im, &event->text);
@@ -917,13 +910,13 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
            sc_input_manager_process_key(im, &event->key);
            break;
        case SDL_MOUSEMOTION:
-            if (!im->mp) {
+            if (!im->mp || paused) {
                break;
            }
            sc_input_manager_process_mouse_motion(im, &event->motion);
            break;
        case SDL_MOUSEWHEEL:
-            if (!im->mp) {
+            if (!im->mp || paused) {
                break;
            }
            sc_input_manager_process_mouse_wheel(im, &event->wheel);
@@ -937,7 +930,7 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
        case SDL_FINGERMOTION:
        case SDL_FINGERDOWN:
        case SDL_FINGERUP:
-            if (!im->mp) {
+            if (!im->mp || paused) {
                break;
            }
            sc_input_manager_process_touch(im, &event->tfinger);
--- a/app/src/options.c
+++ b/app/src/options.c
@@ -89,6 +89,7 @@ const struct scrcpy_options scrcpy_options_default = {
    .kill_adb_on_close = false,
    .camera_high_speed = false,
    .list = 0,
+    .window = true,
 };

 enum sc_orientation
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -143,16 +143,16 @@ enum sc_keyboard_input_mode {
    SC_KEYBOARD_INPUT_MODE_AUTO,
    SC_KEYBOARD_INPUT_MODE_DISABLED,
    SC_KEYBOARD_INPUT_MODE_SDK,
-    SC_KEYBOARD_INPUT_MODE_AOA,
    SC_KEYBOARD_INPUT_MODE_UHID,
+    SC_KEYBOARD_INPUT_MODE_AOA,
 };

 enum sc_mouse_input_mode {
    SC_MOUSE_INPUT_MODE_AUTO,
    SC_MOUSE_INPUT_MODE_DISABLED,
    SC_MOUSE_INPUT_MODE_SDK,
-    SC_MOUSE_INPUT_MODE_AOA,
    SC_MOUSE_INPUT_MODE_UHID,
+    SC_MOUSE_INPUT_MODE_AOA,
 };

 enum sc_key_inject_mode {
@@ -279,6 +279,7 @@ struct scrcpy_options {
 #define SC_OPTION_LIST_CAMERAS 0x4
 #define SC_OPTION_LIST_CAMERA_SIZES 0x8
    uint8_t list;
+    bool window;
 };

 extern const struct scrcpy_options scrcpy_options_default;
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@@ -10,7 +10,8 @@
 #include "util/str.h"

 bool
-sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket) {
+sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
+                 const struct sc_receiver_callbacks *cbs, void *cbs_userdata) {
    bool ok = sc_mutex_init(&receiver->mutex);
    if (!ok) {
        return false;
@@ -20,6 +21,10 @@ sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket) {
    receiver->acksync = NULL;
    receiver->uhid_devices = NULL;

+    assert(cbs && cbs->on_error);
+    receiver->cbs = cbs;
+    receiver->cbs_userdata = cbs_userdata;
+
    return true;
 }

@@ -152,6 +157,8 @@ run_receiver(void *data) {
        }
    }

+    receiver->cbs->on_error(receiver, receiver->cbs_userdata);
+
    return 0;
 }

--- a/app/src/receiver.h
+++ b/app/src/receiver.h
@@ -19,10 +19,18 @@ struct sc_receiver {

    struct sc_acksync *acksync;
    struct sc_uhid_devices *uhid_devices;
+
+    const struct sc_receiver_callbacks *cbs;
+    void *cbs_userdata;
+};
+
+struct sc_receiver_callbacks {
+    void (*on_error)(struct sc_receiver *receiver, void *userdata);
 };

 bool
-sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket);
+sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
+                 const struct sc_receiver_callbacks *cbs, void *cbs_userdata);

 void
 sc_receiver_destroy(struct sc_receiver *receiver);
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -67,17 +67,17 @@ struct scrcpy {
 #endif
    union {
        struct sc_keyboard_sdk keyboard_sdk;
+        struct sc_keyboard_uhid keyboard_uhid;
 #ifdef HAVE_USB
        struct sc_keyboard_aoa keyboard_aoa;
 #endif
-        struct sc_keyboard_uhid keyboard_uhid;
    };
    union {
        struct sc_mouse_sdk mouse_sdk;
+        struct sc_mouse_uhid mouse_uhid;
 #ifdef HAVE_USB
        struct sc_mouse_aoa mouse_aoa;
 #endif
-        struct sc_mouse_uhid mouse_uhid;
    };
    struct sc_timeout timeout;
 };
@@ -106,7 +106,6 @@ static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {

 static void
 sdl_set_hints(const char *render_driver) {
-
    if (render_driver && !SDL_SetHint(SDL_HINT_RENDER_DRIVER, render_driver)) {
        LOGW("Could not set render driver");
    }
@@ -175,6 +174,9 @@ event_loop(struct scrcpy *s) {
            case SC_EVENT_DEMUXER_ERROR:
                LOGE("Demuxer error");
                return SCRCPY_EXIT_FAILURE;
+            case SC_EVENT_CONTROLLER_ERROR:
+                LOGE("Controller error");
+                return SCRCPY_EXIT_FAILURE;
            case SC_EVENT_RECORDER_ERROR:
                LOGE("Recorder error");
                return SCRCPY_EXIT_FAILURE;
@@ -266,6 +268,16 @@ sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer,
    }
 }

+static void
+sc_controller_on_error(struct sc_controller *controller, void *userdata) {
+    // Note: this function may be called twice, once from the controller thread
+    // and once from the receiver thread
+    (void) controller;
+    (void) userdata;
+
+    PUSH_EVENT(SC_EVENT_CONTROLLER_ERROR);
+}
+
 static void
 sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
    (void) server;
@@ -312,6 +324,10 @@ scrcpy_generate_scid(void) {
 enum scrcpy_exit_code
 scrcpy(struct scrcpy_options *options) {
    static struct scrcpy scrcpy;
+#ifndef NDEBUG
+    // Detect missing initializations
+    memset(&scrcpy, 42, sizeof(scrcpy));
+#endif
    struct scrcpy *s = &scrcpy;

    // Minimal SDL initialization
@@ -405,6 +421,12 @@ scrcpy(struct scrcpy_options *options) {
        return SCRCPY_EXIT_FAILURE;
    }

+    if (options->window) {
+        // Set hints before starting the server thread to avoid race conditions
+        // in SDL
+        sdl_set_hints(options->render_driver);
+    }
+
    if (!sc_server_start(&s->server)) {
        goto end;
    }
@@ -421,11 +443,7 @@ scrcpy(struct scrcpy_options *options) {
    assert(!options->video_playback || options->video);
    assert(!options->audio_playback || options->audio);

-    if (options->video_playback) {
-        sdl_set_hints(options->render_driver);
-    }
-
-    if (options->video_playback ||
+    if (options->window ||
            (options->control && options->clipboard_autosync)) {
        // Initialize the video subsystem even if --no-video or
        // --no-video-playback is passed so that clipboard synchronization
@@ -548,7 +566,12 @@ scrcpy(struct scrcpy_options *options) {
    struct sc_mouse_processor *mp = NULL;

    if (options->control) {
-        if (!sc_controller_init(&s->controller, s->server.control_socket)) {
+        static const struct sc_controller_callbacks controller_cbs = {
+            .on_error = sc_controller_on_error,
+        };
+
+        if (!sc_controller_init(&s->controller, s->server.control_socket,
+            &controller_cbs, NULL)) {
            goto end;
        }
        controller_initialized = true;
@@ -570,7 +593,7 @@ scrcpy(struct scrcpy_options *options) {
            if (!ok) {
                LOGE("Failed to initialize USB");
                sc_acksync_destroy(&s->acksync);
-                goto aoa_hid_end;
+                goto end;
            }

            assert(serial);
@@ -578,7 +601,7 @@ scrcpy(struct scrcpy_options *options) {
            ok = sc_usb_select_device(&s->usb, serial, &usb_device);
            if (!ok) {
                sc_usb_destroy(&s->usb);
-                goto aoa_hid_end;
+                goto end;
            }

            LOGI("USB device: %s (%04" PRIx16 ":%04" PRIx16 ") %s %s",
@@ -591,7 +614,7 @@ scrcpy(struct scrcpy_options *options) {
                LOGE("Failed to connect to USB device %s", serial);
                sc_usb_destroy(&s->usb);
                sc_acksync_destroy(&s->acksync);
-                goto aoa_hid_end;
+                goto end;
            }

            ok = sc_aoa_init(&s->aoa, &s->usb, &s->acksync);
@@ -600,7 +623,7 @@ scrcpy(struct scrcpy_options *options) {
                sc_usb_disconnect(&s->usb);
                sc_usb_destroy(&s->usb);
                sc_acksync_destroy(&s->acksync);
-                goto aoa_hid_end;
+                goto end;
            }

            if (use_keyboard_aoa) {
@@ -628,41 +651,18 @@ scrcpy(struct scrcpy_options *options) {
                sc_usb_disconnect(&s->usb);
                sc_usb_destroy(&s->usb);
                sc_aoa_destroy(&s->aoa);
-                goto aoa_hid_end;
+                goto end;
            }

            acksync = &s->acksync;

            aoa_hid_initialized = true;
-
-aoa_hid_end:
-            if (!aoa_hid_initialized) {
-                if (keyboard_aoa_initialized) {
-                    sc_keyboard_aoa_destroy(&s->keyboard_aoa);
-                    keyboard_aoa_initialized = false;
-                }
-                if (mouse_aoa_initialized) {
-                    sc_mouse_aoa_destroy(&s->mouse_aoa);
-                    mouse_aoa_initialized = false;
-                }
-            }
-
-            if (use_keyboard_aoa && !keyboard_aoa_initialized) {
-                LOGE("Fallback to --keyboard=sdk (--keyboard=aoa ignored)");
-                options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_SDK;
-            }
-
-            if (use_mouse_aoa && !mouse_aoa_initialized) {
-                LOGE("Fallback to --keyboard=sdk (--keyboard=aoa ignored)");
-                options->mouse_input_mode = SC_MOUSE_INPUT_MODE_SDK;
-            }
        }
 #else
        assert(options->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_AOA);
        assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_AOA);
 #endif

-        // keyboard_input_mode may have been reset if AOA mode failed
        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_SDK) {
            sc_keyboard_sdk_init(&s->keyboard_sdk, &s->controller,
                                 options->key_inject_mode,
@@ -670,6 +670,7 @@ aoa_hid_end:
            kp = &s->keyboard_sdk.key_processor;
        } else if (options->keyboard_input_mode
                == SC_KEYBOARD_INPUT_MODE_UHID) {
+            sc_uhid_devices_init(&s->uhid_devices);
            bool ok = sc_keyboard_uhid_init(&s->keyboard_uhid, &s->controller,
                                            &s->uhid_devices);
            if (!ok) {
@@ -679,7 +680,6 @@ aoa_hid_end:
            kp = &s->keyboard_uhid.key_processor;
        }

-        // mouse_input_mode may have been reset if AOA mode failed
        if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK) {
            sc_mouse_sdk_init(&s->mouse_sdk, &s->controller);
            mp = &s->mouse_sdk.mouse_processor;
@@ -702,11 +702,12 @@ aoa_hid_end:
    // There is a controller if and only if control is enabled
    assert(options->control == !!controller);

-    if (options->video_playback) {
+    if (options->window) {
        const char *window_title =
            options->window_title ? options->window_title : info->device_name;

        struct sc_screen_params screen_params = {
+            .video = options->video_playback,
            .controller = controller,
            .fp = fp,
            .kp = kp,
@@ -728,12 +729,15 @@ aoa_hid_end:
            .start_fps_counter = options->start_fps_counter,
        };

-        struct sc_frame_source *src = &s->video_decoder.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;
+        struct sc_frame_source *src;
+        if (options->video_playback) {
+            src = &s->video_decoder.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;
+            }
        }

        if (!sc_screen_init(&s->screen, &screen_params)) {
@@ -741,7 +745,9 @@ aoa_hid_end:
        }
        screen_initialized = true;

-        sc_frame_source_add_sink(src, &s->screen.frame_sink);
+        if (options->video_playback) {
+            sc_frame_source_add_sink(src, &s->screen.frame_sink);
+        }
    }

    if (options->audio_playback) {
@@ -823,9 +829,12 @@ aoa_hid_end:
    ret = event_loop(s);
    LOGD("quit...");

-    // Close the window immediately on closing, because screen_destroy() may
-    // only be called once the video demuxer thread is joined (it may take time)
-    sc_screen_hide_window(&s->screen);
+    if (options->video_playback) {
+        // Close the window immediately on closing, because screen_destroy()
+        // may only be called once the video demuxer thread is joined (it may
+        // take time)
+        sc_screen_hide_window(&s->screen);
+    }

 end:
    if (timeout_started) {
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -205,6 +205,8 @@ sc_screen_toggle_mouse_capture(struct sc_screen *screen) {

 static void
 sc_screen_update_content_rect(struct sc_screen *screen) {
+    assert(screen->video);
+
    int dw;
    int dh;
    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
@@ -246,6 +248,8 @@ sc_screen_update_content_rect(struct sc_screen *screen) {
 // changed, so that the content rectangle is recomputed
 static void
 sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
+    assert(screen->video);
+
    if (update_content_rect) {
        sc_screen_update_content_rect(screen);
    }
@@ -255,6 +259,13 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
    (void) res; // any error already logged
 }

+static void
+sc_screen_render_novideo(struct sc_screen *screen) {
+    enum sc_display_result res =
+        sc_display_render(&screen->display, NULL, SC_ORIENTATION_0);
+    (void) res; // any error already logged
+}
+
 #if defined(__APPLE__) || defined(__WINDOWS__)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif
@@ -268,6 +279,8 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
 static int
 event_watcher(void *data, SDL_Event *event) {
    struct sc_screen *screen = data;
+    assert(screen->video);
+
    if (event->type == SDL_WINDOWEVENT
            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
        // In practice, it seems to always be called from the same thread in
@@ -326,6 +339,7 @@ sc_screen_frame_sink_close(struct sc_frame_sink *sink) {
 static bool
 sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
    struct sc_screen *screen = DOWNCAST(sink);
+    assert(screen->video);

    bool previous_skipped;
    bool ok = sc_frame_buffer_push(&screen->fb, frame, &previous_skipped);
@@ -362,6 +376,11 @@ sc_screen_init(struct sc_screen *screen,
    screen->maximized = false;
    screen->minimized = false;
    screen->mouse_capture_key_pressed = 0;
+    screen->paused = false;
+    screen->resume_frame = NULL;
+    screen->orientation = SC_ORIENTATION_0;
+
+    screen->video = params->video;

    screen->req.x = params->window_x;
    screen->req.y = params->window_y;
@@ -379,41 +398,75 @@ sc_screen_init(struct sc_screen *screen,
        goto error_destroy_frame_buffer;
    }

-    screen->orientation = params->orientation;
-    if (screen->orientation != SC_ORIENTATION_0) {
-        LOGI("Initial display orientation set to %s",
-             sc_orientation_get_name(screen->orientation));
+    if (screen->video) {
+        screen->orientation = params->orientation;
+        if (screen->orientation != SC_ORIENTATION_0) {
+            LOGI("Initial display orientation set to %s",
+                 sc_orientation_get_name(screen->orientation));
+        }
    }

-    uint32_t window_flags = SDL_WINDOW_HIDDEN
-                          | SDL_WINDOW_RESIZABLE
-                          | SDL_WINDOW_ALLOW_HIGHDPI;
+    uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
    if (params->always_on_top) {
        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
    }
    if (params->window_borderless) {
        window_flags |= SDL_WINDOW_BORDERLESS;
    }
+    if (params->video) {
+        // The window will be shown on first frame
+        window_flags |= SDL_WINDOW_HIDDEN
+                      | SDL_WINDOW_RESIZABLE;
+    }
+
+    const char *title = params->window_title;
+    assert(title);
+
+    int x = SDL_WINDOWPOS_UNDEFINED;
+    int y = SDL_WINDOWPOS_UNDEFINED;
+    int width = 256;
+    int height = 256;
+    if (params->window_x != SC_WINDOW_POSITION_UNDEFINED) {
+        x = params->window_x;
+    }
+    if (params->window_y != SC_WINDOW_POSITION_UNDEFINED) {
+        y = params->window_y;
+    }
+    if (params->window_width) {
+        width = params->window_width;
+    }
+    if (params->window_height) {
+        height = params->window_height;
+    }

    // The window will be positioned and sized on first video frame
-    screen->window =
-        SDL_CreateWindow(params->window_title, 0, 0, 0, 0, window_flags);
+    screen->window = SDL_CreateWindow(title, x, y, width, height, window_flags);
    if (!screen->window) {
        LOGE("Could not create window: %s", SDL_GetError());
        goto error_destroy_fps_counter;
    }

-    ok = sc_display_init(&screen->display, screen->window, params->mipmaps);
-    if (!ok) {
-        goto error_destroy_window;
-    }
-
    SDL_Surface *icon = scrcpy_icon_load();
    if (icon) {
        SDL_SetWindowIcon(screen->window, icon);
-        scrcpy_icon_destroy(icon);
-    } else {
+    } else if (params->video) {
+        // just a warning
        LOGW("Could not load icon");
+    } else {
+        // without video, the icon is used as window content, it must be present
+        LOGE("Could not load icon");
+        goto error_destroy_fps_counter;
+    }
+
+    SDL_Surface *icon_novideo = params->video ? NULL : icon;
+    bool mipmaps = params->video && params->mipmaps;
+    ok = sc_display_init(&screen->display, screen->window, icon_novideo,
+                         mipmaps);
+    if (icon) {
+        scrcpy_icon_destroy(icon);
+    }
+    if (!ok) {
+        goto error_destroy_window;
    }

    screen->frame = av_frame_alloc();
@@ -437,7 +490,9 @@ sc_screen_init(struct sc_screen *screen,
    sc_input_manager_init(&screen->im, &im_params);

 #ifdef CONTINUOUS_RESIZING_WORKAROUND
-    SDL_AddEventWatch(event_watcher, screen);
+    if (screen->video) {
+        SDL_AddEventWatch(event_watcher, screen);
+    }
 #endif

    static const struct sc_frame_sink_ops ops = {
@@ -452,6 +507,11 @@ sc_screen_init(struct sc_screen *screen,
    screen->open = false;
 #endif

+    if (!screen->video && sc_screen_is_relative_mode(screen)) {
+        // Capture mouse immediately if video mirroring is disabled
+        sc_screen_set_mouse_capture(screen, true);
+    }
+
    return true;

 error_destroy_display:
@@ -522,6 +582,8 @@ sc_screen_destroy(struct sc_screen *screen) {
 static void
 resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
                   struct sc_size new_content_size) {
+    assert(screen->video);
+
    struct sc_size window_size = get_window_size(screen);
    struct sc_size target_size = {
        .width = (uint32_t) window_size.width * new_content_size.width
@@ -535,6 +597,8 @@ resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,

 static void
 set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
+    assert(screen->video);
+
    if (!screen->fullscreen && !screen->maximized && !screen->minimized) {
        resize_for_content(screen, screen->content_size, new_content_size);
    } else if (!screen->resize_pending) {
@@ -549,6 +613,8 @@ set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {

 static void
 apply_pending_resize(struct sc_screen *screen) {
+    assert(screen->video);
+
    assert(!screen->fullscreen);
    assert(!screen->maximized);
    assert(!screen->minimized);
@@ -562,6 +628,8 @@ apply_pending_resize(struct sc_screen *screen) {
 void
 sc_screen_set_orientation(struct sc_screen *screen,
                          enum sc_orientation orientation) {
+    assert(screen->video);
+
    if (orientation == screen->orientation) {
        return;
    }
@@ -596,6 +664,8 @@ sc_screen_init_size(struct sc_screen *screen) {
 // recreate the texture and resize the window if the frame size has changed
 static enum sc_display_result
 prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
+    assert(screen->video);
+
    if (screen->frame_size.width == new_frame_size.width
            && screen->frame_size.height == new_frame_size.height) {
        return SC_DISPLAY_RESULT_OK;
@@ -614,13 +684,12 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
 }

 static bool
-sc_screen_update_frame(struct sc_screen *screen) {
-    av_frame_unref(screen->frame);
-    sc_frame_buffer_consume(&screen->fb, screen->frame);
-    AVFrame *frame = screen->frame;
+sc_screen_apply_frame(struct sc_screen *screen) {
+    assert(screen->video);

    sc_fps_counter_add_rendered_frame(&screen->fps_counter);

+    AVFrame *frame = screen->frame;
    struct sc_size new_frame_size = {frame->width, frame->height};
    enum sc_display_result res = prepare_for_frame(screen, new_frame_size);
    if (res == SC_DISPLAY_RESULT_ERROR) {
@@ -655,8 +724,62 @@ sc_screen_update_frame(struct sc_screen *screen) {
    return true;
 }

+static bool
+sc_screen_update_frame(struct sc_screen *screen) {
+    assert(screen->video);
+
+    if (screen->paused) {
+        if (!screen->resume_frame) {
+            screen->resume_frame = av_frame_alloc();
+            if (!screen->resume_frame) {
+                LOG_OOM();
+                return false;
+            }
+        } else {
+            av_frame_unref(screen->resume_frame);
+        }
+        sc_frame_buffer_consume(&screen->fb, screen->resume_frame);
+        return true;
+    }
+
+    av_frame_unref(screen->frame);
+    sc_frame_buffer_consume(&screen->fb, screen->frame);
+    return sc_screen_apply_frame(screen);
+}
+
+void
+sc_screen_set_paused(struct sc_screen *screen, bool paused) {
+    assert(screen->video);
+
+    if (!paused && !screen->paused) {
+        // nothing to do
+        return;
+    }
+
+    if (screen->paused && screen->resume_frame) {
+        // If display screen was paused, refresh the frame immediately, even if
+        // the new state is also paused.
+        av_frame_free(&screen->frame);
+        screen->frame = screen->resume_frame;
+        screen->resume_frame = NULL;
+        sc_screen_apply_frame(screen);
+    }
+
+    if (!paused) {
+        LOGI("Display screen unpaused");
+    } else if (!screen->paused) {
+        LOGI("Display screen paused");
+    } else {
+        LOGI("Display screen re-paused");
+    }
+
+    screen->paused = paused;
+}
+
 void
 sc_screen_switch_fullscreen(struct sc_screen *screen) {
+    assert(screen->video);
+
    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
    if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
        LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
@@ -674,6 +797,8 @@ sc_screen_switch_fullscreen(struct sc_screen *screen) {

 void
 sc_screen_resize_to_fit(struct sc_screen *screen) {
+    assert(screen->video);
+
    if (screen->fullscreen || screen->maximized || screen->minimized) {
        return;
    }
@@ -698,6 +823,8 @@ sc_screen_resize_to_fit(struct sc_screen *screen) {

 void
 sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
+    assert(screen->video);
+
    if (screen->fullscreen || screen->minimized) {
        return;
    }
@@ -741,6 +868,13 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
            return true;
        }
        case SDL_WINDOWEVENT:
+            if (!screen->video
+                    && event->window.event == SDL_WINDOWEVENT_EXPOSED) {
+                sc_screen_render_novideo(screen);
+            }
+
+            // !video implies !has_frame
+            assert(screen->video || !screen->has_frame);
            if (!screen->has_frame) {
                // Do nothing
                return true;
@@ -844,6 +978,8 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
 struct sc_point
 sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
                                           int32_t x, int32_t y) {
+    assert(screen->video);
+
    enum sc_orientation orientation = screen->orientation;

    int32_t w = screen->content_size.width;
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -26,6 +26,8 @@ struct sc_screen {
    bool open; // track the open/close state to assert correct behavior
 #endif

+    bool video;
+
    struct sc_display display;
    struct sc_input_manager im;
    struct sc_frame_buffer fb;
@@ -64,9 +66,14 @@ struct sc_screen {
    SDL_Keycode mouse_capture_key_pressed;

    AVFrame *frame;
+
+    bool paused;
+    AVFrame *resume_frame;
 };

 struct sc_screen_params {
+    bool video;
+
    struct sc_controller *controller;
    struct sc_file_pusher *fp;
    struct sc_key_processor *kp;
@@ -135,6 +142,10 @@ void
 sc_screen_set_orientation(struct sc_screen *screen,
                          enum sc_orientation orientation);

+// set the display pause state
+void
+sc_screen_set_paused(struct sc_screen *screen, bool paused);
+
 // react to SDL events
 // If this function returns false, scrcpy must exit with an error.
 bool
--- a/app/src/trait/key_processor.h
+++ b/app/src/trait/key_processor.h
@@ -23,7 +23,8 @@ struct sc_key_processor {
     */
    bool async_paste;

-    /** Set by the implementation to indicate that the keyboard is HID. In
+    /**
+     * Set by the implementation to indicate that the keyboard is HID. In
     * practice, it is used to react on a shortcut to open the hard keyboard
     * settings only if the keyboard is HID.
     */
--- a/app/src/usb/scrcpy_otg.c
+++ b/app/src/usb/scrcpy_otg.c
@@ -127,12 +127,6 @@ scrcpy_otg(struct scrcpy_options *options) {
    bool enable_mouse =
        options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;

-    // If neither --hid-keyboard or --hid-mouse is passed, enable both
-    if (!enable_keyboard && !enable_mouse) {
-        enable_keyboard = true;
-        enable_mouse = true;
-    }
-
    if (enable_keyboard) {
        ok = sc_keyboard_aoa_init(&s->keyboard, &s->aoa);
        if (!ok) {
--- a/doc/audio.md
+++ b/doc/audio.md
@@ -28,10 +28,17 @@ To disable only the audio playback, see [no playback](video.md#no-playback).

 ## Audio only

-To play audio only, disable the video:
+To play audio only, disable video and control:

 ```bash
-scrcpy --no-video
+scrcpy --no-video --no-control
+```
+
+To play audio without a window:
+
+```bash
+# --no-video and --no-control are implied by --no-window
+scrcpy --no-window
 # interrupt with Ctrl+C
 ```

--- a/doc/build.md
+++ b/doc/build.md
@@ -233,10 +233,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v2.3.1`][direct-scrcpy-server]  
-   <sub>SHA-256: `f6814822fc308a7a532f253485c9038183c6296a6c5df470a9e383b4f8e7605b`</sub>
+ - [`scrcpy-server-v2.4`][direct-scrcpy-server]  
+   <sub>SHA-256: `93c272b7438605c055e127f7444064ed78fa9ca49f81156777fd201e79ce7ba3`</sub>

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.3.1/scrcpy-server-v2.3.1
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.4/scrcpy-server-v2.4

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/doc/connection.md
+++ b/doc/connection.md
@@ -67,14 +67,6 @@ computer.
 An option `--tcpip` allows to configure the connection automatically. There are
 two variants.

-If the device (accessible at 192.168.1.1 in this example) already listens on a
-port (typically 5555) for incoming _adb_ connections, then run:
-
-```bash
-scrcpy --tcpip=192.168.1.1       # default port is 5555
-scrcpy --tcpip=192.168.1.1:5555
-```
-
 If _adb_ TCP/IP mode is disabled on the device (or if you don't know the IP
 address), connect the device over USB, then run:

@@ -85,6 +77,14 @@ scrcpy --tcpip   # without arguments
 It will automatically find the device IP address and adb port, enable TCP/IP
 mode if necessary, then connect to the device before starting.

+If the device (accessible at 192.168.1.1 in this example) already listens on a
+port (typically 5555) for incoming _adb_ connections, then run:
+
+```bash
+scrcpy --tcpip=192.168.1.1       # default port is 5555
+scrcpy --tcpip=192.168.1.1:5555
+```
+

 ### Manual

--- a/doc/control.md
+++ b/doc/control.md
@@ -10,36 +10,34 @@ scrcpy --no-control
 scrcpy -n   # short version
 ```

+## Keyboard and mouse

-## Text injection preference
+Read [keyboard](keyboard.md) and [mouse](mouse.md).

-Two kinds of [events][textevents] are generated when typing text:
- - _key events_, signaling that a key is pressed or released;
- - _text events_, signaling that a text has been entered.

-By default, letters are injected using key events, so that the keyboard behaves
-as expected in games (typically for WASD keys).
+## Control only

-But this may [cause issues][prefertext]. If you encounter such a problem, you
-can avoid it by:
+To control the device without mirroring:

 ```bash
-scrcpy --prefer-text
+scrcpy --no-video --no-audio
 ```

-(but this will break keyboard behavior in games)
+By default, mouse mode is switched to UHID if video mirroring is disabled (a
+relative mouse mode is required).

-On the contrary, you could force to always inject raw key events:
+To also use a UHID keyboard, set it explicitly:

 ```bash
-scrcpy --raw-key-events
+scrcpy --no-video --no-audio --keyboard=uhid
+scrcpy --no-video --no-audio -K  # short version
 ```

-These options have no effect on HID keyboard (all key events are sent as
-scancodes in this mode).
+To use AOA instead (over USB only):

-[textevents]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-text-input
-[prefertext]: https://github.com/Genymobile/scrcpy/issues/650#issuecomment-512945343
+```bash
+scrcpy --no-video --no-audio --keyboard=aoa --mouse=aoa
+```


 ## Copy-paste
@@ -85,6 +83,7 @@ way as <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>).
 To disable automatic clipboard synchronization, use
 `--no-clipboard-autosync`.

+
 ## Pinch-to-zoom, rotate and tilt simulation

 To simulate "pinch-to-zoom": <kbd>Ctrl</kbd>+_click-and-move_.
@@ -93,27 +92,18 @@ More precisely, hold down <kbd>Ctrl</kbd> while pressing the left-click button.
 Until the left-click button is released, all mouse movements scale and rotate
 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 tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.

+https://github.com/Genymobile/scrcpy/assets/543275/1e252341-4a90-4b29-9d11-9153b324669f
+
 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.
+<kbd>Ctrl</kbd> the _x_ and _y_ coordinates are inverted. Using <kbd>Shift</kbd>
+only inverts _x_.

-
-## Key repeat
-
-By default, holding a key down generates repeated key events. This can cause
-performance problems in some games, where these events are useless anyway.
-
-To avoid forwarding repeated key events:
-
-```bash
-scrcpy --no-key-repeat
-```
-
-This option has no effect on HID keyboard (key repeat is handled by Android
-directly in this mode).
+This only works for the default mouse mode (`--mouse=sdk`).


 ## Right-click and middle-click
@@ -147,7 +137,3 @@ The target directory can be changed on start:
 ```bash
 scrcpy --push-target=/sdcard/Movies/
 ```
-
-## Physical keyboard and mouse simulation
-
-See the dedicated [HID/OTG](hid-otg.md) page.
--- a/doc/develop.md
+++ b/doc/develop.md
@@ -234,7 +234,7 @@ The video and audio streams are decoded by [FFmpeg].
 The client parses the command line arguments, then [runs one of two code
 paths][run]:
 - scrcpy in "normal" mode ([`scrcpy.c`])
- - scrcpy in [OTG mode](hid-otg.md) ([`scrcpy_otg.c`])
+ - scrcpy in [OTG mode](otg.md) ([`scrcpy_otg.c`])

 [run]: https://github.com/Genymobile/scrcpy/blob/a3cdf1a6b86ea22786e1f7d09b9c202feabc6949/app/src/main.c#L81-L82
 [`scrcpy.c`]: https://github.com/Genymobile/scrcpy/blob/a3cdf1a6b86ea22786e1f7d09b9c202feabc6949/app/src/scrcpy.c#L292-L293
--- a/doc/hid-otg.md
+++ b/doc/hid-otg.md
@@ -1,112 +0,0 @@
-# HID/OTG
-
-By default, _scrcpy_ injects input events at the Android API level. As an
-alternative, when connected over USB, it is possible to send HID events, so that
-scrcpy behaves as if it was a physical keyboard and/or mouse connected to the
-Android device.
-
-A special [OTG](#otg) mode allows to control the device without mirroring (and
-without USB debugging).
-
-
-## Physical keyboard simulation
-
-By default, _scrcpy_ uses Android key or text injection. It works everywhere,
-but is limited to ASCII.
-
-Instead, it can simulate a physical USB keyboard on Android to provide a better
-input experience (using [USB HID over AOAv2][hid-aoav2]): the virtual keyboard
-is disabled and it works for all characters and IME.
-
-[hid-aoav2]: https://source.android.com/devices/accessories/aoa2#hid-support
-
-However, it only works if the device is connected via USB.
-
-Note: On Windows, it may only work in [OTG mode](#otg), not while mirroring (it
-is not possible to open a USB device if it is already open by another process
-like the _adb daemon_).
-
-To enable this mode:
-
-```bash
-scrcpy --hid-keyboard
-scrcpy -K   # short version
-```
-
-If it fails for some reason (for example because the device is not connected via
-USB), it automatically fallbacks to the default mode (with a log in the
-console). This allows using the same command line options when connected over
-USB and TCP/IP.
-
-In this mode, raw key events (scancodes) are sent to the device, independently
-of the host key mapping. Therefore, if your keyboard layout does not match, it
-must be configured on the Android device, in Settings → System → Languages and
-input → [Physical keyboard].
-
-This settings page can be started directly:
-
-```bash
-adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS
-```
-
-However, the option is only available when the HID keyboard is enabled (or when
-a physical keyboard is connected).
-
-[Physical keyboard]: https://github.com/Genymobile/scrcpy/pull/2632#issuecomment-923756915
-
-
-## Physical mouse simulation
-
-By default, _scrcpy_ uses Android mouse events injection with absolute
-coordinates. By simulating a physical mouse, a mouse pointer appears on the
-Android device, and relative mouse motion, clicks and scrolls are injected.
-
-To enable this mode:
-
-```bash
-scrcpy --hid-mouse
-scrcpy -M   # short version
-```
-
-When this mode is enabled, the computer mouse is "captured" (the mouse pointer
-disappears from the computer and appears on the Android device instead).
-
-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.
-
-
-## OTG
-
-It is possible to run _scrcpy_ with only physical keyboard and mouse simulation
-(HID), as if the computer keyboard and mouse were plugged directly to the device
-via an OTG cable.
-
-In this mode, `adb` (USB debugging) is not necessary, and mirroring is disabled.
-
-This is similar to `--hid-keyboard --hid-mouse`, but without mirroring.
-
-To enable OTG mode:
-
-```bash
-scrcpy --otg
-# Pass the serial if several USB devices are available
-scrcpy --otg -s 0123456789abcdef
-```
-
-It is possible to enable only HID keyboard or HID mouse:
-
-```bash
-scrcpy --otg --hid-keyboard              # keyboard only
-scrcpy --otg --hid-mouse                 # mouse only
-scrcpy --otg --hid-keyboard --hid-mouse  # keyboard and mouse
-# for convenience, enable both by default
-scrcpy --otg                             # keyboard and mouse
-```
-
-Like `--hid-keyboard` and `--hid-mouse`, it only works if the device is
-connected over USB.
-
-## HID/OTG issues on Windows
-
-See [FAQ](/FAQ.md#hidotg-issues-on-windows).
--- a/doc/keyboard.md
+++ b/doc/keyboard.md
@@ -0,0 +1,136 @@
+# Keyboard
+
+Several keyboard input modes are available:
+
+ - `--keyboard=sdk` (default)
+ - `--keyboard=uhid` (or `-K`): simulates a physical HID keyboard using the UHID
+   kernel module on the device
+ - `--keyboard=aoa`: simulates a physical HID keyboard using the AOAv2 protocol
+ - `--keyboard=disabled`
+
+By default, `sdk` is used, but if you use scrcpy regularly, it is recommended to
+use [`uhid`](#uhid) and configure the keyboard layout once and for all.
+
+
+## SDK keyboard
+
+In this mode (`--keyboard=sdk`, or if the parameter is omitted), keyboard input
+events are injected at the Android API level. It works everywhere, but it is
+limited to ASCII and some other characters.
+
+Note that on some devices, an additional option must be enabled in developer
+options for this keyboard mode to work. See
+[prerequisites](/README.md#prerequisites).
+
+Additional parameters (specific to `--keyboard=sdk`) described below allow to
+customize the behavior.
+
+
+### Text injection preference
+
+Two kinds of [events][textevents] are generated when typing text:
+ - _key events_, signaling that a key is pressed or released;
+ - _text events_, signaling that a text has been entered.
+
+By default, numbers and "special characters" are inserted using text events, but
+letters are injected using key events, so that the keyboard behaves as expected
+in games (typically for WASD keys).
+
+But this may [cause issues][prefertext]. If you encounter such a problem, you
+can inject letters as text (or just switch to [UHID](#uhid)):
+
+```bash
+scrcpy --prefer-text
+```
+
+(but this will break keyboard behavior in games)
+
+On the contrary, you could force to always inject raw key events:
+
+```bash
+scrcpy --raw-key-events
+```
+
+[textevents]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-text-input
+[prefertext]: https://github.com/Genymobile/scrcpy/issues/650#issuecomment-512945343
+
+
+### Key repeat
+
+By default, holding a key down generates repeated key events. Ths can cause
+performance problems in some games, where these events are useless anyway.
+
+To avoid forwarding repeated key events:
+
+```bash
+scrcpy --no-key-repeat
+```
+
+
+## Physical keyboard simulation
+
+Two modes allow to simulate a physical HID keyboard on the device.
+
+To work properly, it is necessary to configure (once and for all) the keyboard
+layout on the device to match that of the computer.
+
+The configuration page can be opened in one of the following ways:
+ - from the scrcpy window (when `uhid` or `aoa` is used), by pressing
+   <kbd>MOD</kbd>+<kbd>k</kbd> (see [shortcuts](shortcuts.md))
+ - from the device, in Settings → System → Languages and input → Physical
+   devices
+ - from a terminal on the computer, by executing `adb shell am start -a
+   android.settings.HARD_KEYBOARD_SETTINGS`
+
+From this configuration page, it is also possible to enable or disable on-screen
+keyboard.
+
+
+### UHID
+
+This mode simulates a physical HID keyboard using the [UHID] kernel module on the
+device.
+
+[UHID]: https://kernel.org/doc/Documentation/hid/uhid.txt
+
+To enable UHID keyboard, use:
+
+```bash
+scrcpy --keyboard=uhid
+scrcpy -K  # short version
+```
+
+Once the keyboard layout is configured (see above), it is the best mode for
+using the keyboard while mirroring:
+
+ - it works for all characters and IME (contrary to `--keyboard=sdk`)
+ - the on-screen keyboard can be disabled (contrary to `--keyboard=sdk`)
+ - it works over TCP/IP (wirelessly) (contrary to `--keyboard=aoa`)
+ - there are no issues on Windows (contrary to `--keyboard=aoa`)
+
+One drawback is that it may not work on old Android versions due to permission
+errors.
+
+
+### AOA
+
+This mode simulates a physical HID keyboard using the [AOAv2] protocol.
+
+[AOAv2]: https://source.android.com/devices/accessories/aoa2#hid-support
+
+To enable AOA keyboard, use:
+
+```bash
+scrcpy --keyboard=aoa
+```
+
+Contrary to the other modes, 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: 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_).
--- a/doc/mouse.md
+++ b/doc/mouse.md
@@ -0,0 +1,70 @@
+# Mouse
+
+Several mouse input modes are available:
+
+ - `--mouse=sdk` (default)
+ - `--mouse=uhid` (or `-M`): simulates a physical HID mouse using the UHID
+   kernel module on the device
+ - `--mouse=aoa`: simulates a physical HID mouse using the AOAv2 protocol
+ - `--mouse=disabled`
+
+
+## SDK mouse
+
+In this mode (`--mouse=sdk`, or if the parameter is omitted), mouse input events
+are injected at the Android API level with absolute coordinates.
+
+Note that on some devices, an additional option must be enabled in developer
+options for this mouse mode to work. See
+[prerequisites](/README.md#prerequisites).
+
+
+## Physical mouse simulation
+
+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.
+
+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
+
+This mode simulates a physical HID mouse using the [UHID] kernel module on the
+device.
+
+[UHID]: https://kernel.org/doc/Documentation/hid/uhid.txt
+
+To enable UHID mouse, use:
+
+```bash
+scrcpy --mouse=uhid
+scrcpy -M  # short version
+```
+
+
+### AOA
+
+This mode simulates a physical HID mouse using the [AOAv2] protocol.
+
+[AOAv2]: https://source.android.com/devices/accessories/aoa2#hid-support
+
+To enable AOA mouse, use:
+
+```bash
+scrcpy --mouse=aoa
+```
+
+Contrary to the other modes, 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: 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_).
--- a/doc/otg.md
+++ b/doc/otg.md
@@ -0,0 +1,58 @@
+# OTG
+
+By default, _scrcpy_ injects input events at the Android API level. As an
+alternative, it is possible to send HID events, so that scrcpy behaves as if it
+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]: physical-keyboard-simulation
+
+A special mode (OTG) allows to control the device using AOA
+[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 and mouse
+simulation, as if the computer keyboard and mouse were plugged directly to the
+device via an OTG cable.
+
+To enable OTG mode:
+
+```bash
+scrcpy --otg
+# Pass the serial if several USB devices are available
+scrcpy --otg -s 0123456789abcdef
+```
+
+It is possible to disable keyboard or mouse:
+
+```bash
+scrcpy --otg --keyboard=disabled
+scrcpy --otg --mouse=disabled
+```
+
+It only works if the device is connected over USB.
+
+## OTG issues on Windows
+
+See [FAQ](/FAQ.md#otg-issues-on-windows).
+
+
+## Control only
+
+Note that the purpose of OTG is to control the device without USB debugging
+(adb).
+
+If you want to solely control the device without mirroring while USB debugging
+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
+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.
--- a/doc/recording.md
+++ b/doc/recording.md
@@ -58,12 +58,10 @@ orientation](video.md#orientation).

 ## No playback

-To disable playback while recording:
+To disable playback and control while recording:

 ```bash
-scrcpy --no-playback --record=file.mp4
-scrcpy -Nr file.mkv
-# interrupt recording with Ctrl+C
+scrcpy --no-playback --no-control --record=file.mp4
 ```

 It is also possible to disable video and audio playback separately:
@@ -73,6 +71,13 @@ It is also possible to disable video and audio playback separately:
 scrcpy --record=file.mkv --no-audio-playback
 ```

+To also disable the window:
+
+```bash
+scrcpy --no-playback --no-window --record=file.mp4
+# interrupt recording with Ctrl+C
+```
+
 ## Time limit

 To limit the recording time:
--- a/doc/shortcuts.md
+++ b/doc/shortcuts.md
@@ -28,6 +28,8 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Rotate display right                        | <kbd>MOD</kbd>+<kbd>→</kbd> _(right)_
 | Flip display horizontally                   | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>←</kbd> _(left)_ \| <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>→</kbd> _(right)_
 | 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>
 | Resize window to 1:1 (pixel-perfect)        | <kbd>MOD</kbd>+<kbd>g</kbd>
 | Resize window to remove black borders       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-left-click¹_
 | Click on `HOME`                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Middle-click_
--- a/doc/window.md
+++ b/doc/window.md
@@ -1,5 +1,14 @@
 # Window

+## Disable window
+
+To disable window (may be useful for recording or for playing audio only):
+
+```bash
+scrcpy --no-window --record=file.mp4
+# Ctrl+C to interrupt
+```
+
 ## Title

 By default, the window title is the device model. It can be changed:
--- a/doc/windows.md
+++ b/doc/windows.md
@@ -4,14 +4,14 @@

 Download the [latest release]:

- - [`scrcpy-win64-v2.3.1.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `f1f78ac98214078425804e524a1bed515b9d4b8a05b78d210a4ced2b910b262d`</sub>
- - [`scrcpy-win32-v2.3.1.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `5dffc2d432e9b8b5b0e16f12e71428c37c70d9124cfbe7620df0b41b7efe91ff`</sub>
+ - [`scrcpy-win64-v2.4.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `9dc56f21bfa455352ec0c58b40feaf2fb02d67372910a4235e298ece286ff3a9`</sub>
+ - [`scrcpy-win32-v2.4.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `cf92acc45eef37c6ee2db819f92e420ced3bc50f1348dd57f7d6ca1fc80f6116`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.3.1/scrcpy-win64-v2.3.1.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.3.1/scrcpy-win32-v2.3.1.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.4/scrcpy-win64-v2.4.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.4/scrcpy-win32-v2.4.zip

 and extract it.

--- a/install_release.sh
+++ b/install_release.sh
@@ -2,8 +2,8 @@
 set -e

 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.3.1/scrcpy-server-v2.3.1
-PREBUILT_SERVER_SHA256=f6814822fc308a7a532f253485c9038183c6296a6c5df470a9e383b4f8e7605b
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.4/scrcpy-server-v2.4
+PREBUILT_SERVER_SHA256=93c272b7438605c055e127f7444064ed78fa9ca49f81156777fd201e79ce7ba3

 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '2.3.1',
+        version: '2.4',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/release.mk
+++ b/release.mk
@@ -62,38 +62,38 @@ build-server:
 		meson setup "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )
 	ninja -C "$(SERVER_BUILD_DIR)"

-prepare-deps:
-	@app/prebuilt-deps/prepare-adb.sh
-	@app/prebuilt-deps/prepare-sdl.sh
-	@app/prebuilt-deps/prepare-ffmpeg.sh
-	@app/prebuilt-deps/prepare-libusb.sh
+prepare-deps-win32:
+	@app/deps/adb.sh win32
+	@app/deps/sdl.sh win32
+	@app/deps/ffmpeg.sh win32
+	@app/deps/libusb.sh win32

-build-win32: prepare-deps
+prepare-deps-win64:
+	@app/deps/adb.sh win64
+	@app/deps/sdl.sh win64
+	@app/deps/ffmpeg.sh win64
+	@app/deps/libusb.sh win64
+
+build-win32: prepare-deps-win32
 	rm -rf "$(WIN32_BUILD_DIR)"
 	mkdir -p "$(WIN32_BUILD_DIR)/local"
-	cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win32/. "$(WIN32_BUILD_DIR)/local/"
-	cp -r app/prebuilt-deps/data/SDL2-2.28.5/i686-w64-mingw32/. "$(WIN32_BUILD_DIR)/local/"
-	cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/. "$(WIN32_BUILD_DIR)/local/"
 	meson setup "$(WIN32_BUILD_DIR)" \
-		--pkg-config-path="$(WIN32_BUILD_DIR)/local/lib/pkgconfig" \
-		-Dc_args="-I$(PWD)/$(WIN32_BUILD_DIR)/local/include" \
-		-Dc_link_args="-L$(PWD)/$(WIN32_BUILD_DIR)/local/lib" \
+		--pkg-config-path="app/deps/work/install/win32/lib/pkgconfig" \
+		-Dc_args="-I$(PWD)/app/deps/work/install/win32/include" \
+		-Dc_link_args="-L$(PWD)/app/deps/work/install/win32/lib" \
 		--cross-file=cross_win32.txt \
 		--buildtype=release --strip -Db_lto=true \
 		-Dcompile_server=false \
 		-Dportable=true
 	ninja -C "$(WIN32_BUILD_DIR)"

-build-win64: prepare-deps
+build-win64: prepare-deps-win64
 	rm -rf "$(WIN64_BUILD_DIR)"
 	mkdir -p "$(WIN64_BUILD_DIR)/local"
-	cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win64/. "$(WIN64_BUILD_DIR)/local/"
-	cp -r app/prebuilt-deps/data/SDL2-2.28.5/x86_64-w64-mingw32/. "$(WIN64_BUILD_DIR)/local/"
-	cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/. "$(WIN64_BUILD_DIR)/local/"
 	meson setup "$(WIN64_BUILD_DIR)" \
-		--pkg-config-path="$(WIN64_BUILD_DIR)/local/lib/pkgconfig" \
-		-Dc_args="-I$(PWD)/$(WIN64_BUILD_DIR)/local/include" \
-		-Dc_link_args="-L$(PWD)/$(WIN64_BUILD_DIR)/local/lib" \
+		--pkg-config-path="app/deps/work/install/win64/lib/pkgconfig" \
+		-Dc_args="-I$(PWD)/app/deps/work/install/win64/include" \
+		-Dc_link_args="-L$(PWD)/app/deps/work/install/win64/lib" \
 		--cross-file=cross_win64.txt \
 		--buildtype=release --strip -Db_lto=true \
 		-Dcompile_server=false \
@@ -108,10 +108,8 @@ dist-win32: build-server build-win32
 	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/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp "$(WIN32_BUILD_DIR)"/local/bin/*.dll "$(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)"
@@ -121,10 +119,8 @@ dist-win64: build-server build-win64
 	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/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp "$(WIN64_BUILD_DIR)"/local/bin/*.dll "$(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)"; \
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -7,8 +7,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 34
-        versionCode 20301
-        versionName "2.3.1"
+        versionCode 20400
+        versionName "2.4"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -12,7 +12,7 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=2.3.1
+SCRCPY_VERSION_NAME=2.4

 PLATFORM=${ANDROID_PLATFORM:-34}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
@@ -53,8 +53,6 @@ public class CameraCapture extends SurfaceCapture {

    private final AtomicBoolean disconnected = new AtomicBoolean();

-    private CameraCaptureSession currentSession;
-
    public CameraCapture(String explicitCameraId, CameraFacing cameraFacing, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio, int fps,
            boolean highSpeed) {
        this.explicitCameraId = explicitCameraId;
@@ -129,6 +127,10 @@ public class CameraCapture extends SurfaceCapture {

        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
        android.util.Size[] sizes = highSpeed ? configs.getHighSpeedVideoSizes() : configs.getOutputSizes(MediaCodec.class);
+        if (sizes == null) {
+            return null;
+        }
+
        Stream<android.util.Size> stream = Arrays.stream(sizes);
        if (maxSize > 0) {
            stream = stream.filter(it -> it.getWidth() <= maxSize && it.getHeight() <= maxSize);
@@ -198,22 +200,7 @@ public class CameraCapture extends SurfaceCapture {
    public void start(Surface surface) throws IOException {
        try {
            CameraCaptureSession session = createCaptureSession(cameraDevice, surface);
-            CaptureRequest request = createCaptureRequest(surface, false);
-            setRepeatingRequest(session, request);
-            setCurrentSession(session);
-        } catch (CameraAccessException | InterruptedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.M)
-    public void setTorchEnabled(boolean enabled) throws IOException {
-        CameraCaptureSession session = getCurrentSession();
-        if (session == null) {
-            return;
-        }
-        try {
-            CaptureRequest request = createCaptureRequest(session.getInputSurface(), enabled);
+            CaptureRequest request = createCaptureRequest(surface);
            setRepeatingRequest(session, request);
        } catch (CameraAccessException | InterruptedException e) {
            throw new IOException(e);
@@ -327,12 +314,9 @@ public class CameraCapture extends SurfaceCapture {
        }
    }

-    private CaptureRequest createCaptureRequest(Surface surface, boolean torch) throws CameraAccessException {
+    private CaptureRequest createCaptureRequest(Surface surface) throws CameraAccessException {
        CaptureRequest.Builder requestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
        requestBuilder.addTarget(surface);
-        if (torch) {
-            requestBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH);
-        }

        if (fps > 0) {
            requestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, new Range<>(fps, fps));
@@ -368,12 +352,4 @@ public class CameraCapture extends SurfaceCapture {
    public boolean isClosed() {
        return disconnected.get();
    }
-
-    private synchronized void setCurrentSession(CameraCaptureSession session) {
-        currentSession = session;
-    }
-
-    private synchronized CameraCaptureSession getCurrentSession() {
-        return currentSession;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@@ -20,7 +20,6 @@ public final class ControlMessage {
    public static final int TYPE_UHID_CREATE = 12;
    public static final int TYPE_UHID_INPUT = 13;
    public static final int TYPE_OPEN_HARD_KEYBOARD_SETTINGS = 14;
-    public static final int TYPE_SET_CAMERA_TORCH = 15;

    public static final long SEQUENCE_INVALID = 0;

@@ -46,7 +45,6 @@ public final class ControlMessage {
    private long sequence;
    private int id;
    private byte[] data;
-    private boolean enabled;

    private ControlMessage() {
    }
@@ -146,13 +144,6 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createSetCameraTorch(boolean enabled) {
-        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_SET_CAMERA_TORCH;
-        msg.enabled = enabled;
-        return msg;
-    }
-
    public int getType() {
        return type;
    }
@@ -224,8 +215,4 @@ public final class ControlMessage {
    public byte[] getData() {
        return data;
    }
-
-    public boolean getEnabled() {
-        return enabled;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -17,7 +17,6 @@ public class ControlMessageReader {
    static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 9;
    static final int UHID_CREATE_FIXED_PAYLOAD_LENGTH = 4;
    static final int UHID_INPUT_FIXED_PAYLOAD_LENGTH = 4;
-    static final int CAMERA_TORCH_PAYLOAD_LENGTH = 1;

    private static final int MESSAGE_MAX_SIZE = 1 << 18; // 256k

@@ -96,9 +95,6 @@ public class ControlMessageReader {
            case ControlMessage.TYPE_UHID_INPUT:
                msg = parseUhidInput();
                break;
-            case ControlMessage.TYPE_SET_CAMERA_TORCH:
-                msg = parseCameraTorch();
-                break;
            default:
                Ln.w("Unknown event type: " + type);
                msg = null;
@@ -249,14 +245,6 @@ public class ControlMessageReader {
        return ControlMessage.createUhidInput(id, data);
    }

-    private ControlMessage parseCameraTorch() {
-        if (buffer.remaining() < CAMERA_TORCH_PAYLOAD_LENGTH) {
-            return null;
-        }
-        boolean enabled = buffer.get() != 0;
-        return ControlMessage.createSetCameraTorch(enabled);
-    }
-
    private static Position readPosition(ByteBuffer buffer) {
        int x = buffer.getInt();
        int y = buffer.getInt();
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -32,7 +32,6 @@ public class Controller implements AsyncProcessor {

    private final Device device;
    private final ControlChannel controlChannel;
-    private final CameraCapture cameraCapture;
    private final CleanUp cleanUp;
    private final DeviceMessageSender sender;
    private final boolean clipboardAutosync;
@@ -47,11 +46,9 @@ public class Controller implements AsyncProcessor {

    private boolean keepPowerModeOff;

-    public Controller(Device device, ControlChannel controlChannel, CameraCapture cameraCapture, CleanUp cleanUp, boolean clipboardAutosync,
-            boolean powerOn) {
+    public Controller(Device device, ControlChannel controlChannel, CleanUp cleanUp, boolean clipboardAutosync, boolean powerOn) {
        this.device = device;
        this.controlChannel = controlChannel;
-        this.cameraCapture = cameraCapture;
        this.cleanUp = cleanUp;
        this.clipboardAutosync = clipboardAutosync;
        this.powerOn = powerOn;
@@ -148,7 +145,7 @@ public class Controller implements AsyncProcessor {
            // this is expected on close
            return false;
        }
-Ln.i("==== msg = " + msg.getType());
+
        switch (msg.getType()) {
            case ControlMessage.TYPE_INJECT_KEYCODE:
                if (device.supportsInputEvents()) {
@@ -216,10 +213,6 @@ Ln.i("==== msg = " + msg.getType());
            case ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
                openHardKeyboardSettings();
                break;
-            case ControlMessage.TYPE_SET_CAMERA_TORCH:
-                Ln.i("===");
-                cameraCapture.setTorchEnabled(msg.getEnabled());
-                break;
            default:
                // do nothing
        }
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
@@ -118,12 +118,16 @@ public final class LogUtils {
                        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);

                        android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
-                        for (android.util.Size size : sizes) {
-                            builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
+                        if (sizes == null || sizes.length == 0) {
+                            builder.append("\n        (none)");
+                        } else {
+                            for (android.util.Size size : sizes) {
+                                builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
+                            }
                        }

                        android.util.Size[] highSpeedSizes = configs.getHighSpeedVideoSizes();
-                        if (highSpeedSizes.length > 0) {
+                        if (highSpeedSizes != null && highSpeedSizes.length > 0) {
                            builder.append("\n      High speed capture (--camera-high-speed):");
                            for (android.util.Size size : highSpeedSizes) {
                                Range<Integer>[] highFpsRanges = configs.getHighSpeedVideoFpsRanges();
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;

 import android.os.BatteryManager;
 import android.os.Build;
-import android.os.SystemClock;

 import java.io.File;
 import java.io.IOException;
@@ -131,6 +130,16 @@ public final class Server {
                connection.sendDeviceMeta(Device.getDeviceName());
            }

+            if (control) {
+                ControlChannel controlChannel = connection.getControlChannel();
+                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);
+            }
+
            if (audio) {
                AudioCodec audioCodec = options.getAudioCodec();
                AudioCapture audioCapture = new AudioCapture(options.getAudioSource());
@@ -145,7 +154,6 @@ public final class Server {
                asyncProcessors.add(audioRecorder);
            }

-            CameraCapture cameraCapture = null;
            if (video) {
                Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
                        options.getSendFrameMeta());
@@ -153,26 +161,14 @@ public final class Server {
                if (options.getVideoSource() == VideoSource.DISPLAY) {
                    surfaceCapture = new ScreenCapture(device);
                } else {
-                    cameraCapture = new CameraCapture(options.getCameraId(), options.getCameraFacing(), options.getCameraSize(),
+                    surfaceCapture = new CameraCapture(options.getCameraId(), options.getCameraFacing(), options.getCameraSize(),
                            options.getMaxSize(), options.getCameraAspectRatio(), options.getCameraFps(), options.getCameraHighSpeed());
-                    surfaceCapture = cameraCapture;
                }
                SurfaceEncoder surfaceEncoder = new SurfaceEncoder(surfaceCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
                        options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
                asyncProcessors.add(surfaceEncoder);
            }

-            if (control) {
-                ControlChannel controlChannel = connection.getControlChannel();
-                Controller controller = new Controller(
-                        device, controlChannel, cameraCapture, cleanUp, options.getClipboardAutosync(), options.getPowerOn());
-                device.setClipboardListener(text -> {
-                    DeviceMessage msg = DeviceMessage.createClipboard(text);
-                    controller.getSender().send(msg);
-                });
-                asyncProcessors.add(controller);
-            }
-
            Completion completion = new Completion(asyncProcessors.size());
            for (AsyncProcessor asyncProcessor : asyncProcessors) {
                asyncProcessor.start((fatalError) -> {
--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
@@ -3,6 +3,7 @@ package com.genymobile.scrcpy;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
+import android.os.Build;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.view.Surface;
@@ -220,6 +221,9 @@ public class SurfaceEncoder implements AsyncProcessor {
        // must be present to configure the encoder, but does not impact the actual frame rate, which is variable
        format.setInteger(MediaFormat.KEY_FRAME_RATE, 60);
        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            format.setInteger(MediaFormat.KEY_COLOR_RANGE, MediaFormat.COLOR_RANGE_LIMITED);
+        }
        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, DEFAULT_I_FRAME_INTERVAL);
        // display the very first frame, and recover from bad quality when no new frames
        format.setLong(MediaFormat.KEY_REPEAT_PREVIOUS_FRAME_AFTER, REPEAT_FRAME_DELAY_US); // µs
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@@ -12,12 +12,15 @@ import java.lang.reflect.Method;
 public final class WindowManager {
    private final IInterface manager;
    private Method getRotationMethod;
-    private Method freezeRotationMethod;
+
    private Method freezeDisplayRotationMethod;
-    private Method isRotationFrozenMethod;
+    private int freezeDisplayRotationMethodVersion;
+
    private Method isDisplayRotationFrozenMethod;
-    private Method thawRotationMethod;
+    private int isDisplayRotationFrozenMethodVersion;
+
    private Method thawDisplayRotationMethod;
+    private int thawDisplayRotationMethodVersion;

    static WindowManager create() {
        IInterface manager = ServiceManager.getService("window", "android.view.IWindowManager");
@@ -43,50 +46,61 @@ public final class WindowManager {
        return getRotationMethod;
    }

-    private Method getFreezeRotationMethod() throws NoSuchMethodException {
-        if (freezeRotationMethod == null) {
-            freezeRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
-        }
-        return freezeRotationMethod;
-    }
-
-    // New method added by this commit:
-    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
    private Method getFreezeDisplayRotationMethod() throws NoSuchMethodException {
        if (freezeDisplayRotationMethod == null) {
-            freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
+            try {
+                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
+                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
+                freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
+                freezeDisplayRotationMethodVersion = 0;
+            } catch (NoSuchMethodException e) {
+                try {
+                    // New method added by this commit:
+                    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
+                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
+                    freezeDisplayRotationMethodVersion = 1;
+                } catch (NoSuchMethodException e1) {
+                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
+                    freezeDisplayRotationMethodVersion = 2;
+                }
+            }
        }
        return freezeDisplayRotationMethod;
    }

-    private Method getIsRotationFrozenMethod() throws NoSuchMethodException {
-        if (isRotationFrozenMethod == null) {
-            isRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
-        }
-        return isRotationFrozenMethod;
-    }
-
-    // New method added by this commit:
-    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
    private Method getIsDisplayRotationFrozenMethod() throws NoSuchMethodException {
        if (isDisplayRotationFrozenMethod == null) {
-            isDisplayRotationFrozenMethod = manager.getClass().getMethod("isDisplayRotationFrozen", int.class);
+            try {
+                // New method added by this commit:
+                // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
+                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isDisplayRotationFrozen", int.class);
+                isDisplayRotationFrozenMethodVersion = 0;
+            } catch (NoSuchMethodException e) {
+                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
+                isDisplayRotationFrozenMethodVersion = 1;
+            }
        }
        return isDisplayRotationFrozenMethod;
    }

-    private Method getThawRotationMethod() throws NoSuchMethodException {
-        if (thawRotationMethod == null) {
-            thawRotationMethod = manager.getClass().getMethod("thawRotation");
-        }
-        return thawRotationMethod;
-    }
-
-    // New method added by this commit:
-    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
    private Method getThawDisplayRotationMethod() throws NoSuchMethodException {
        if (thawDisplayRotationMethod == null) {
-            thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
+            try {
+                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
+                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
+                thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
+                thawDisplayRotationMethodVersion = 0;
+            } catch (NoSuchMethodException e) {
+                try {
+                    // New method added by this commit:
+                    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
+                    thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
+                    thawDisplayRotationMethodVersion = 1;
+                } catch (NoSuchMethodException e1) {
+                    thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
+                    thawDisplayRotationMethodVersion = 2;
+                }
+            }
        }
        return thawDisplayRotationMethod;
    }
@@ -103,16 +117,21 @@ public final class WindowManager {

    public void freezeRotation(int displayId, int rotation) {
        try {
-            try {
-                Method method = getFreezeDisplayRotationMethod();
-                method.invoke(manager, displayId, rotation);
-            } catch (ReflectiveOperationException e) {
-                if (displayId == 0) {
-                    Method method = getFreezeRotationMethod();
+            Method method = getFreezeDisplayRotationMethod();
+            switch (freezeDisplayRotationMethodVersion) {
+                case 0:
+                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
+                    break;
+                case 1:
+                    method.invoke(manager, displayId, rotation);
+                    break;
+                default:
+                    if (displayId != 0) {
+                        Ln.e("Secondary display rotation not supported on this device");
+                        return;
+                    }
                    method.invoke(manager, rotation);
-                } else {
-                    Ln.e("Could not invoke method", e);
-                }
+                    break;
            }
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
@@ -121,17 +140,16 @@ public final class WindowManager {

    public boolean isRotationFrozen(int displayId) {
        try {
-            try {
-                Method method = getIsDisplayRotationFrozenMethod();
-                return (boolean) method.invoke(manager, displayId);
-            } catch (ReflectiveOperationException e) {
-                if (displayId == 0) {
-                    Method method = getIsRotationFrozenMethod();
+            Method method = getIsDisplayRotationFrozenMethod();
+            switch (isDisplayRotationFrozenMethodVersion) {
+                case 0:
+                    return (boolean) method.invoke(manager, displayId);
+                default:
+                    if (displayId != 0) {
+                        Ln.e("Secondary display rotation not supported on this device");
+                        return false;
+                    }
                    return (boolean) method.invoke(manager);
-                } else {
-                    Ln.e("Could not invoke method", e);
-                    return false;
-                }
            }
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
@@ -141,16 +159,21 @@ public final class WindowManager {

    public void thawRotation(int displayId) {
        try {
-            try {
-                Method method = getThawDisplayRotationMethod();
-                method.invoke(manager, displayId);
-            } catch (ReflectiveOperationException e) {
-                if (displayId == 0) {
-                    Method method = getThawRotationMethod();
+            Method method = getThawDisplayRotationMethod();
+            switch (thawDisplayRotationMethodVersion) {
+                case 0:
+                    method.invoke(manager, displayId, "scrcpy#thawRotation");
+                    break;
+                case 1:
+                    method.invoke(manager, displayId);
+                    break;
+                default:
+                    if (displayId != 0) {
+                        Ln.e("Secondary display rotation not supported on this device");
+                        return;
+                    }
                    method.invoke(manager);
-                } else {
-                    Ln.e("Could not invoke method", e);
-                }
+                    break;
            }
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
@@ -166,6 +189,10 @@ public final class WindowManager {
                cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, displayId);
            } catch (NoSuchMethodException e) {
                // old version
+                if (displayId != 0) {
+                    Ln.e("Secondary display rotation not supported on this device");
+                    return;
+                }
                cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);
            }
        } catch (Exception e) {
Author	SHA1	Message	Date
Romain Vimont	063a8339ed	Terminate on controller error This is particularly important to react to server socket disconnection since video and audio may be disabled. PR #4868 <https://github.com/Genymobile/scrcpy/pull/4868>	2024-05-11 17:12:00 +02:00
Romain Vimont	b5c8de08e0	Update documentation for --no-window PR #4868 <https://github.com/Genymobile/scrcpy/pull/4868>	2024-05-11 17:12:00 +02:00
Romain Vimont	45fe6b602b	Add scrcpy window without video playback Add the possibility to solely control the device without screen mirroring: scrcpy --no-video --no-audio This is different from OTG mode, which does not require USB debugging at all. Here, the standard mode is used but with the possibility to disable video playback. By default, always open a window (even without video playback), and add an option --no-window. Fixes #4727 <https://github.com/Genymobile/scrcpy/issues/4727> Fixes #4793 <https://github.com/Genymobile/scrcpy/issues/4793> PR #4868 <https://github.com/Genymobile/scrcpy/pull/4868>	2024-05-11 17:06:16 +02:00
Romain Vimont	cca2c9ffb7	Disable FPS counter when no video playback There is no frame rate to count.	2024-04-19 12:57:18 +02:00
Romain Vimont	22d78e8a82	Fix boolean condition Use the short-circuit operator && between booleans.	2024-04-19 12:49:03 +02:00
Romain Vimont	bcb8503b26	Handle reported camera sizes array is null The array of sizes may be null. Handle this case gracefully. Fixes #4852 <https://github.com/Genymobile/scrcpy/issues/4852>	2024-04-17 10:45:18 +02:00
Romain Vimont	9aa6cc71be	Forbid --no-control in OTG mode The whole purpose of OTG is to only control the device.	2024-04-16 15:50:44 +02:00
Romain Vimont	54e08b4eae	Fix code style Limit to 80 columns.	2024-04-16 15:50:41 +02:00
Romain Vimont	bd8b945bb3	Register rotation watcher only when possible Old Android versions may not be able to register a rotation watcher for a secondary display. In that case, report the error instead of registering a rotation watcher for the default display. Refs <https://github.com/Genymobile/scrcpy/pull/4740#issuecomment-2051245633> Suggested by: Kaiming Hu <huxxx1234@gmail.com>	2024-04-12 17:22:45 +02:00
Kaiming Hu	a73bf932d6	Fix could not rotate secondary display The version of the methods with the display id parameter must be tried first, otherwise they will never be used (since the old versions without the display id are still present). Regression introduced by `ee6620d123`. Refs #4740 <https://github.com/Genymobile/scrcpy/pull/4740> PR #4841 <https://github.com/Genymobile/scrcpy/pull/4841> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-04-12 17:20:15 +02:00
Stepan Salenikovich	7011dd1ef0	Fix freeze and thaw rotation for Android 14 Changed since AOSP/framework_base commit 670fb7f5c0d23cf51ead25538bcb017e03ed73ac, included in tag android-14.0.0_r29. Refs <`670fb7f5c0`%5E%21/> PR #4740 <https://github.com/Genymobile/scrcpy/pull/4740> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-04-06 17:38:24 +02:00
Romain Vimont	ee6620d123	Refactor WindowManager methods Select the available method to invoke the same way as in other wrappers (using a version field). Refs `d894e270a7` Refs #4740 <https://github.com/Genymobile/scrcpy/pull/4740>	2024-04-06 17:38:21 +02:00
Romain Vimont	aa34d63171	Fix segfault on close with --no-video Do not call sc_screen_hide_window() if screen is not initialized. To reproduce: scrcpy --no-video --record=file.mp4 This only segfaults in debug mode since commit `fd0f432e87`.	2024-04-04 08:52:32 +02:00
Simon Chan	bf625790fa	Request limited color range by default Most devices currently use limited color range, but some recent devices encode in full color range, which is currently not supported by the SDL opengl render driver. Fixes #4756 <https://github.com/Genymobile/scrcpy/issues/4756> Refs <https://github.com/Genymobile/scrcpy/issues/4756#issuecomment-2003710860> Refs libusb/#9311 <https://github.com/libsdl-org/SDL/issues/9311> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-03-30 15:28:57 +01:00
Romain Vimont	db55edb196	Fix YUV conversion for full color range Take the color range (full vs limited) into account to render the picture. Note that with the current version of SDL, it has no impact with the SDL opengl render driver. Fixes #4756 <https://github.com/Genymobile/scrcpy/issues/4756> Refs <https://github.com/Genymobile/scrcpy/issues/4756#issuecomment-2003228916> Refs libusb/#9311 <https://github.com/libsdl-org/SDL/issues/9311> Suggested-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>	2024-03-30 15:28:09 +01:00
Romain Vimont	1c3801a0b1	Add a shortcut to pause/unpause display Pause/unpause display on MOD+z and MOD+Shift+z. It only impacts rendering, the device is still captured, the video stream continues to be transmitted to the device and recorded (if recording is enabled). Fixes #1632 <https://github.com/Genymobile/scrcpy/issues/1632> PR #4748 <https://github.com/Genymobile/scrcpy/pull/4748>	2024-03-30 14:20:51 +01:00
Romain Vimont	be3d357a6d	Use source repo tarball for libusb Legitimate or not, we should not use sources that do not match the repository. Refs <https://github.com/libusb/libusb/issues/1468#issuecomment-1974787595> Refs <https://news.ycombinator.com/item?id=39866309> Refs #4713 <https://github.com/Genymobile/scrcpy/pull/4713>	2024-03-30 14:18:47 +01:00
Romain Vimont	79968a0ae6	Reorder documentation Present the --tcpip option without arguments first.	2024-03-11 18:05:27 +01:00
Romain Vimont	7f23ff3f2c	Add videos for pinch-to-zoom and tilt A video is worth a thousand words.	2024-03-03 00:06:54 +01:00
Romain Vimont	cc7719079a	Italicize coordinates letters in documentation	2024-03-03 00:05:26 +01:00
Romain Vimont	0c94b75eef	Update links to 2.4	2024-03-03 00:00:24 +01:00
Romain Vimont	af57309074	Bump version to 2.4	2024-03-02 23:22:09 +01:00
Romain Vimont	a720c946a6	Merge branch 'master' into release	2024-03-02 23:21:32 +01:00
Romain Vimont	8d87b91f69	Build dependencies from sources The project has 3 build dependencies: - SDL - FFmpeg - libusb For Windows, the release script downloaded pre-built build dependencies (either from upstream, or from the scrcpy-deps repository). Instead, download the source releases and build locally. This offers more flexibility. The official adb release is still downloaded and included as is in the release archive (it is not a build dependency). Also upgrade FFmpeg to 6.1.1 and libusb to 1.0.27. PR #4713 <https://github.com/Genymobile/scrcpy/pull/4713>	2024-03-02 22:52:54 +01:00
inson1	125b1103e1	Happy new year 2024! PR #4716 <https://github.com/Genymobile/scrcpy/pull/4716> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-03-02 16:48:21 +01:00
Romain Vimont	36189b90ea	Remove spurious line	2024-03-01 09:57:10 +01:00
Romain Vimont	4dca08cfe3	Set SDL hints before creating any thread To avoid race conditions in SDL (reported by TSAN).	2024-03-01 09:57:10 +01:00
Romain Vimont	fd0f432e87	Detect missing initializations Write invalid data in memory to easily detect missing initializations in debug mode.	2024-03-01 00:52:35 +01:00
Romain Vimont	cdf09805c0	Add missing initialization	2024-03-01 00:52:34 +01:00
Romain Vimont	bf069bd37b	Document usage examples This exposes several common options on the front page.	2024-03-01 00:52:31 +01:00
Romain Vimont	b9d244b4c9	Document UHID Rework the documentation to present the keyboard and mouse input modes. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:28 +01:00
Romain Vimont	dd479ed176	Check options specific to SDK keyboard Fail if an option specific to --keyboard=sdk is passed with another keyboard input mode. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:23 +01:00
Romain Vimont	5f12132c47	Do not fallback keyboard mode if AOA fails Initially, if AOA initialization failed, default injection method was used, in order to use the same command/shortcut when the device is connected via USB or via TCP/IP, without changing the arguments. Now that there are 3 keyboard modes, it seems unexpected to switch to another specific mode if AOA fails (and it is inconsistent). If the user explicitly requests AOA, then use AOA or fail. Refs #2632 comment <https://github.com/Genymobile/scrcpy/pull/2632#issuecomment-945190859> PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:19 +01:00
Romain Vimont	1c5ad0e813	Reassign -K and -M to UHID keyboard and mouse The options were deprecated, but for convenience, reassign them to aliases for --keyboard=uhid and --mouse=uhid respectively. Their long version (--hid-keyboard and --hid-mouse) remain deprecated. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:16 +01:00
Romain Vimont	6a103c809f	Add UHID mouse support Use the following command: scrcpy --mouse=uhid PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:13 +01:00
Romain Vimont	151a6225d4	Add shortcut to open keyboard settings The keyboard settings can be opened by: adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS Add a shortcut (MOD+k) for convenience if the current keyboard is HID. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:10 +01:00
Romain Vimont	54dede3630	Fix startActivity() for supporting API < 30 Call the older startActivityAsUser() instead of startActivityAsUserWithFeature() so that it also works on older Android versions. Fixes #4704 <https://github.com/Genymobile/scrcpy/issues/4704> PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:05 +01:00
Romain Vimont	f557188dc8	Create UhidManager only on first use There is no need to create a UhidManager instance (with its thread) if no UHID is used. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:52:03 +01:00
Simon Chan	87da68ee0d	Handle UHID output Use UHID output reports to synchronize CapsLock and VerrNum states. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473> Co-authored-by: Romain Vimont <rom@rom1v.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-03-01 00:52:00 +01:00
Romain Vimont	021c5d371a	Refactor DeviceMessageSender Refactor DeviceMessage as a queue of message. This will allow to add other message types. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:57 +01:00
Simon Chan	840680f546	Add UHID keyboard support Use the following command: scrcpy --keyboard=uhid PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473> Co-authored-by: Romain Vimont <rom@rom1v.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-03-01 00:51:54 +01:00
Romain Vimont	4d5b67cc80	Log controller handling errors On close, the controller is expected to throw an IOException because the socket is closed, so the exception was ignored. However, message handling actions may also throw IOException, and they must not be silently ignored. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:52 +01:00
Romain Vimont	604e59ac7b	Initialize controller before keyboards The UHID keyboard initializer will need the controller. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:50 +01:00
Romain Vimont	4d2c2514fc	Initialize controller in two steps There is a dependency cycle in the initialization order: - keyboard depends on controller - controller depends on acksync - acksync depends on keyboard initialization To break this cycle, bind the async instance to the controller in a second step. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:47 +01:00
Romain Vimont	107f7a83ab	Extract binary to hex string conversion PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:44 +01:00
Romain Vimont	2e7f6a6fc4	Rename default keyboard implementation to "sdk" Rename {keyboard,mouse}_inject to {keyboard,mouse}_sdk. All implementations "inject" key events and mouse events, what differs is the mechanism. For these implementations, the Android SDK API is used to inject events. Note that the input mode enum variants were already renamed (SC_KEYBOARD_INPUT_MODE_SDK and SC_MOUSE_INPUT_MODE_SDK). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:41 +01:00
Romain Vimont	d95276467b	Extract mouse HID handling Split the mouse implementation using AOA and the code handling HID events, so that HID events can be reused for another protocol (UHID). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:39 +01:00
Romain Vimont	91485e2863	Extract keyboard HID handling Split the keyboard implementation using AOA and the code handling HID events, so that HID events can be reused for another protocol (UHID). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:37 +01:00
Romain Vimont	f2d6203156	Extract HID events struct An event contained several fields: - the accessory id - the HID event data - a field ack_to_wait specific to the AOA implementation. Extract the HID event part to prepare the factorization of HID event creation. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:34 +01:00
Romain Vimont	2d32557fde	Embed HID event data In the implementation, an HID event is at most 8 bytes. Embed the data in the HID event structure to avoid allocations and simplify the code. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:30 +01:00
Romain Vimont	ae303b8d07	Rename hid event "buffer" to "data" This fields contains the HID event data (there is no "bufferization"). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:29 +01:00
Romain Vimont	29ce03e337	Rename "buffer" to "data" The variable name is intended to match the parameter name of libusb_control_transfer(). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:25 +01:00
Romain Vimont	48adae1728	Fix HID mouse documentation The size of a mouse HID event is 4 bytes. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:21 +01:00
Simon Chan	ea98d49bae	Introduce --keyboard and --mouse Until now, there was two modes for keyboard and mouse: - event injection using the Android system API (default) - HID/AOA over USB For this reason, the options were exposed as simple flags: - -K or --hid-keyboard to enable physical keyboard simulation (AOA) - -M or --hid-mouse to enable physical mouse simulation (AOA) Replace them by explicit --keyboard and --mouse options, with 3 possible values: - disabled - sdk (default) - aoa This will allow to add a new mode (uhid). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473> Co-authored-by: Romain Vimont <rom@rom1v.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-03-01 00:51:15 +01:00
Romain Vimont	35add3daee	Accept disabled keyboard or mouse The input manager assumed that if a controller was present, then both a key processor and a mouse processor were present. Remove this assumption, to support disabling keyboard and mouse separately. This prepares the introduction of new command line options --keyboard and --mouse. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:51:02 +01:00
Romain Vimont	c0a1aee8ce	Always pass input manager instance Some functions in input_manager.c only have access to a sub-object (for example the controller). For consistency, always pass the whole input manager instance. This will allow to add assertions when keyboard and mouse could be disabled separately. PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>	2024-03-01 00:50:39 +01:00
Romain Vimont	a976417572	Fix typo in error message	2024-03-01 00:11:48 +01:00
Romain Vimont	ffa238b9d3	Remove duplicate lines in libusb script	2024-02-29 23:55:44 +01:00
Romain Vimont	f6459dd742	Fix FAQ link Refs `ad05a01800`	2024-02-29 10:31:45 +01:00
Romain Vimont	5a6b8310ca	Add note about official website	2023-12-13 12:55:14 +01:00