Update developer documentation

.gitignore

@@ -7,4 +7,3 @@ build/
 .gradle/
 /x/
 local.properties
-/scrcpy-server

FAQ.md

@@ -159,8 +159,6 @@ In developer options, enable:
 > **USB debugging (Security settings)**  
 > _Allow granting permissions and simulating input via USB debugging_
 
-Rebooting the device is necessary once this option is set.
-
 [simulating input]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
 
 
@@ -170,12 +168,12 @@ 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).
+Since scrcpy v1.20, it is possible to simulate a [physical keyboard][hid] (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]: README.md#physical-keyboard-simulation-hid
 
 
 ## Client issues
@@ -231,4 +229,4 @@ Translations of this FAQ in other languages are available in the [wiki].
 
 [wiki]: https://github.com/Genymobile/scrcpy/wiki
 
-Only this FAQ file is guaranteed to be up-to-date.
+Only this README file is guaranteed to be up-to-date.

README.md

@@ -1,11 +1,11 @@
-# scrcpy (v2.3.1)
+# scrcpy (v2.0)
 
 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
 
 _pronounced "**scr**een **c**o**py**"_
 
 This application mirrors Android devices (video and audio) connected via
-USB or [over TCP/IP](doc/connection.md#tcpip-wireless), and allows to control the
+USB or [over TCP/IP](doc/device.md#tcpip-wireless), and allows to control the
 device with the keyboard and the mouse of the computer. It does not require any
 _root_ access. It works on _Linux_, _Windows_ and _macOS_.
 
@@ -25,13 +25,12 @@ It focuses on:
 [lowlatency]: https://github.com/Genymobile/scrcpy/pull/646
 
 Its features include:
- - [audio forwarding](doc/audio.md) (Android 11+)
+ - [audio forwarding](doc/audio.md) (Android >= 11)
  - [recording](doc/recording.md)
  - mirroring with [Android device screen off](doc/device.md#turn-screen-off)
  - [copy-paste](doc/control.md#copy-paste) in both directions
  - [configurable quality](doc/video.md)
- - [camera mirroring](doc/camera.md) (Android 12+)
+ - Android device [as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
- - [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)
  - and more…
@@ -40,7 +39,7 @@ Its features include:
 
 The Android device requires at least API 21 (Android 5.0).
 
-[Audio forwarding](doc/audio.md) is supported for API >= 30 (Android 11+).
+[Audio forwarding](doc/audio.md) is supported from API 30 (Android 11).
 
 Make sure you [enabled USB debugging][enable-adb] on your device(s).
 
@@ -48,14 +47,10 @@ Make sure you [enabled USB debugging][enable-adb] on your device(s).
 
 On some devices, you also need to enable [an additional option][control] `USB
 debugging (Security Settings)` (this is an item different from `USB debugging`)
-to control it using a keyboard and mouse. Rebooting the device is necessary once
+to control it using a keyboard and mouse.
-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).
-
 
 ## Get the app
 
@@ -69,16 +64,14 @@ mode](doc/hid-otg.md#otg).
 The application provides a lot of features and configuration options. They are
 documented in the following pages:
 
- - [Connection](doc/connection.md)
+ - [Device](doc/device.md)
  - [Video](doc/video.md)
  - [Audio](doc/audio.md)
  - [Control](doc/control.md)
- - [Device](doc/device.md)
  - [Window](doc/window.md)
  - [Recording](doc/recording.md)
  - [Tunnels](doc/tunnels.md)
  - [HID/OTG](doc/hid-otg.md)
- - [Camera](doc/camera.md)
  - [Video4Linux](doc/v4l2.md)
  - [Shortcuts](doc/shortcuts.md)
 
@@ -120,10 +113,7 @@ For general questions or discussions, you can also use:
 I'm [@rom1v](https://github.com/rom1v), the author and maintainer of _scrcpy_.
 
 If you appreciate this application, you can [support my open source
-work][donate]:
+work][donate].
- - [GitHub Sponsors](https://github.com/sponsors/rom1v)
- - [Liberapay](https://liberapay.com/rom1v/)
- - [PayPal](https://paypal.me/rom2v)
 
 [donate]: https://blog.rom1v.com/about/#support-my-open-source-work
 

app/data/bash-completion/scrcpy

@@ -10,28 +10,19 @@ _scrcpy() {
         --audio-source=
         --audio-output-buffer=
         -b --video-bit-rate=
-        --camera-ar=
-        --camera-id=
-        --camera-facing=
-        --camera-fps=
-        --camera-high-speed
-        --camera-size=
         --crop=
         -d --select-usb
         --disable-screensaver
+        --display=
         --display-buffer=
-        --display-id=
-        --display-orientation=
         -e --select-tcpip
         -f --fullscreen
         --force-adb-forward
         --forward-all-clicks
         -h --help
-        --keyboard
         --kill-adb-on-close
+        -K --hid-keyboard
         --legacy-paste
-        --list-camera-sizes
-        --list-cameras
         --list-displays
         --list-encoders
         --lock-video-orientation
@@ -39,7 +30,6 @@ _scrcpy() {
         -m --max-size=
         -M --hid-mouse
         --max-fps=
-        --mouse=
         -n --no-control
         -N --no-playback
         --no-audio
@@ -52,11 +42,8 @@ _scrcpy() {
         --no-power-on
         --no-video
         --no-video-playback
-        --orientation=
         --otg
         -p --port=
-        --pause-on-exit
-        --pause-on-exit=
         --power-off-on-close
         --prefer-text
         --print-fps
@@ -64,7 +51,6 @@ _scrcpy() {
         -r --record=
         --raw-key-events
         --record-format=
-        --record-orientation=
         --render-driver=
         --require-audio
         --rotation=
@@ -84,7 +70,6 @@ _scrcpy() {
         --video-codec=
         --video-codec-options=
         --video-encoder=
-        --video-source=
         -w --stay-awake
         --window-borderless
         --window-title=
@@ -101,43 +86,15 @@ _scrcpy() {
             return
             ;;
         --audio-codec)
-            COMPREPLY=($(compgen -W 'opus aac flac raw' -- "$cur"))
+            COMPREPLY=($(compgen -W 'opus aac raw' -- "$cur"))
-            return
-            ;;
-        --video-source)
-            COMPREPLY=($(compgen -W 'display camera' -- "$cur"))
             return
             ;;
         --audio-source)
             COMPREPLY=($(compgen -W 'output mic' -- "$cur"))
             return
             ;;
-        --camera-facing)
-            COMPREPLY=($(compgen -W 'front back external' -- "$cur"))
-            return
-            ;;
-        --keyboard)
-            COMPREPLY=($(compgen -W 'disabled sdk aoa' -- "$cur"))
-            return
-            ;;
-        --mouse)
-            COMPREPLY=($(compgen -W 'disabled sdk aoa' -- "$cur"))
-            return
-            ;;
-        --orientation|--display-orientation)
-            COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
-            return
-            ;;
-        --record-orientation)
-            COMPREPLY=($(compgen -W '0 90 180 270' -- "$cur"))
-            return
-            ;;
         --lock-video-orientation)
-            COMPREPLY=($(compgen -W 'unlocked initial 0 90 180 270' -- "$cur"))
+            COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
-            return
-            ;;
-        --pause-on-exit)
-            COMPREPLY=($(compgen -W 'true false if-error' -- "$cur"))
             return
             ;;
         -r|--record)
@@ -145,13 +102,17 @@ _scrcpy() {
             return
             ;;
         --record-format)
-            COMPREPLY=($(compgen -W 'mp4 mkv m4a mka opus aac flac wav' -- "$cur"))
+            COMPREPLY=($(compgen -W 'mkv mp4' -- "$cur"))
             return
             ;;
         --render-driver)
             COMPREPLY=($(compgen -W 'direct3d opengl opengles2 opengles metal software' -- "$cur"))
             return
             ;;
+        --rotation)
+            COMPREPLY=($(compgen -W '0 1 2 3' -- "$cur"))
+            return
+            ;;
         --shortcut-mod)
             # Only auto-complete a single key
             COMPREPLY=($(compgen -W 'lctrl rctrl lalt ralt lsuper rsuper' -- "$cur"))
@@ -172,12 +133,8 @@ _scrcpy() {
         |--audio-codec-options \
         |--audio-encoder \
         |--audio-output-buffer \
-        |--camera-ar \
-        |--camera-id \
-        |--camera-fps \
-        |--camera-size \
         |--crop \
-        |--display-id \
+        |--display \
         |--display-buffer \
         |--max-fps \
         |-m|--max-size \

app/data/scrcpy-console.bat

@@ -1,2 +1,4 @@
 @echo off
-scrcpy.exe --pause-on-exit=if-error %*
+scrcpy.exe %*
+:: if the exit code is >= 1, then pause
+if errorlevel 1 pause

app/data/scrcpy-console.desktop

@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\\$SHELL -i -c 'scrcpy --pause-on-exit=if-error'"
+Exec=/bin/bash --norc --noprofile -i -c "\"\\$SHELL\" -i -c scrcpy || read -p 'Press Enter to quit...'"
 Icon=scrcpy
 Terminal=true
 Type=Application

app/data/scrcpy.desktop

@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\\$SHELL -i -c scrcpy"
+Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy"
 Icon=scrcpy
 Terminal=false
 Type=Application

app/data/zsh-completion/_scrcpy

@@ -11,41 +11,31 @@ arguments=(
     '--always-on-top[Make scrcpy window always on top \(above other windows\)]'
     '--audio-bit-rate=[Encode the audio at the given bit-rate]'
     '--audio-buffer=[Configure the audio buffering delay (in milliseconds)]'
-    '--audio-codec=[Select the audio codec]:codec:(opus aac flac raw)'
+    '--audio-codec=[Select the audio codec]:codec:(opus aac raw)'
     '--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
     '--audio-encoder=[Use a specific MediaCodec audio encoder]'
     '--audio-source=[Select the audio source]:source:(output mic)'
     '--audio-output-buffer=[Configure the size of the SDL audio output buffer (in milliseconds)]'
     {-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
-    '--camera-ar=[Select the camera size by its aspect ratio]'
-    '--camera-high-speed=[Enable high-speed camera capture mode]'
-    '--camera-id=[Specify the camera id to mirror]'
-    '--camera-facing=[Select the device camera by its facing direction]:facing:(front back external)'
-    '--camera-fps=[Specify the camera capture frame rate]'
-    '--camera-size=[Specify an explicit camera capture size]'
     '--crop=[\[width\:height\:x\:y\] Crop the device screen on the server]'
     {-d,--select-usb}'[Use USB device]'
     '--disable-screensaver[Disable screensaver while scrcpy is running]'
+    '--display=[Specify the display id to mirror]'
     '--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
-    '--display-id=[Specify the display id to mirror]'
-    '--display-orientation=[Set the initial display orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
     {-e,--select-tcpip}'[Use TCP/IP device]'
     {-f,--fullscreen}'[Start in fullscreen]'
     '--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
     '--forward-all-clicks[Forward clicks to device]'
     {-h,--help}'[Print the help]'
-    '--keyboard[Set the keyboard input mode]:mode:(disabled sdk aoa)'
     '--kill-adb-on-close[Kill adb when scrcpy terminates]'
+    {-K,--hid-keyboard}'[Simulate a physical keyboard by using HID over AOAv2]'
     '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
-    '--list-camera-sizes[List the valid camera capture sizes]'
-    '--list-cameras[List cameras available on the device]'
     '--list-displays[List displays available on the device]'
     '--list-encoders[List video and audio encoders available on the device]'
-    '--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 90 180 270)'
+    '--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 1 2 3)'
     {-m,--max-size=}'[Limit both the width and height of the video to value]'
     {-M,--hid-mouse}'[Simulate a physical mouse by using HID over AOAv2]'
     '--max-fps=[Limit the frame rate of screen capture]'
-    '--mouse[Set the mouse input mode]:mode:(disabled sdk 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]'
@@ -58,20 +48,18 @@ arguments=(
     '--no-power-on[Do not power on the device on start]'
     '--no-video[Disable video forwarding]'
     '--no-video-playback[Disable video playback]'
-    '--orientation=[Set the video orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
     '--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
     {-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
-    '--pause-on-exit=[Make scrcpy pause before exiting]:mode:(true false if-error)'
     '--power-off-on-close[Turn the device screen off when closing scrcpy]'
     '--prefer-text[Inject alpha characters and space as text events instead of key events]'
     '--print-fps[Start FPS counter, to print frame logs to the console]'
     '--push-target=[Set the target directory for pushing files to the device by drag and drop]'
     {-r,--record=}'[Record screen to file]:record file:_files'
     '--raw-key-events[Inject key events for all input keys, and ignore text events]'
-    '--record-format=[Force recording format]:format:(mp4 mkv m4a mka opus aac flac wav)'
+    '--record-format=[Force recording format]:format:(mp4 mkv)'
-    '--record-orientation=[Set the record orientation]:orientation values:(0 90 180 270)'
     '--render-driver=[Request SDL to use the given render driver]:driver name:(direct3d opengl opengles2 opengles metal software)'
     '--require-audio=[Make scrcpy fail if audio is enabled but does not work]'
+    '--rotation=[Set the initial display rotation]:rotation values:(0 1 2 3)'
     {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
     {-S,--turn-screen-off}'[Turn the device screen off immediately]'
     '--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
@@ -87,7 +75,6 @@ arguments=(
     '--video-codec=[Select the video codec]:codec:(h264 h265 av1)'
     '--video-codec-options=[Set a list of comma-separated key\:type=value options for the device video encoder]'
     '--video-encoder=[Use a specific MediaCodec video encoder]'
-    '--video-source=[Select the video source]:source:(display camera)'
     {-w,--stay-awake}'[Keep the device on while scrcpy is running, when the device is plugged in]'
     '--window-borderless[Disable window decorations \(display borderless window\)]'
     '--window-title=[Set a custom window title]'

app/meson.build

@@ -20,8 +20,8 @@ src = [
     'src/fps_counter.c',
     'src/frame_buffer.c',
     'src/input_manager.c',
-    'src/keyboard_sdk.c',
+    'src/keyboard_inject.c',
-    'src/mouse_sdk.c',
+    'src/mouse_inject.c',
     'src/opengl.c',
     'src/options.c',
     'src/packet_merger.c',
@@ -87,11 +87,9 @@ endif
 usb_support = get_option('usb')
 if usb_support
     src += [
-        'src/hid/hid_keyboard.c',
-        'src/hid/hid_mouse.c',
         'src/usb/aoa_hid.c',
-        'src/usb/keyboard_aoa.c',
+        'src/usb/hid_keyboard.c',
-        'src/usb/mouse_aoa.c',
+        'src/usb/hid_mouse.c',
         'src/usb/scrcpy_otg.c',
         'src/usb/screen_otg.c',
         'src/usb/usb.c',
@@ -100,24 +98,77 @@ endif
 
 cc = meson.get_compiler('c')
 
-dependencies = [
+crossbuild_windows = meson.is_cross_build() and host_machine.system() == 'windows'
-    dependency('libavformat', version: '>= 57.33'),
-    dependency('libavcodec', version: '>= 57.37'),
-    dependency('libavutil'),
-    dependency('libswresample'),
-    dependency('sdl2', version: '>= 2.0.5'),
-]
 
-if v4l2_support
+if not crossbuild_windows
-    dependencies += dependency('libavdevice')
+
-endif
+    # native build
+    dependencies = [
+        dependency('libavformat', version: '>= 57.33'),
+        dependency('libavcodec', version: '>= 57.37'),
+        dependency('libavutil'),
+        dependency('libswresample'),
+        dependency('sdl2', version: '>= 2.0.5'),
+    ]
+
+    if v4l2_support
+        dependencies += dependency('libavdevice')
+    endif
+
+    if usb_support
+        dependencies += dependency('libusb-1.0')
+    endif
+
+else
+    # cross-compile mingw32 build (from Linux to Windows)
+    prebuilt_sdl2 = meson.get_cross_property('prebuilt_sdl2')
+    sdl2_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/bin'
+    sdl2_lib_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/lib'
+    sdl2_include_dir = 'prebuilt-deps/data/' + prebuilt_sdl2 + '/include'
+
+    sdl2 = declare_dependency(
+        dependencies: [
+            cc.find_library('SDL2', dirs: sdl2_bin_dir),
+            cc.find_library('SDL2main', dirs: sdl2_lib_dir),
+        ],
+        include_directories: include_directories(sdl2_include_dir)
+    )
+
+    prebuilt_ffmpeg = meson.get_cross_property('prebuilt_ffmpeg')
+    ffmpeg_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_ffmpeg + '/bin'
+    ffmpeg_include_dir = 'prebuilt-deps/data/' + prebuilt_ffmpeg + '/include'
+
+    ffmpeg = declare_dependency(
+        dependencies: [
+            cc.find_library('avcodec-60', dirs: ffmpeg_bin_dir),
+            cc.find_library('avformat-60', dirs: ffmpeg_bin_dir),
+            cc.find_library('avutil-58', dirs: ffmpeg_bin_dir),
+            cc.find_library('swresample-4', dirs: ffmpeg_bin_dir),
+        ],
+        include_directories: include_directories(ffmpeg_include_dir)
+    )
+
+    prebuilt_libusb = meson.get_cross_property('prebuilt_libusb')
+    libusb_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_libusb + '/bin'
+    libusb_include_dir = 'prebuilt-deps/data/' + prebuilt_libusb + '/include'
+
+    libusb = declare_dependency(
+        dependencies: [
+            cc.find_library('msys-usb-1.0', dirs: libusb_bin_dir),
+        ],
+        include_directories: include_directories(libusb_include_dir)
+    )
+
+    dependencies = [
+        ffmpeg,
+        sdl2,
+        libusb,
+        cc.find_library('mingw32')
+    ]
 
-if usb_support
-    dependencies += dependency('libusb-1.0')
 endif
 
 if host_machine.system() == 'windows'
-    dependencies += cc.find_library('mingw32')
     dependencies += cc.find_library('ws2_32')
 endif
 
@@ -238,10 +289,6 @@ if get_option('buildtype') == 'debug'
             'tests/test_device_msg_deserialize.c',
             'src/device_msg.c',
         ]],
-        ['test_orientation', [
-            'tests/test_orientation.c',
-            'src/options.c',
-        ]],
         ['test_strbuf', [
             'tests/test_strbuf.c',
             'src/util/strbuf.c',

app/prebuilt-deps/prepare-adb.sh

@@ -6,10 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"
 
-DEP_DIR=platform-tools-34.0.5
+DEP_DIR=platform-tools-34.0.1
 
-FILENAME=platform-tools_r34.0.5-windows.zip
+FILENAME=platform-tools_r34.0.1-windows.zip
-SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571
+SHA256SUM=5dd9c2be744c224fa3a7cbe30ba02d2cb378c763bd0f797a7e47e9f3156a5daa
 
 if [[ -d "$DEP_DIR" ]]
 then

app/prebuilt-deps/prepare-ffmpeg.sh

@@ -6,11 +6,11 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"
 
-VERSION=6.1-scrcpy-3
+VERSION=6.0-scrcpy-4
 DEP_DIR="ffmpeg-$VERSION"
 
 FILENAME="$DEP_DIR".7z
-SHA256SUM=b646d18a3d543a4e4c46881568213499f22e4454a464e1552f03f2ac9cc3a05a
+SHA256SUM=39274b321491ce83e76cab5d24e7cbe3f402d3ccf382f739b13be5651c146b60
 
 if [[ -d "$DEP_DIR" ]]
 then

app/prebuilt-deps/prepare-libusb.sh

@@ -6,10 +6,9 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"
 
-VERSION=1.0.26
+DEP_DIR=libusb-1.0.26
-DEP_DIR="libusb-$VERSION"
 
-FILENAME="libusb-$VERSION-binaries.7z"
+FILENAME=libusb-1.0.26-binaries.7z
 SHA256SUM=9c242696342dbde9cdc47239391f71833939bf9f7aa2bbb28cdaabe890465ec5
 
 if [[ -d "$DEP_DIR" ]]
@@ -18,22 +17,17 @@ then
     exit 0
 fi
 
-get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/$FILENAME" \
+get_file "https://github.com/libusb/libusb/releases/download/v1.0.26/$FILENAME" "$FILENAME" "$SHA256SUM"
-    "$FILENAME" "$SHA256SUM"
 
 mkdir "$DEP_DIR"
 cd "$DEP_DIR"
 
 7z x "../$FILENAME" \
-    "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
+    libusb-1.0.26-binaries/libusb-MinGW-Win32/bin/msys-usb-1.0.dll \
-    "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
+    libusb-1.0.26-binaries/libusb-MinGW-Win32/include/ \
-    "libusb-$VERSION-binaries/libusb-MinGW-x64/" \
+    libusb-1.0.26-binaries/libusb-MinGW-x64/bin/msys-usb-1.0.dll \
-    "libusb-$VERSION-binaries/libusb-MinGW-x64/"
+    libusb-1.0.26-binaries/libusb-MinGW-x64/include/
 
-mv "libusb-$VERSION-binaries/libusb-MinGW-Win32" .
+mv libusb-1.0.26-binaries/libusb-MinGW-Win32 .
-mv "libusb-$VERSION-binaries/libusb-MinGW-x64" .
+mv libusb-1.0.26-binaries/libusb-MinGW-x64 .
-rm -rf "libusb-$VERSION-binaries"
+rm -rf libusb-1.0.26-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

app/prebuilt-deps/prepare-sdl.sh

@@ -6,11 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"
 
-VERSION=2.28.5
+DEP_DIR=SDL2-2.28.0
-DEP_DIR="SDL2-$VERSION"
 
-FILENAME="SDL2-devel-$VERSION-mingw.tar.gz"
+FILENAME=SDL2-devel-2.28.0-mingw.tar.gz
-SHA256SUM=3c0c655c2ebf67cad48fead72761d1601740ded30808952c3274ba223d226c21
+SHA256SUM=b91ce59eeacd4a9db403f976fd2337d9360b21ada374124417d716065c380e20
 
 if [[ -d "$DEP_DIR" ]]
 then
@@ -18,8 +17,7 @@ then
     exit 0
 fi
 
-get_file "https://github.com/libsdl-org/SDL/releases/download/release-$VERSION/$FILENAME" \
+get_file "https://libsdl.org/release/$FILENAME" "$FILENAME" "$SHA256SUM"
-    "$FILENAME" "$SHA256SUM"
 
 mkdir "$DEP_DIR"
 cd "$DEP_DIR"

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.0"
     END
   END
   BLOCK "VarFileInfo"

app/scrcpy.1

@@ -21,12 +21,12 @@ Make scrcpy window always on top (above other windows).
 
 .TP
 .BI "\-\-audio\-bit\-rate " value
-Encode the audio at the given bit rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
+Encode the audio at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
 
 Default is 128K (128000).
 
 .TP
-.BI "\-\-audio\-buffer " ms
+.BI "\-\-audio\-buffer ms
 Configure the audio buffering delay (in milliseconds).
 
 Lower values decrease the latency, but increase the likelyhood of buffer underrun (causing audio glitches).
@@ -35,7 +35,7 @@ Default is 50.
 
 .TP
 .BI "\-\-audio\-codec " name
-Select an audio codec (opus, aac, flac or raw).
+Select an audio codec (opus, aac or raw).
 
 Default is opus.
 
@@ -45,15 +45,15 @@ Set a list of comma-separated key:type=value options for the device audio encode
 
 The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
 
-The list of possible codec options is available in the Android documentation:
+The list of possible codec options is available in the Android documentation
-
+.UR https://d.android.com/reference/android/media/MediaFormat
-<https://d.android.com/reference/android/media/MediaFormat>
+.UE .
 
 .TP
 .BI "\-\-audio\-encoder " name
 Use a specific MediaCodec audio encoder (depending on the codec provided by \fB\-\-audio\-codec\fR).
 
-The available encoders can be listed by \fB\-\-list\-encoders\fR.
+The available encoders can be listed by \-\-list\-encoders.
 
 .TP
 .BI "\-\-audio\-source " source
@@ -62,7 +62,7 @@ Select the audio source (output or mic).
 Default is output.
 
 .TP
-.BI "\-\-audio\-output\-buffer " ms
+.BI "\-\-audio\-output\-buffer ms
 Configure the size of the SDL audio output buffer (in milliseconds).
 
 If you get "robotic" audio playback, you should test with a higher value (10). Do not change this setting otherwise.
@@ -71,44 +71,10 @@ Default is 5.
 
 .TP
 .BI "\-b, \-\-video\-bit\-rate " value
-Encode the video at the given bit rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
+Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
 
 Default is 8M (8000000).
 
-.TP
-.BI "\-\-camera\-ar " ar
-Select the camera size by its aspect ratio (+/- 10%).
-
-Possible values are "sensor" (use the camera sensor aspect ratio), "\fInum\fR:\fIden\fR" (e.g. "4:3") and "\fIvalue\fR" (e.g. "1.6").
-
-.TP
-.B \-\-camera\-high\-speed
-Enable high-speed camera capture mode.
-
-This mode is restricted to specific resolutions and frame rates, listed by \fB\-\-list\-camera\-sizes\fR.
-
-.TP
-.BI "\-\-camera\-id " id
-Specify the device camera id to mirror.
-
-The available camera ids can be listed by \fB\-\-list\-cameras\fR.
-
-.TP
-.BI "\-\-camera\-facing " facing
-Select the device camera by its facing direction.
-
-Possible values are "front", "back" and "external".
-
-.TP
-.BI "\-\-camera\-fps " fps
-Specify the camera capture frame rate.
-
-If not specified, Android's default frame rate (30 fps) is used.
-
-.TP
-.BI "\-\-camera\-size " width\fRx\fIheight
-Specify an explicit camera capture size.
-
 .TP
 .BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.
@@ -124,31 +90,23 @@ Use USB device (if there is exactly one, like adb -d).
 Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).
 
 .TP
-.BI "\-\-disable\-screensaver"
+.BI "\-\-disable-screensaver"
 Disable screensaver while scrcpy is running.
 
 .TP
-.BI "\-\-display\-buffer " ms
+.BI "\-\-display " id
+Specify the device display id to mirror.
+
+The available display ids can be listed by \-\-list\-displays.
+
+Default is 0.
+
+.TP
+.BI "\-\-display\-buffer ms
 Add a buffering delay (in milliseconds) before displaying. This increases latency to compensate for jitter.
 
 Default is 0 (no buffering).
 
-.TP
-.BI "\-\-display\-id " id
-Specify the device display id to mirror.
-
-The available display ids can be listed by \fB\-\-list\-displays\fR.
-
-Default is 0.
-
-.TP
-.BI "\-\-display\-orientation " value
-Set the initial display orientation.
-
-Possible values are 0, 90, 180, 270, flip0, flip90, flip180 and flip270. The number represents the clockwise rotation in degrees; the "flip" keyword applies a horizontal flip before the rotation.
-
-Default is 0.
-
 .TP
 .B \-e, \-\-select\-tcpip
 Use TCP/IP device (if there is exactly one, like adb -e).
@@ -172,26 +130,24 @@ By default, right-click triggers BACK (or POWER on) and middle-click triggers HO
 Print this help.
 
 .TP
-.BI "\-\-keyboard " mode
+.B \-\-kill\-adb\-on\-close
-Select how to send keyboard inputs to the device.
+Kill adb when scrcpy terminates.
 
-Possible values are "disabled", "sdk" and "aoa":
+.TP
+.B \-K, \-\-hid\-keyboard
+Simulate a physical keyboard by using HID over AOAv2.
 
- - "disabled" does not send keyboard inputs to the device.
+This provides a better experience for IME users, and allows to generate non-ASCII characters, contrary to the default injection method.
- - "sdk" uses the Android system API to deliver keyboard events to applications.
- - "aoa" simulates a physical keyboard using the AOAv2 protocol. It may only work over USB.
 
-For "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:
+It may only work over USB.
+
+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:
 
     adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS
 
-This option is only available when the HID keyboard is enabled (or a physical keyboard is connected).
+However, the option is only available when the HID keyboard is enabled (or a physical keyboard is connected).
 
-Also see \fB\-\-mouse\fR.
+Also see \fB\-\-hid\-mouse\fR.
-
-.TP
-.B \-\-kill\-adb\-on\-close
-Kill adb when scrcpy terminates.
 
 .TP
 .B \-\-legacy\-paste
@@ -199,14 +155,6 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S
 
 This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.
 
-.TP
-.B \-\-list\-camera\-sizes
-List the valid camera capture sizes.
-
-.TP
-.B \-\-list\-cameras
-List cameras available on the device.
-
 .TP
 .B \-\-list\-encoders
 List video and audio encoders available on the device.
@@ -217,9 +165,7 @@ List displays available on the device.
 
 .TP
 \fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
-Lock capture video orientation to \fIvalue\fR.
+Lock video orientation to \fIvalue\fR. Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees rotation counterclockwise.
-
-Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 90, 180, and 270. The values represent the clockwise rotation from the natural device orientation, in degrees.
 
 Default is "unlocked".
 
@@ -232,25 +178,20 @@ Limit both the width and height of the video to \fIvalue\fR. The other dimension
 Default is 0 (unlimited).
 
 .TP
-.BI "\-\-max\-fps " value
+.B \-M, \-\-hid\-mouse
-Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
+Simulate a physical mouse by using HID over AOAv2.
 
-.TP
+In this mode, the computer mouse is captured to control the device directly (relative mouse mode).
-.BI "\-\-mouse " mode
-Select how to send mouse inputs to the device.
-
-Possible values are "disabled", "sdk" 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.
-
-In "aoa" mode, 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.
 
-Also see \fB\-\-keyboard\fR.
+It may only work over USB.
 
+Also see \fB\-\-hid\-keyboard\fR.
+
+.TP
+.BI "\-\-max\-fps " value
+Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
 
 .TP
 .B \-n, \-\-no\-control
@@ -258,7 +199,7 @@ Disable device control (mirror the device in read\-only).
 
 .TP
 .B \-N, \-\-no\-playback
-Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video\-playback \-\-no\-audio\-playback\fR).
+Disable video and audio playback on the computer (equivalent to --no-video-playback --no-audio-playback).
 
 .TP
 .B \-\-no\-audio
@@ -306,10 +247,6 @@ Disable video forwarding.
 .B \-\-no\-video\-playback
 Disable video playback on the computer.
 
-.TP
-.BI "\-\-orientation " value
-Same as --display-orientation=value --record-orientation=value.
-
 .TP
 .B \-\-otg
 Run in OTG mode: simulate physical keyboard and mouse, as if the computer keyboard and mouse were plugged directly to the device via an OTG cable.
@@ -330,16 +267,6 @@ Set the TCP port (range) used by the client to listen.
 
 Default is 27183:27199.
 
-.TP
-\fB\-\-pause\-on\-exit\fR[=\fImode\fR]
-Configure pause on exit. Possible values are "true" (always pause on exit), "false" (never pause on exit) and "if-error" (pause only if an error occured).
-
-This is useful to prevent the terminal window from automatically closing, so that error messages can be read.
-
-Default is "false".
-
-Passing the option without argument is equivalent to passing "true".
-
 .TP
 .B \-\-power\-off\-on\-close
 Turn the device screen off when closing scrcpy.
@@ -368,7 +295,7 @@ Record screen to
 
 The format is determined by the
 .B \-\-record\-format
-option if set, or by the file extension.
+option if set, or by the file extension (.mp4 or .mkv).
 
 .TP
 .B \-\-raw\-key\-events
@@ -376,15 +303,7 @@ Inject key events for all input keys, and ignore text events.
 
 .TP
 .BI "\-\-record\-format " format
-Force recording format (mp4, mkv, m4a, mka, opus, aac, flac or wav).
+Force recording format (either mp4 or mkv).
-
-.TP
-.BI "\-\-record\-orientation " value
-Set the record orientation.
-
-Possible values are 0, 90, 180 and 270. The number represents the clockwise rotation in degrees.
-
-Default is 0.
 
 .TP
 .BI "\-\-render\-driver " name
@@ -392,12 +311,17 @@ Request SDL to use the given render driver (this is just a hint).
 
 Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "metal" and "software".
 
-<https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER>
+.UR https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER
+.UE
 
 .TP
 .B \-\-require\-audio
 By default, scrcpy mirrors only the video if audio capture fails on the device. This option makes scrcpy fail if audio is enabled but does not work.
 
+.TP
+.BI "\-\-rotation " value
+Set the initial display rotation. Possibles values are 0, 1, 2 and 3. Each increment adds a 90 degrees rotation counterclockwise.
+
 .TP
 .BI "\-s, \-\-serial " number
 The device serial number. Mandatory only if several devices are connected to adb.
@@ -436,13 +360,13 @@ Set the maximum mirroring time, in seconds.
 
 .TP
 .BI "\-\-tunnel\-host " ip
-Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables \fB\-\-force\-adb\-forward\fR.
+Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.
 
 Default is localhost.
 
 .TP
 .BI "\-\-tunnel\-port " port
-Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables \fB\-\-force\-adb\-forward\fR.
+Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.
 
 Default is 0 (not forced): the local port used for establishing the tunnel will be used.
 
@@ -482,23 +406,15 @@ Set a list of comma-separated key:type=value options for the device video encode
 
 The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
 
-The list of possible codec options is available in the Android documentation:
+The list of possible codec options is available in the Android documentation
-
+.UR https://d.android.com/reference/android/media/MediaFormat
-<https://d.android.com/reference/android/media/MediaFormat>
+.UE .
 
 .TP
 .BI "\-\-video\-encoder " name
 Use a specific MediaCodec video encoder (depending on the codec provided by \fB\-\-video\-codec\fR).
 
-The available encoders can be listed by \fB\-\-list\-encoders\fR.
+The available encoders can be listed by \-\-list\-encoders.
-
-.TP
-.BI "\-\-video\-source " source
-Select the video source (display or camera).
-
-Camera mirroring requires Android 12+.
-
-Default is display.
 
 .TP
 .B \-w, \-\-stay-awake
@@ -559,14 +475,6 @@ Rotate display left
 .B MOD+Right
 Rotate display right
 
-.TP
-.B MOD+Shift+Left, MOD+Shift+Right
-Flip display horizontally
-
-.TP
-.B MOD+Shift+Up, MOD+Shift+Down
-Flip display vertically
-
 .TP
 .B MOD+g
 Resize window to 1:1 (pixel\-perfect)
@@ -649,11 +557,7 @@ Enable/disable FPS counter (print frames/second in logs)
 
 .TP
 .B Ctrl+click-and-move
-Pinch-to-zoom and rotate from the center of the screen
+Pinch-to-zoom from the center of the screen
-
-.TP
-.B Shift+click-and-move
-Tilt (slide vertically with two fingers)
 
 .TP
 .B Drag & drop APK file
@@ -672,7 +576,7 @@ Path to adb.
 
 .TP
 .B ANDROID_SERIAL
-Device serial to use if no selector (\fB-s\fR, \fB-d\fR, \fB-e\fR or \fB\-\-tcpip=\fIaddr\fR) is specified.
+Device serial to use if no selector (-s, -d, -e or --tcpip=<addr>) is specified.
 
 .TP
 .B SCRCPY_ICON_PATH
@@ -695,14 +599,23 @@ for the Debian Project (and may be used by others).
 
 
 .SH "REPORTING BUGS"
-Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
+Report bugs to
+.UR https://github.com/Genymobile/scrcpy/issues
+.UE .
 
 .SH COPYRIGHT
-Copyright \(co 2018 Genymobile <https://www.genymobile.com>
+Copyright \(co 2018 Genymobile
+.UR https://www.genymobile.com
+Genymobile
+.UE
 
-Copyright \(co 2018\-2023 Romain Vimont <rom@rom1v.com>
+Copyright \(co 2018\-2023
+.MT rom@rom1v.com
+Romain Vimont
+.ME
 
 Licensed under the Apache License, Version 2.0.
 
 .SH WWW
-<https://github.com/Genymobile/scrcpy>
+.UR https://github.com/Genymobile/scrcpy
+.UE

app/src/adb/adb.c

@@ -70,7 +70,7 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
 }
 
 static void
-show_adb_installation_msg(void) {
+show_adb_installation_msg() {
 #ifndef __WINDOWS__
     static const struct {
         const char *binary;
@@ -218,16 +218,8 @@ sc_adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
                const char *device_socket_name, unsigned flags) {
     char local[4 + 5 + 1]; // tcp:PORT
     char remote[108 + 14 + 1]; // localabstract:NAME
-
+    sprintf(local, "tcp:%" PRIu16, local_port);
-    int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
+    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
-    assert(r >= 0 && (size_t) r < sizeof(local));
-
-    r = snprintf(remote, sizeof(remote), "localabstract:%s",
-                 device_socket_name);
-    if (r < 0 || (size_t) r >= sizeof(remote)) {
-        LOGE("Could not write socket name");
-        return false;
-    }
 
     assert(serial);
     const char *const argv[] =
@@ -241,9 +233,7 @@ bool
 sc_adb_forward_remove(struct sc_intr *intr, const char *serial,
                       uint16_t local_port, unsigned flags) {
     char local[4 + 5 + 1]; // tcp:PORT
-    int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
+    sprintf(local, "tcp:%" PRIu16, local_port);
-    assert(r >= 0 && (size_t) r < sizeof(local));
-    (void) r;
 
     assert(serial);
     const char *const argv[] =
@@ -259,16 +249,8 @@ sc_adb_reverse(struct sc_intr *intr, const char *serial,
                unsigned flags) {
     char local[4 + 5 + 1]; // tcp:PORT
     char remote[108 + 14 + 1]; // localabstract:NAME
-    int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
+    sprintf(local, "tcp:%" PRIu16, local_port);
-    assert(r >= 0 && (size_t) r < sizeof(local));
+    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
-
-    r = snprintf(remote, sizeof(remote), "localabstract:%s",
-                 device_socket_name);
-    if (r < 0 || (size_t) r >= sizeof(remote)) {
-        LOGE("Could not write socket name");
-        return false;
-    }
-
     assert(serial);
     const char *const argv[] =
         SC_ADB_COMMAND("-s", serial, "reverse", remote, local);
@@ -281,12 +263,7 @@ bool
 sc_adb_reverse_remove(struct sc_intr *intr, const char *serial,
                       const char *device_socket_name, unsigned flags) {
     char remote[108 + 14 + 1]; // localabstract:NAME
-    int r = snprintf(remote, sizeof(remote), "localabstract:%s",
+    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
-                     device_socket_name);
-    if (r < 0 || (size_t) r >= sizeof(remote)) {
-        LOGE("Device socket name too long");
-        return false;
-    }
 
     assert(serial);
     const char *const argv[] =
@@ -356,9 +333,7 @@ bool
 sc_adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
              unsigned flags) {
     char port_string[5 + 1];
-    int r = snprintf(port_string, sizeof(port_string), "%" PRIu16, port);
+    sprintf(port_string, "%" PRIu16, port);
-    assert(r >= 0 && (size_t) r < sizeof(port_string));
-    (void) r;
 
     assert(serial);
     const char *const argv[] =
@@ -653,8 +628,8 @@ sc_adb_select_device(struct sc_intr *intr,
         return false;
     }
 
-    LOGI("ADB device found:");
+    LOGD("ADB device found:");
-    sc_adb_devices_log(SC_LOG_LEVEL_INFO, vec.data, vec.size);
+    sc_adb_devices_log(SC_LOG_LEVEL_DEBUG, vec.data, vec.size);
 
     // Move devics into out_device (do not destroy device)
     sc_adb_device_move(out_device, device);

app/src/adb/adb_parser.c

@@ -7,7 +7,7 @@
 #include "util/log.h"
 #include "util/str.h"
 
-static bool
+bool
 sc_adb_parse_device(char *line, struct sc_adb_device *device) {
     // One device line looks like:
     // "0123456789abcdef	device usb:2-1 product:MyProduct model:MyModel "

app/src/audio_player.h

@@ -4,16 +4,16 @@
 #include "common.h"
 
 #include <stdbool.h>
+#include "trait/frame_sink.h"
+#include <util/audiobuf.h>
+#include <util/average.h>
+#include <util/thread.h>
+#include <util/tick.h>
+
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
 #include <SDL2/SDL.h>
 
-#include "trait/frame_sink.h"
-#include "util/audiobuf.h"
-#include "util/average.h"
-#include "util/thread.h"
-#include "util/tick.h"
-
 struct sc_audio_player {
     struct sc_frame_sink frame_sink;
 

app/src/cli.h

@@ -7,17 +7,10 @@
 
 #include "options.h"
 
-enum sc_pause_on_exit {
-    SC_PAUSE_ON_EXIT_TRUE,
-    SC_PAUSE_ON_EXIT_FALSE,
-    SC_PAUSE_ON_EXIT_IF_ERROR,
-};
-
 struct scrcpy_cli_args {
     struct scrcpy_options opts;
     bool help;
     bool version;
-    enum sc_pause_on_exit pause_on_exit;
 };
 
 void

app/src/compat.h

@@ -3,9 +3,7 @@
 
 #include "config.h"
 
-#include <libavcodec/version.h>
 #include <libavformat/version.h>
-#include <libavutil/version.h>
 #include <SDL2/SDL_version.h>
 
 #ifndef __WIN32
@@ -52,15 +50,6 @@
 # define SCRCPY_LAVU_HAS_CHLAYOUT
 #endif
 
-// In ffmpeg/doc/APIchanges:
-// 2023-10-06 - 5432d2aacad - lavc 60.15.100 - avformat.h
-//   Deprecate AVFormatContext.{nb_,}side_data, av_stream_add_side_data(),
-//   av_stream_new_side_data(), and av_stream_get_side_data(). Side data fields
-//   from AVFormatContext.codecpar should be used from now on.
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 15, 100)
-# define SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
-#endif
-
 #if SDL_VERSION_ATLEAST(2, 0, 6)
 // <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
 # define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS

app/src/demuxer.c

@@ -25,8 +25,7 @@ sc_demuxer_to_avcodec_id(uint32_t codec_id) {
 #define SC_CODEC_ID_H265 UINT32_C(0x68323635) // "h265" in ASCII
 #define SC_CODEC_ID_AV1 UINT32_C(0x00617631) // "av1" in ASCII
 #define SC_CODEC_ID_OPUS UINT32_C(0x6f707573) // "opus" in ASCII
-#define SC_CODEC_ID_AAC UINT32_C(0x00616163) // "aac" in ASCII
+#define SC_CODEC_ID_AAC UINT32_C(0x00616163) // "aac in ASCII"
-#define SC_CODEC_ID_FLAC UINT32_C(0x666c6163) // "flac" in ASCII
 #define SC_CODEC_ID_RAW UINT32_C(0x00726177) // "raw" in ASCII
     switch (codec_id) {
         case SC_CODEC_ID_H264:
@@ -44,8 +43,6 @@ sc_demuxer_to_avcodec_id(uint32_t codec_id) {
             return AV_CODEC_ID_OPUS;
         case SC_CODEC_ID_AAC:
             return AV_CODEC_ID_AAC;
-        case SC_CODEC_ID_FLAC:
-            return AV_CODEC_ID_FLAC;
         case SC_CODEC_ID_RAW:
             return AV_CODEC_ID_PCM_S16LE;
         default:
@@ -210,11 +207,6 @@ run_demuxer(void *data) {
         codec_ctx->channels = 2;
 #endif
         codec_ctx->sample_rate = 48000;
-
-        if (raw_codec_id == SC_CODEC_ID_FLAC) {
-            // The sample_fmt is not set by the FLAC decoder
-            codec_ctx->sample_fmt = AV_SAMPLE_FMT_S16;
-        }
     }
 
     if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
@@ -227,9 +219,8 @@ run_demuxer(void *data) {
     }
 
     // Config packets must be merged with the next non-config packet only for
-    // H.26x
+    // video streams
-    bool must_merge_config_packet = raw_codec_id == SC_CODEC_ID_H264
+    bool must_merge_config_packet = codec->type == AVMEDIA_TYPE_VIDEO;
-                                 || raw_codec_id == SC_CODEC_ID_H265;
 
     struct sc_packet_merger merger;
 

app/src/display.c

@@ -53,7 +53,7 @@ sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
                 display->mipmaps = true;
             } else {
                 LOGW("Trilinear filtering disabled "
-                     "(OpenGL 3.0+ or ES 2.0+ required)");
+                     "(OpenGL 3.0+ or ES 2.0+ required");
             }
         } else {
             LOGI("Trilinear filtering disabled");
@@ -234,7 +234,7 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame) {
 
 enum sc_display_result
 sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
-                  enum sc_orientation orientation) {
+                  unsigned rotation) {
     SDL_RenderClear(display->renderer);
 
     if (display->pending.flags) {
@@ -247,33 +247,33 @@ sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
     SDL_Renderer *renderer = display->renderer;
     SDL_Texture *texture = display->texture;
 
-    if (orientation == SC_ORIENTATION_0) {
+    if (rotation == 0) {
         int ret = SDL_RenderCopy(renderer, texture, NULL, geometry);
         if (ret) {
             LOGE("Could not render texture: %s", SDL_GetError());
             return SC_DISPLAY_RESULT_ERROR;
         }
     } else {
-        unsigned cw_rotation = sc_orientation_get_rotation(orientation);
+        // rotation in RenderCopyEx() is clockwise, while screen->rotation is
+        // counterclockwise (to be consistent with --lock-video-orientation)
+        int cw_rotation = (4 - rotation) % 4;
         double angle = 90 * cw_rotation;
 
         const SDL_Rect *dstrect = NULL;
         SDL_Rect rect;
-        if (sc_orientation_is_swap(orientation)) {
+        if (rotation & 1) {
             rect.x = geometry->x + (geometry->w - geometry->h) / 2;
             rect.y = geometry->y + (geometry->h - geometry->w) / 2;
             rect.w = geometry->h;
             rect.h = geometry->w;
             dstrect = ▭
         } else {
+            assert(rotation == 2);
             dstrect = geometry;
         }
 
-        SDL_RendererFlip flip = sc_orientation_is_mirror(orientation)
-                              ? SDL_FLIP_HORIZONTAL : 0;
-
         int ret = SDL_RenderCopyEx(renderer, texture, NULL, dstrect, angle,
-                                   NULL, flip);
+                                   NULL, 0);
         if (ret) {
             LOGE("Could not render texture: %s", SDL_GetError());
             return SC_DISPLAY_RESULT_ERROR;

app/src/display.h

@@ -9,7 +9,6 @@
 
 #include "coords.h"
 #include "opengl.h"
-#include "options.h"
 
 #ifdef __APPLE__
 # define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
@@ -55,6 +54,6 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame);
 
 enum sc_display_result
 sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
-                  enum sc_orientation orientation);
+                  unsigned rotation);
 
 #endif

app/src/hid/hid_event.h

@@ -1,15 +0,0 @@
-#ifndef SC_HID_EVENT_H
-#define SC_HID_EVENT_H
-
-#include "common.h"
-
-#include <stdint.h>
-
-#define SC_HID_MAX_SIZE 8
-
-struct sc_hid_event {
-    uint8_t data[SC_HID_MAX_SIZE];
-    uint8_t size;
-};
-
-#endif

app/src/hid/hid_mouse.c

@@ -1,192 +0,0 @@
-#include "hid_mouse.h"
-
-// 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position,
-// 1 byte for wheel motion
-#define HID_MOUSE_EVENT_SIZE 4
-
-/**
- * Mouse descriptor from the specification:
- * <https://www.usb.org/sites/default/files/hid1_11.pdf>
- *
- * Appendix E (p71): §E.10 Report Descriptor (Mouse)
- *
- * The usage tags (like Wheel) are listed in "HID Usage Tables":
- * <https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf>
- * §4 Generic Desktop Page (0x01) (p26)
- */
-const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Mouse)
-    0x09, 0x02,
-
-    // Collection (Application)
-    0xA1, 0x01,
-
-    // Usage (Pointer)
-    0x09, 0x01,
-
-    // Collection (Physical)
-    0xA1, 0x00,
-
-    // Usage Page (Buttons)
-    0x05, 0x09,
-
-    // Usage Minimum (1)
-    0x19, 0x01,
-     // Usage Maximum (5)
-    0x29, 0x05,
-    // Logical Minimum (0)
-    0x15, 0x00,
-    // Logical Maximum (1)
-    0x25, 0x01,
-    // Report Count (5)
-    0x95, 0x05,
-    // Report Size (1)
-    0x75, 0x01,
-    // Input (Data, Variable, Absolute): 5 buttons bits
-    0x81, 0x02,
-
-    // Report Count (1)
-    0x95, 0x01,
-    // Report Size (3)
-    0x75, 0x03,
-    // Input (Constant): 3 bits padding
-    0x81, 0x01,
-
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (X)
-    0x09, 0x30,
-    // Usage (Y)
-    0x09, 0x31,
-    // Usage (Wheel)
-    0x09, 0x38,
-    // Local Minimum (-127)
-    0x15, 0x81,
-    // Local Maximum (127)
-    0x25, 0x7F,
-    // Report Size (8)
-    0x75, 0x08,
-    // Report Count (3)
-    0x95, 0x03,
-    // Input (Data, Variable, Relative): 3 position bytes (X, Y, Wheel)
-    0x81, 0x06,
-
-    // End Collection
-    0xC0,
-
-    // End Collection
-    0xC0,
-};
-
-const size_t SC_HID_MOUSE_REPORT_DESC_LEN =
-    sizeof(SC_HID_MOUSE_REPORT_DESC);
-
-/**
- * A mouse HID event is 4 bytes long:
- *
- *  - byte 0: buttons state
- *  - byte 1: relative x motion (signed byte from -127 to 127)
- *  - byte 2: relative y motion (signed byte from -127 to 127)
- *  - byte 3: wheel motion (-1, 0 or 1)
- *
- *                   7 6 5 4 3 2 1 0
- *                  +---------------+
- *         byte 0:  |0 0 0 . . . . .| buttons state
- *                  +---------------+
- *                         ^ ^ ^ ^ ^
- *                         | | | | `- left button
- *                         | | | `--- right button
- *                         | | `----- middle button
- *                         | `------- button 4
- *                         `--------- button 5
- *
- *                  +---------------+
- *         byte 1:  |. . . . . . . .| relative x motion
- *                  +---------------+
- *         byte 2:  |. . . . . . . .| relative y motion
- *                  +---------------+
- *         byte 3:  |. . . . . . . .| wheel motion
- *                  +---------------+
- *
- * As an example, here is the report for a motion of (x=5, y=-4) with left
- * button pressed:
- *
- *                  +---------------+
- *                  |0 0 0 0 0 0 0 1| left button pressed
- *                  +---------------+
- *                  |0 0 0 0 0 1 0 1| horizontal motion (x = 5)
- *                  +---------------+
- *                  |1 1 1 1 1 1 0 0| relative y motion (y = -4)
- *                  +---------------+
- *                  |0 0 0 0 0 0 0 0| wheel motion
- *                  +---------------+
- */
-
-static void
-sc_hid_mouse_event_init(struct sc_hid_event *hid_event) {
-    hid_event->size = HID_MOUSE_EVENT_SIZE;
-    // Leave hid_event->data uninitialized, it will be fully initialized by
-    // callers
-}
-
-static uint8_t
-sc_hid_buttons_from_buttons_state(uint8_t buttons_state) {
-    uint8_t c = 0;
-    if (buttons_state & SC_MOUSE_BUTTON_LEFT) {
-        c |= 1 << 0;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_RIGHT) {
-        c |= 1 << 1;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_MIDDLE) {
-        c |= 1 << 2;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_X1) {
-        c |= 1 << 3;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_X2) {
-        c |= 1 << 4;
-    }
-    return c;
-}
-
-void
-sc_hid_mouse_event_from_motion(struct sc_hid_event *hid_event,
-                               const struct sc_mouse_motion_event *event) {
-    sc_hid_mouse_event_init(hid_event);
-
-    uint8_t *data = hid_event->data;
-    data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
-    data[1] = CLAMP(event->xrel, -127, 127);
-    data[2] = CLAMP(event->yrel, -127, 127);
-    data[3] = 0; // wheel coordinates only used for scrolling
-}
-
-void
-sc_hid_mouse_event_from_click(struct sc_hid_event *hid_event,
-                              const struct sc_mouse_click_event *event) {
-    sc_hid_mouse_event_init(hid_event);
-
-    uint8_t *data = hid_event->data;
-    data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
-    data[1] = 0; // no x motion
-    data[2] = 0; // no y motion
-    data[3] = 0; // wheel coordinates only used for scrolling
-}
-
-void
-sc_hid_mouse_event_from_scroll(struct sc_hid_event *hid_event,
-                               const struct sc_mouse_scroll_event *event) {
-    sc_hid_mouse_event_init(hid_event);
-
-    uint8_t *data = hid_event->data;
-    data[0] = 0; // buttons state irrelevant (and unknown)
-    data[1] = 0; // no x motion
-    data[2] = 0; // no y motion
-    // In practice, vscroll is always -1, 0 or 1, but in theory other values
-    // are possible
-    data[3] = CLAMP(event->vscroll, -127, 127);
-    // Horizontal scrolling ignored
-}

app/src/hid/hid_mouse.h

@@ -1,26 +0,0 @@
-#ifndef SC_HID_MOUSE_H
-#define SC_HID_MOUSE_H
-
-#endif
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include "hid/hid_event.h"
-#include "input_events.h"
-
-extern const uint8_t SC_HID_MOUSE_REPORT_DESC[];
-extern const size_t SC_HID_MOUSE_REPORT_DESC_LEN;
-
-void
-sc_hid_mouse_event_from_motion(struct sc_hid_event *hid_event,
-                               const struct sc_mouse_motion_event *event);
-
-void
-sc_hid_mouse_event_from_click(struct sc_hid_event *hid_event,
-                              const struct sc_mouse_click_event *event);
-
-void
-sc_hid_mouse_event_from_scroll(struct sc_hid_event *hid_event,
-                               const struct sc_mouse_scroll_event *event);

app/src/icon.c

@@ -271,7 +271,7 @@ error:
 }
 
 SDL_Surface *
-scrcpy_icon_load(void) {
+scrcpy_icon_load() {
     char *icon_path = get_icon_path();
     if (!icon_path) {
         return NULL;

app/src/input_manager.c

@@ -52,11 +52,8 @@ is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
 void
 sc_input_manager_init(struct sc_input_manager *im,
                       const struct sc_input_manager_params *params) {
-    // A key/mouse processor may not be present if there is no controller
+    assert(!params->controller || (params->kp && params->kp->ops));
-    assert((!params->kp && !params->mp) || params->controller);
+    assert(!params->controller || (params->mp && params->mp->ops));
-    // A processor must have ops initialized
-    assert(!params->kp || params->kp->ops);
-    assert(!params->mp || params->mp->ops);
 
     im->controller = params->controller;
     im->fp = params->fp;
@@ -79,8 +76,6 @@ sc_input_manager_init(struct sc_input_manager *im,
     im->sdl_shortcut_mods.count = shortcut_mods->count;
 
     im->vfinger_down = false;
-    im->vfinger_invert_x = false;
-    im->vfinger_invert_y = false;
 
     im->last_keycode = SDLK_UNKNOWN;
     im->last_mod = 0;
@@ -90,10 +85,8 @@ sc_input_manager_init(struct sc_input_manager *im,
 }
 
 static void
-send_keycode(struct sc_input_manager *im, enum android_keycode keycode,
+send_keycode(struct sc_controller *controller, enum android_keycode keycode,
              enum sc_action action, const char *name) {
-    assert(im->controller && im->kp);
-
     // send DOWN event
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_INJECT_KEYCODE;
@@ -104,109 +97,100 @@ send_keycode(struct sc_input_manager *im, enum android_keycode keycode,
     msg.inject_keycode.metastate = 0;
     msg.inject_keycode.repeat = 0;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'inject %s'", name);
     }
 }
 
 static inline void
-action_home(struct sc_input_manager *im, enum sc_action action) {
+action_home(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_HOME, action, "HOME");
+    send_keycode(controller, AKEYCODE_HOME, action, "HOME");
 }
 
 static inline void
-action_back(struct sc_input_manager *im, enum sc_action action) {
+action_back(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_BACK, action, "BACK");
+    send_keycode(controller, AKEYCODE_BACK, action, "BACK");
 }
 
 static inline void
-action_app_switch(struct sc_input_manager *im, enum sc_action action) {
+action_app_switch(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_APP_SWITCH, action, "APP_SWITCH");
+    send_keycode(controller, AKEYCODE_APP_SWITCH, action, "APP_SWITCH");
 }
 
 static inline void
-action_power(struct sc_input_manager *im, enum sc_action action) {
+action_power(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_POWER, action, "POWER");
+    send_keycode(controller, AKEYCODE_POWER, action, "POWER");
 }
 
 static inline void
-action_volume_up(struct sc_input_manager *im, enum sc_action action) {
+action_volume_up(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_VOLUME_UP, action, "VOLUME_UP");
+    send_keycode(controller, AKEYCODE_VOLUME_UP, action, "VOLUME_UP");
 }
 
 static inline void
-action_volume_down(struct sc_input_manager *im, enum sc_action action) {
+action_volume_down(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_VOLUME_DOWN, action, "VOLUME_DOWN");
+    send_keycode(controller, AKEYCODE_VOLUME_DOWN, action, "VOLUME_DOWN");
 }
 
 static inline void
-action_menu(struct sc_input_manager *im, enum sc_action action) {
+action_menu(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(im, AKEYCODE_MENU, action, "MENU");
+    send_keycode(controller, AKEYCODE_MENU, action, "MENU");
 }
 
 // turn the screen on if it was off, press BACK otherwise
 // If the screen is off, it is turned on only on ACTION_DOWN
 static void
-press_back_or_turn_screen_on(struct sc_input_manager *im,
+press_back_or_turn_screen_on(struct sc_controller *controller,
                              enum sc_action action) {
-    assert(im->controller && im->kp);
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
     msg.back_or_screen_on.action = action == SC_ACTION_DOWN
                                  ? AKEY_EVENT_ACTION_DOWN
                                  : AKEY_EVENT_ACTION_UP;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'press back or turn screen on'");
     }
 }
 
 static void
-expand_notification_panel(struct sc_input_manager *im) {
+expand_notification_panel(struct sc_controller *controller) {
-    assert(im->controller);
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'expand notification panel'");
     }
 }
 
 static void
-expand_settings_panel(struct sc_input_manager *im) {
+expand_settings_panel(struct sc_controller *controller) {
-    assert(im->controller);
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'expand settings panel'");
     }
 }
 
 static void
-collapse_panels(struct sc_input_manager *im) {
+collapse_panels(struct sc_controller *controller) {
-    assert(im->controller);
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'collapse notification panel'");
     }
 }
 
 static bool
-get_device_clipboard(struct sc_input_manager *im, enum sc_copy_key copy_key) {
+get_device_clipboard(struct sc_controller *controller,
-    assert(im->controller && im->kp);
+                     enum sc_copy_key copy_key) {
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_GET_CLIPBOARD;
     msg.get_clipboard.copy_key = copy_key;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'get device clipboard'");
         return false;
     }
@@ -215,10 +199,8 @@ get_device_clipboard(struct sc_input_manager *im, enum sc_copy_key copy_key) {
 }
 
 static bool
-set_device_clipboard(struct sc_input_manager *im, bool paste,
+set_device_clipboard(struct sc_controller *controller, bool paste,
                      uint64_t sequence) {
-    assert(im->controller && im->kp);
-
     char *text = SDL_GetClipboardText();
     if (!text) {
         LOGW("Could not get clipboard text: %s", SDL_GetError());
@@ -238,7 +220,7 @@ set_device_clipboard(struct sc_input_manager *im, bool paste,
     msg.set_clipboard.text = text_dup;
     msg.set_clipboard.paste = paste;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         free(text_dup);
         LOGW("Could not request 'set device clipboard'");
         return false;
@@ -248,23 +230,19 @@ set_device_clipboard(struct sc_input_manager *im, bool paste,
 }
 
 static void
-set_screen_power_mode(struct sc_input_manager *im,
+set_screen_power_mode(struct sc_controller *controller,
                       enum sc_screen_power_mode mode) {
-    assert(im->controller);
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
     msg.set_screen_power_mode.mode = mode;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request 'set screen power mode'");
     }
 }
 
 static void
-switch_fps_counter_state(struct sc_input_manager *im) {
+switch_fps_counter_state(struct sc_fps_counter *fps_counter) {
-    struct sc_fps_counter *fps_counter = &im->screen->fps_counter;
-
     // the started state can only be written from the current thread, so there
     // is no ToCToU issue
     if (sc_fps_counter_is_started(fps_counter)) {
@@ -276,9 +254,7 @@ switch_fps_counter_state(struct sc_input_manager *im) {
 }
 
 static void
-clipboard_paste(struct sc_input_manager *im) {
+clipboard_paste(struct sc_controller *controller) {
-    assert(im->controller && im->kp);
-
     char *text = SDL_GetClipboardText();
     if (!text) {
         LOGW("Could not get clipboard text: %s", SDL_GetError());
@@ -300,31 +276,32 @@ clipboard_paste(struct sc_input_manager *im) {
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_INJECT_TEXT;
     msg.inject_text.text = text_dup;
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         free(text_dup);
         LOGW("Could not request 'paste clipboard'");
     }
 }
 
 static void
-rotate_device(struct sc_input_manager *im) {
+rotate_device(struct sc_controller *controller) {
-    assert(im->controller);
-
     struct sc_control_msg msg;
     msg.type = SC_CONTROL_MSG_TYPE_ROTATE_DEVICE;
 
-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!sc_controller_push_msg(controller, &msg)) {
         LOGW("Could not request device rotation");
     }
 }
 
 static void
-apply_orientation_transform(struct sc_input_manager *im,
+rotate_client_left(struct sc_screen *screen) {
-                            enum sc_orientation transform) {
+    unsigned new_rotation = (screen->rotation + 1) % 4;
-    struct sc_screen *screen = im->screen;
+    sc_screen_set_rotation(screen, new_rotation);
-    enum sc_orientation new_orientation =
+}
-        sc_orientation_apply(screen->orientation, transform);
+
-    sc_screen_set_orientation(screen, new_orientation);
+static void
+rotate_client_right(struct sc_screen *screen) {
+    unsigned new_rotation = (screen->rotation + 3) % 4;
+    sc_screen_set_rotation(screen, new_rotation);
 }
 
 static void
@@ -374,14 +351,9 @@ simulate_virtual_finger(struct sc_input_manager *im,
 }
 
 static struct sc_point
-inverse_point(struct sc_point point, struct sc_size size,
+inverse_point(struct sc_point point, struct sc_size size) {
-              bool invert_x, bool invert_y) {
+    point.x = size.width - point.x;
-    if (invert_x) {
+    point.y = size.height - point.y;
-        point.x = size.width - point.x;
-    }
-    if (invert_y) {
-        point.y = size.height - point.y;
-    }
     return point;
 }
 
@@ -389,7 +361,7 @@ static void
 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;
+    struct sc_controller *controller = im->controller;
 
     SDL_Keycode keycode = event->keysym.sym;
     uint16_t mod = event->keysym.mod;
@@ -415,102 +387,81 @@ 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 (controller && !shift && !repeat) {
-                    action_home(im, action);
+                    action_home(controller, action);
                 }
                 return;
             case SDLK_b: // fall-through
             case SDLK_BACKSPACE:
-                if (im->kp && !shift && !repeat) {
+                if (controller && !shift && !repeat) {
-                    action_back(im, action);
+                    action_back(controller, action);
                 }
                 return;
             case SDLK_s:
-                if (im->kp && !shift && !repeat) {
+                if (controller && !shift && !repeat) {
-                    action_app_switch(im, action);
+                    action_app_switch(controller, action);
                 }
                 return;
             case SDLK_m:
-                if (im->kp && !shift && !repeat) {
+                if (controller && !shift && !repeat) {
-                    action_menu(im, action);
+                    action_menu(controller, action);
                 }
                 return;
             case SDLK_p:
-                if (im->kp && !shift && !repeat) {
+                if (controller && !shift && !repeat) {
-                    action_power(im, action);
+                    action_power(controller, action);
                 }
                 return;
             case SDLK_o:
-                if (control && !repeat && down) {
+                if (controller && !repeat && down) {
                     enum sc_screen_power_mode mode = shift
                                                    ? SC_SCREEN_POWER_MODE_NORMAL
                                                    : SC_SCREEN_POWER_MODE_OFF;
-                    set_screen_power_mode(im, mode);
+                    set_screen_power_mode(controller, mode);
                 }
                 return;
             case SDLK_DOWN:
-                if (shift) {
+                if (controller && !shift) {
-                    if (!repeat & down) {
-                        apply_orientation_transform(im,
-                                                    SC_ORIENTATION_FLIP_180);
-                    }
-                } else if (im->kp) {
                     // forward repeated events
-                    action_volume_down(im, action);
+                    action_volume_down(controller, action);
                 }
                 return;
             case SDLK_UP:
-                if (shift) {
+                if (controller && !shift) {
-                    if (!repeat & down) {
-                        apply_orientation_transform(im,
-                                                    SC_ORIENTATION_FLIP_180);
-                    }
-                } else if (im->kp) {
                     // forward repeated events
-                    action_volume_up(im, action);
+                    action_volume_up(controller, action);
                 }
                 return;
             case SDLK_LEFT:
-                if (!repeat && down) {
+                if (!shift && !repeat && down) {
-                    if (shift) {
+                    rotate_client_left(im->screen);
-                        apply_orientation_transform(im,
-                                                    SC_ORIENTATION_FLIP_0);
-                    } else {
-                        apply_orientation_transform(im,
-                                                    SC_ORIENTATION_270);
-                    }
                 }
                 return;
             case SDLK_RIGHT:
-                if (!repeat && down) {
+                if (!shift && !repeat && down) {
-                    if (shift) {
+                    rotate_client_right(im->screen);
-                        apply_orientation_transform(im,
-                                                    SC_ORIENTATION_FLIP_0);
-                    } else {
-                        apply_orientation_transform(im,
-                                                    SC_ORIENTATION_90);
-                    }
                 }
                 return;
             case SDLK_c:
-                if (im->kp && !shift && !repeat && down) {
+                if (controller && !shift && !repeat && down) {
-                    get_device_clipboard(im, SC_COPY_KEY_COPY);
+                    get_device_clipboard(controller, SC_COPY_KEY_COPY);
                 }
                 return;
             case SDLK_x:
-                if (im->kp && !shift && !repeat && down) {
+                if (controller && !shift && !repeat && down) {
-                    get_device_clipboard(im, SC_COPY_KEY_CUT);
+                    get_device_clipboard(controller, SC_COPY_KEY_CUT);
                 }
                 return;
             case SDLK_v:
-                if (im->kp && !repeat && down) {
+                if (controller && !repeat && down) {
                     if (shift || im->legacy_paste) {
                         // inject the text as input events
-                        clipboard_paste(im);
+                        clipboard_paste(controller);
                     } else {
                         // store the text in the device clipboard and paste,
                         // without requesting an acknowledgment
-                        set_device_clipboard(im, true, SC_SEQUENCE_INVALID);
+                        set_device_clipboard(controller, true,
+                                             SC_SEQUENCE_INVALID);
                     }
                 }
                 return;
@@ -531,23 +482,23 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                 return;
             case SDLK_i:
                 if (!shift && !repeat && down) {
-                    switch_fps_counter_state(im);
+                    switch_fps_counter_state(&im->screen->fps_counter);
                 }
                 return;
             case SDLK_n:
-                if (control && !repeat && down) {
+                if (controller && !repeat && down) {
                     if (shift) {
-                        collapse_panels(im);
+                        collapse_panels(controller);
                     } else if (im->key_repeat == 0) {
-                        expand_notification_panel(im);
+                        expand_notification_panel(controller);
                     } else {
-                        expand_settings_panel(im);
+                        expand_settings_panel(controller);
                     }
                 }
                 return;
             case SDLK_r:
-                if (control && !shift && !repeat && down) {
+                if (controller && !shift && !repeat && down) {
-                    rotate_device(im);
+                    rotate_device(controller);
                 }
                 return;
         }
@@ -555,7 +506,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
         return;
     }
 
-    if (!im->kp) {
+    if (!controller) {
         return;
     }
 
@@ -564,7 +515,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
     if (im->clipboard_autosync && is_ctrl_v) {
         if (im->legacy_paste) {
             // inject the text as input events
-            clipboard_paste(im);
+            clipboard_paste(controller);
             return;
         }
 
@@ -574,7 +525,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
 
         // Synchronize the computer clipboard to the device clipboard before
         // sending Ctrl+v, to allow seamless copy-paste.
-        bool ok = set_device_clipboard(im, false, sequence);
+        bool ok = set_device_clipboard(controller, false, sequence);
         if (!ok) {
             LOGW("Clipboard could not be synchronized, Ctrl+v not injected");
             return;
@@ -636,9 +587,7 @@ sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
         struct sc_point mouse =
            sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                     event->y);
-        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
+        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
-                                                im->vfinger_invert_x,
-                                                im->vfinger_invert_y);
         simulate_virtual_finger(im, AMOTION_EVENT_ACTION_MOVE, vfinger);
     }
 }
@@ -676,7 +625,7 @@ 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;
+    struct sc_controller *controller = im->controller;
 
     if (event->which == SDL_TOUCH_MOUSEID) {
         // simulated from touch events, so it's a duplicate
@@ -685,27 +634,27 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
 
     bool down = event->type == SDL_MOUSEBUTTONDOWN;
     if (!im->forward_all_clicks) {
-        if (control) {
+        if (controller) {
             enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
 
-            if (im->kp && event->button == SDL_BUTTON_X1) {
+            if (event->button == SDL_BUTTON_X1) {
-                action_app_switch(im, action);
+                action_app_switch(controller, action);
                 return;
             }
             if (event->button == SDL_BUTTON_X2 && down) {
                 if (event->clicks < 2) {
-                    expand_notification_panel(im);
+                    expand_notification_panel(controller);
                 } else {
-                    expand_settings_panel(im);
+                    expand_settings_panel(controller);
                 }
                 return;
             }
-            if (im->kp && event->button == SDL_BUTTON_RIGHT) {
+            if (event->button == SDL_BUTTON_RIGHT) {
-                press_back_or_turn_screen_on(im, action);
+                press_back_or_turn_screen_on(controller, action);
                 return;
             }
-            if (im->kp && event->button == SDL_BUTTON_MIDDLE) {
+            if (event->button == SDL_BUTTON_MIDDLE) {
-                action_home(im, action);
+                action_home(controller, action);
                 return;
             }
         }
@@ -728,7 +677,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
         // otherwise, send the click event to the device
     }
 
-    if (!im->mp) {
+    if (!controller) {
         return;
     }
 
@@ -759,7 +708,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
         return;
     }
 
-    // Pinch-to-zoom, rotate and tilt simulation.
+    // Pinch-to-zoom simulation.
     //
     // If Ctrl is hold when the left-click button is pressed, then
     // pinch-to-zoom mode is enabled: on every mouse event until the left-click
@@ -768,29 +717,14 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
     //
     // In other words, the center of the rotation/scaling is the center of the
     // screen.
-    //
+#define CTRL_PRESSED (SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL))
-    // To simulate a tilt gesture (a vertical slide with two fingers), Shift
-    // can be used instead of Ctrl. The "virtual finger" has a position
-    // inverted with respect to the vertical axis of symmetry in the middle of
-    // the screen.
-    const SDL_Keymod keymod = SDL_GetModState();
-    const bool ctrl_pressed = keymod & KMOD_CTRL;
-    const bool shift_pressed = keymod & KMOD_SHIFT;
     if (event->button == SDL_BUTTON_LEFT &&
-            ((down && !im->vfinger_down &&
+            ((down && !im->vfinger_down && CTRL_PRESSED) ||
-              ((ctrl_pressed && !shift_pressed) ||
-               (!ctrl_pressed && shift_pressed))) ||
              (!down && im->vfinger_down))) {
         struct sc_point mouse =
             sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                                  event->y);
-        if (down) {
+        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
-            im->vfinger_invert_x = ctrl_pressed || shift_pressed;
-            im->vfinger_invert_y = ctrl_pressed;
-        }
-        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
-                                                im->vfinger_invert_x,
-                                                im->vfinger_invert_y);
         enum android_motionevent_action action = down
                                                ? AMOTION_EVENT_ACTION_DOWN
                                                : AMOTION_EVENT_ACTION_UP;
@@ -868,7 +802,7 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
     bool control = im->controller;
     switch (event->type) {
         case SDL_TEXTINPUT:
-            if (!im->kp) {
+            if (!control) {
                 break;
             }
             sc_input_manager_process_text_input(im, &event->text);
@@ -880,13 +814,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 (!control) {
                 break;
             }
             sc_input_manager_process_mouse_motion(im, &event->motion);
             break;
         case SDL_MOUSEWHEEL:
-            if (!im->mp) {
+            if (!control) {
                 break;
             }
             sc_input_manager_process_mouse_wheel(im, &event->wheel);
@@ -900,7 +834,7 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
         case SDL_FINGERMOTION:
         case SDL_FINGERDOWN:
         case SDL_FINGERUP:
-            if (!im->mp) {
+            if (!control) {
                 break;
             }
             sc_input_manager_process_touch(im, &event->tfinger);

app/src/input_manager.h

@@ -32,8 +32,6 @@ struct sc_input_manager {
     } sdl_shortcut_mods;
 
     bool vfinger_down;
-    bool vfinger_invert_x;
-    bool vfinger_invert_y;
 
     // Tracks the number of identical consecutive shortcut key down events.
     // Not to be confused with event->repeat, which counts the number of

app/src/keyboard_inject.c

@@ -1,4 +1,4 @@
-#include "keyboard_sdk.h"
+#include "keyboard_inject.h"
 
 #include <assert.h>
 
@@ -9,8 +9,8 @@
 #include "util/intmap.h"
 #include "util/log.h"
 
-/** Downcast key processor to sc_keyboard_sdk */
+/** Downcast key processor to sc_keyboard_inject */
-#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_sdk, key_processor)
+#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_inject, key_processor)
 
 static enum android_keyevent_action
 convert_keycode_action(enum sc_action action) {
@@ -271,20 +271,20 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
     // is set before injecting Ctrl+v.
     (void) ack_to_wait;
 
-    struct sc_keyboard_sdk *kb = DOWNCAST(kp);
+    struct sc_keyboard_inject *ki = DOWNCAST(kp);
 
     if (event->repeat) {
-        if (!kb->forward_key_repeat) {
+        if (!ki->forward_key_repeat) {
             return;
         }
-        ++kb->repeat;
+        ++ki->repeat;
     } else {
-        kb->repeat = 0;
+        ki->repeat = 0;
     }
 
     struct sc_control_msg msg;
-    if (convert_input_key(event, &msg, kb->key_inject_mode, kb->repeat)) {
+    if (convert_input_key(event, &msg, ki->key_inject_mode, ki->repeat)) {
-        if (!sc_controller_push_msg(kb->controller, &msg)) {
+        if (!sc_controller_push_msg(ki->controller, &msg)) {
             LOGW("Could not request 'inject keycode'");
         }
     }
@@ -293,14 +293,14 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
 static void
 sc_key_processor_process_text(struct sc_key_processor *kp,
                               const struct sc_text_event *event) {
-    struct sc_keyboard_sdk *kb = DOWNCAST(kp);
+    struct sc_keyboard_inject *ki = DOWNCAST(kp);
 
-    if (kb->key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
+    if (ki->key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
         // Never inject text events
         return;
     }
 
-    if (kb->key_inject_mode == SC_KEY_INJECT_MODE_MIXED) {
+    if (ki->key_inject_mode == SC_KEY_INJECT_MODE_MIXED) {
         char c = event->text[0];
         if (isalpha(c) || c == ' ') {
             assert(event->text[1] == '\0');
@@ -316,22 +316,22 @@ sc_key_processor_process_text(struct sc_key_processor *kp,
         LOGW("Could not strdup input text");
         return;
     }
-    if (!sc_controller_push_msg(kb->controller, &msg)) {
+    if (!sc_controller_push_msg(ki->controller, &msg)) {
         free(msg.inject_text.text);
         LOGW("Could not request 'inject text'");
     }
 }
 
 void
-sc_keyboard_sdk_init(struct sc_keyboard_sdk *kb,
+sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
-                     struct sc_controller *controller,
+                        struct sc_controller *controller,
-                     enum sc_key_inject_mode key_inject_mode,
+                        enum sc_key_inject_mode key_inject_mode,
-                     bool forward_key_repeat) {
+                        bool forward_key_repeat) {
-    kb->controller = controller;
+    ki->controller = controller;
-    kb->key_inject_mode = key_inject_mode;
+    ki->key_inject_mode = key_inject_mode;
-    kb->forward_key_repeat = forward_key_repeat;
+    ki->forward_key_repeat = forward_key_repeat;
 
-    kb->repeat = 0;
+    ki->repeat = 0;
 
     static const struct sc_key_processor_ops ops = {
         .process_key = sc_key_processor_process_key,
@@ -339,6 +339,6 @@ sc_keyboard_sdk_init(struct sc_keyboard_sdk *kb,
     };
 
     // Key injection and clipboard synchronization are serialized
-    kb->key_processor.async_paste = false;
+    ki->key_processor.async_paste = false;
-    kb->key_processor.ops = &ops;
+    ki->key_processor.ops = &ops;
 }

app/src/keyboard_inject.h

@@ -1,5 +1,5 @@
-#ifndef SC_KEYBOARD_SDK_H
+#ifndef SC_KEYBOARD_INJECT_H
-#define SC_KEYBOARD_SDK_H
+#define SC_KEYBOARD_INJECT_H
 
 #include "common.h"
 
@@ -9,7 +9,7 @@
 #include "options.h"
 #include "trait/key_processor.h"
 
-struct sc_keyboard_sdk {
+struct sc_keyboard_inject {
     struct sc_key_processor key_processor; // key processor trait
 
     struct sc_controller *controller;
@@ -23,9 +23,9 @@ struct sc_keyboard_sdk {
 };
 
 void
-sc_keyboard_sdk_init(struct sc_keyboard_sdk *kb,
+sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
-                     struct sc_controller *controller,
+                        struct sc_controller *controller,
-                     enum sc_key_inject_mode key_inject_mode,
+                        enum sc_key_inject_mode key_inject_mode,
-                     bool forward_key_repeat);
+                        bool forward_key_repeat);
 
 #endif

app/src/main.c

@@ -23,7 +23,7 @@
 #include "util/str.h"
 #endif
 
-static int
+int
 main_scrcpy(int argc, char *argv[]) {
 #ifdef _WIN32
     // disable buffering, we want logs immediately
@@ -39,32 +39,26 @@ main_scrcpy(int argc, char *argv[]) {
         .opts = scrcpy_options_default,
         .help = false,
         .version = false,
-        .pause_on_exit = SC_PAUSE_ON_EXIT_FALSE,
     };
 
 #ifndef NDEBUG
     args.opts.log_level = SC_LOG_LEVEL_DEBUG;
 #endif
 
-    enum scrcpy_exit_code ret;
-
     if (!scrcpy_parse_args(&args, argc, argv)) {
-        ret = SCRCPY_EXIT_FAILURE;
+        return SCRCPY_EXIT_FAILURE;
-        goto end;
     }
 
     sc_set_log_level(args.opts.log_level);
 
     if (args.help) {
         scrcpy_print_usage(argv[0]);
-        ret = SCRCPY_EXIT_SUCCESS;
+        return SCRCPY_EXIT_SUCCESS;
-        goto end;
     }
 
     if (args.version) {
         scrcpy_print_version();
-        ret = SCRCPY_EXIT_SUCCESS;
+        return SCRCPY_EXIT_SUCCESS;
-        goto end;
     }
 
 #ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
@@ -78,26 +72,18 @@ main_scrcpy(int argc, char *argv[]) {
 #endif
 
     if (!net_init()) {
-        ret = SCRCPY_EXIT_FAILURE;
+        return SCRCPY_EXIT_FAILURE;
-        goto end;
     }
 
     sc_log_configure();
 
 #ifdef HAVE_USB
-    ret = args.opts.otg ? scrcpy_otg(&args.opts) : scrcpy(&args.opts);
+    enum scrcpy_exit_code ret = args.opts.otg ? scrcpy_otg(&args.opts)
+                                              : scrcpy(&args.opts);
 #else
-    ret = scrcpy(&args.opts);
+    enum scrcpy_exit_code ret = scrcpy(&args.opts);
 #endif
 
-end:
-    if (args.pause_on_exit == SC_PAUSE_ON_EXIT_TRUE ||
-            (args.pause_on_exit == SC_PAUSE_ON_EXIT_IF_ERROR &&
-                ret != SCRCPY_EXIT_SUCCESS)) {
-        printf("Press Enter to continue...\n");
-        getchar();
-    }
-
     return ret;
 }
 

app/src/mouse_inject.c

@@ -1,4 +1,4 @@
-#include "mouse_sdk.h"
+#include "mouse_inject.h"
 
 #include <assert.h>
 
@@ -9,8 +9,8 @@
 #include "util/intmap.h"
 #include "util/log.h"
 
-/** Downcast mouse processor to sc_mouse_sdk */
+/** Downcast mouse processor to sc_mouse_inject */
-#define DOWNCAST(MP) container_of(MP, struct sc_mouse_sdk, mouse_processor)
+#define DOWNCAST(MP) container_of(MP, struct sc_mouse_inject, mouse_processor)
 
 static enum android_motionevent_buttons
 convert_mouse_buttons(uint32_t state) {
@@ -63,7 +63,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
         return;
     }
 
-    struct sc_mouse_sdk *m = DOWNCAST(mp);
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
 
     struct sc_control_msg msg = {
         .type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
@@ -76,7 +76,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
         },
     };
 
-    if (!sc_controller_push_msg(m->controller, &msg)) {
+    if (!sc_controller_push_msg(mi->controller, &msg)) {
         LOGW("Could not request 'inject mouse motion event'");
     }
 }
@@ -84,7 +84,7 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
 static void
 sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
                                     const struct sc_mouse_click_event *event) {
-    struct sc_mouse_sdk *m = DOWNCAST(mp);
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
 
     struct sc_control_msg msg = {
         .type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
@@ -98,7 +98,7 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
         },
     };
 
-    if (!sc_controller_push_msg(m->controller, &msg)) {
+    if (!sc_controller_push_msg(mi->controller, &msg)) {
         LOGW("Could not request 'inject mouse click event'");
     }
 }
@@ -106,7 +106,7 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
 static void
 sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_scroll_event *event) {
-    struct sc_mouse_sdk *m = DOWNCAST(mp);
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
 
     struct sc_control_msg msg = {
         .type = SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
@@ -118,7 +118,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
         },
     };
 
-    if (!sc_controller_push_msg(m->controller, &msg)) {
+    if (!sc_controller_push_msg(mi->controller, &msg)) {
         LOGW("Could not request 'inject mouse scroll event'");
     }
 }
@@ -126,7 +126,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
 static void
 sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
                                  const struct sc_touch_event *event) {
-    struct sc_mouse_sdk *m = DOWNCAST(mp);
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
 
     struct sc_control_msg msg = {
         .type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
@@ -139,14 +139,15 @@ sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
         },
     };
 
-    if (!sc_controller_push_msg(m->controller, &msg)) {
+    if (!sc_controller_push_msg(mi->controller, &msg)) {
         LOGW("Could not request 'inject touch event'");
     }
 }
 
 void
-sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller) {
+sc_mouse_inject_init(struct sc_mouse_inject *mi,
-    m->controller = controller;
+                     struct sc_controller *controller) {
+    mi->controller = controller;
 
     static const struct sc_mouse_processor_ops ops = {
         .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
@@ -155,7 +156,7 @@ sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller) {
         .process_touch = sc_mouse_processor_process_touch,
     };
 
-    m->mouse_processor.ops = &ops;
+    mi->mouse_processor.ops = &ops;
 
-    m->mouse_processor.relative_mode = false;
+    mi->mouse_processor.relative_mode = false;
 }

app/src/mouse_inject.h

@@ -1,5 +1,5 @@
-#ifndef SC_MOUSE_SDK_H
+#ifndef SC_MOUSE_INJECT_H
-#define SC_MOUSE_SDK_H
+#define SC_MOUSE_INJECT_H
 
 #include "common.h"
 
@@ -9,13 +9,14 @@
 #include "screen.h"
 #include "trait/mouse_processor.h"
 
-struct sc_mouse_sdk {
+struct sc_mouse_inject {
     struct sc_mouse_processor mouse_processor; // mouse processor trait
 
     struct sc_controller *controller;
 };
 
 void
-sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller);
+sc_mouse_inject_init(struct sc_mouse_inject *mi,
+                     struct sc_controller *controller);
 
 #endif

app/src/options.c

@@ -11,19 +11,13 @@ const struct scrcpy_options scrcpy_options_default = {
     .audio_codec_options = NULL,
     .video_encoder = NULL,
     .audio_encoder = NULL,
-    .camera_id = NULL,
-    .camera_size = NULL,
-    .camera_ar = NULL,
-    .camera_fps = 0,
     .log_level = SC_LOG_LEVEL_INFO,
     .video_codec = SC_CODEC_H264,
     .audio_codec = SC_CODEC_OPUS,
-    .video_source = SC_VIDEO_SOURCE_DISPLAY,
+    .audio_source = SC_AUDIO_SOURCE_OUTPUT,
-    .audio_source = SC_AUDIO_SOURCE_AUTO,
     .record_format = SC_RECORD_FORMAT_AUTO,
-    .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_AUTO,
+    .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT,
-    .mouse_input_mode = SC_MOUSE_INPUT_MODE_AUTO,
+    .mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,
-    .camera_facing = SC_CAMERA_FACING_ANY,
     .port_range = {
         .first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
         .last = DEFAULT_LOCAL_PORT_RANGE_LAST,
@@ -39,15 +33,14 @@ const struct scrcpy_options scrcpy_options_default = {
     .audio_bit_rate = 0,
     .max_fps = 0,
     .lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
-    .display_orientation = SC_ORIENTATION_0,
+    .rotation = 0,
-    .record_orientation = SC_ORIENTATION_0,
     .window_x = SC_WINDOW_POSITION_UNDEFINED,
     .window_y = SC_WINDOW_POSITION_UNDEFINED,
     .window_width = 0,
     .window_height = 0,
     .display_id = 0,
     .display_buffer = 0,
-    .audio_buffer = -1, // depends on the audio format,
+    .audio_buffer = SC_TICK_FROM_MS(50),
     .audio_output_buffer = SC_TICK_FROM_MS(5),
     .time_limit = 0,
 #ifdef HAVE_V4L2
@@ -86,43 +79,7 @@ const struct scrcpy_options scrcpy_options_default = {
     .video = true,
     .audio = true,
     .require_audio = false,
+    .list_encoders = false,
+    .list_displays = false,
     .kill_adb_on_close = false,
-    .camera_high_speed = false,
-    .list = 0,
 };
-
-enum sc_orientation
-sc_orientation_apply(enum sc_orientation src, enum sc_orientation transform) {
-    assert(!(src & ~7));
-    assert(!(transform & ~7));
-
-    unsigned transform_hflip = transform & 4;
-    unsigned transform_rotation = transform & 3;
-    unsigned src_hflip = src & 4;
-    unsigned src_rotation = src & 3;
-    unsigned src_swap = src & 1;
-    if (src_swap && transform_hflip) {
-        // If the src is rotated by 90 or 270 degrees, applying a flipped
-        // transformation requires an additional 180 degrees rotation to
-        // compensate for the inversion of the order of multiplication:
-        //
-        //     hflip1 × rotate1 × hflip2 × rotate2
-        //     `--------------'   `--------------'
-        //           src             transform
-        //
-        // In the final result, we want all the hflips then all the rotations,
-        // so we must move hflip2 to the left:
-        //
-        //     hflip1 × hflip2 × rotate1' × rotate2
-        //
-        // with rotate1' = | rotate1           if src is 0° or 180°
-        //                 | rotate1 + 180°    if src is 90° or 270°
-
-        src_rotation += 2;
-    }
-
-    unsigned result_hflip = src_hflip ^ transform_hflip;
-    unsigned result_rotation = (transform_rotation + src_rotation) % 4;
-    enum sc_orientation result = result_hflip | result_rotation;
-    return result;
-}

app/src/options.h

@@ -3,7 +3,6 @@
 
 #include "common.h"
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -26,8 +25,6 @@ enum sc_record_format {
     SC_RECORD_FORMAT_MKA,
     SC_RECORD_FORMAT_OPUS,
     SC_RECORD_FORMAT_AAC,
-    SC_RECORD_FORMAT_FLAC,
-    SC_RECORD_FORMAT_WAV,
 };
 
 static inline bool
@@ -35,9 +32,7 @@ sc_record_format_is_audio_only(enum sc_record_format fmt) {
     return fmt == SC_RECORD_FORMAT_M4A
         || fmt == SC_RECORD_FORMAT_MKA
         || fmt == SC_RECORD_FORMAT_OPUS
-        || fmt == SC_RECORD_FORMAT_AAC
+        || fmt == SC_RECORD_FORMAT_AAC;
-        || fmt == SC_RECORD_FORMAT_FLAC
-        || fmt == SC_RECORD_FORMAT_WAV;
 }
 
 enum sc_codec {
@@ -46,111 +41,32 @@ enum sc_codec {
     SC_CODEC_AV1,
     SC_CODEC_OPUS,
     SC_CODEC_AAC,
-    SC_CODEC_FLAC,
     SC_CODEC_RAW,
 };
 
-enum sc_video_source {
-    SC_VIDEO_SOURCE_DISPLAY,
-    SC_VIDEO_SOURCE_CAMERA,
-};
-
 enum sc_audio_source {
-    SC_AUDIO_SOURCE_AUTO, // OUTPUT for video DISPLAY, MIC for video CAMERA
     SC_AUDIO_SOURCE_OUTPUT,
     SC_AUDIO_SOURCE_MIC,
 };
 
-enum sc_camera_facing {
-    SC_CAMERA_FACING_ANY,
-    SC_CAMERA_FACING_FRONT,
-    SC_CAMERA_FACING_BACK,
-    SC_CAMERA_FACING_EXTERNAL,
-};
-
-                              // ,----- hflip (applied before the rotation)
-                              // | ,--- 180°
-                              // | | ,- 90° clockwise
-                              // | | |
-enum sc_orientation {         // v v v
-    SC_ORIENTATION_0,         // 0 0 0
-    SC_ORIENTATION_90,        // 0 0 1
-    SC_ORIENTATION_180,       // 0 1 0
-    SC_ORIENTATION_270,       // 0 1 1
-    SC_ORIENTATION_FLIP_0,    // 1 0 0
-    SC_ORIENTATION_FLIP_90,   // 1 0 1
-    SC_ORIENTATION_FLIP_180,  // 1 1 0
-    SC_ORIENTATION_FLIP_270,  // 1 1 1
-};
-
-static inline bool
-sc_orientation_is_mirror(enum sc_orientation orientation) {
-    assert(!(orientation & ~7));
-    return orientation & 4;
-}
-
-// Does the orientation swap width and height?
-static inline bool
-sc_orientation_is_swap(enum sc_orientation orientation) {
-    assert(!(orientation & ~7));
-    return orientation & 1;
-}
-
-static inline enum sc_orientation
-sc_orientation_get_rotation(enum sc_orientation orientation) {
-    assert(!(orientation & ~7));
-    return orientation & 3;
-}
-
-enum sc_orientation
-sc_orientation_apply(enum sc_orientation src, enum sc_orientation transform);
-
-static inline const char *
-sc_orientation_get_name(enum sc_orientation orientation) {
-    switch (orientation) {
-        case SC_ORIENTATION_0:
-            return "0";
-        case SC_ORIENTATION_90:
-            return "90";
-        case SC_ORIENTATION_180:
-            return "180";
-        case SC_ORIENTATION_270:
-            return "270";
-        case SC_ORIENTATION_FLIP_0:
-            return "flip0";
-        case SC_ORIENTATION_FLIP_90:
-            return "flip90";
-        case SC_ORIENTATION_FLIP_180:
-            return "flip180";
-        case SC_ORIENTATION_FLIP_270:
-            return "flip270";
-        default:
-            return "(unknown)";
-    }
-}
-
 enum sc_lock_video_orientation {
     SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
     // lock the current orientation when scrcpy starts
     SC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,
     SC_LOCK_VIDEO_ORIENTATION_0 = 0,
-    SC_LOCK_VIDEO_ORIENTATION_90 = 3,
+    SC_LOCK_VIDEO_ORIENTATION_1,
-    SC_LOCK_VIDEO_ORIENTATION_180 = 2,
+    SC_LOCK_VIDEO_ORIENTATION_2,
-    SC_LOCK_VIDEO_ORIENTATION_270 = 1,
+    SC_LOCK_VIDEO_ORIENTATION_3,
 };
 
 enum sc_keyboard_input_mode {
-    SC_KEYBOARD_INPUT_MODE_AUTO,
+    SC_KEYBOARD_INPUT_MODE_INJECT,
-    SC_KEYBOARD_INPUT_MODE_DISABLED,
+    SC_KEYBOARD_INPUT_MODE_HID,
-    SC_KEYBOARD_INPUT_MODE_SDK,
-    SC_KEYBOARD_INPUT_MODE_AOA,
 };
 
 enum sc_mouse_input_mode {
-    SC_MOUSE_INPUT_MODE_AUTO,
+    SC_MOUSE_INPUT_MODE_INJECT,
-    SC_MOUSE_INPUT_MODE_DISABLED,
+    SC_MOUSE_INPUT_MODE_HID,
-    SC_MOUSE_INPUT_MODE_SDK,
-    SC_MOUSE_INPUT_MODE_AOA,
 };
 
 enum sc_key_inject_mode {
@@ -201,19 +117,13 @@ struct scrcpy_options {
     const char *audio_codec_options;
     const char *video_encoder;
     const char *audio_encoder;
-    const char *camera_id;
-    const char *camera_size;
-    const char *camera_ar;
-    uint16_t camera_fps;
     enum sc_log_level log_level;
     enum sc_codec video_codec;
     enum sc_codec audio_codec;
-    enum sc_video_source video_source;
     enum sc_audio_source audio_source;
     enum sc_record_format record_format;
     enum sc_keyboard_input_mode keyboard_input_mode;
     enum sc_mouse_input_mode mouse_input_mode;
-    enum sc_camera_facing camera_facing;
     struct sc_port_range port_range;
     uint32_t tunnel_host;
     uint16_t tunnel_port;
@@ -223,8 +133,7 @@ struct scrcpy_options {
     uint32_t audio_bit_rate;
     uint16_t max_fps;
     enum sc_lock_video_orientation lock_video_orientation;
-    enum sc_orientation display_orientation;
+    uint8_t rotation;
-    enum sc_orientation record_orientation;
     int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
     int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
     uint16_t window_width;
@@ -270,13 +179,9 @@ struct scrcpy_options {
     bool video;
     bool audio;
     bool require_audio;
+    bool list_encoders;
+    bool list_displays;
     bool kill_adb_on_close;
-    bool camera_high_speed;
-#define SC_OPTION_LIST_ENCODERS 0x1
-#define SC_OPTION_LIST_DISPLAYS 0x2
-#define SC_OPTION_LIST_CAMERAS 0x4
-#define SC_OPTION_LIST_CAMERA_SIZES 0x8
-    uint8_t list;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/recorder.c

@@ -4,7 +4,6 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
-#include <libavutil/display.h>
 
 #include "util/log.h"
 #include "util/str.h"
@@ -70,10 +69,6 @@ sc_recorder_get_format_name(enum sc_record_format format) {
             return "matroska";
         case SC_RECORD_FORMAT_OPUS:
             return "opus";
-        case SC_RECORD_FORMAT_FLAC:
-            return "flac";
-        case SC_RECORD_FORMAT_WAV:
-            return "wav";
         default:
             return NULL;
     }
@@ -106,7 +101,7 @@ sc_recorder_write_stream(struct sc_recorder *recorder,
     AVStream *stream = recorder->ctx->streams[st->index];
     sc_recorder_rescale_packet(stream, packet);
     if (st->last_pts != AV_NOPTS_VALUE && packet->pts <= st->last_pts) {
-        LOGD("Fixing PTS non monotonically increasing in stream %d "
+        LOGW("Fixing PTS non monotonically increasing in stream %d "
              "(%" PRIi64 " >= %" PRIi64 ")",
              st->index, st->last_pts, packet->pts);
         packet->pts = ++st->last_pts;
@@ -171,14 +166,13 @@ sc_recorder_close_output_file(struct sc_recorder *recorder) {
 }
 
 static inline bool
-sc_recorder_must_wait_for_config_packets(struct sc_recorder *recorder) {
+sc_recorder_has_empty_queues(struct sc_recorder *recorder) {
     if (recorder->video && sc_vecdeque_is_empty(&recorder->video_queue)) {
         // The video queue is empty
         return true;
     }
 
-    if (recorder->audio && recorder->audio_expects_config_packet
+    if (recorder->audio && sc_vecdeque_is_empty(&recorder->audio_queue)) {
-            && sc_vecdeque_is_empty(&recorder->audio_queue)) {
         // The audio queue is empty (when audio is enabled)
         return true;
     }
@@ -194,7 +188,7 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
     while (!recorder->stopped &&
               ((recorder->video && !recorder->video_init)
             || (recorder->audio && !recorder->audio_init)
-            || sc_recorder_must_wait_for_config_packets(recorder))) {
+            || sc_recorder_has_empty_queues(recorder))) {
         sc_cond_wait(&recorder->cond, &recorder->mutex);
     }
 
@@ -213,8 +207,7 @@ sc_recorder_process_header(struct sc_recorder *recorder) {
     }
 
     AVPacket *audio_pkt = NULL;
-    if (recorder->audio_expects_config_packet &&
+    if (!sc_vecdeque_is_empty(&recorder->audio_queue)) {
-            !sc_vecdeque_is_empty(&recorder->audio_queue)) {
         assert(recorder->audio);
         audio_pkt = sc_vecdeque_pop(&recorder->audio_queue);
     }
@@ -494,42 +487,6 @@ run_recorder(void *data) {
     return 0;
 }
 
-static bool
-sc_recorder_set_orientation(AVStream *stream, enum sc_orientation orientation) {
-    assert(!sc_orientation_is_mirror(orientation));
-
-    uint8_t *raw_data;
-#ifdef SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
-    AVPacketSideData *sd =
-        av_packet_side_data_new(&stream->codecpar->coded_side_data,
-                                &stream->codecpar->nb_coded_side_data,
-                                AV_PKT_DATA_DISPLAYMATRIX,
-                                sizeof(int32_t) * 9, 0);
-    if (!sd) {
-        LOG_OOM();
-        return false;
-    }
-
-    raw_data = sd->data;
-#else
-    raw_data = av_stream_new_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX,
-                                      sizeof(int32_t) * 9);
-    if (!raw_data) {
-        LOG_OOM();
-        return false;
-    }
-#endif
-
-    int32_t *matrix = (int32_t *) raw_data;
-
-    unsigned rotation = orientation;
-    unsigned angle = rotation * 90;
-
-    av_display_rotation_set(matrix, angle);
-
-    return true;
-}
-
 static bool
 sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
                                    AVCodecContext *ctx) {
@@ -557,16 +514,6 @@ sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
 
     recorder->video_stream.index = stream->index;
 
-    if (recorder->orientation != SC_ORIENTATION_0) {
-        if (!sc_recorder_set_orientation(stream, recorder->orientation)) {
-            sc_mutex_unlock(&recorder->mutex);
-            return false;
-        }
-
-        LOGI("Record orientation set to %s",
-             sc_orientation_get_name(recorder->orientation));
-    }
-
     recorder->video_init = true;
     sc_cond_signal(&recorder->cond);
     sc_mutex_unlock(&recorder->mutex);
@@ -648,10 +595,6 @@ sc_recorder_audio_packet_sink_open(struct sc_packet_sink *sink,
 
     recorder->audio_stream.index = stream->index;
 
-    // A config packet is provided for all supported formats except raw audio
-    recorder->audio_expects_config_packet =
-        ctx->codec_id != AV_CODEC_ID_PCM_S16LE;
-
     recorder->audio_init = true;
     sc_cond_signal(&recorder->cond);
     sc_mutex_unlock(&recorder->mutex);
@@ -736,10 +679,7 @@ sc_recorder_stream_init(struct sc_recorder_stream *stream) {
 bool
 sc_recorder_init(struct sc_recorder *recorder, const char *filename,
                  enum sc_record_format format, bool video, bool audio,
-                 enum sc_orientation orientation,
                  const struct sc_recorder_callbacks *cbs, void *cbs_userdata) {
-    assert(!sc_orientation_is_mirror(orientation));
-
     recorder->filename = strdup(filename);
     if (!recorder->filename) {
         LOG_OOM();
@@ -760,8 +700,6 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
     recorder->video = video;
     recorder->audio = audio;
 
-    recorder->orientation = orientation;
-
     sc_vecdeque_init(&recorder->video_queue);
     sc_vecdeque_init(&recorder->audio_queue);
     recorder->stopped = false;
@@ -769,8 +707,6 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
     recorder->video_init = false;
     recorder->audio_init = false;
 
-    recorder->audio_expects_config_packet = false;
-
     sc_recorder_stream_init(&recorder->video_stream);
     sc_recorder_stream_init(&recorder->audio_stream);
 

app/src/recorder.h

@@ -34,8 +34,6 @@ struct sc_recorder {
     bool audio;
     bool video;
 
-    enum sc_orientation orientation;
-
     char *filename;
     enum sc_record_format format;
     AVFormatContext *ctx;
@@ -52,8 +50,6 @@ struct sc_recorder {
     bool video_init;
     bool audio_init;
 
-    bool audio_expects_config_packet;
-
     struct sc_recorder_stream video_stream;
     struct sc_recorder_stream audio_stream;
 
@@ -69,7 +65,6 @@ struct sc_recorder_callbacks {
 bool
 sc_recorder_init(struct sc_recorder *recorder, const char *filename,
                  enum sc_record_format format, bool video, bool audio,
-                 enum sc_orientation orientation,
                  const struct sc_recorder_callbacks *cbs, void *cbs_userdata);
 
 bool

app/src/scrcpy.c

@@ -20,15 +20,15 @@
 #include "demuxer.h"
 #include "events.h"
 #include "file_pusher.h"
-#include "keyboard_sdk.h"
+#include "keyboard_inject.h"
-#include "mouse_sdk.h"
+#include "mouse_inject.h"
 #include "recorder.h"
 #include "screen.h"
 #include "server.h"
 #ifdef HAVE_USB
 # include "usb/aoa_hid.h"
-# include "usb/keyboard_aoa.h"
+# include "usb/hid_keyboard.h"
-# include "usb/mouse_aoa.h"
+# include "usb/hid_mouse.h"
 # include "usb/usb.h"
 #endif
 #include "util/acksync.h"
@@ -63,15 +63,15 @@ struct scrcpy {
     struct sc_acksync acksync;
 #endif
     union {
-        struct sc_keyboard_sdk keyboard_sdk;
+        struct sc_keyboard_inject keyboard_inject;
 #ifdef HAVE_USB
-        struct sc_keyboard_aoa keyboard_aoa;
+        struct sc_hid_keyboard keyboard_hid;
 #endif
     };
     union {
-        struct sc_mouse_sdk mouse_sdk;
+        struct sc_mouse_inject mouse_inject;
 #ifdef HAVE_USB
-        struct sc_mouse_aoa mouse_aoa;
+        struct sc_hid_mouse mouse_hid;
 #endif
     };
     struct sc_timeout timeout;
@@ -90,7 +90,7 @@ push_event(uint32_t type, const char *name) {
 #define PUSH_EVENT(TYPE) push_event(TYPE, # TYPE)
 
 #ifdef _WIN32
-static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
+BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
     if (ctrl_type == CTRL_C_EVENT) {
         PUSH_EVENT(SDL_QUIT);
         return TRUE;
@@ -252,9 +252,7 @@ sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer,
 
     // Contrary to the video demuxer, keep mirroring if only the audio fails
     // (unless --require-audio is set).
-    if (status == SC_DEMUXER_STATUS_EOS) {
+    if (status == SC_DEMUXER_STATUS_ERROR
-        PUSH_EVENT(SC_EVENT_DEVICE_DISCONNECTED);
-    } else if (status == SC_DEMUXER_STATUS_ERROR
             || (status == SC_DEMUXER_STATUS_DISABLED
                 && options->require_audio)) {
         PUSH_EVENT(SC_EVENT_DEMUXER_ERROR);
@@ -297,7 +295,7 @@ sc_timeout_on_timeout(struct sc_timeout *timeout, void *userdata) {
 
 // Generate a scrcpy id to differentiate multiple running scrcpy instances
 static uint32_t
-scrcpy_generate_scid(void) {
+scrcpy_generate_scid() {
     struct sc_rand rand;
     sc_rand_init(&rand);
     // Only use 31 bits to avoid issues with signed values on the Java-side
@@ -330,8 +328,8 @@ scrcpy(struct scrcpy_options *options) {
     bool audio_demuxer_started = false;
 #ifdef HAVE_USB
     bool aoa_hid_initialized = false;
-    bool keyboard_aoa_initialized = false;
+    bool hid_keyboard_initialized = false;
-    bool mouse_aoa_initialized = false;
+    bool hid_mouse_initialized = false;
 #endif
     bool controller_initialized = false;
     bool controller_started = false;
@@ -351,9 +349,7 @@ scrcpy(struct scrcpy_options *options) {
         .log_level = options->log_level,
         .video_codec = options->video_codec,
         .audio_codec = options->audio_codec,
-        .video_source = options->video_source,
         .audio_source = options->audio_source,
-        .camera_facing = options->camera_facing,
         .crop = options->crop,
         .port_range = options->port_range,
         .tunnel_host = options->tunnel_host,
@@ -373,10 +369,6 @@ scrcpy(struct scrcpy_options *options) {
         .audio_codec_options = options->audio_codec_options,
         .video_encoder = options->video_encoder,
         .audio_encoder = options->audio_encoder,
-        .camera_id = options->camera_id,
-        .camera_size = options->camera_size,
-        .camera_ar = options->camera_ar,
-        .camera_fps = options->camera_fps,
         .force_adb_forward = options->force_adb_forward,
         .power_off_on_close = options->power_off_on_close,
         .clipboard_autosync = options->clipboard_autosync,
@@ -385,9 +377,9 @@ scrcpy(struct scrcpy_options *options) {
         .tcpip_dst = options->tcpip_dst,
         .cleanup = options->cleanup,
         .power_on = options->power_on,
+        .list_encoders = options->list_encoders,
+        .list_displays = options->list_displays,
         .kill_adb_on_close = options->kill_adb_on_close,
-        .camera_high_speed = options->camera_high_speed,
-        .list = options->list,
     };
 
     static const struct sc_server_callbacks cbs = {
@@ -405,7 +397,7 @@ scrcpy(struct scrcpy_options *options) {
 
     server_started = true;
 
-    if (options->list) {
+    if (options->list_encoders || options->list_displays) {
         bool ok = await_for_server(NULL);
         ret = ok ? SCRCPY_EXIT_SUCCESS : SCRCPY_EXIT_FAILURE;
         goto end;
@@ -417,22 +409,9 @@ scrcpy(struct scrcpy_options *options) {
 
     if (options->video_playback) {
         sdl_set_hints(options->render_driver);
-    }
-
-    if (options->video_playback ||
-            (options->control && options->clipboard_autosync)) {
-        // Initialize the video subsystem even if --no-video or
-        // --no-video-playback is passed so that clipboard synchronization
-        // still works.
-        // <https://github.com/Genymobile/scrcpy/issues/4418>
         if (SDL_Init(SDL_INIT_VIDEO)) {
-            // If it fails, it is an error only if video playback is enabled
+            LOGE("Could not initialize SDL video: %s", SDL_GetError());
-            if (options->video_playback) {
+            goto end;
-                LOGE("Could not initialize SDL video: %s", SDL_GetError());
-                goto end;
-            } else {
-                LOGW("Could not initialize SDL video: %s", SDL_GetError());
-            }
         }
     }
 
@@ -469,7 +448,9 @@ scrcpy(struct scrcpy_options *options) {
 
     struct sc_file_pusher *fp = NULL;
 
-    if (options->video_playback && options->control) {
+    // control implies video playback
+    assert(!options->control || options->video_playback);
+    if (options->control) {
         if (!sc_file_pusher_init(&s->file_pusher, serial,
                                  options->push_target)) {
             goto end;
@@ -516,8 +497,7 @@ scrcpy(struct scrcpy_options *options) {
         };
         if (!sc_recorder_init(&s->recorder, options->record_filename,
                               options->record_format, options->video,
-                              options->audio, options->record_orientation,
+                              options->audio, &recorder_cbs, NULL)) {
-                              &recorder_cbs, NULL)) {
             goto end;
         }
         recorder_initialized = true;
@@ -543,11 +523,11 @@ scrcpy(struct scrcpy_options *options) {
 
     if (options->control) {
 #ifdef HAVE_USB
-        bool use_keyboard_aoa =
+        bool use_hid_keyboard =
-            options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
+            options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID;
-        bool use_mouse_aoa =
+        bool use_hid_mouse =
-            options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;
+            options->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID;
-        if (use_keyboard_aoa || use_mouse_aoa) {
+        if (use_hid_keyboard || use_hid_mouse) {
             bool ok = sc_acksync_init(&s->acksync);
             if (!ok) {
                 goto end;
@@ -590,25 +570,25 @@ scrcpy(struct scrcpy_options *options) {
                 goto aoa_hid_end;
             }
 
-            if (use_keyboard_aoa) {
+            if (use_hid_keyboard) {
-                if (sc_keyboard_aoa_init(&s->keyboard_aoa, &s->aoa)) {
+                if (sc_hid_keyboard_init(&s->keyboard_hid, &s->aoa)) {
-                    keyboard_aoa_initialized = true;
+                    hid_keyboard_initialized = true;
-                    kp = &s->keyboard_aoa.key_processor;
+                    kp = &s->keyboard_hid.key_processor;
                 } else {
                     LOGE("Could not initialize HID keyboard");
                 }
             }
 
-            if (use_mouse_aoa) {
+            if (use_hid_mouse) {
-                if (sc_mouse_aoa_init(&s->mouse_aoa, &s->aoa)) {
+                if (sc_hid_mouse_init(&s->mouse_hid, &s->aoa)) {
-                    mouse_aoa_initialized = true;
+                    hid_mouse_initialized = true;
-                    mp = &s->mouse_aoa.mouse_processor;
+                    mp = &s->mouse_hid.mouse_processor;
                 } else {
                     LOGE("Could not initialized HID mouse");
                 }
             }
 
-            bool need_aoa = keyboard_aoa_initialized || mouse_aoa_initialized;
+            bool need_aoa = hid_keyboard_initialized || hid_mouse_initialized;
 
             if (!need_aoa || !sc_aoa_start(&s->aoa)) {
                 sc_acksync_destroy(&s->acksync);
@@ -624,43 +604,45 @@ scrcpy(struct scrcpy_options *options) {
 
 aoa_hid_end:
             if (!aoa_hid_initialized) {
-                if (keyboard_aoa_initialized) {
+                if (hid_keyboard_initialized) {
-                    sc_keyboard_aoa_destroy(&s->keyboard_aoa);
+                    sc_hid_keyboard_destroy(&s->keyboard_hid);
-                    keyboard_aoa_initialized = false;
+                    hid_keyboard_initialized = false;
                 }
-                if (mouse_aoa_initialized) {
+                if (hid_mouse_initialized) {
-                    sc_mouse_aoa_destroy(&s->mouse_aoa);
+                    sc_hid_mouse_destroy(&s->mouse_hid);
-                    mouse_aoa_initialized = false;
+                    hid_mouse_initialized = false;
                 }
             }
 
-            if (use_keyboard_aoa && !keyboard_aoa_initialized) {
+            if (use_hid_keyboard && !hid_keyboard_initialized) {
-                LOGE("Fallback to --keyboard=sdk (--keyboard=aoa ignored)");
+                LOGE("Fallback to default keyboard injection method "
-                options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_SDK;
+                     "(-K/--hid-keyboard ignored)");
+                options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT;
             }
 
-            if (use_mouse_aoa && !mouse_aoa_initialized) {
+            if (use_hid_mouse && !hid_mouse_initialized) {
-                LOGE("Fallback to --keyboard=sdk (--keyboard=aoa ignored)");
+                LOGE("Fallback to default mouse injection method "
-                options->mouse_input_mode = SC_MOUSE_INPUT_MODE_SDK;
+                     "(-M/--hid-mouse ignored)");
+                options->mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT;
             }
         }
 #else
-        assert(options->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_AOA);
+        assert(options->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_HID);
-        assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_AOA);
+        assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_HID);
 #endif
 
         // keyboard_input_mode may have been reset if HID mode failed
-        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_SDK) {
+        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_INJECT) {
-            sc_keyboard_sdk_init(&s->keyboard_sdk, &s->controller,
+            sc_keyboard_inject_init(&s->keyboard_inject, &s->controller,
-                                 options->key_inject_mode,
+                                    options->key_inject_mode,
-                                 options->forward_key_repeat);
+                                    options->forward_key_repeat);
-            kp = &s->keyboard_sdk.key_processor;
+            kp = &s->keyboard_inject.key_processor;
         }
 
         // mouse_input_mode may have been reset if HID mode failed
-        if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK) {
+        if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_INJECT) {
-            sc_mouse_sdk_init(&s->mouse_sdk, &s->controller);
+            sc_mouse_inject_init(&s->mouse_inject, &s->controller);
-            mp = &s->mouse_sdk.mouse_processor;
+            mp = &s->mouse_inject.mouse_processor;
         }
 
         if (!sc_controller_init(&s->controller, s->server.control_socket,
@@ -699,7 +681,7 @@ aoa_hid_end:
             .window_width = options->window_width,
             .window_height = options->window_height,
             .window_borderless = options->window_borderless,
-            .orientation = options->display_orientation,
+            .rotation = options->rotation,
             .mipmaps = options->mipmaps,
             .fullscreen = options->fullscreen,
             .start_fps_counter = options->start_fps_counter,
@@ -813,11 +795,11 @@ end:
     // end-of-stream
 #ifdef HAVE_USB
     if (aoa_hid_initialized) {
-        if (keyboard_aoa_initialized) {
+        if (hid_keyboard_initialized) {
-            sc_keyboard_aoa_destroy(&s->keyboard_aoa);
+            sc_hid_keyboard_destroy(&s->keyboard_hid);
         }
-        if (mouse_aoa_initialized) {
+        if (hid_mouse_initialized) {
-            sc_mouse_aoa_destroy(&s->mouse_aoa);
+            sc_hid_mouse_destroy(&s->mouse_hid);
         }
         sc_aoa_stop(&s->aoa);
         sc_usb_stop(&s->usb);

app/src/screen.c

@@ -14,16 +14,16 @@
 #define DOWNCAST(SINK) container_of(SINK, struct sc_screen, frame_sink)
 
 static inline struct sc_size
-get_oriented_size(struct sc_size size, enum sc_orientation orientation) {
+get_rotated_size(struct sc_size size, int rotation) {
-    struct sc_size oriented_size;
+    struct sc_size rotated_size;
-    if (sc_orientation_is_swap(orientation)) {
+    if (rotation & 1) {
-        oriented_size.width = size.height;
+        rotated_size.width = size.height;
-        oriented_size.height = size.width;
+        rotated_size.height = size.width;
     } else {
-        oriented_size.width = size.width;
+        rotated_size.width = size.width;
-        oriented_size.height = size.height;
+        rotated_size.height = size.height;
     }
-    return oriented_size;
+    return rotated_size;
 }
 
 // get the window size in a struct sc_size
@@ -251,7 +251,7 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
     }
 
     enum sc_display_result res =
-        sc_display_render(&screen->display, &screen->rect, screen->orientation);
+        sc_display_render(&screen->display, &screen->rect, screen->rotation);
     (void) res; // any error already logged
 }
 
@@ -379,10 +379,9 @@ sc_screen_init(struct sc_screen *screen,
         goto error_destroy_frame_buffer;
     }
 
-    screen->orientation = params->orientation;
+    screen->rotation = params->rotation;
-    if (screen->orientation != SC_ORIENTATION_0) {
+    if (screen->rotation) {
-        LOGI("Initial display orientation set to %s",
+        LOGI("Initial display rotation set to %u", screen->rotation);
-             sc_orientation_get_name(screen->orientation));
     }
 
     uint32_t window_flags = SDL_WINDOW_HIDDEN
@@ -489,7 +488,6 @@ sc_screen_show_initial_window(struct sc_screen *screen) {
     }
 
     SDL_ShowWindow(screen->window);
-    sc_screen_update_content_rect(screen);
 }
 
 void
@@ -560,19 +558,19 @@ apply_pending_resize(struct sc_screen *screen) {
 }
 
 void
-sc_screen_set_orientation(struct sc_screen *screen,
+sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation) {
-                          enum sc_orientation orientation) {
+    assert(rotation < 4);
-    if (orientation == screen->orientation) {
+    if (rotation == screen->rotation) {
         return;
     }
 
     struct sc_size new_content_size =
-        get_oriented_size(screen->frame_size, orientation);
+        get_rotated_size(screen->frame_size, rotation);
 
     set_content_size(screen, new_content_size);
 
-    screen->orientation = orientation;
+    screen->rotation = rotation;
-    LOGI("Display orientation set to %s", sc_orientation_get_name(orientation));
+    LOGI("Display rotation set to %u", rotation);
 
     sc_screen_render(screen, true);
 }
@@ -585,7 +583,7 @@ sc_screen_init_size(struct sc_screen *screen) {
     // The requested size is passed via screen->frame_size
 
     struct sc_size content_size =
-        get_oriented_size(screen->frame_size, screen->orientation);
+        get_rotated_size(screen->frame_size, screen->rotation);
     screen->content_size = content_size;
 
     enum sc_display_result res =
@@ -605,7 +603,7 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
     screen->frame_size = new_frame_size;
 
     struct sc_size new_content_size =
-        get_oriented_size(new_frame_size, screen->orientation);
+        get_rotated_size(new_frame_size, screen->rotation);
     set_content_size(screen, new_content_size);
 
     sc_screen_update_content_rect(screen);
@@ -844,54 +842,37 @@ 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) {
-    enum sc_orientation orientation = screen->orientation;
+    unsigned rotation = screen->rotation;
+    assert(rotation < 4);
 
     int32_t w = screen->content_size.width;
     int32_t h = screen->content_size.height;
 
-    // screen->rect must be initialized to avoid a division by zero
-    assert(screen->rect.w && screen->rect.h);
 
     x = (int64_t) (x - screen->rect.x) * w / screen->rect.w;
     y = (int64_t) (y - screen->rect.y) * h / screen->rect.h;
 
+    // rotate
     struct sc_point result;
-    switch (orientation) {
+    switch (rotation) {
-        case SC_ORIENTATION_0:
+        case 0:
             result.x = x;
             result.y = y;
             break;
-        case SC_ORIENTATION_90:
+        case 1:
-            result.x = y;
-            result.y = w - x;
-            break;
-        case SC_ORIENTATION_180:
-            result.x = w - x;
-            result.y = h - y;
-            break;
-        case SC_ORIENTATION_270:
             result.x = h - y;
             result.y = x;
             break;
-        case SC_ORIENTATION_FLIP_0:
+        case 2:
             result.x = w - x;
-            result.y = y;
-            break;
-        case SC_ORIENTATION_FLIP_90:
-            result.x = h - y;
-            result.y = w - x;
-            break;
-        case SC_ORIENTATION_FLIP_180:
-            result.x = x;
             result.y = h - y;
             break;
         default:
-            assert(orientation == SC_ORIENTATION_FLIP_270);
+            assert(rotation == 3);
             result.x = y;
-            result.y = x;
+            result.y = w - x;
             break;
     }
-
     return result;
 }
 

app/src/screen.h

@@ -14,7 +14,6 @@
 #include "frame_buffer.h"
 #include "input_manager.h"
 #include "opengl.h"
-#include "options.h"
 #include "trait/key_processor.h"
 #include "trait/frame_sink.h"
 #include "trait/mouse_processor.h"
@@ -50,8 +49,8 @@ struct sc_screen {
     // fullscreen (meaningful only when resize_pending is true)
     struct sc_size windowed_content_size;
 
-    // client orientation
+    // client rotation: 0, 1, 2 or 3 (x90 degrees counterclockwise)
-    enum sc_orientation orientation;
+    unsigned rotation;
     // rectangle of the content (excluding black borders)
     struct SDL_Rect rect;
     bool has_frame;
@@ -87,7 +86,7 @@ struct sc_screen_params {
 
     bool window_borderless;
 
-    enum sc_orientation orientation;
+    uint8_t rotation;
     bool mipmaps;
 
     bool fullscreen;
@@ -130,10 +129,9 @@ sc_screen_resize_to_fit(struct sc_screen *screen);
 void
 sc_screen_resize_to_pixel_perfect(struct sc_screen *screen);
 
-// set the display orientation
+// set the display rotation (0, 1, 2 or 3, x90 degrees counterclockwise)
 void
-sc_screen_set_orientation(struct sc_screen *screen,
+sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation);
-                          enum sc_orientation orientation);
 
 // react to SDL events
 // If this function returns false, scrcpy must exit with an error.

app/src/server.c

@@ -76,8 +76,6 @@ sc_server_params_destroy(struct sc_server_params *params) {
     free((char *) params->video_encoder);
     free((char *) params->audio_encoder);
     free((char *) params->tcpip_dst);
-    free((char *) params->camera_id);
-    free((char *) params->camera_ar);
 }
 
 static bool
@@ -88,15 +86,14 @@ sc_server_params_copy(struct sc_server_params *dst,
     // The params reference user-allocated memory, so we must copy them to
     // handle them from another thread
 
-#define COPY(FIELD) do { \
+#define COPY(FIELD) \
     dst->FIELD = NULL; \
     if (src->FIELD) { \
         dst->FIELD = strdup(src->FIELD); \
         if (!dst->FIELD) { \
             goto error; \
         } \
-    } \
+    }
-} while(0)
 
     COPY(req_serial);
     COPY(crop);
@@ -105,8 +102,6 @@ sc_server_params_copy(struct sc_server_params *dst,
     COPY(video_encoder);
     COPY(audio_encoder);
     COPY(tcpip_dst);
-    COPY(camera_id);
-    COPY(camera_ar);
 #undef COPY
 
     return true;
@@ -178,8 +173,6 @@ sc_server_get_codec_name(enum sc_codec codec) {
             return "opus";
         case SC_CODEC_AAC:
             return "aac";
-        case SC_CODEC_FLAC:
-            return "flac";
         case SC_CODEC_RAW:
             return "raw";
         default:
@@ -187,20 +180,6 @@ sc_server_get_codec_name(enum sc_codec codec) {
     }
 }
 
-static const char *
-sc_server_get_camera_facing_name(enum sc_camera_facing camera_facing) {
-    switch (camera_facing) {
-        case SC_CAMERA_FACING_FRONT:
-            return "front";
-        case SC_CAMERA_FACING_BACK:
-            return "back";
-        case SC_CAMERA_FACING_EXTERNAL:
-            return "external";
-        default:
-            return NULL;
-    }
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
                const struct sc_server_params *params) {
@@ -236,13 +215,13 @@ execute_server(struct sc_server *server,
     cmd[count++] = SCRCPY_VERSION;
 
     unsigned dyn_idx = count; // from there, the strings are allocated
-#define ADD_PARAM(fmt, ...) do { \
+#define ADD_PARAM(fmt, ...) { \
         char *p; \
         if (asprintf(&p, fmt, ## __VA_ARGS__) == -1) { \
             goto end; \
         } \
         cmd[count++] = p; \
-    } while(0)
+    }
 
     ADD_PARAM("scid=%08x", params->scid);
     ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
@@ -267,11 +246,8 @@ execute_server(struct sc_server *server,
         ADD_PARAM("audio_codec=%s",
             sc_server_get_codec_name(params->audio_codec));
     }
-    if (params->video_source != SC_VIDEO_SOURCE_DISPLAY) {
+    if (params->audio_source != SC_AUDIO_SOURCE_OUTPUT) {
-        assert(params->video_source == SC_VIDEO_SOURCE_CAMERA);
+        assert(params->audio_source == SC_AUDIO_SOURCE_MIC);
-        ADD_PARAM("video_source=camera");
-    }
-    if (params->audio_source == SC_AUDIO_SOURCE_MIC) {
         ADD_PARAM("audio_source=mic");
     }
     if (params->max_size) {
@@ -297,25 +273,6 @@ execute_server(struct sc_server *server,
     if (params->display_id) {
         ADD_PARAM("display_id=%" PRIu32, params->display_id);
     }
-    if (params->camera_id) {
-        ADD_PARAM("camera_id=%s", params->camera_id);
-    }
-    if (params->camera_size) {
-        ADD_PARAM("camera_size=%s", params->camera_size);
-    }
-    if (params->camera_facing != SC_CAMERA_FACING_ANY) {
-        ADD_PARAM("camera_facing=%s",
-            sc_server_get_camera_facing_name(params->camera_facing));
-    }
-    if (params->camera_ar) {
-        ADD_PARAM("camera_ar=%s", params->camera_ar);
-    }
-    if (params->camera_fps) {
-        ADD_PARAM("camera_fps=%" PRIu16, params->camera_fps);
-    }
-    if (params->camera_high_speed) {
-        ADD_PARAM("camera_high_speed=true");
-    }
     if (params->show_touches) {
         ADD_PARAM("show_touches=true");
     }
@@ -353,18 +310,12 @@ execute_server(struct sc_server *server,
         // By default, power_on is true
         ADD_PARAM("power_on=false");
     }
-    if (params->list & SC_OPTION_LIST_ENCODERS) {
+    if (params->list_encoders) {
         ADD_PARAM("list_encoders=true");
     }
-    if (params->list & SC_OPTION_LIST_DISPLAYS) {
+    if (params->list_displays) {
         ADD_PARAM("list_displays=true");
     }
-    if (params->list & SC_OPTION_LIST_CAMERAS) {
-        ADD_PARAM("list_cameras=true");
-    }
-    if (params->list & SC_OPTION_LIST_CAMERA_SIZES) {
-        ADD_PARAM("list_camera_sizes=true");
-    }
 
 #undef ADD_PARAM
 
@@ -582,8 +533,8 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
                 if (audio_socket == SC_SOCKET_NONE) {
                     goto fail;
                 }
-                bool ok = net_connect_intr(&server->intr, audio_socket,
+                bool ok = net_connect_intr(&server->intr, audio_socket, tunnel_host,
-                                           tunnel_host, tunnel_port);
+                                           tunnel_port);
                 if (!ok) {
                     goto fail;
                 }
@@ -944,7 +895,7 @@ run_server(void *data) {
 
     // If --list-* is passed, then the server just prints the requested data
     // then exits.
-    if (params->list) {
+    if (params->list_encoders || params->list_displays) {
         sc_pid pid = execute_server(server, params);
         if (pid == SC_PROCESS_NONE) {
             goto error_connection_failed;

app/src/server.h

@@ -26,18 +26,12 @@ struct sc_server_params {
     enum sc_log_level log_level;
     enum sc_codec video_codec;
     enum sc_codec audio_codec;
-    enum sc_video_source video_source;
     enum sc_audio_source audio_source;
-    enum sc_camera_facing camera_facing;
     const char *crop;
     const char *video_codec_options;
     const char *audio_codec_options;
     const char *video_encoder;
     const char *audio_encoder;
-    const char *camera_id;
-    const char *camera_size;
-    const char *camera_ar;
-    uint16_t camera_fps;
     struct sc_port_range port_range;
     uint32_t tunnel_host;
     uint16_t tunnel_port;
@@ -62,9 +56,9 @@ struct sc_server_params {
     bool select_tcpip;
     bool cleanup;
     bool power_on;
+    bool list_encoders;
+    bool list_displays;
     bool kill_adb_on_close;
-    bool camera_high_speed;
-    uint8_t list;
 };
 
 struct sc_server {

app/src/usb/aoa_hid.c

@@ -14,10 +14,10 @@
 
 #define DEFAULT_TIMEOUT 1000
 
-#define SC_AOA_EVENT_QUEUE_MAX 64
+#define SC_HID_EVENT_QUEUE_MAX 64
 
 static void
-sc_hid_event_log(uint16_t accessory_id, const struct sc_hid_event *event) {
+sc_hid_event_log(const struct sc_hid_event *event) {
     // HID Event: [00] FF FF FF FF...
     assert(event->size);
     unsigned buffer_size = event->size * 3 + 1;
@@ -27,18 +27,32 @@ sc_hid_event_log(uint16_t accessory_id, const struct sc_hid_event *event) {
         return;
     }
     for (unsigned i = 0; i < event->size; ++i) {
-        snprintf(buffer + i * 3, 4, " %02x", event->data[i]);
+        snprintf(buffer + i * 3, 4, " %02x", event->buffer[i]);
     }
-    LOGV("HID Event: [%d]%s", accessory_id, buffer);
+    LOGV("HID Event: [%d]%s", event->accessory_id, buffer);
     free(buffer);
 }
 
+void
+sc_hid_event_init(struct sc_hid_event *hid_event, uint16_t accessory_id,
+                  unsigned char *buffer, uint16_t buffer_size) {
+    hid_event->accessory_id = accessory_id;
+    hid_event->buffer = buffer;
+    hid_event->size = buffer_size;
+    hid_event->ack_to_wait = SC_SEQUENCE_INVALID;
+}
+
+void
+sc_hid_event_destroy(struct sc_hid_event *hid_event) {
+    free(hid_event->buffer);
+}
+
 bool
 sc_aoa_init(struct sc_aoa *aoa, struct sc_usb *usb,
             struct sc_acksync *acksync) {
     sc_vecdeque_init(&aoa->queue);
 
-    if (!sc_vecdeque_reserve(&aoa->queue, SC_AOA_EVENT_QUEUE_MAX)) {
+    if (!sc_vecdeque_reserve(&aoa->queue, SC_HID_EVENT_QUEUE_MAX)) {
         return false;
     }
 
@@ -62,7 +76,12 @@ sc_aoa_init(struct sc_aoa *aoa, struct sc_usb *usb,
 
 void
 sc_aoa_destroy(struct sc_aoa *aoa) {
-    sc_vecdeque_destroy(&aoa->queue);
+    // Destroy remaining events
+    while (!sc_vecdeque_is_empty(&aoa->queue)) {
+        struct sc_hid_event *event = sc_vecdeque_popref(&aoa->queue);
+        assert(event);
+        sc_hid_event_destroy(event);
+    }
 
     sc_cond_destroy(&aoa->event_cond);
     sc_mutex_destroy(&aoa->mutex);
@@ -78,10 +97,10 @@ sc_aoa_register_hid(struct sc_aoa *aoa, uint16_t accessory_id,
     // index (arg1): total length of the HID report descriptor
     uint16_t value = accessory_id;
     uint16_t index = report_desc_size;
-    unsigned char *data = NULL;
+    unsigned char *buffer = NULL;
     uint16_t length = 0;
     int result = libusb_control_transfer(aoa->usb->handle, request_type,
-                                         request, value, index, data, length,
+                                         request, value, index, buffer, length,
                                          DEFAULT_TIMEOUT);
     if (result < 0) {
         LOGE("REGISTER_HID: libusb error: %s", libusb_strerror(result));
@@ -111,14 +130,14 @@ sc_aoa_set_hid_report_desc(struct sc_aoa *aoa, uint16_t accessory_id,
      * See <https://libusb.sourceforge.io/api-1.0/libusb_packetoverflow.html>
      */
     // value (arg0): accessory assigned ID for the HID device
-    // index (arg1): offset of data in descriptor
+    // index (arg1): offset of data (buffer) in descriptor
     uint16_t value = accessory_id;
     uint16_t index = 0;
     // libusb_control_transfer expects a pointer to non-const
-    unsigned char *data = (unsigned char *) report_desc;
+    unsigned char *buffer = (unsigned char *) report_desc;
     uint16_t length = report_desc_size;
     int result = libusb_control_transfer(aoa->usb->handle, request_type,
-                                         request, value, index, data, length,
+                                         request, value, index, buffer, length,
                                          DEFAULT_TIMEOUT);
     if (result < 0) {
         LOGE("SET_HID_REPORT_DESC: libusb error: %s", libusb_strerror(result));
@@ -150,19 +169,18 @@ sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
 }
 
 static bool
-sc_aoa_send_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
+sc_aoa_send_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event) {
-                      const struct sc_hid_event *event) {
     uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
     uint8_t request = ACCESSORY_SEND_HID_EVENT;
     // <https://source.android.com/devices/accessories/aoa2.html#hid-support>
     // value (arg0): accessory assigned ID for the HID device
     // index (arg1): 0 (unused)
-    uint16_t value = accessory_id;
+    uint16_t value = event->accessory_id;
     uint16_t index = 0;
-    unsigned char *data = (uint8_t *) event->data; // discard const
+    unsigned char *buffer = event->buffer;
     uint16_t length = event->size;
     int result = libusb_control_transfer(aoa->usb->handle, request_type,
-                                         request, value, index, data, length,
+                                         request, value, index, buffer, length,
                                          DEFAULT_TIMEOUT);
     if (result < 0) {
         LOGE("SEND_HID_EVENT: libusb error: %s", libusb_strerror(result));
@@ -174,7 +192,7 @@ sc_aoa_send_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
 }
 
 bool
-sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id) {
+sc_aoa_unregister_hid(struct sc_aoa *aoa, const uint16_t accessory_id) {
     uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
     uint8_t request = ACCESSORY_UNREGISTER_HID;
     // <https://source.android.com/devices/accessories/aoa2.html#hid-support>
@@ -182,10 +200,10 @@ sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id) {
     // index (arg1): 0
     uint16_t value = accessory_id;
     uint16_t index = 0;
-    unsigned char *data = NULL;
+    unsigned char *buffer = NULL;
     uint16_t length = 0;
     int result = libusb_control_transfer(aoa->usb->handle, request_type,
-                                         request, value, index, data, length,
+                                         request, value, index, buffer, length,
                                          DEFAULT_TIMEOUT);
     if (result < 0) {
         LOGE("UNREGISTER_HID: libusb error: %s", libusb_strerror(result));
@@ -197,25 +215,16 @@ sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id) {
 }
 
 bool
-sc_aoa_push_hid_event_with_ack_to_wait(struct sc_aoa *aoa,
+sc_aoa_push_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event) {
-                                       uint16_t accessory_id,
-                                       const struct sc_hid_event *event,
-                                       uint64_t ack_to_wait) {
     if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
-        sc_hid_event_log(accessory_id, event);
+        sc_hid_event_log(event);
     }
 
     sc_mutex_lock(&aoa->mutex);
     bool full = sc_vecdeque_is_full(&aoa->queue);
     if (!full) {
         bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
-
+        sc_vecdeque_push_noresize(&aoa->queue, *event);
-        struct sc_aoa_event *aoa_event =
-            sc_vecdeque_push_hole_noresize(&aoa->queue);
-        aoa_event->hid = *event;
-        aoa_event->accessory_id = accessory_id;
-        aoa_event->ack_to_wait = ack_to_wait;
-
         if (was_empty) {
             sc_cond_signal(&aoa->event_cond);
         }
@@ -243,7 +252,7 @@ run_aoa_thread(void *data) {
         }
 
         assert(!sc_vecdeque_is_empty(&aoa->queue));
-        struct sc_aoa_event event = sc_vecdeque_pop(&aoa->queue);
+        struct sc_hid_event event = sc_vecdeque_pop(&aoa->queue);
         uint64_t ack_to_wait = event.ack_to_wait;
         sc_mutex_unlock(&aoa->mutex);
 
@@ -262,14 +271,17 @@ run_aoa_thread(void *data) {
 
             if (result == SC_ACKSYNC_WAIT_TIMEOUT) {
                 LOGW("Ack not received after 500ms, discarding HID event");
+                sc_hid_event_destroy(&event);
                 continue;
             } else if (result == SC_ACKSYNC_WAIT_INTR) {
                 // stopped
+                sc_hid_event_destroy(&event);
                 break;
             }
         }
 
-        bool ok = sc_aoa_send_hid_event(aoa, event.accessory_id, &event.hid);
+        bool ok = sc_aoa_send_hid_event(aoa, &event);
+        sc_hid_event_destroy(&event);
         if (!ok) {
             LOGW("Could not send HID event to USB device");
         }

app/src/usb/aoa_hid.h

@@ -6,22 +6,28 @@
 
 #include <libusb-1.0/libusb.h>
 
-#include "hid/hid_event.h"
 #include "usb.h"
 #include "util/acksync.h"
 #include "util/thread.h"
 #include "util/tick.h"
 #include "util/vecdeque.h"
 
-#define SC_HID_MAX_SIZE 8
+struct sc_hid_event {
-
-struct sc_aoa_event {
-    struct sc_hid_event hid;
     uint16_t accessory_id;
+    unsigned char *buffer;
+    uint16_t size;
     uint64_t ack_to_wait;
 };
 
-struct sc_aoa_event_queue SC_VECDEQUE(struct sc_aoa_event);
+// Takes ownership of buffer
+void
+sc_hid_event_init(struct sc_hid_event *hid_event, uint16_t accessory_id,
+                  unsigned char *buffer, uint16_t buffer_size);
+
+void
+sc_hid_event_destroy(struct sc_hid_event *hid_event);
+
+struct sc_hid_event_queue SC_VECDEQUE(struct sc_hid_event);
 
 struct sc_aoa {
     struct sc_usb *usb;
@@ -29,7 +35,7 @@ struct sc_aoa {
     sc_mutex mutex;
     sc_cond event_cond;
     bool stopped;
-    struct sc_aoa_event_queue queue;
+    struct sc_hid_event_queue queue;
 
     struct sc_acksync *acksync;
 };
@@ -57,16 +63,6 @@ bool
 sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id);
 
 bool
-sc_aoa_push_hid_event_with_ack_to_wait(struct sc_aoa *aoa,
+sc_aoa_push_hid_event(struct sc_aoa *aoa, const struct sc_hid_event *event);
-                                       uint16_t accessory_id,
-                                       const struct sc_hid_event *event,
-                                       uint64_t ack_to_wait);
-
-static inline bool
-sc_aoa_push_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
-                      const struct sc_hid_event *event) {
-    return sc_aoa_push_hid_event_with_ack_to_wait(aoa, accessory_id, event,
-                                                  SC_SEQUENCE_INVALID);
-}
 
 #endif

app/src/usb/hid_keyboard.c

@@ -1,34 +1,39 @@
 #include "hid_keyboard.h"
 
-#include <string.h>
+#include <assert.h>
 
+#include "input_events.h"
 #include "util/log.h"
 
-#define SC_HID_MOD_NONE 0x00
+/** Downcast key processor to hid_keyboard */
-#define SC_HID_MOD_LEFT_CONTROL (1 << 0)
+#define DOWNCAST(KP) container_of(KP, struct sc_hid_keyboard, key_processor)
-#define SC_HID_MOD_LEFT_SHIFT (1 << 1)
-#define SC_HID_MOD_LEFT_ALT (1 << 2)
-#define SC_HID_MOD_LEFT_GUI (1 << 3)
-#define SC_HID_MOD_RIGHT_CONTROL (1 << 4)
-#define SC_HID_MOD_RIGHT_SHIFT (1 << 5)
-#define SC_HID_MOD_RIGHT_ALT (1 << 6)
-#define SC_HID_MOD_RIGHT_GUI (1 << 7)
 
-#define SC_HID_KEYBOARD_INDEX_MODS 0
+#define HID_KEYBOARD_ACCESSORY_ID 1
-#define SC_HID_KEYBOARD_INDEX_KEYS 2
+
+#define HID_MODIFIER_NONE 0x00
+#define HID_MODIFIER_LEFT_CONTROL (1 << 0)
+#define HID_MODIFIER_LEFT_SHIFT (1 << 1)
+#define HID_MODIFIER_LEFT_ALT (1 << 2)
+#define HID_MODIFIER_LEFT_GUI (1 << 3)
+#define HID_MODIFIER_RIGHT_CONTROL (1 << 4)
+#define HID_MODIFIER_RIGHT_SHIFT (1 << 5)
+#define HID_MODIFIER_RIGHT_ALT (1 << 6)
+#define HID_MODIFIER_RIGHT_GUI (1 << 7)
+
+#define HID_KEYBOARD_INDEX_MODIFIER 0
+#define HID_KEYBOARD_INDEX_KEYS 2
 
 // USB HID protocol says 6 keys in an event is the requirement for BIOS
 // keyboard support, though OS could support more keys via modifying the report
 // desc. 6 should be enough for scrcpy.
-#define SC_HID_KEYBOARD_MAX_KEYS 6
+#define HID_KEYBOARD_MAX_KEYS 6
-#define SC_HID_KEYBOARD_EVENT_SIZE \
+#define HID_KEYBOARD_EVENT_SIZE (2 + HID_KEYBOARD_MAX_KEYS)
-    (SC_HID_KEYBOARD_INDEX_KEYS + SC_HID_KEYBOARD_MAX_KEYS)
 
-#define SC_HID_RESERVED 0x00
+#define HID_RESERVED 0x00
-#define SC_HID_ERROR_ROLL_OVER 0x01
+#define HID_ERROR_ROLL_OVER 0x01
 
 /**
- * For HID, only report descriptor is needed.
+ * For HID over AOAv2, only report descriptor is needed.
  *
  * The specification is available here:
  * <https://www.usb.org/sites/default/files/hid1_11.pdf>
@@ -47,7 +52,7 @@
  *
  * (change vid:pid' to your device's vendor ID and product ID).
  */
-const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
+static const unsigned char keyboard_report_desc[]  = {
     // Usage Page (Generic Desktop)
     0x05, 0x01,
     // Usage (Keyboard)
@@ -113,7 +118,7 @@ const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
     // Report Size (8)
     0x75, 0x08,
     // Report Count (6)
-    0x95, SC_HID_KEYBOARD_MAX_KEYS,
+    0x95, HID_KEYBOARD_MAX_KEYS,
     // Input (Data, Array): Keys
     0x81, 0x00,
 
@@ -121,9 +126,6 @@ const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
     0xC0
 };
 
-const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN =
-    sizeof(SC_HID_KEYBOARD_REPORT_DESC);
-
 /**
  * A keyboard HID event is 8 bytes long:
  *
@@ -198,50 +200,51 @@ const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN =
  *                  +---------------+
  */
 
-static void
+static unsigned char
-sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
+sdl_keymod_to_hid_modifiers(uint16_t mod) {
-    hid_event->size = SC_HID_KEYBOARD_EVENT_SIZE;
+    unsigned char modifiers = HID_MODIFIER_NONE;
-
-    uint8_t *data = hid_event->data;
-
-    data[SC_HID_KEYBOARD_INDEX_MODS] = SC_HID_MOD_NONE;
-    data[1] = SC_HID_RESERVED;
-    memset(&data[SC_HID_KEYBOARD_INDEX_KEYS], 0, SC_HID_KEYBOARD_MAX_KEYS);
-}
-
-static uint16_t
-sc_hid_mod_from_sdl_keymod(uint16_t mod) {
-    uint16_t mods = SC_HID_MOD_NONE;
     if (mod & SC_MOD_LCTRL) {
-        mods |= SC_HID_MOD_LEFT_CONTROL;
+        modifiers |= HID_MODIFIER_LEFT_CONTROL;
     }
     if (mod & SC_MOD_LSHIFT) {
-        mods |= SC_HID_MOD_LEFT_SHIFT;
+        modifiers |= HID_MODIFIER_LEFT_SHIFT;
     }
     if (mod & SC_MOD_LALT) {
-        mods |= SC_HID_MOD_LEFT_ALT;
+        modifiers |= HID_MODIFIER_LEFT_ALT;
     }
     if (mod & SC_MOD_LGUI) {
-        mods |= SC_HID_MOD_LEFT_GUI;
+        modifiers |= HID_MODIFIER_LEFT_GUI;
     }
     if (mod & SC_MOD_RCTRL) {
-        mods |= SC_HID_MOD_RIGHT_CONTROL;
+        modifiers |= HID_MODIFIER_RIGHT_CONTROL;
     }
     if (mod & SC_MOD_RSHIFT) {
-        mods |= SC_HID_MOD_RIGHT_SHIFT;
+        modifiers |= HID_MODIFIER_RIGHT_SHIFT;
     }
     if (mod & SC_MOD_RALT) {
-        mods |= SC_HID_MOD_RIGHT_ALT;
+        modifiers |= HID_MODIFIER_RIGHT_ALT;
     }
     if (mod & SC_MOD_RGUI) {
-        mods |= SC_HID_MOD_RIGHT_GUI;
+        modifiers |= HID_MODIFIER_RIGHT_GUI;
     }
-    return mods;
+    return modifiers;
 }
 
-void
+static bool
-sc_hid_keyboard_init(struct sc_hid_keyboard *hid) {
+sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
-    memset(hid->keys, false, SC_HID_KEYBOARD_KEYS);
+    unsigned char *buffer = malloc(HID_KEYBOARD_EVENT_SIZE);
+    if (!buffer) {
+        LOG_OOM();
+        return false;
+    }
+
+    buffer[HID_KEYBOARD_INDEX_MODIFIER] = HID_MODIFIER_NONE;
+    buffer[1] = HID_RESERVED;
+    memset(&buffer[HID_KEYBOARD_INDEX_KEYS], 0, HID_KEYBOARD_MAX_KEYS);
+
+    sc_hid_event_init(hid_event, HID_KEYBOARD_ACCESSORY_ID, buffer,
+                      HID_KEYBOARD_EVENT_SIZE);
+    return true;
 }
 
 static inline bool
@@ -249,10 +252,10 @@ scancode_is_modifier(enum sc_scancode scancode) {
     return scancode >= SC_SCANCODE_LCTRL && scancode <= SC_SCANCODE_RGUI;
 }
 
-bool
+static bool
-sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
+convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
-                               struct sc_hid_event *hid_event,
+                           struct sc_hid_event *hid_event,
-                               const struct sc_key_event *event) {
+                           const struct sc_key_event *event) {
     enum sc_scancode scancode = event->scancode;
     assert(scancode >= 0);
 
@@ -264,37 +267,39 @@ sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
         return false;
     }
 
-    sc_hid_keyboard_event_init(hid_event);
+    if (!sc_hid_keyboard_event_init(hid_event)) {
+        LOGW("Could not initialize HID keyboard event");
+        return false;
+    }
 
-    uint16_t mods = sc_hid_mod_from_sdl_keymod(event->mods_state);
+    unsigned char modifiers = sdl_keymod_to_hid_modifiers(event->mods_state);
 
     if (scancode < SC_HID_KEYBOARD_KEYS) {
         // Pressed is true and released is false
-        hid->keys[scancode] = (event->action == SC_ACTION_DOWN);
+        kb->keys[scancode] = (event->action == SC_ACTION_DOWN);
         LOGV("keys[%02x] = %s", scancode,
-             hid->keys[scancode] ? "true" : "false");
+             kb->keys[scancode] ? "true" : "false");
     }
 
-    hid_event->data[SC_HID_KEYBOARD_INDEX_MODS] = mods;
+    hid_event->buffer[HID_KEYBOARD_INDEX_MODIFIER] = modifiers;
 
-    uint8_t *keys_data = &hid_event->data[SC_HID_KEYBOARD_INDEX_KEYS];
+    unsigned char *keys_buffer = &hid_event->buffer[HID_KEYBOARD_INDEX_KEYS];
     // Re-calculate pressed keys every time
     int keys_pressed_count = 0;
     for (int i = 0; i < SC_HID_KEYBOARD_KEYS; ++i) {
-        if (hid->keys[i]) {
+        if (kb->keys[i]) {
             // USB HID protocol says that if keys exceeds report count, a
             // phantom state should be reported
-            if (keys_pressed_count >= SC_HID_KEYBOARD_MAX_KEYS) {
+            if (keys_pressed_count >= HID_KEYBOARD_MAX_KEYS) {
                 // Phantom state:
                 //  - Modifiers
                 //  - Reserved
                 //  - ErrorRollOver * HID_MAX_KEYS
-                memset(keys_data, SC_HID_ERROR_ROLL_OVER,
+                memset(keys_buffer, HID_ERROR_ROLL_OVER, HID_KEYBOARD_MAX_KEYS);
-                       SC_HID_KEYBOARD_MAX_KEYS);
                 goto end;
             }
 
-            keys_data[keys_pressed_count] = i;
+            keys_buffer[keys_pressed_count] = i;
             ++keys_pressed_count;
         }
     }
@@ -302,30 +307,124 @@ sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
 end:
     LOGV("hid keyboard: key %-4s scancode=%02x (%u) mod=%02x",
          event->action == SC_ACTION_DOWN ? "down" : "up", event->scancode,
-         event->scancode, mods);
+         event->scancode, modifiers);
+
+    return true;
+}
+
+
+static bool
+push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t mods_state) {
+    bool capslock = mods_state & SC_MOD_CAPS;
+    bool numlock = mods_state & SC_MOD_NUM;
+    if (!capslock && !numlock) {
+        // Nothing to do
+        return true;
+    }
+
+    struct sc_hid_event hid_event;
+    if (!sc_hid_keyboard_event_init(&hid_event)) {
+        LOGW("Could not initialize HID keyboard event");
+        return false;
+    }
+
+    unsigned i = 0;
+    if (capslock) {
+        hid_event.buffer[HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
+        ++i;
+    }
+    if (numlock) {
+        hid_event.buffer[HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_NUMLOCK;
+        ++i;
+    }
+
+    if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
+        sc_hid_event_destroy(&hid_event);
+        LOGW("Could not request HID event (mod lock state)");
+        return false;
+    }
+
+    LOGD("HID keyboard state synchronized");
+
+    return true;
+}
+
+static void
+sc_key_processor_process_key(struct sc_key_processor *kp,
+                             const struct sc_key_event *event,
+                             uint64_t ack_to_wait) {
+    if (event->repeat) {
+        // In USB HID protocol, key repeat is handled by the host (Android), so
+        // just ignore key repeat here.
+        return;
+    }
+
+    struct sc_hid_keyboard *kb = DOWNCAST(kp);
+
+    struct sc_hid_event hid_event;
+    // Not all keys are supported, just ignore unsupported keys
+    if (convert_hid_keyboard_event(kb, &hid_event, event)) {
+        if (!kb->mod_lock_synchronized) {
+            // Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
+            // keyboard state
+            if (push_mod_lock_state(kb, event->mods_state)) {
+                kb->mod_lock_synchronized = true;
+            }
+        }
+
+        if (ack_to_wait) {
+            // Ctrl+v is pressed, so clipboard synchronization has been
+            // requested. Wait until clipboard synchronization is acknowledged
+            // by the server, otherwise it could paste the old clipboard
+            // content.
+            hid_event.ack_to_wait = ack_to_wait;
+        }
+
+        if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
+            sc_hid_event_destroy(&hid_event);
+            LOGW("Could not request HID event (key)");
+        }
+    }
+}
+
+bool
+sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa) {
+    kb->aoa = aoa;
+
+    bool ok = sc_aoa_setup_hid(aoa, HID_KEYBOARD_ACCESSORY_ID,
+                               keyboard_report_desc,
+                               ARRAY_LEN(keyboard_report_desc));
+    if (!ok) {
+        LOGW("Register HID keyboard failed");
+        return false;
+    }
+
+    // Reset all states
+    memset(kb->keys, false, SC_HID_KEYBOARD_KEYS);
+
+    kb->mod_lock_synchronized = false;
+
+    static const struct sc_key_processor_ops ops = {
+        .process_key = sc_key_processor_process_key,
+        // Never forward text input via HID (all the keys are injected
+        // separately)
+        .process_text = NULL,
+    };
+
+    // Clipboard synchronization is requested over the control socket, while HID
+    // events are sent over AOA, so it must wait for clipboard synchronization
+    // to be acknowledged by the device before injecting Ctrl+v.
+    kb->key_processor.async_paste = true;
+    kb->key_processor.ops = &ops;
 
     return true;
 }
 
 void
-sc_hid_keyboard_event_from_mods(struct sc_hid_event *event,
+sc_hid_keyboard_destroy(struct sc_hid_keyboard *kb) {
-                                uint16_t mods_state) {
+    // Unregister HID keyboard so the soft keyboard shows again on Android
-    bool capslock = mods_state & SC_MOD_CAPS;
+    bool ok = sc_aoa_unregister_hid(kb->aoa, HID_KEYBOARD_ACCESSORY_ID);
-    bool numlock = mods_state & SC_MOD_NUM;
+    if (!ok) {
-    if (!capslock && !numlock) {
+        LOGW("Could not unregister HID keyboard");
-        // Nothing to do
-        return;
-    }
-
-    sc_hid_keyboard_event_init(event);
-
-    unsigned i = 0;
-    if (capslock) {
-        event->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
-        ++i;
-    }
-    if (numlock) {
-        event->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_NUMLOCK;
-        ++i;
     }
 }

app/src/usb/hid_keyboard.h

@@ -5,8 +5,8 @@
 
 #include <stdbool.h>
 
-#include "hid/hid_event.h"
+#include "aoa_hid.h"
-#include "input_events.h"
+#include "trait/key_processor.h"
 
 // See "SDL2/SDL_scancode.h".
 // Maybe SDL_Keycode is used by most people, but SDL_Scancode is taken from USB
@@ -14,9 +14,6 @@
 // 0x65 is Application, typically AT-101 Keyboard ends here.
 #define SC_HID_KEYBOARD_KEYS 0x66
 
-extern const uint8_t SC_HID_KEYBOARD_REPORT_DESC[];
-extern const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN;
-
 /**
  * HID keyboard events are sequence-based, every time keyboard state changes
  * it sends an array of currently pressed keys, the host is responsible for
@@ -30,19 +27,18 @@ extern const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN;
  * phantom state.
  */
 struct sc_hid_keyboard {
+    struct sc_key_processor key_processor; // key processor trait
+
+    struct sc_aoa *aoa;
     bool keys[SC_HID_KEYBOARD_KEYS];
+
+    bool mod_lock_synchronized;
 };
 
-void
-sc_hid_keyboard_init(struct sc_hid_keyboard *hid);
-
 bool
-sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
+sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa);
-                               struct sc_hid_event *hid_event,
-                               const struct sc_key_event *event);
 
 void
-sc_hid_keyboard_event_from_mods(struct sc_hid_event *event,
+sc_hid_keyboard_destroy(struct sc_hid_keyboard *kb);
-                                uint16_t mods_state);
 
 #endif

app/src/usb/hid_mouse.c

@@ -0,0 +1,267 @@
+#include "hid_mouse.h"
+
+#include <assert.h>
+
+#include "input_events.h"
+#include "util/log.h"
+
+/** Downcast mouse processor to hid_mouse */
+#define DOWNCAST(MP) container_of(MP, struct sc_hid_mouse, mouse_processor)
+
+#define HID_MOUSE_ACCESSORY_ID 2
+
+// 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position
+#define HID_MOUSE_EVENT_SIZE 4
+
+/**
+ * Mouse descriptor from the specification:
+ * <https://www.usb.org/sites/default/files/hid1_11.pdf>
+ *
+ * Appendix E (p71): §E.10 Report Descriptor (Mouse)
+ *
+ * The usage tags (like Wheel) are listed in "HID Usage Tables":
+ * <https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf>
+ * §4 Generic Desktop Page (0x01) (p26)
+ */
+static const unsigned char mouse_report_desc[]  = {
+    // Usage Page (Generic Desktop)
+    0x05, 0x01,
+    // Usage (Mouse)
+    0x09, 0x02,
+
+    // Collection (Application)
+    0xA1, 0x01,
+
+    // Usage (Pointer)
+    0x09, 0x01,
+
+    // Collection (Physical)
+    0xA1, 0x00,
+
+    // Usage Page (Buttons)
+    0x05, 0x09,
+
+    // Usage Minimum (1)
+    0x19, 0x01,
+     // Usage Maximum (5)
+    0x29, 0x05,
+    // Logical Minimum (0)
+    0x15, 0x00,
+    // Logical Maximum (1)
+    0x25, 0x01,
+    // Report Count (5)
+    0x95, 0x05,
+    // Report Size (1)
+    0x75, 0x01,
+    // Input (Data, Variable, Absolute): 5 buttons bits
+    0x81, 0x02,
+
+    // Report Count (1)
+    0x95, 0x01,
+    // Report Size (3)
+    0x75, 0x03,
+    // Input (Constant): 3 bits padding
+    0x81, 0x01,
+
+    // Usage Page (Generic Desktop)
+    0x05, 0x01,
+    // Usage (X)
+    0x09, 0x30,
+    // Usage (Y)
+    0x09, 0x31,
+    // Usage (Wheel)
+    0x09, 0x38,
+    // Local Minimum (-127)
+    0x15, 0x81,
+    // Local Maximum (127)
+    0x25, 0x7F,
+    // Report Size (8)
+    0x75, 0x08,
+    // Report Count (3)
+    0x95, 0x03,
+    // Input (Data, Variable, Relative): 3 position bytes (X, Y, Wheel)
+    0x81, 0x06,
+
+    // End Collection
+    0xC0,
+
+    // End Collection
+    0xC0,
+};
+
+/**
+ * A mouse HID event is 3 bytes long:
+ *
+ *  - byte 0: buttons state
+ *  - byte 1: relative x motion (signed byte from -127 to 127)
+ *  - byte 2: relative y motion (signed byte from -127 to 127)
+ *
+ *                   7 6 5 4 3 2 1 0
+ *                  +---------------+
+ *         byte 0:  |0 0 0 . . . . .| buttons state
+ *                  +---------------+
+ *                         ^ ^ ^ ^ ^
+ *                         | | | | `- left button
+ *                         | | | `--- right button
+ *                         | | `----- middle button
+ *                         | `------- button 4
+ *                         `--------- button 5
+ *
+ *                  +---------------+
+ *         byte 1:  |. . . . . . . .| relative x motion
+ *                  +---------------+
+ *         byte 2:  |. . . . . . . .| relative y motion
+ *                  +---------------+
+ *         byte 3:  |. . . . . . . .| wheel motion (-1, 0 or 1)
+ *                  +---------------+
+ *
+ * As an example, here is the report for a motion of (x=5, y=-4) with left
+ * button pressed:
+ *
+ *                  +---------------+
+ *                  |0 0 0 0 0 0 0 1| left button pressed
+ *                  +---------------+
+ *                  |0 0 0 0 0 1 0 1| horizontal motion (x = 5)
+ *                  +---------------+
+ *                  |1 1 1 1 1 1 0 0| relative y motion (y = -4)
+ *                  +---------------+
+ *                  |0 0 0 0 0 0 0 0| wheel motion
+ *                  +---------------+
+ */
+
+static bool
+sc_hid_mouse_event_init(struct sc_hid_event *hid_event) {
+    unsigned char *buffer = calloc(1, HID_MOUSE_EVENT_SIZE);
+    if (!buffer) {
+        LOG_OOM();
+        return false;
+    }
+
+    sc_hid_event_init(hid_event, HID_MOUSE_ACCESSORY_ID, buffer,
+                      HID_MOUSE_EVENT_SIZE);
+    return true;
+}
+
+static unsigned char
+buttons_state_to_hid_buttons(uint8_t buttons_state) {
+    unsigned char c = 0;
+    if (buttons_state & SC_MOUSE_BUTTON_LEFT) {
+        c |= 1 << 0;
+    }
+    if (buttons_state & SC_MOUSE_BUTTON_RIGHT) {
+        c |= 1 << 1;
+    }
+    if (buttons_state & SC_MOUSE_BUTTON_MIDDLE) {
+        c |= 1 << 2;
+    }
+    if (buttons_state & SC_MOUSE_BUTTON_X1) {
+        c |= 1 << 3;
+    }
+    if (buttons_state & SC_MOUSE_BUTTON_X2) {
+        c |= 1 << 4;
+    }
+    return c;
+}
+
+static void
+sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
+                                    const struct sc_mouse_motion_event *event) {
+    struct sc_hid_mouse *mouse = DOWNCAST(mp);
+
+    struct sc_hid_event hid_event;
+    if (!sc_hid_mouse_event_init(&hid_event)) {
+        return;
+    }
+
+    unsigned char *buffer = hid_event.buffer;
+    buffer[0] = buttons_state_to_hid_buttons(event->buttons_state);
+    buffer[1] = CLAMP(event->xrel, -127, 127);
+    buffer[2] = CLAMP(event->yrel, -127, 127);
+    buffer[3] = 0; // wheel coordinates only used for scrolling
+
+    if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
+        sc_hid_event_destroy(&hid_event);
+        LOGW("Could not request HID event (mouse motion)");
+    }
+}
+
+static void
+sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
+                                   const struct sc_mouse_click_event *event) {
+    struct sc_hid_mouse *mouse = DOWNCAST(mp);
+
+    struct sc_hid_event hid_event;
+    if (!sc_hid_mouse_event_init(&hid_event)) {
+        return;
+    }
+
+    unsigned char *buffer = hid_event.buffer;
+    buffer[0] = buttons_state_to_hid_buttons(event->buttons_state);
+    buffer[1] = 0; // no x motion
+    buffer[2] = 0; // no y motion
+    buffer[3] = 0; // wheel coordinates only used for scrolling
+
+    if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
+        sc_hid_event_destroy(&hid_event);
+        LOGW("Could not request HID event (mouse click)");
+    }
+}
+
+static void
+sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
+                                    const struct sc_mouse_scroll_event *event) {
+    struct sc_hid_mouse *mouse = DOWNCAST(mp);
+
+    struct sc_hid_event hid_event;
+    if (!sc_hid_mouse_event_init(&hid_event)) {
+        return;
+    }
+
+    unsigned char *buffer = hid_event.buffer;
+    buffer[0] = 0; // buttons state irrelevant (and unknown)
+    buffer[1] = 0; // no x motion
+    buffer[2] = 0; // no y motion
+    // In practice, vscroll is always -1, 0 or 1, but in theory other values
+    // are possible
+    buffer[3] = CLAMP(event->vscroll, -127, 127);
+    // Horizontal scrolling ignored
+
+    if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
+        sc_hid_event_destroy(&hid_event);
+        LOGW("Could not request HID event (mouse scroll)");
+    }
+}
+
+bool
+sc_hid_mouse_init(struct sc_hid_mouse *mouse, struct sc_aoa *aoa) {
+    mouse->aoa = aoa;
+
+    bool ok = sc_aoa_setup_hid(aoa, HID_MOUSE_ACCESSORY_ID, mouse_report_desc,
+                               ARRAY_LEN(mouse_report_desc));
+    if (!ok) {
+        LOGW("Register HID mouse failed");
+        return false;
+    }
+
+    static const struct sc_mouse_processor_ops ops = {
+        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
+        .process_mouse_click = sc_mouse_processor_process_mouse_click,
+        .process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
+        // Touch events not supported (coordinates are not relative)
+        .process_touch = NULL,
+    };
+
+    mouse->mouse_processor.ops = &ops;
+
+    mouse->mouse_processor.relative_mode = true;
+
+    return true;
+}
+
+void
+sc_hid_mouse_destroy(struct sc_hid_mouse *mouse) {
+    bool ok = sc_aoa_unregister_hid(mouse->aoa, HID_MOUSE_ACCESSORY_ID);
+    if (!ok) {
+        LOGW("Could not unregister HID mouse");
+    }
+}

app/src/usb/hid_mouse.h

@@ -1,5 +1,5 @@
-#ifndef SC_MOUSE_AOA_H
+#ifndef SC_HID_MOUSE_H
-#define SC_MOUSE_AOA_H
+#define SC_HID_MOUSE_H
 
 #include "common.h"
 
@@ -8,16 +8,16 @@
 #include "aoa_hid.h"
 #include "trait/mouse_processor.h"
 
-struct sc_mouse_aoa {
+struct sc_hid_mouse {
     struct sc_mouse_processor mouse_processor; // mouse processor trait
 
     struct sc_aoa *aoa;
 };
 
 bool
-sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa);
+sc_hid_mouse_init(struct sc_hid_mouse *mouse, struct sc_aoa *aoa);
 
 void
-sc_mouse_aoa_destroy(struct sc_mouse_aoa *mouse);
+sc_hid_mouse_destroy(struct sc_hid_mouse *mouse);
 
 #endif

app/src/usb/keyboard_aoa.c

@@ -1,106 +0,0 @@
-#include "keyboard_aoa.h"
-
-#include <assert.h>
-
-#include "input_events.h"
-#include "util/log.h"
-
-/** Downcast key processor to keyboard_aoa */
-#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_aoa, key_processor)
-
-#define HID_KEYBOARD_ACCESSORY_ID 1
-
-static bool
-push_mod_lock_state(struct sc_keyboard_aoa *kb, uint16_t mods_state) {
-    struct sc_hid_event hid_event;
-    sc_hid_keyboard_event_from_mods(&hid_event, mods_state);
-
-    if (!sc_aoa_push_hid_event(kb->aoa, HID_KEYBOARD_ACCESSORY_ID,
-                               &hid_event)) {
-        LOGW("Could not request HID event (mod lock state)");
-        return false;
-    }
-
-    LOGD("HID keyboard state synchronized");
-
-    return true;
-}
-
-static void
-sc_key_processor_process_key(struct sc_key_processor *kp,
-                             const struct sc_key_event *event,
-                             uint64_t ack_to_wait) {
-    if (event->repeat) {
-        // In USB HID protocol, key repeat is handled by the host (Android), so
-        // just ignore key repeat here.
-        return;
-    }
-
-    struct sc_keyboard_aoa *kb = DOWNCAST(kp);
-
-    struct sc_hid_event hid_event;
-
-    // Not all keys are supported, just ignore unsupported keys
-    if (sc_hid_keyboard_event_from_key(&kb->hid, &hid_event, event)) {
-        if (!kb->mod_lock_synchronized) {
-            // Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
-            // keyboard state
-            if (push_mod_lock_state(kb, event->mods_state)) {
-                kb->mod_lock_synchronized = true;
-            }
-        }
-
-        // If ack_to_wait is != SC_SEQUENCE_INVALID, then Ctrl+v is pressed, so
-        // clipboard synchronization has been requested. Wait until clipboard
-        // synchronization is acknowledged by the server, otherwise it could
-        // paste the old clipboard content.
-
-        if (!sc_aoa_push_hid_event_with_ack_to_wait(kb->aoa,
-                                                    HID_KEYBOARD_ACCESSORY_ID,
-                                                    &hid_event,
-                                                    ack_to_wait)) {
-            LOGW("Could not request HID event (key)");
-        }
-    }
-}
-
-bool
-sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa) {
-    kb->aoa = aoa;
-
-    bool ok = sc_aoa_setup_hid(aoa, HID_KEYBOARD_ACCESSORY_ID,
-                               SC_HID_KEYBOARD_REPORT_DESC,
-                               SC_HID_KEYBOARD_REPORT_DESC_LEN);
-    if (!ok) {
-        LOGW("Register HID keyboard failed");
-        return false;
-    }
-
-    sc_hid_keyboard_init(&kb->hid);
-
-    kb->mod_lock_synchronized = false;
-
-    static const struct sc_key_processor_ops ops = {
-        .process_key = sc_key_processor_process_key,
-        // Never forward text input via HID (all the keys are injected
-        // separately)
-        .process_text = NULL,
-    };
-
-    // Clipboard synchronization is requested over the control socket, while HID
-    // events are sent over AOA, so it must wait for clipboard synchronization
-    // to be acknowledged by the device before injecting Ctrl+v.
-    kb->key_processor.async_paste = true;
-    kb->key_processor.ops = &ops;
-
-    return true;
-}
-
-void
-sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb) {
-    // Unregister HID keyboard so the soft keyboard shows again on Android
-    bool ok = sc_aoa_unregister_hid(kb->aoa, HID_KEYBOARD_ACCESSORY_ID);
-    if (!ok) {
-        LOGW("Could not unregister HID keyboard");
-    }
-}

app/src/usb/keyboard_aoa.h

@@ -1,27 +0,0 @@
-#ifndef SC_KEYBOARD_AOA_H
-#define SC_KEYBOARD_AOA_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include "aoa_hid.h"
-#include "hid/hid_keyboard.h"
-#include "trait/key_processor.h"
-
-struct sc_keyboard_aoa {
-    struct sc_key_processor key_processor; // key processor trait
-
-    struct sc_hid_keyboard hid;
-    struct sc_aoa *aoa;
-
-    bool mod_lock_synchronized;
-};
-
-bool
-sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa);
-
-void
-sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb);
-
-#endif

app/src/usb/mouse_aoa.c

@@ -1,89 +0,0 @@
-#include "mouse_aoa.h"
-
-#include <assert.h>
-
-#include "hid/hid_mouse.h"
-#include "input_events.h"
-#include "util/log.h"
-
-/** Downcast mouse processor to mouse_aoa */
-#define DOWNCAST(MP) container_of(MP, struct sc_mouse_aoa, mouse_processor)
-
-#define HID_MOUSE_ACCESSORY_ID 2
-
-static void
-sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
-                                    const struct sc_mouse_motion_event *event) {
-    struct sc_mouse_aoa *mouse = DOWNCAST(mp);
-
-    struct sc_hid_event hid_event;
-    sc_hid_mouse_event_from_motion(&hid_event, event);
-
-    if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
-                               &hid_event)) {
-        LOGW("Could not request HID event (mouse motion)");
-    }
-}
-
-static void
-sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
-                                   const struct sc_mouse_click_event *event) {
-    struct sc_mouse_aoa *mouse = DOWNCAST(mp);
-
-    struct sc_hid_event hid_event;
-    sc_hid_mouse_event_from_click(&hid_event, event);
-
-    if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
-                               &hid_event)) {
-        LOGW("Could not request HID event (mouse click)");
-    }
-}
-
-static void
-sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
-                                    const struct sc_mouse_scroll_event *event) {
-    struct sc_mouse_aoa *mouse = DOWNCAST(mp);
-
-    struct sc_hid_event hid_event;
-    sc_hid_mouse_event_from_scroll(&hid_event, event);
-
-    if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
-                               &hid_event)) {
-        LOGW("Could not request HID event (mouse scroll)");
-    }
-}
-
-bool
-sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa) {
-    mouse->aoa = aoa;
-
-    bool ok = sc_aoa_setup_hid(aoa, HID_MOUSE_ACCESSORY_ID,
-                               SC_HID_MOUSE_REPORT_DESC,
-                               SC_HID_MOUSE_REPORT_DESC_LEN);
-    if (!ok) {
-        LOGW("Register HID mouse failed");
-        return false;
-    }
-
-    static const struct sc_mouse_processor_ops ops = {
-        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
-        .process_mouse_click = sc_mouse_processor_process_mouse_click,
-        .process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
-        // Touch events not supported (coordinates are not relative)
-        .process_touch = NULL,
-    };
-
-    mouse->mouse_processor.ops = &ops;
-
-    mouse->mouse_processor.relative_mode = true;
-
-    return true;
-}
-
-void
-sc_mouse_aoa_destroy(struct sc_mouse_aoa *mouse) {
-    bool ok = sc_aoa_unregister_hid(mouse->aoa, HID_MOUSE_ACCESSORY_ID);
-    if (!ok) {
-        LOGW("Could not unregister HID mouse");
-    }
-}

app/src/usb/scrcpy_otg.c

@@ -10,8 +10,8 @@
 struct scrcpy_otg {
     struct sc_usb usb;
     struct sc_aoa aoa;
-    struct sc_keyboard_aoa keyboard;
+    struct sc_hid_keyboard keyboard;
-    struct sc_mouse_aoa mouse;
+    struct sc_hid_mouse mouse;
 
     struct sc_screen_otg screen_otg;
 };
@@ -62,7 +62,7 @@ scrcpy_otg(struct scrcpy_options *options) {
     // Minimal SDL initialization
     if (SDL_Init(SDL_INIT_EVENTS)) {
         LOGE("Could not initialize SDL: %s", SDL_GetError());
-        return SCRCPY_EXIT_FAILURE;
+        return false;
     }
 
     atexit(SDL_Quit);
@@ -73,8 +73,8 @@ scrcpy_otg(struct scrcpy_options *options) {
 
     enum scrcpy_exit_code ret = SCRCPY_EXIT_FAILURE;
 
-    struct sc_keyboard_aoa *keyboard = NULL;
+    struct sc_hid_keyboard *keyboard = NULL;
-    struct sc_mouse_aoa *mouse = NULL;
+    struct sc_hid_mouse *mouse = NULL;
     bool usb_device_initialized = false;
     bool usb_connected = false;
     bool aoa_started = false;
@@ -105,6 +105,10 @@ scrcpy_otg(struct scrcpy_options *options) {
 
     usb_device_initialized = true;
 
+    LOGI("USB device: %s (%04x:%04x) %s %s", usb_device.serial,
+         (unsigned) usb_device.vid, (unsigned) usb_device.pid,
+         usb_device.manufacturer, usb_device.product);
+
     ok = sc_usb_connect(&s->usb, usb_device.device, &cbs, NULL);
     if (!ok) {
         goto end;
@@ -117,15 +121,10 @@ scrcpy_otg(struct scrcpy_options *options) {
     }
     aoa_initialized = true;
 
-    assert(options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA
-        || options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_DISABLED);
-    assert(options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA
-        || options->mouse_input_mode == SC_MOUSE_INPUT_MODE_DISABLED);
-
     bool enable_keyboard =
-        options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
+        options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID;
     bool enable_mouse =
-        options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;
+        options->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID;
 
     // If neither --hid-keyboard or --hid-mouse is passed, enable both
     if (!enable_keyboard && !enable_mouse) {
@@ -134,7 +133,7 @@ scrcpy_otg(struct scrcpy_options *options) {
     }
 
     if (enable_keyboard) {
-        ok = sc_keyboard_aoa_init(&s->keyboard, &s->aoa);
+        ok = sc_hid_keyboard_init(&s->keyboard, &s->aoa);
         if (!ok) {
             goto end;
         }
@@ -142,7 +141,7 @@ scrcpy_otg(struct scrcpy_options *options) {
     }
 
     if (enable_mouse) {
-        ok = sc_mouse_aoa_init(&s->mouse, &s->aoa);
+        ok = sc_hid_mouse_init(&s->mouse, &s->aoa);
         if (!ok) {
             goto end;
         }
@@ -191,10 +190,10 @@ end:
     sc_usb_stop(&s->usb);
 
     if (mouse) {
-        sc_mouse_aoa_destroy(&s->mouse);
+        sc_hid_mouse_destroy(&s->mouse);
     }
     if (keyboard) {
-        sc_keyboard_aoa_destroy(&s->keyboard);
+        sc_hid_keyboard_destroy(&s->keyboard);
     }
 
     if (aoa_initialized) {

app/src/usb/screen_otg.h

@@ -6,12 +6,12 @@
 #include <stdbool.h>
 #include <SDL2/SDL.h>
 
-#include "keyboard_aoa.h"
+#include "hid_keyboard.h"
-#include "mouse_aoa.h"
+#include "hid_mouse.h"
 
 struct sc_screen_otg {
-    struct sc_keyboard_aoa *keyboard;
+    struct sc_hid_keyboard *keyboard;
-    struct sc_mouse_aoa *mouse;
+    struct sc_hid_mouse *mouse;
 
     SDL_Window *window;
     SDL_Renderer *renderer;
@@ -22,8 +22,8 @@ struct sc_screen_otg {
 };
 
 struct sc_screen_otg_params {
-    struct sc_keyboard_aoa *keyboard;
+    struct sc_hid_keyboard *keyboard;
-    struct sc_mouse_aoa *mouse;
+    struct sc_hid_mouse *mouse;
 
     const char *window_title;
     bool always_on_top;

app/src/usb/usb.c

@@ -93,7 +93,7 @@ sc_usb_device_move(struct sc_usb_device *dst, struct sc_usb_device *src) {
     src->product = NULL;
 }
 
-static void
+void
 sc_usb_devices_destroy(struct sc_vec_usb_devices *usb_devices) {
     for (size_t i = 0; i < usb_devices->size; ++i) {
         sc_usb_device_destroy(&usb_devices->data[i]);
@@ -213,8 +213,8 @@ sc_usb_select_device(struct sc_usb *usb, const char *serial,
     assert(sel_count == 1); // sel_idx is valid only if sel_count == 1
     struct sc_usb_device *device = &vec.data[sel_idx];
 
-    LOGI("USB device found:");
+    LOGD("USB device found:");
-    sc_usb_devices_log(SC_LOG_LEVEL_INFO, vec.data, vec.size);
+    sc_usb_devices_log(SC_LOG_LEVEL_DEBUG, vec.data, vec.size);
 
     // Move device into out_device (do not destroy device)
     sc_usb_device_move(out_device, device);

app/src/util/log.c

@@ -147,7 +147,7 @@ sc_sdl_log_print(void *userdata, int category, SDL_LogPriority priority,
 }
 
 void
-sc_log_configure(void) {
+sc_log_configure() {
     SDL_LogSetOutputFunction(sc_sdl_log_print, NULL);
     // Redirect FFmpeg logs to SDL logs
     av_log_set_callback(sc_av_log_callback);

app/src/util/log.h

@@ -36,6 +36,6 @@ sc_log_windows_error(const char *prefix, int error);
 #endif
 
 void
-sc_log_configure(void);
+sc_log_configure();
 
 #endif

app/src/util/vecdeque.h

@@ -190,10 +190,10 @@ sc_vecdeque_reallocdata_(void *ptr, size_t newcap, size_t item_size,
 
     size_t right_len = MIN(size, oldcap - oldorigin);
     assert(right_len);
-    memcpy(newptr, (char *) ptr + (oldorigin * item_size), right_len * item_size);
+    memcpy(newptr, ptr + (oldorigin * item_size), right_len * item_size);
 
     if (size > right_len) {
-        memcpy((char *) newptr + (right_len * item_size), ptr,
+        memcpy(newptr + (right_len * item_size), ptr,
                (size - right_len) * item_size);
     }
 

app/tests/test_bytebuf.c

@@ -5,7 +5,7 @@
 
 #include "util/bytebuf.h"
 
-static void test_bytebuf_simple(void) {
+void test_bytebuf_simple(void) {
     struct sc_bytebuf buf;
     uint8_t data[20];
 
@@ -34,7 +34,7 @@ static void test_bytebuf_simple(void) {
     sc_bytebuf_destroy(&buf);
 }
 
-static void test_bytebuf_boundaries(void) {
+void test_bytebuf_boundaries(void) {
     struct sc_bytebuf buf;
     uint8_t data[20];
 
@@ -71,7 +71,7 @@ static void test_bytebuf_boundaries(void) {
     sc_bytebuf_destroy(&buf);
 }
 
-static void test_bytebuf_two_steps_write(void) {
+void test_bytebuf_two_steps_write(void) {
     struct sc_bytebuf buf;
     uint8_t data[20];
 

app/tests/test_orientation.c

@@ -1,91 +0,0 @@
-#include "common.h"
-
-#include <assert.h>
-
-#include "options.h"
-
-static void test_transforms(void) {
-    #define O(X) SC_ORIENTATION_ ## X
-    #define ASSERT_TRANSFORM(SRC, TR, RES) \
-        assert(sc_orientation_apply(O(SRC), O(TR)) == O(RES));
-
-    ASSERT_TRANSFORM(0, 0, 0);
-    ASSERT_TRANSFORM(0, 90, 90);
-    ASSERT_TRANSFORM(0, 180, 180);
-    ASSERT_TRANSFORM(0, 270, 270);
-    ASSERT_TRANSFORM(0, FLIP_0, FLIP_0);
-    ASSERT_TRANSFORM(0, FLIP_90, FLIP_90);
-    ASSERT_TRANSFORM(0, FLIP_180, FLIP_180);
-    ASSERT_TRANSFORM(0, FLIP_270, FLIP_270);
-
-    ASSERT_TRANSFORM(90, 0, 90);
-    ASSERT_TRANSFORM(90, 90, 180);
-    ASSERT_TRANSFORM(90, 180, 270);
-    ASSERT_TRANSFORM(90, 270, 0);
-    ASSERT_TRANSFORM(90, FLIP_0, FLIP_270);
-    ASSERT_TRANSFORM(90, FLIP_90, FLIP_0);
-    ASSERT_TRANSFORM(90, FLIP_180, FLIP_90);
-    ASSERT_TRANSFORM(90, FLIP_270, FLIP_180);
-
-    ASSERT_TRANSFORM(180, 0, 180);
-    ASSERT_TRANSFORM(180, 90, 270);
-    ASSERT_TRANSFORM(180, 180, 0);
-    ASSERT_TRANSFORM(180, 270, 90);
-    ASSERT_TRANSFORM(180, FLIP_0, FLIP_180);
-    ASSERT_TRANSFORM(180, FLIP_90, FLIP_270);
-    ASSERT_TRANSFORM(180, FLIP_180, FLIP_0);
-    ASSERT_TRANSFORM(180, FLIP_270, FLIP_90);
-
-    ASSERT_TRANSFORM(270, 0, 270);
-    ASSERT_TRANSFORM(270, 90, 0);
-    ASSERT_TRANSFORM(270, 180, 90);
-    ASSERT_TRANSFORM(270, 270, 180);
-    ASSERT_TRANSFORM(270, FLIP_0, FLIP_90);
-    ASSERT_TRANSFORM(270, FLIP_90, FLIP_180);
-    ASSERT_TRANSFORM(270, FLIP_180, FLIP_270);
-    ASSERT_TRANSFORM(270, FLIP_270, FLIP_0);
-
-    ASSERT_TRANSFORM(FLIP_0, 0, FLIP_0);
-    ASSERT_TRANSFORM(FLIP_0, 90, FLIP_90);
-    ASSERT_TRANSFORM(FLIP_0, 180, FLIP_180);
-    ASSERT_TRANSFORM(FLIP_0, 270, FLIP_270);
-    ASSERT_TRANSFORM(FLIP_0, FLIP_0, 0);
-    ASSERT_TRANSFORM(FLIP_0, FLIP_90, 90);
-    ASSERT_TRANSFORM(FLIP_0, FLIP_180, 180);
-    ASSERT_TRANSFORM(FLIP_0, FLIP_270, 270);
-
-    ASSERT_TRANSFORM(FLIP_90, 0, FLIP_90);
-    ASSERT_TRANSFORM(FLIP_90, 90, FLIP_180);
-    ASSERT_TRANSFORM(FLIP_90, 180, FLIP_270);
-    ASSERT_TRANSFORM(FLIP_90, 270, FLIP_0);
-    ASSERT_TRANSFORM(FLIP_90, FLIP_0, 270);
-    ASSERT_TRANSFORM(FLIP_90, FLIP_90, 0);
-    ASSERT_TRANSFORM(FLIP_90, FLIP_180, 90);
-    ASSERT_TRANSFORM(FLIP_90, FLIP_270, 180);
-
-    ASSERT_TRANSFORM(FLIP_180, 0, FLIP_180);
-    ASSERT_TRANSFORM(FLIP_180, 90, FLIP_270);
-    ASSERT_TRANSFORM(FLIP_180, 180, FLIP_0);
-    ASSERT_TRANSFORM(FLIP_180, 270, FLIP_90);
-    ASSERT_TRANSFORM(FLIP_180, FLIP_0, 180);
-    ASSERT_TRANSFORM(FLIP_180, FLIP_90, 270);
-    ASSERT_TRANSFORM(FLIP_180, FLIP_180, 0);
-    ASSERT_TRANSFORM(FLIP_180, FLIP_270, 90);
-
-    ASSERT_TRANSFORM(FLIP_270, 0, FLIP_270);
-    ASSERT_TRANSFORM(FLIP_270, 90, FLIP_0);
-    ASSERT_TRANSFORM(FLIP_270, 180, FLIP_90);
-    ASSERT_TRANSFORM(FLIP_270, 270, FLIP_180);
-    ASSERT_TRANSFORM(FLIP_270, FLIP_0, 90);
-    ASSERT_TRANSFORM(FLIP_270, FLIP_90, 180);
-    ASSERT_TRANSFORM(FLIP_270, FLIP_180, 270);
-    ASSERT_TRANSFORM(FLIP_270, FLIP_270, 0);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
-    test_transforms();
-    return 0;
-}

app/tests/test_str.c

@@ -269,25 +269,21 @@ static void test_parse_integer_with_suffix(void) {
 
     char buf[32];
 
-    int r = snprintf(buf, sizeof(buf), "%ldk", LONG_MAX / 2000);
+    sprintf(buf, "%ldk", LONG_MAX / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
     ok = sc_str_parse_integer_with_suffix(buf, &value);
     assert(ok);
     assert(value == LONG_MAX / 2000 * 1000);
 
-    r = snprintf(buf, sizeof(buf), "%ldm", LONG_MAX / 2000);
+    sprintf(buf, "%ldm", LONG_MAX / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
     ok = sc_str_parse_integer_with_suffix(buf, &value);
     assert(!ok);
 
-    r = snprintf(buf, sizeof(buf), "%ldk", LONG_MIN / 2000);
+    sprintf(buf, "%ldk", LONG_MIN / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
     ok = sc_str_parse_integer_with_suffix(buf, &value);
     assert(ok);
     assert(value == LONG_MIN / 2000 * 1000);
 
-    r = snprintf(buf, sizeof(buf), "%ldm", LONG_MIN / 2000);
+    sprintf(buf, "%ldm", LONG_MIN / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
     ok = sc_str_parse_integer_with_suffix(buf, &value);
     assert(!ok);
 }
@@ -362,7 +358,7 @@ static void test_index_of_column(void) {
     assert(sc_str_index_of_column("  a bc  d", 1, " ") == 2);
 }
 
-static void test_remove_trailing_cr(void) {
+static void test_remove_trailing_cr() {
     char s[] = "abc\r";
     sc_str_remove_trailing_cr(s, sizeof(s) - 1);
     assert(!strcmp(s, "abc"));

app/tests/test_vecdeque.c

@@ -102,7 +102,7 @@ static void test_vecdeque_reserve(void) {
     sc_vecdeque_destroy(&vdq);
 }
 
-static void test_vecdeque_grow(void) {
+static void test_vecdeque_grow() {
     struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;
 
     bool ok = sc_vecdeque_reserve(&vdq, 20);
@@ -142,7 +142,7 @@ static void test_vecdeque_grow(void) {
     sc_vecdeque_destroy(&vdq);
 }
 
-static void test_vecdeque_push_hole(void) {
+static void test_vecdeque_push_hole() {
     struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;
 
     bool ok = sc_vecdeque_reserve(&vdq, 20);

app/tests/test_vector.c

@@ -187,7 +187,7 @@ static void test_vector_index_of(void) {
     sc_vector_destroy(&vec);
 }
 
-static void test_vector_grow(void) {
+static void test_vector_grow() {
     struct SC_VECTOR(int) vec = SC_VECTOR_INITIALIZER;
 
     bool ok;

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,3 +23,7 @@ allprojects {
         options.compilerArgs << "-Xlint:deprecation"
     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

config/android-checkstyle.gradle

@@ -2,7 +2,7 @@ apply plugin: 'checkstyle'
 check.dependsOn 'checkstyle'
 
 checkstyle {
-    toolVersion = '10.12.5'
+    toolVersion = '9.0.1'
 }
 
 task checkstyle(type: Checkstyle) {

cross_win32.txt

@@ -6,7 +6,7 @@ c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
-pkg-config = 'i686-w64-mingw32-pkg-config'
+pkgconfig = 'i686-w64-mingw32-pkg-config'
 windres = 'i686-w64-mingw32-windres'
 
 [host_machine]
@@ -14,3 +14,8 @@ system = 'windows'
 cpu_family = 'x86'
 cpu = 'i686'
 endian = 'little'
+
+[properties]
+prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win32'
+prebuilt_sdl2 = 'SDL2-2.28.0/i686-w64-mingw32'
+prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-Win32'

cross_win64.txt

@@ -6,7 +6,7 @@ c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
-pkg-config = 'x86_64-w64-mingw32-pkg-config'
+pkgconfig = 'x86_64-w64-mingw32-pkg-config'
 windres = 'x86_64-w64-mingw32-windres'
 
 [host_machine]
@@ -14,3 +14,8 @@ system = 'windows'
 cpu_family = 'x86'
 cpu = 'x86_64'
 endian = 'little'
+
+[properties]
+prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win64'
+prebuilt_sdl2 = 'SDL2-2.28.0/x86_64-w64-mingw32'
+prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-x64'

doc/audio.md

@@ -62,37 +62,15 @@ scrcpy --audio-source=mic --no-video --no-playback --record=file.opus
 
 ## Codec
 
-The audio codec can be selected. The possible values are `opus` (default),
+The audio codec can be selected. The possible values are `opus` (default), `aac`
-`aac`, `flac` and `raw` (uncompressed PCM 16-bit LE):
+and `raw` (uncompressed PCM 16-bit LE):
 
 ```bash
 scrcpy --audio-codec=opus  # default
 scrcpy --audio-codec=aac
-scrcpy --audio-codec=flac
 scrcpy --audio-codec=raw
 ```
 
-In particular, if you get the following error:
-
-> Failed to initialize audio/opus, error 0xfffffffe
-
-then your device has no Opus encoder: try `scrcpy --audio-codec=aac`.
-
-For advanced usage, to pass arbitrary parameters to the [`MediaFormat`],
-check `--audio-codec-options` in the manpage or in `scrcpy --help`.
-
-For example, to change the [FLAC compression level]:
-
-```bash
-scrcpy --audio-codec=flac --audio-codec-options=flac-compression-level=8
-```
-
-[`MediaFormat`]: https://developer.android.com/reference/android/media/MediaFormat
-[FLAC compression level]: https://developer.android.com/reference/android/media/MediaFormat#KEY_FLAC_COMPRESSION_LEVEL
-
-
-## Encoder
-
 Several encoders may be available on the device. They can be listed by:
 
 ```bash
@@ -101,14 +79,19 @@ scrcpy --list-encoders
 
 To select a specific encoder:
 
-```bash
+```
 scrcpy --audio-codec=opus --audio-encoder='c2.android.opus.encoder'
 ```
 
+For advanced usage, to pass arbitrary parameters to the [`MediaFormat`],
+check `--audio-codec-options` in the manpage or in `scrcpy --help`.
+
+[`MediaFormat`]: https://developer.android.com/reference/android/media/MediaFormat
+
 
 ## Bit rate
 
-The default audio bit rate is 128Kbps. To change it:
+The default video bit-rate is 128Kbps. To change it:
 
 ```bash
 scrcpy --audio-bit-rate=64K

doc/build.md

@@ -58,7 +58,7 @@ sudo apt install gcc git pkg-config meson ninja-build libsdl2-dev \
                  libswresample-dev libusb-1.0-0-dev
 
 # server build dependencies
-sudo apt install openjdk-17-jdk
+sudo apt install openjdk-11-jdk
 ```
 
 On old versions (like Ubuntu 16.04), `meson` is too old. In that case, install
@@ -77,7 +77,7 @@ pip3 install meson
 sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
 
 # client build dependencies
-sudo dnf install SDL2-devel ffms2-devel libusb1-devel meson gcc make
+sudo dnf install SDL2-devel ffms2-devel libusb-devel meson gcc make
 
 # server build dependencies
 sudo dnf install java-devel
@@ -100,7 +100,7 @@ sudo apt install mingw-w64 mingw-w64-tools
 You also need the JDK to build the server:
 
 ```bash
-sudo apt install openjdk-17-jdk
+sudo apt install openjdk-11-jdk
 ```
 
 Then generate the releases:
@@ -168,13 +168,13 @@ brew install sdl2 ffmpeg libusb
 brew install pkg-config meson
 ```
 
-Additionally, if you want to build the server, install Java 17 from Caskroom, and
+Additionally, if you want to build the server, install Java 8 from Caskroom, and
 make it available from the `PATH`:
 
 ```bash
 brew tap homebrew/cask-versions
-brew install adoptopenjdk/openjdk/adoptopenjdk17
+brew install adoptopenjdk/openjdk/adoptopenjdk11
-export JAVA_HOME="$(/usr/libexec/java_home --version 1.17)"
+export JAVA_HOME="$(/usr/libexec/java_home --version 1.11)"
 export PATH="$JAVA_HOME/bin:$PATH"
 ```
 
@@ -233,10 +233,10 @@ install` must be run as root)._
 
 #### Option 2: Use prebuilt server
 
- - [`scrcpy-server-v2.3.1`][direct-scrcpy-server]  
+ - [`scrcpy-server-v2.0`][direct-scrcpy-server]  
-   <sub>SHA-256: `f6814822fc308a7a532f253485c9038183c6296a6c5df470a9e383b4f8e7605b`</sub>
+   <sub>SHA-256: `9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2`</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.0/scrcpy-server-v2.0
 
 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:

doc/camera.md

@@ -1,171 +0,0 @@
-# Camera
-
-Camera mirroring is supported for devices with Android 12 or higher.
-
-To capture the camera instead of the device screen:
-
-```
-scrcpy --video-source=camera
-```
-
-By default, it automatically switches [audio source](audio.md#source) to
-microphone (as if `--audio-source=mic` were also passed).
-
-```bash
-scrcpy --video-source=display  # default is --audio-source=output
-scrcpy --video-source=camera   # default is --audio-source=mic
-scrcpy --video-source=display --audio-source=mic    # force display AND microphone
-scrcpy --video-source=camera --audio-source=output  # force camera AND device audio output
-```
-
-Audio can be disabled:
-
-```bash
-# audio not captured at all
-scrcpy --video-source=camera --no-audio
-scrcpy --video-source=camera --no-audio --record=file.mp4
-
-# audio captured and recorded, but not played
-scrcpy --video-source=camera --no-audio-playback --record=file.mp4
-```
-
-
-## List
-
-To list the cameras available (with their declared valid sizes and frame rates):
-
-```
-scrcpy --list-cameras
-scrcpy --list-camera-sizes
-```
-
-_Note that the sizes and frame rates are declarative. They are not accurate on
-all devices: some of them are declared but not supported, while some others are
-not declared but supported._
-
-
-## Selection
-
-It is possible to pass an explicit camera id (as listed by `--list-cameras`):
-
-```
-scrcpy --video-source=camera --camera-id=0
-```
-
-Alternatively, the camera may be selected automatically:
-
-```bash
-scrcpy --video-source=camera                           # use the first camera
-scrcpy --video-source=camera --camera-facing=front     # use the first front camera
-scrcpy --video-source=camera --camera-facing=back      # use the first back camera
-scrcpy --video-source=camera --camera-facing=external  # use the first external camera
-```
-
-If `--camera-id` is specified, then `--camera-facing` is forbidden (the id
-already determines the camera):
-
-```bash
-scrcpy --video-source=camera --camera-id=0 --camera-facing=front  # error
-```
-
-
-### Size selection
-
-It is possible to pass an explicit camera size:
-
-```
-scrcpy --video-source=camera --camera-size=1920x1080
-```
-
-The given size may be listed among the declared valid sizes
-(`--list-camera-sizes`), but may also be anything else (some devices support
-arbitrary sizes):
-
-```
-scrcpy --video-source=camera --camera-size=1840x444
-```
-
-Alternatively, a declared valid size (among the ones listed by
-`list-camera-sizes`) may be selected automatically.
-
-Two constraints are supported:
- - `-m`/`--max-size` (already used for display mirroring), for example `-m1920`;
- - `--camera-ar` to specify an aspect ratio (`<num>:<den>`, `<value>` or
-   `sensor`).
-
-Some examples:
-
-```bash
-scrcpy --video-source=camera                          # use the greatest width and the greatest associated height
-scrcpy --video-source=camera -m1920                   # use the greatest width not above 1920 and the greatest associated height
-scrcpy --video-source=camera --camera-ar=4:3          # use the greatest size with an aspect ratio of 4:3 (+/- 10%)
-scrcpy --video-source=camera --camera-ar=1.6          # use the greatest size with an aspect ratio of 1.6 (+/- 10%)
-scrcpy --video-source=camera --camera-ar=sensor       # use the greatest size with the aspect ratio of the camera sensor (+/- 10%)
-scrcpy --video-source=camera -m1920 --camera-ar=16:9  # use the greatest width not above 1920 and the closest to 16:9 aspect ratio
-```
-
-If `--camera-size` is specified, then `-m`/`--max-size` and `--camera-ar` are
-forbidden (the size is determined by the value given explicitly):
-
-```bash
-scrcpy --video-source=camera --camera-size=1920x1080 -m3000  # error
-```
-
-
-## Rotation
-
-To rotate the captured video, use the [video orientation](video.md#orientation)
-option:
-
-```
-scrcpy --video-source=camera --camera-size=1920x1080 --orientation=90
-```
-
-
-## Frame rate
-
-By default, camera is captured at Android's default frame rate (30 fps).
-
-To configure a different frame rate:
-
-```
-scrcpy --video-source=camera --camera-fps=60
-```
-
-
-## High speed capture
-
-The Android camera API also supports a [high speed capture mode][high speed].
-
-This mode is restricted to specific resolutions and frame rates, listed by
-`--list-camera-sizes`.
-
-```
-scrcpy --video-source=camera --camera-size=1920x1080 --camera-fps=240
-```
-
-[high speed]: https://developer.android.com/reference/android/hardware/camera2/CameraConstrainedHighSpeedCaptureSession
-
-
-## Brace expansion tip
-
-All camera options start with `--camera-`, so if your shell supports it, you can
-benefit from [brace expansion] (for example, it is supported _bash_ and _zsh_):
-
-```bash
-scrcpy --video-source=camera --camera-{facing=back,ar=16:9,high-speed,fps=120}
-```
-
-This will be expanded as:
-
-```bash
-scrcpy --video-source=camera --camera-facing=back --camera-ar=16:9 --camera-high-speed --camera-fps=120
-```
-
-[brace expansion]: https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html
-
-
-## Webcam
-
-Combined with the [V4L2](v4l2.md) feature on Linux, the Android device camera
-may be used as a webcam on the computer.

doc/connection.md

@@ -1,125 +0,0 @@
-# Connection
-
-## Selection
-
-If exactly one device is connected (i.e. listed by `adb devices`), then it is
-automatically selected.
-
-However, if there are multiple devices connected, you must specify the one to
-use in one of 4 ways:
- - by its serial:
-   ```bash
-   scrcpy --serial=0123456789abcdef
-   scrcpy -s 0123456789abcdef   # short version
-
-   # the serial is the ip:port if connected over TCP/IP (same behavior as adb)
-   scrcpy --serial=192.168.1.1:5555
-   ```
- - the one connected over USB (if there is exactly one):
-   ```bash
-   scrcpy --select-usb
-   scrcpy -d   # short version
-   ```
- - the one connected over TCP/IP (if there is exactly one):
-   ```bash
-   scrcpy --select-tcpip
-   scrcpy -e   # short version
-   ```
- - a device already listening on TCP/IP (see [below](#tcpip-wireless)):
-   ```bash
-   scrcpy --tcpip=192.168.1.1:5555
-   scrcpy --tcpip=192.168.1.1        # default port is 5555
-   ```
-
-The serial may also be provided via the environment variable `ANDROID_SERIAL`
-(also used by `adb`):
-
-```bash
-# in bash
-export ANDROID_SERIAL=0123456789abcdef
-scrcpy
-```
-
-```cmd
-:: in cmd
-set ANDROID_SERIAL=0123456789abcdef
-scrcpy
-```
-
-```powershell
-# in PowerShell
-$env:ANDROID_SERIAL = '0123456789abcdef'
-scrcpy
-```
-
-
-## TCP/IP (wireless)
-
-_Scrcpy_ uses `adb` to communicate with the device, and `adb` can [connect] to a
-device over TCP/IP. The device must be connected on the same network as the
-computer.
-
-[connect]: https://developer.android.com/studio/command-line/adb.html#wireless
-
-
-### Automatic
-
-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:
-
-```bash
-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.
-
-
-### Manual
-
-Alternatively, it is possible to enable the TCP/IP connection manually using
-`adb`:
-
-1. Plug the device into a USB port on your computer.
-2. Connect the device to the same Wi-Fi network as your computer.
-3. Get your device IP address, in Settings → About phone → Status, or by
-   executing this command:
-
-    ```bash
-    adb shell ip route | awk '{print $9}'
-    ```
-
-4. Enable `adb` over TCP/IP on your device: `adb tcpip 5555`.
-5. Unplug your device.
-6. Connect to your device: `adb connect DEVICE_IP:5555` _(replace `DEVICE_IP`
-with the device IP address you found)_.
-7. Run `scrcpy` as usual.
-8. Run `adb disconnect` once you're done.
-
-Since Android 11, a [wireless debugging option][adb-wireless] allows to bypass
-having to physically connect your device directly to your computer.
-
-[adb-wireless]: https://developer.android.com/studio/command-line/adb#wireless-android11-command-line
-
-
-## Autostart
-
-A small tool (by the scrcpy author) allows to run arbitrary commands whenever a
-new Android device is connected: [AutoAdb]. It can be used to start scrcpy:
-
-```bash
-autoadb scrcpy -s '{}'
-```
-
-[AutoAdb]: https://github.com/rom1v/autoadb

doc/control.md

@@ -85,7 +85,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
+## Pinch-to-zoom
 
 To simulate "pinch-to-zoom": <kbd>Ctrl</kbd>+_click-and-move_.
 
@@ -93,12 +93,8 @@ 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.
 
-To simulate a tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.
-
 Technically, _scrcpy_ generates additional touch events from a "virtual finger"
-at a location inverted through the center of the screen. When pressing
+at a location inverted through the center of the screen.
-<kbd>Ctrl</kbd> the x and y coordinates are inverted. Using <kbd>Shift</kbd>
-only inverts x.
 
 
 ## Key repeat

doc/develop.md

@@ -359,7 +359,7 @@ metadata]:
    - the initial video width (`u32`)
    - the initial video height (`u32`)
  - On the _audio_ socket, 4 bytes:
-   - the codec id (`u32`) (OPUS, AAC or RAW)
+   - the codec id ('u32`) (OPUS, AAC or RAW)
 
 [codec metadata]: https://github.com/Genymobile/scrcpy/blob/a3cdf1a6b86ea22786e1f7d09b9c202feabc6949/server/src/main/java/com/genymobile/scrcpy/Streamer.java#L33-L51
 

doc/device.md

@@ -1,9 +1,156 @@
 # Device
 
+## Selection
+
+If exactly one device is connected (i.e. listed by `adb devices`), then it is
+automatically selected.
+
+However, if there are multiple devices connected, you must specify the one to
+use in one of 4 ways:
+ - by its serial:
+   ```bash
+   scrcpy --serial=0123456789abcdef
+   scrcpy -s 0123456789abcdef   # short version
+
+   # the serial is the ip:port if connected over TCP/IP (same behavior as adb)
+   scrcpy --serial=192.168.1.1:5555
+   ```
+ - the one connected over USB (if there is exactly one):
+   ```bash
+   scrcpy --select-usb
+   scrcpy -d   # short version
+   ```
+ - the one connected over TCP/IP (if there is exactly one):
+   ```bash
+   scrcpy --select-tcpip
+   scrcpy -e   # short version
+   ```
+ - a device already listening on TCP/IP (see [below](#tcpip-wireless)):
+   ```bash
+   scrcpy --tcpip=192.168.1.1:5555
+   scrcpy --tcpip=192.168.1.1        # default port is 5555
+   ```
+
+The serial may also be provided via the environment variable `ANDROID_SERIAL`
+(also used by `adb`):
+
+```bash
+# in bash
+export ANDROID_SERIAL=0123456789abcdef
+scrcpy
+```
+
+```cmd
+:: in cmd
+set ANDROID_SERIAL=0123456789abcdef
+scrcpy
+```
+
+```powershell
+# in PowerShell
+$env:ANDROID_SERIAL = '0123456789abcdef'
+scrcpy
+```
+
+
+## TCP/IP (wireless)
+
+_Scrcpy_ uses `adb` to communicate with the device, and `adb` can [connect] to a
+device over TCP/IP. The device must be connected on the same network as the
+computer.
+
+[connect]: https://developer.android.com/studio/command-line/adb.html#wireless
+
+
+### Automatic
+
+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:
+
+```bash
+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.
+
+
+### Manual
+
+Alternatively, it is possible to enable the TCP/IP connection manually using
+`adb`:
+
+1. Plug the device into a USB port on your computer.
+2. Connect the device to the same Wi-Fi network as your computer.
+3. Get your device IP address, in Settings → About phone → Status, or by
+   executing this command:
+
+    ```bash
+    adb shell ip route | awk '{print $9}'
+    ```
+
+4. Enable `adb` over TCP/IP on your device: `adb tcpip 5555`.
+5. Unplug your device.
+6. Connect to your device: `adb connect DEVICE_IP:5555` _(replace `DEVICE_IP`
+with the device IP address you found)_.
+7. Run `scrcpy` as usual.
+8. Run `adb disconnect` once you're done.
+
+Since Android 11, a [wireless debugging option][adb-wireless] allows to bypass
+having to physically connect your device directly to your computer.
+
+[adb-wireless]: https://developer.android.com/studio/command-line/adb#wireless-android11-command-line
+
+
+## Autostart
+
+A small tool (by the scrcpy author) allows to run arbitrary commands whenever a
+new Android device is connected: [AutoAdb]. It can be used to start scrcpy:
+
+```bash
+autoadb scrcpy -s '{}'
+```
+
+[AutoAdb]: https://github.com/rom1v/autoadb
+
+
+## Display
+
+If several displays are available on the Android device, it is possible to
+select the display to mirror:
+
+```bash
+scrcpy --display=1
+```
+
+The list of display ids can be retrieved by:
+
+```bash
+scrcpy --list-displays
+```
+
+A secondary display may only be controlled if the device runs at least Android
+10 (otherwise it is mirrored as read-only).
+
+
+## Actions
+
 Some command line arguments perform actions on the device itself while scrcpy is
 running.
 
-## Stay awake
+
+### Stay awake
 
 To prevent the device from sleeping after a delay **when the device is plugged
 in**:
@@ -19,7 +166,7 @@ If the device is not plugged in (i.e. only connected over TCP/IP),
 `--stay-awake` has no effect (this is the Android behavior).
 
 
-## Turn screen off
+### Turn screen off
 
 It is possible to turn the device screen off while mirroring on start with a
 command-line option:
@@ -47,7 +194,7 @@ scrcpy -Sw   # short version
 ```
 
 
-## Show touches
+### Show touches
 
 For presentations, it may be useful to show physical touches (on the physical
 device). Android exposes this feature in _Developers options_.
@@ -63,7 +210,7 @@ scrcpy -t   # short version
 Note that it only shows _physical_ touches (by a finger on the device).
 
 
-## Power off on close
+### Power off on close
 
 To turn the device screen off when closing _scrcpy_:
 
@@ -71,10 +218,11 @@ To turn the device screen off when closing _scrcpy_:
 scrcpy --power-off-on-close
 ```
 
-## Power on on start
+### Power on on start
 
 By default, on start, the device is powered on. To prevent this behavior:
 
 ```bash
 scrcpy --no-power-on
 ```
+

doc/hid-otg.md

@@ -106,7 +106,3 @@ 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).

doc/linux.md

@@ -9,10 +9,12 @@ Scrcpy is packaged in several distributions and package managers:
  - Debian/Ubuntu: `apt install scrcpy`
  - Arch Linux: `pacman -S scrcpy`
  - Fedora: `dnf copr enable zeno/scrcpy && dnf install scrcpy`
- - Gentoo: `emerge scrcpy`
+ - Gentoo: [ebuild][ebuild-link] file
  - Snap: `snap install scrcpy`
  - … (see [repology](https://repology.org/project/scrcpy/versions))
 
+[ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy
+
 ### Latest version
 
 However, the packaged version is not always the latest release. To install the

doc/recording.md

@@ -18,9 +18,7 @@ To record only the audio:
 ```bash
 scrcpy --no-video --record=file.opus
 scrcpy --no-video --audio-codec=aac --record=file.aac
-scrcpy --no-video --audio-codec=flac --record=file.flac
+# .m4a/.mp4 and .mka/.mkv are also supported for both opus and aac
-scrcpy --no-video --audio-codec=raw --record=file.wav
-# .m4a/.mp4 and .mka/.mkv are also supported for opus, aac and flac
 ```
 
 Timestamps are captured on the device, so [packet delay variation] does not
@@ -33,29 +31,20 @@ course, not if you capture your scrcpy window and audio output on the computer).
 ## Format
 
 The video and audio streams are encoded on the device, but are muxed on the
-client side. Several formats (containers) are supported:
+client side. Two formats (containers) are supported:
- - MP4 (`.mp4`, `.m4a`, `.aac`)
+ - Matroska (`.mkv`)
- - Matroska (`.mkv`, `.mka`)
+ - MP4 (`.mp4`)
- - OPUS (`.opus`)
- - FLAC (`.flac`)
- - WAV (`.wav`)
 
 The container is automatically selected based on the filename.
 
 It is also possible to explicitly select a container (in that case the filename
-needs not end with a known extension):
+needs not end with `.mkv` or `.mp4`):
 
 ```
 scrcpy --record=file --record-format=mkv
 ```
 
 
-## Rotation
-
-The video can be recorded rotated. See [video
-orientation](video.md#orientation).
-
-
 ## No playback
 
 To disable playback while recording:

doc/shortcuts.md

@@ -26,12 +26,10 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
  | Switch fullscreen mode                      | <kbd>MOD</kbd>+<kbd>f</kbd>
  | Rotate display left                         | <kbd>MOD</kbd>+<kbd>←</kbd> _(left)_
  | 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)_
  | 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_
- | Click on `BACK`                             | <kbd>MOD</kbd>+<kbd>b</kbd> \| <kbd>MOD</kbd>+<kbd>Backspace</kbd> \| _Right-click²_
+ | Click on `BACK`                             | <kbd>MOD</kbd>+<kbd>b</kbd> \| _Right-click²_
  | Click on `APP_SWITCH`                       | <kbd>MOD</kbd>+<kbd>s</kbd> \| _4th-click³_
  | Click on `MENU` (unlock screen)⁴            | <kbd>MOD</kbd>+<kbd>m</kbd>
  | Click on `VOLUME_UP`                        | <kbd>MOD</kbd>+<kbd>↑</kbd> _(up)_
@@ -49,8 +47,7 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
  | Synchronize clipboards and paste⁵           | <kbd>MOD</kbd>+<kbd>v</kbd>
  | Inject computer clipboard text              | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
  | Enable/disable FPS counter (on stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
- | Pinch-to-zoom/rotate                        | <kbd>Ctrl</kbd>+_click-and-move_
+ | Pinch-to-zoom                               | <kbd>Ctrl</kbd>+_click-and-move_
- | Tilt (slide vertically with 2 fingers)      | <kbd>Shift</kbd>+_click-and-move_
  | Drag & drop APK file                        | Install APK from computer
  | Drag & drop non-APK file                    | [Push file to device](control.md#push-file-to-device)
 

doc/v4l2.md

@@ -21,13 +21,6 @@ This will create a new video device in `/dev/videoN`, where `N` is an integer
 (more [options](https://github.com/umlaeute/v4l2loopback#options) are available
 to create several devices or devices with specific IDs).
 
-If you encounter problems detecting your device with Chrome/WebRTC, you can try
-`exclusive_caps` mode:
-
-```
-sudo modprobe v4l2loopback exclusive_caps=1
-```
-
 To list the enabled devices:
 
 ```bash

doc/video.md

@@ -1,14 +1,5 @@
 # Video
 
-## Source
-
-By default, scrcpy mirrors the device screen.
-
-It is possible to capture the device camera instead.
-
-See the dedicated [camera](camera.md) page.
-
-
 ## Size
 
 By default, scrcpy attempts to mirror at the Android device resolution.
@@ -30,7 +21,7 @@ If encoding fails, scrcpy automatically tries again with a lower definition
 
 ## Bit rate
 
-The default video bit rate is 8 Mbps. To change it:
+The default video bit-rate is 8 Mbps. To change it:
 
 ```bash
 scrcpy --video-bit-rate=2M
@@ -75,14 +66,6 @@ scrcpy --video-codec=av1
 H265 may provide better quality, but H264 should provide lower latency.
 AV1 encoders are not common on current Android devices.
 
-For advanced usage, to pass arbitrary parameters to the [`MediaFormat`],
-check `--video-codec-options` in the manpage or in `scrcpy --help`.
-
-[`MediaFormat`]: https://developer.android.com/reference/android/media/MediaFormat
-
-
-## Encoder
-
 Several encoders may be available on the device. They can be listed by:
 
 ```bash
@@ -96,51 +79,45 @@ try another one:
 scrcpy --video-codec=h264 --video-encoder='OMX.qcom.video.encoder.avc'
 ```
 
+For advanced usage, to pass arbitrary parameters to the [`MediaFormat`],
+check `--video-codec-options` in the manpage or in `scrcpy --help`.
 
-## Orientation
+[`MediaFormat`]: https://developer.android.com/reference/android/media/MediaFormat
 
-The orientation may be applied at 3 different levels:
+
+## Rotation
+
+The rotation may be applied at 3 different levels:
  - The [shortcut](shortcuts.md) <kbd>MOD</kbd>+<kbd>r</kbd> requests the
    device to switch between portrait and landscape (the current running app may
    refuse, if it does not support the requested orientation).
  - `--lock-video-orientation` changes the mirroring orientation (the orientation
    of the video sent from the device to the computer). This affects the
    recording.
- - `--orientation` is applied on the client side, and affects display and
+ - `--rotation` rotates only the window content. This only affects the display,
-   recording. For the display, it can be changed dynamically using
+   not the recording. It may be changed dynamically at any time using the
-   [shortcuts](shortcuts.md).
+   [shortcuts](shortcuts.md) <kbd>MOD</kbd>+<kbd>←</kbd> and
+   <kbd>MOD</kbd>+<kbd>→</kbd>.
 
-To lock the mirroring orientation (on the capture side):
+To lock the mirroring orientation:
 
 ```bash
-scrcpy --lock-video-orientation      # initial (current) orientation
+scrcpy --lock-video-orientation     # initial (current) orientation
-scrcpy --lock-video-orientation=0    # natural orientation
+scrcpy --lock-video-orientation=0   # natural orientation
-scrcpy --lock-video-orientation=90   # 90° clockwise
+scrcpy --lock-video-orientation=1   # 90° counterclockwise
-scrcpy --lock-video-orientation=180  # 180°
+scrcpy --lock-video-orientation=2   # 180°
-scrcpy --lock-video-orientation=270  # 270° clockwise
+scrcpy --lock-video-orientation=3   # 90° clockwise
 ```
 
-To orient the video (on the rendering side):
+To set an initial window rotation:
 
 ```bash
-scrcpy --orientation=0
+scrcpy --rotation=0   # no rotation
-scrcpy --orientation=90       # 90° clockwise
+scrcpy --rotation=1   # 90 degrees counterclockwise
-scrcpy --orientation=180      # 180°
+scrcpy --rotation=2   # 180 degrees
-scrcpy --orientation=270      # 270° clockwise
+scrcpy --rotation=3   # 90 degrees clockwise
-scrcpy --orientation=flip0    # hflip
-scrcpy --orientation=flip90   # hflip + 90° clockwise
-scrcpy --orientation=flip180  # vflip (hflip + 180°)
-scrcpy --orientation=flip270  # hflip + 270° clockwise
 ```
 
-The orientation can be set separately for display and record if necessary, via
-`--display-orientation` and `--record-orientation`.
-
-The rotation is applied to a recorded file by writing a display transformation
-to the MP4 or MKV target file. Flipping is not supported, so only the 4 first
-values are allowed when recording.
-
-
 ## Crop
 
 The device screen may be cropped to mirror only part of the screen.
@@ -157,25 +134,6 @@ phone, landscape for a tablet).
 If `--max-size` is also specified, resizing is applied after cropping.
 
 
-## Display
-
-If several displays are available on the Android device, it is possible to
-select the display to mirror:
-
-```bash
-scrcpy --display-id=1
-```
-
-The list of display ids can be retrieved by:
-
-```bash
-scrcpy --list-displays
-```
-
-A secondary display may only be controlled if the device runs at least Android
-10 (otherwise it is mirrored as read-only).
-
-
 ## Buffering
 
 By default, there is no video buffering, to get the lowest possible latency.

doc/windows.md

@@ -4,24 +4,18 @@
 
 Download the [latest release]:
 
- - [`scrcpy-win64-v2.3.1.zip`][direct-win64] (64-bit)  
+ - [`scrcpy-win64-v2.0.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `f1f78ac98214078425804e524a1bed515b9d4b8a05b78d210a4ced2b910b262d`</sub>
+   <sub>SHA-256: `ae4c8d37a496b43f8974ba8f07f708e22a9570ba0cddc3dc3a36edbccd4d2a20`</sub>
- - [`scrcpy-win32-v2.3.1.zip`][direct-win32] (32-bit)  
+ - [`scrcpy-win32-v2.0.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `5dffc2d432e9b8b5b0e16f12e71428c37c70d9124cfbe7620df0b41b7efe91ff`</sub>
+   <sub>SHA-256: `15d98c02cb0e0bbd84f8b5d54991e0f6925569b1286a86a40743944fcb1c2d8c`</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-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.0/scrcpy-win64-v2.0.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.3.1/scrcpy-win32-v2.3.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.0/scrcpy-win32-v2.0.zip
 
 and extract it.
 
-Alternatively, you could install it from packages manager, like [Winget]:
+Alternatively, you could install it from packages manager, like [Chocolatey]:
-
-```bash
-winget install scrcpy
-```
-
-or [Chocolatey]:
 
 ```bash
 choco install scrcpy
@@ -36,7 +30,6 @@ scoop install scrcpy
 scoop install adb    # if you don't have it yet
 ```
 
-[Winget]: https://github.com/microsoft/winget-cli
 [Chocolatey]: https://chocolatey.org/
 [Scoop]: https://scoop.sh
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

install_release.sh

@@ -2,8 +2,8 @@
 set -e
 
 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.3.1/scrcpy-server-v2.3.1
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.0/scrcpy-server-v2.0
-PREBUILT_SERVER_SHA256=f6814822fc308a7a532f253485c9038183c6296a6c5df470a9e383b4f8e7605b
+PREBUILT_SERVER_SHA256=9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2
 
 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server

meson.build

@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '2.3.1',
+        version: '2.0',
         meson_version: '>= 0.48',
         default_options: [
             'c_std=c11',
@@ -7,8 +7,6 @@ project('scrcpy', 'c',
             'b_ndebug=if-release',
         ])
 
-add_project_arguments('-Wmissing-prototypes', language: 'c')
-
 if get_option('compile_app')
     subdir('app')
 endif

release.mk

@@ -69,62 +69,58 @@ prepare-deps:
 	@app/prebuilt-deps/prepare-libusb.sh
 
 build-win32: prepare-deps
-	rm -rf "$(WIN32_BUILD_DIR)"
+	[ -d "$(WIN32_BUILD_DIR)" ] || ( mkdir "$(WIN32_BUILD_DIR)" && \
-	mkdir -p "$(WIN32_BUILD_DIR)/local"
+		meson setup "$(WIN32_BUILD_DIR)" \
-	cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win32/. "$(WIN32_BUILD_DIR)/local/"
+			--cross-file cross_win32.txt \
-	cp -r app/prebuilt-deps/data/SDL2-2.28.5/i686-w64-mingw32/. "$(WIN32_BUILD_DIR)/local/"
+			--buildtype release --strip -Db_lto=true \
-	cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/. "$(WIN32_BUILD_DIR)/local/"
+			-Dcompile_server=false \
-	meson setup "$(WIN32_BUILD_DIR)" \
+			-Dportable=true )
-		--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" \
-		--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
-	rm -rf "$(WIN64_BUILD_DIR)"
+	[ -d "$(WIN64_BUILD_DIR)" ] || ( mkdir "$(WIN64_BUILD_DIR)" && \
-	mkdir -p "$(WIN64_BUILD_DIR)/local"
+		meson setup "$(WIN64_BUILD_DIR)" \
-	cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win64/. "$(WIN64_BUILD_DIR)/local/"
+			--cross-file cross_win64.txt \
-	cp -r app/prebuilt-deps/data/SDL2-2.28.5/x86_64-w64-mingw32/. "$(WIN64_BUILD_DIR)/local/"
+			--buildtype release --strip -Db_lto=true \
-	cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/. "$(WIN64_BUILD_DIR)/local/"
+			-Dcompile_server=false \
-	meson setup "$(WIN64_BUILD_DIR)" \
+			-Dportable=true )
-		--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" \
-		--cross-file=cross_win64.txt \
-		--buildtype=release --strip -Db_lto=true \
-		-Dcompile_server=false \
-		-Dportable=true
 	ninja -C "$(WIN64_BUILD_DIR)"
 
 dist-win32: build-server build-win32
 	mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/data/open_a_terminal_here.bat "$(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/ffmpeg-6.0-scrcpy-4/win32/bin/avutil-58.dll "$(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/ffmpeg-6.0-scrcpy-4/win32/bin/avcodec-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win32/bin/avformat-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp "$(WIN32_BUILD_DIR)"/local/bin/*.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win32/bin/swresample-4.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.28.0/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/bin/msys-usb-1.0.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 
 dist-win64: build-server build-win64
 	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/data/open_a_terminal_here.bat "$(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/ffmpeg-6.0-scrcpy-4/win64/bin/avutil-58.dll "$(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/ffmpeg-6.0-scrcpy-4/win64/bin/avcodec-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win64/bin/avformat-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp "$(WIN64_BUILD_DIR)"/local/bin/*.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win64/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.28.0/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/bin/msys-usb-1.0.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 
 zip-win32: dist-win32
 	cd "$(DIST)"; \

server/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     namespace 'com.genymobile.scrcpy'
-    compileSdk 34
+    compileSdkVersion 33
     defaultConfig {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 33
-        versionCode 20301
+        versionCode 20000
-        versionName "2.3.1"
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -17,10 +17,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildFeatures {
-        buildConfig true
-        aidl true
-    }
 }
 
 dependencies {

server/build_without_gradle.sh

@@ -12,10 +12,10 @@
 set -e
 
 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=2.3.1
+SCRCPY_VERSION_NAME=2.0
 
-PLATFORM=${ANDROID_PLATFORM:-34}
+PLATFORM=${ANDROID_PLATFORM:-33}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-33.0.0}
 BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"
 
 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
@@ -48,7 +48,6 @@ cd "$SERVER_DIR/src/main/aidl"
 "$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" android/view/IRotationWatcher.aidl
 "$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" \
     android/content/IOnPrimaryClipChangedListener.aidl
-"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" android/view/IDisplayFoldListener.aidl
 
 echo "Compiling java sources..."
 cd ../java

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

@@ -11,8 +11,6 @@ public interface AsyncProcessor {
     }
 
     void start(TerminationListener listener);
-
     void stop();
-
     void join() throws InterruptedException;
 }

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

@@ -24,19 +24,11 @@ public final class AudioCapture {
     public static final int ENCODING = AudioFormat.ENCODING_PCM_16BIT;
     public static final int BYTES_PER_SAMPLE = 2;
 
-    // Never read more than 1024 samples, even if the buffer is bigger (that would increase latency).
-    // A lower value is useless, since the system captures audio samples by blocks of 1024 (so for example if we read by blocks of 256 samples, we
-    // receive 4 successive blocks without waiting, then we wait for the 4 next ones).
-    public static final int MAX_READ_SIZE = 1024 * CHANNELS * BYTES_PER_SAMPLE;
-
-    private static final long ONE_SAMPLE_US = (1000000 + SAMPLE_RATE - 1) / SAMPLE_RATE; // 1 sample in microseconds (used for fixing PTS)
-
     private final int audioSource;
 
     private AudioRecord recorder;
 
     private final AudioTimestamp timestamp = new AudioTimestamp();
-    private long previousRecorderTimestamp = -1;
     private long previousPts = 0;
     private long nextPts = 0;
 
@@ -44,6 +36,10 @@ public final class AudioCapture {
         this.audioSource = audioSource.value();
     }
 
+    public static int millisToBytes(int millis) {
+        return SAMPLE_RATE * CHANNELS * BYTES_PER_SAMPLE * millis / 1000;
+    }
+
     private static AudioFormat createAudioFormat() {
         AudioFormat.Builder builder = new AudioFormat.Builder();
         builder.setEncoding(ENCODING);
@@ -122,7 +118,7 @@ public final class AudioCapture {
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
             startWorkaroundAndroid11();
             try {
-                tryStartRecording(5, 100);
+                tryStartRecording(3, 100);
             } finally {
                 stopWorkaroundAndroid11();
             }
@@ -139,8 +135,8 @@ public final class AudioCapture {
     }
 
     @TargetApi(Build.VERSION_CODES.N)
-    public int read(ByteBuffer directBuffer, MediaCodec.BufferInfo outBufferInfo) {
+    public int read(ByteBuffer directBuffer, int size, MediaCodec.BufferInfo outBufferInfo) {
-        int r = recorder.read(directBuffer, MAX_READ_SIZE);
+        int r = recorder.read(directBuffer, size);
         if (r <= 0) {
             return r;
         }
@@ -148,28 +144,26 @@ public final class AudioCapture {
         long pts;
 
         int ret = recorder.getTimestamp(timestamp, AudioTimestamp.TIMEBASE_MONOTONIC);
-        if (ret == AudioRecord.SUCCESS && timestamp.nanoTime != previousRecorderTimestamp) {
+        if (ret == AudioRecord.SUCCESS) {
             pts = timestamp.nanoTime / 1000;
-            previousRecorderTimestamp = timestamp.nanoTime;
         } else {
             if (nextPts == 0) {
-                Ln.w("Could not get initial audio timestamp");
+                Ln.w("Could not get any audio timestamp");
-                nextPts = System.nanoTime() / 1000;
             }
             // compute from previous timestamp and packet size
             pts = nextPts;
         }
 
-        long durationUs = r * 1000000L / (CHANNELS * BYTES_PER_SAMPLE * SAMPLE_RATE);
+        long durationUs = r * 1000000 / (CHANNELS * BYTES_PER_SAMPLE * SAMPLE_RATE);
         nextPts = pts + durationUs;
 
-        if (previousPts != 0 && pts < previousPts + ONE_SAMPLE_US) {
+        if (previousPts != 0 && pts < previousPts) {
             // Audio PTS may come from two sources:
             //  - recorder.getTimestamp() if the call works;
             //  - an estimation from the previous PTS and the packet size as a fallback.
             //
             // Therefore, the property that PTS are monotonically increasing is no guaranteed in corner cases, so enforce it.
-            pts = previousPts + ONE_SAMPLE_US;
+            pts = previousPts + 1;
         }
         previousPts = pts;
 

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

@@ -5,7 +5,6 @@ import android.media.MediaFormat;
 public enum AudioCodec implements Codec {
     OPUS(0x6f_70_75_73, "opus", MediaFormat.MIMETYPE_AUDIO_OPUS),
     AAC(0x00_61_61_63, "aac", MediaFormat.MIMETYPE_AUDIO_AAC),
-    FLAC(0x66_6c_61_63, "flac", MediaFormat.MIMETYPE_AUDIO_FLAC),
     RAW(0x00_72_61_77, "raw", MediaFormat.MIMETYPE_AUDIO_RAW);
 
     private final int id; // 4-byte ASCII representation of the name

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

@@ -37,6 +37,9 @@ public final class AudioEncoder implements AsyncProcessor {
     private static final int SAMPLE_RATE = AudioCapture.SAMPLE_RATE;
     private static final int CHANNELS = AudioCapture.CHANNELS;
 
+    private static final int READ_MS = 5; // milliseconds
+    private static final int READ_SIZE = AudioCapture.millisToBytes(READ_MS);
+
     private final AudioCapture capture;
     private final Streamer streamer;
     private final int bitRate;
@@ -90,7 +93,7 @@ public final class AudioEncoder implements AsyncProcessor {
         while (!Thread.currentThread().isInterrupted()) {
             InputTask task = inputTasks.take();
             ByteBuffer buffer = mediaCodec.getInputBuffer(task.index);
-            int r = capture.read(buffer, bufferInfo);
+            int r = capture.read(buffer, READ_SIZE, bufferInfo);
             if (r <= 0) {
                 throw new IOException("Could not read audio: " + r);
             }
@@ -295,7 +298,7 @@ public final class AudioEncoder implements AsyncProcessor {
         }
     }
 
-    private final class EncoderCallback extends MediaCodec.Callback {
+    private class EncoderCallback extends MediaCodec.Callback {
         @TargetApi(Build.VERSION_CODES.N)
         @Override
         public void onInputBufferAvailable(MediaCodec codec, int index) {

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

@@ -13,6 +13,9 @@ public final class AudioRawRecorder implements AsyncProcessor {
 
     private Thread thread;
 
+    private static final int READ_MS = 5; // milliseconds
+    private static final int READ_SIZE = AudioCapture.millisToBytes(READ_MS);
+
     public AudioRawRecorder(AudioCapture capture, Streamer streamer) {
         this.capture = capture;
         this.streamer = streamer;
@@ -25,22 +28,16 @@ public final class AudioRawRecorder implements AsyncProcessor {
             return;
         }
 
-        final ByteBuffer buffer = ByteBuffer.allocateDirect(AudioCapture.MAX_READ_SIZE);
+        final ByteBuffer buffer = ByteBuffer.allocateDirect(READ_SIZE);
         final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
 
         try {
-            try {
+            capture.start();
-                capture.start();
-            } catch (Throwable t) {
-                // Notify the client that the audio could not be captured
-                streamer.writeDisableStream(false);
-                throw t;
-            }
 
             streamer.writeAudioHeader();
             while (!Thread.currentThread().isInterrupted()) {
                 buffer.position(0);
-                int r = capture.read(buffer, bufferInfo);
+                int r = capture.read(buffer, READ_SIZE, bufferInfo);
                 if (r < 0) {
                     throw new IOException("Could not read audio: " + r);
                 }
@@ -48,11 +45,10 @@ public final class AudioRawRecorder implements AsyncProcessor {
 
                 streamer.writePacket(buffer, bufferInfo);
             }
-        } catch (IOException e) {
+        } catch (Throwable e) {
-            // Broken pipe is expected on close, because the socket is closed by the client
+            // Notify the client that the audio could not be captured
-            if (!IO.isBrokenPipe(e)) {
+            streamer.writeDisableStream(false);
-                Ln.e("Audio capture error", e);
+            throw e;
-            }
         } finally {
             capture.stop();
         }
@@ -66,8 +62,8 @@ public final class AudioRawRecorder implements AsyncProcessor {
                 record();
             } catch (AudioCaptureForegroundException e) {
                 // Do not print stack trace, a user-friendly error-message has already been logged
-            } catch (Throwable t) {
+            } catch (IOException e) {
-                Ln.e("Audio recording error", t);
+                Ln.e("Audio recording error", e);
                 fatalError = true;
             } finally {
                 Ln.d("Audio recorder stopped");

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

@@ -1,37 +0,0 @@
-package com.genymobile.scrcpy;
-
-public final class CameraAspectRatio {
-    private static final float SENSOR = -1;
-
-    private float ar;
-
-    private CameraAspectRatio(float ar) {
-        this.ar = ar;
-    }
-
-    public static CameraAspectRatio fromFloat(float ar) {
-        if (ar < 0) {
-            throw new IllegalArgumentException("Invalid aspect ratio: " + ar);
-        }
-        return new CameraAspectRatio(ar);
-    }
-
-    public static CameraAspectRatio fromFraction(int w, int h) {
-        if (w <= 0 || h <= 0) {
-            throw new IllegalArgumentException("Invalid aspect ratio: " + w + ":" + h);
-        }
-        return new CameraAspectRatio((float) w / h);
-    }
-
-    public static CameraAspectRatio sensorAspectRatio() {
-        return new CameraAspectRatio(SENSOR);
-    }
-
-    public boolean isSensor() {
-        return ar == SENSOR;
-    }
-
-    public float getAspectRatio() {
-        return ar;
-    }
-}

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

@@ -1,351 +0,0 @@
-package com.genymobile.scrcpy;
-
-import com.genymobile.scrcpy.wrappers.ServiceManager;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.graphics.Rect;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.params.OutputConfiguration;
-import android.hardware.camera2.params.SessionConfiguration;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.MediaCodec;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.Range;
-import android.view.Surface;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
-
-public class CameraCapture extends SurfaceCapture {
-
-    private final String explicitCameraId;
-    private final CameraFacing cameraFacing;
-    private final Size explicitSize;
-    private int maxSize;
-    private final CameraAspectRatio aspectRatio;
-    private final int fps;
-    private final boolean highSpeed;
-
-    private String cameraId;
-    private Size size;
-
-    private HandlerThread cameraThread;
-    private Handler cameraHandler;
-    private CameraDevice cameraDevice;
-    private Executor cameraExecutor;
-
-    private final AtomicBoolean disconnected = new AtomicBoolean();
-
-    public CameraCapture(String explicitCameraId, CameraFacing cameraFacing, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio, int fps,
-            boolean highSpeed) {
-        this.explicitCameraId = explicitCameraId;
-        this.cameraFacing = cameraFacing;
-        this.explicitSize = explicitSize;
-        this.maxSize = maxSize;
-        this.aspectRatio = aspectRatio;
-        this.fps = fps;
-        this.highSpeed = highSpeed;
-    }
-
-    @Override
-    public void init() throws IOException {
-        cameraThread = new HandlerThread("camera");
-        cameraThread.start();
-        cameraHandler = new Handler(cameraThread.getLooper());
-        cameraExecutor = new HandlerExecutor(cameraHandler);
-
-        try {
-            cameraId = selectCamera(explicitCameraId, cameraFacing);
-            if (cameraId == null) {
-                throw new IOException("No matching camera found");
-            }
-
-            size = selectSize(cameraId, explicitSize, maxSize, aspectRatio, highSpeed);
-            if (size == null) {
-                throw new IOException("Could not select camera size");
-            }
-
-            Ln.i("Using camera '" + cameraId + "'");
-            cameraDevice = openCamera(cameraId);
-        } catch (CameraAccessException | InterruptedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    private static String selectCamera(String explicitCameraId, CameraFacing cameraFacing) throws CameraAccessException {
-        if (explicitCameraId != null) {
-            return explicitCameraId;
-        }
-
-        CameraManager cameraManager = ServiceManager.getCameraManager();
-
-        String[] cameraIds = cameraManager.getCameraIdList();
-        if (cameraFacing == null) {
-            // Use the first one
-            return cameraIds.length > 0 ? cameraIds[0] : null;
-        }
-
-        for (String cameraId : cameraIds) {
-            CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);
-
-            int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
-            if (cameraFacing.value() == facing) {
-                return cameraId;
-            }
-        }
-
-        // Not found
-        return null;
-    }
-
-    @TargetApi(Build.VERSION_CODES.N)
-    private static Size selectSize(String cameraId, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio, boolean highSpeed)
-            throws CameraAccessException {
-        if (explicitSize != null) {
-            return explicitSize;
-        }
-
-        CameraManager cameraManager = ServiceManager.getCameraManager();
-        CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);
-
-        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-        android.util.Size[] sizes = highSpeed ? configs.getHighSpeedVideoSizes() : configs.getOutputSizes(MediaCodec.class);
-        Stream<android.util.Size> stream = Arrays.stream(sizes);
-        if (maxSize > 0) {
-            stream = stream.filter(it -> it.getWidth() <= maxSize && it.getHeight() <= maxSize);
-        }
-
-        Float targetAspectRatio = resolveAspectRatio(aspectRatio, characteristics);
-        if (targetAspectRatio != null) {
-            stream = stream.filter(it -> {
-                float ar = ((float) it.getWidth() / it.getHeight());
-                float arRatio = ar / targetAspectRatio;
-                // Accept if the aspect ratio is the target aspect ratio + or - 10%
-                return arRatio >= 0.9f && arRatio <= 1.1f;
-            });
-        }
-
-        Optional<android.util.Size> selected = stream.max((s1, s2) -> {
-            // Greater width is better
-            int cmp = Integer.compare(s1.getWidth(), s2.getWidth());
-            if (cmp != 0) {
-                return cmp;
-            }
-
-            if (targetAspectRatio != null) {
-                // Closer to the target aspect ratio is better
-                float ar1 = ((float) s1.getWidth() / s1.getHeight());
-                float arRatio1 = ar1 / targetAspectRatio;
-                float distance1 = Math.abs(1 - arRatio1);
-
-                float ar2 = ((float) s2.getWidth() / s2.getHeight());
-                float arRatio2 = ar2 / targetAspectRatio;
-                float distance2 = Math.abs(1 - arRatio2);
-
-                // Reverse the order because lower distance is better
-                cmp = Float.compare(distance2, distance1);
-                if (cmp != 0) {
-                    return cmp;
-                }
-            }
-
-            // Greater height is better
-            return Integer.compare(s1.getHeight(), s2.getHeight());
-        });
-
-        if (selected.isPresent()) {
-            android.util.Size size = selected.get();
-            return new Size(size.getWidth(), size.getHeight());
-        }
-
-        // Not found
-        return null;
-    }
-
-    private static Float resolveAspectRatio(CameraAspectRatio ratio, CameraCharacteristics characteristics) {
-        if (ratio == null) {
-            return null;
-        }
-
-        if (ratio.isSensor()) {
-            Rect activeSize = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-            return (float) activeSize.width() / activeSize.height();
-        }
-
-        return ratio.getAspectRatio();
-    }
-
-    @Override
-    public void start(Surface surface) throws IOException {
-        try {
-            CameraCaptureSession session = createCaptureSession(cameraDevice, surface);
-            CaptureRequest request = createCaptureRequest(surface);
-            setRepeatingRequest(session, request);
-        } catch (CameraAccessException | InterruptedException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public void release() {
-        if (cameraDevice != null) {
-            cameraDevice.close();
-        }
-        if (cameraThread != null) {
-            cameraThread.quitSafely();
-        }
-    }
-
-    @Override
-    public Size getSize() {
-        return size;
-    }
-
-    @Override
-    public boolean setMaxSize(int maxSize) {
-        if (explicitSize != null) {
-            return false;
-        }
-
-        this.maxSize = maxSize;
-        try {
-            size = selectSize(cameraId, null, maxSize, aspectRatio, highSpeed);
-            return size != null;
-        } catch (CameraAccessException e) {
-            Ln.w("Could not select camera size", e);
-            return false;
-        }
-    }
-
-    @SuppressLint("MissingPermission")
-    @TargetApi(Build.VERSION_CODES.S)
-    private CameraDevice openCamera(String id) throws CameraAccessException, InterruptedException {
-        CompletableFuture<CameraDevice> future = new CompletableFuture<>();
-        ServiceManager.getCameraManager().openCamera(id, new CameraDevice.StateCallback() {
-            @Override
-            public void onOpened(CameraDevice camera) {
-                Ln.d("Camera opened successfully");
-                future.complete(camera);
-            }
-
-            @Override
-            public void onDisconnected(CameraDevice camera) {
-                Ln.w("Camera disconnected");
-                disconnected.set(true);
-                requestReset();
-            }
-
-            @Override
-            public void onError(CameraDevice camera, int error) {
-                int cameraAccessExceptionErrorCode;
-                switch (error) {
-                    case CameraDevice.StateCallback.ERROR_CAMERA_IN_USE:
-                        cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_IN_USE;
-                        break;
-                    case CameraDevice.StateCallback.ERROR_MAX_CAMERAS_IN_USE:
-                        cameraAccessExceptionErrorCode = CameraAccessException.MAX_CAMERAS_IN_USE;
-                        break;
-                    case CameraDevice.StateCallback.ERROR_CAMERA_DISABLED:
-                        cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_DISABLED;
-                        break;
-                    case CameraDevice.StateCallback.ERROR_CAMERA_DEVICE:
-                    case CameraDevice.StateCallback.ERROR_CAMERA_SERVICE:
-                    default:
-                        cameraAccessExceptionErrorCode = CameraAccessException.CAMERA_ERROR;
-                        break;
-                }
-                future.completeExceptionally(new CameraAccessException(cameraAccessExceptionErrorCode));
-            }
-        }, cameraHandler);
-
-        try {
-            return future.get();
-        } catch (ExecutionException e) {
-            throw (CameraAccessException) e.getCause();
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.S)
-    private CameraCaptureSession createCaptureSession(CameraDevice camera, Surface surface) throws CameraAccessException, InterruptedException {
-        CompletableFuture<CameraCaptureSession> future = new CompletableFuture<>();
-        OutputConfiguration outputConfig = new OutputConfiguration(surface);
-        List<OutputConfiguration> outputs = Arrays.asList(outputConfig);
-
-        int sessionType = highSpeed ? SessionConfiguration.SESSION_HIGH_SPEED : SessionConfiguration.SESSION_REGULAR;
-        SessionConfiguration sessionConfig = new SessionConfiguration(sessionType, outputs, cameraExecutor, new CameraCaptureSession.StateCallback() {
-            @Override
-            public void onConfigured(CameraCaptureSession session) {
-                future.complete(session);
-            }
-
-            @Override
-            public void onConfigureFailed(CameraCaptureSession session) {
-                future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
-            }
-        });
-
-        camera.createCaptureSession(sessionConfig);
-
-        try {
-            return future.get();
-        } catch (ExecutionException e) {
-            throw (CameraAccessException) e.getCause();
-        }
-    }
-
-    private CaptureRequest createCaptureRequest(Surface surface) throws CameraAccessException {
-        CaptureRequest.Builder requestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
-        requestBuilder.addTarget(surface);
-
-        if (fps > 0) {
-            requestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, new Range<>(fps, fps));
-        }
-
-        return requestBuilder.build();
-    }
-
-    @TargetApi(Build.VERSION_CODES.S)
-    private void setRepeatingRequest(CameraCaptureSession session, CaptureRequest request) throws CameraAccessException, InterruptedException {
-        CameraCaptureSession.CaptureCallback callback = new CameraCaptureSession.CaptureCallback() {
-            @Override
-            public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, long timestamp, long frameNumber) {
-                // Called for each frame captured, do nothing
-            }
-
-            @Override
-            public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request, CaptureFailure failure) {
-                Ln.w("Camera capture failed: frame " + failure.getFrameNumber());
-            }
-        };
-
-        if (highSpeed) {
-            CameraConstrainedHighSpeedCaptureSession highSpeedSession = (CameraConstrainedHighSpeedCaptureSession) session;
-            List<CaptureRequest> requests = highSpeedSession.createHighSpeedRequestList(request);
-            highSpeedSession.setRepeatingBurst(requests, callback, cameraHandler);
-        } else {
-            session.setRepeatingRequest(request, callback, cameraHandler);
-        }
-    }
-
-    @Override
-    public boolean isClosed() {
-        return disconnected.get();
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.annotation.SuppressLint;
-import android.hardware.camera2.CameraCharacteristics;
-
-public enum CameraFacing {
-    FRONT("front", CameraCharacteristics.LENS_FACING_FRONT),
-    BACK("back", CameraCharacteristics.LENS_FACING_BACK),
-    @SuppressLint("InlinedApi") // introduced in API 23
-    EXTERNAL("external", CameraCharacteristics.LENS_FACING_EXTERNAL);
-
-    private final String name;
-    private final int value;
-
-    CameraFacing(String name, int value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    int value() {
-        return value;
-    }
-
-    static CameraFacing findByName(String name) {
-        for (CameraFacing facing : CameraFacing.values()) {
-            if (name.equals(facing.name)) {
-                return facing;
-            }
-        }
-
-        return null;
-    }
-}

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

@@ -14,6 +14,8 @@ import java.io.IOException;
  */
 public final class CleanUp {
 
+    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
+
     // A simple struct to be passed from the main process to the cleanup process
     public static class Config implements Parcelable {
 
@@ -133,13 +135,13 @@ public final class CleanUp {
         String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};
 
         ProcessBuilder builder = new ProcessBuilder(cmd);
-        builder.environment().put("CLASSPATH", Server.SERVER_PATH);
+        builder.environment().put("CLASSPATH", SERVER_PATH);
         builder.start();
     }
 
     public static void unlinkSelf() {
         try {
-            new File(Server.SERVER_PATH).delete();
+            new File(SERVER_PATH).delete();
         } catch (Exception e) {
             Ln.e("Could not unlink server", e);
         }
@@ -187,7 +189,5 @@ public final class CleanUp {
                 Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
             }
         }
-
-        System.exit(0);
     }
 }

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

@@ -318,8 +318,9 @@ public class Controller implements AsyncProcessor {
             }
         }
 
-        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
+        MotionEvent event = MotionEvent
-                DEFAULT_DEVICE_ID, 0, source, 0);
+                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source,
+                        0);
         return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 
@@ -340,8 +341,9 @@ public class Controller implements AsyncProcessor {
         coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
         coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
 
-        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
+        MotionEvent event = MotionEvent
-                DEFAULT_DEVICE_ID, 0, InputDevice.SOURCE_MOUSE, 0);
+                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0,
+                        InputDevice.SOURCE_MOUSE, 0);
         return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 

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

@@ -64,6 +64,8 @@ public final class DesktopConnection implements Closeable {
             throws IOException {
         String socketName = getSocketName(scid);
 
+        LocalSocket firstSocket = null;
+
         LocalSocket videoSocket = null;
         LocalSocket audioSocket = null;
         LocalSocket controlSocket = null;
@@ -72,28 +74,24 @@ public final class DesktopConnection implements Closeable {
                 try (LocalServerSocket localServerSocket = new LocalServerSocket(socketName)) {
                     if (video) {
                         videoSocket = localServerSocket.accept();
-                        if (sendDummyByte) {
+                        firstSocket = videoSocket;
-                            // send one byte so the client may read() to detect a connection error
-                            videoSocket.getOutputStream().write(0);
-                            sendDummyByte = false;
-                        }
                     }
                     if (audio) {
                         audioSocket = localServerSocket.accept();
-                        if (sendDummyByte) {
+                        if (firstSocket == null) {
-                            // send one byte so the client may read() to detect a connection error
+                            firstSocket = audioSocket;
-                            audioSocket.getOutputStream().write(0);
-                            sendDummyByte = false;
                         }
                     }
                     if (control) {
                         controlSocket = localServerSocket.accept();
-                        if (sendDummyByte) {
+                        if (firstSocket == null) {
-                            // send one byte so the client may read() to detect a connection error
+                            firstSocket = controlSocket;
-                            controlSocket.getOutputStream().write(0);
-                            sendDummyByte = false;
                         }
                     }
+                    if (sendDummyByte) {
+                        // send one byte so the client may read() to detect a connection error
+                        firstSocket.getOutputStream().write(0);
+                    }
                 }
             } else {
                 if (video) {
@@ -132,29 +130,20 @@ public final class DesktopConnection implements Closeable {
         return controlSocket;
     }
 
-    public void shutdown() throws IOException {
+    public void close() throws IOException {
         if (videoSocket != null) {
             videoSocket.shutdownInput();
             videoSocket.shutdownOutput();
+            videoSocket.close();
         }
         if (audioSocket != null) {
             audioSocket.shutdownInput();
             audioSocket.shutdownOutput();
+            audioSocket.close();
         }
         if (controlSocket != null) {
             controlSocket.shutdownInput();
             controlSocket.shutdownOutput();
-        }
-    }
-
-    public void close() throws IOException {
-        if (videoSocket != null) {
-            videoSocket.close();
-        }
-        if (audioSocket != null) {
-            audioSocket.close();
-        }
-        if (controlSocket != null) {
             controlSocket.close();
         }
     }

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

@@ -1,7 +1,6 @@
 package com.genymobile.scrcpy;
 
 import com.genymobile.scrcpy.wrappers.ClipboardManager;
-import com.genymobile.scrcpy.wrappers.DisplayControl;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
@@ -12,8 +11,8 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
-import android.view.IDisplayFoldListener;
 import android.view.IRotationWatcher;
+import android.view.IDisplayFoldListener;
 import android.view.InputDevice;
 import android.view.InputEvent;
 import android.view.KeyCharacterMap;
@@ -45,11 +44,11 @@ public final class Device {
         void onClipboardTextChanged(String text);
     }
 
+    private final Size deviceSize;
     private final Rect crop;
     private int maxSize;
     private final int lockVideoOrientation;
 
-    private Size deviceSize;
     private ScreenInfo screenInfo;
     private RotationListener rotationListener;
     private FoldListener foldListener;
@@ -100,32 +99,25 @@ public final class Device {
             }
         }, displayId);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        ServiceManager.getWindowManager().registerDisplayFoldListener(new IDisplayFoldListener.Stub() {
-            ServiceManager.getWindowManager().registerDisplayFoldListener(new IDisplayFoldListener.Stub() {
+            @Override
-                @Override
+            public void onDisplayFoldChanged(int displayId, boolean folded) {
-                public void onDisplayFoldChanged(int displayId, boolean folded) {
+                synchronized (Device.this) {
-                    if (Device.this.displayId != displayId) {
+                    DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
-                        // Ignore events related to other display ids
+                    if (displayInfo == null) {
+                        Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
                         return;
                     }
 
-                    synchronized (Device.this) {
+                    screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), displayInfo.getSize(), options.getCrop(),
-                        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+                            options.getMaxSize(), options.getLockVideoOrientation());
-                        if (displayInfo == null) {
+                    // notify
-                            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
+                    if (foldListener != null) {
-                            return;
+                        foldListener.onFoldChanged(displayId, folded);
-                        }
-
-                        deviceSize = displayInfo.getSize();
-                        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
-                        // notify
-                        if (foldListener != null) {
-                            foldListener.onFoldChanged(displayId, folded);
-                        }
                     }
                 }
-            });
+            }
-        }
+        });
 
         if (options.getControl() && options.getClipboardAutosync()) {
             // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
@@ -316,12 +308,8 @@ public final class Device {
      */
     public static boolean setScreenPowerMode(int mode) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            // On Android 14, these internal methods have been moved to DisplayControl
-            boolean useDisplayControl =
-                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !SurfaceControl.hasPhysicalDisplayIdsMethod();
-
             // Change the power mode for all physical displays
-            long[] physicalDisplayIds = useDisplayControl ? DisplayControl.getPhysicalDisplayIds() : SurfaceControl.getPhysicalDisplayIds();
+            long[] physicalDisplayIds = SurfaceControl.getPhysicalDisplayIds();
             if (physicalDisplayIds == null) {
                 Ln.e("Could not get physical display ids");
                 return false;
@@ -329,8 +317,7 @@ public final class Device {
 
             boolean allOk = true;
             for (long physicalDisplayId : physicalDisplayIds) {
-                IBinder binder = useDisplayControl ? DisplayControl.getPhysicalDisplayToken(
+                IBinder binder = SurfaceControl.getPhysicalDisplayToken(physicalDisplayId);
-                        physicalDisplayId) : SurfaceControl.getPhysicalDisplayToken(physicalDisplayId);
                 allOk &= SurfaceControl.setDisplayPowerMode(binder, mode);
             }
             return allOk;