Build macOS x86_64 release

Add actions to build a release for macOS x86_64 in addition to the aarch64 version.
Specify architecture for Linux and macOS releases
2026-03-02 02:04:28 +01:00 · 2024-11-26 00:20:25 +01:00 · 2024-11-26 00:18:27 +01:00 · 2024-11-26 00:18:03 +01:00 · 2024-11-26 00:16:46 +01:00 · 2024-11-26 00:16:04 +01:00
177 changed files with 703 additions and 1633 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -74,7 +74,6 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@@ -84,23 +83,13 @@ jobs:
        run: release/test_client.sh

  build-linux-x86_64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
-      - name: Check architecture
-        run: |
-            arch=$(uname -m)
-            if [[ "$arch" != x86_64 ]]
-            then
-                echo "Unexpected architecture: $arch" >&2
-                exit 1
-            fi
-
      - name: Checkout code
        uses: actions/checkout@v4

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@@ -131,12 +120,14 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             mingw-w64 mingw-w64-tools libz-mingw-w64-dev

+      - name: Workaround for old meson version run by Github Actions
+        run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt
+
      - name: Build
        run: release/build_windows.sh 32

@@ -162,12 +153,14 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             mingw-w64 mingw-w64-tools libz-mingw-w64-dev

+      - name: Workaround for old meson version run by Github Actions
+        run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt
+
      - name: Build
        run: release/build_windows.sh 64

@@ -188,15 +181,6 @@ jobs:
  build-macos-aarch64:
    runs-on: macos-latest
    steps:
-      - name: Check architecture
-        run: |
-            arch=$(uname -m)
-            if [[ "$arch" != arm64 ]]
-            then
-                echo "Unexpected architecture: $arch" >&2
-                exit 1
-            fi
-
      - name: Checkout code
        uses: actions/checkout@v4

@@ -206,13 +190,6 @@ jobs:
                libtool

      - name: Build
-        env:
-          # the default Xcode (and macOS SDK) version can be found at
-          # <https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode>
-          #
-          # then the minimal supported deployment target of that macOS SDK can be found at
-          # <https://developer.apple.com/support/xcode/#minimum-requirements>
-          MACOSX_DEPLOYMENT_TARGET: 10.13
        run: release/build_macos.sh aarch64

      # upload-artifact does not preserve permissions
@@ -232,15 +209,6 @@ jobs:
  build-macos-x86_64:
    runs-on: macos-13
    steps:
-      - name: Check architecture
-        run: |
-            arch=$(uname -m)
-            if [[ "$arch" != x86_64 ]]
-            then
-                echo "Unexpected architecture: $arch" >&2
-                exit 1
-            fi
-
      - name: Checkout code
        uses: actions/checkout@v4

@@ -249,13 +217,6 @@ jobs:
             # autoconf and libtool are already installed on macos-13

      - name: Build
-        env:
-          # the default Xcode (and macOS SDK) version can be found at
-          # <https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode>
-          #
-          # then the minimal supported deployment target of that macOS SDK can be found at
-          # <https://developer.apple.com/support/xcode/#minimum-requirements>
-          MACOSX_DEPLOYMENT_TARGET: 10.13
        run: release/build_macos.sh x86_64

      # upload-artifact does not preserve permissions
@@ -498,7 +459,7 @@ jobs:
      - name: Download release-macos-x86_64
        uses: actions/download-artifact@v4
        with:
-          name: release-macos-x86_64
+          name: release-macos-aarch64
          path: release/output/

      - name: Package server
--- a/2
+++ b/2
@@ -188,7 +188,7 @@
      identification within third-party archives.

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

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -2,16 +2,16 @@
 source for the project. Do not download releases from random websites, even if
 their name contains `scrcpy`.**

-# scrcpy (v3.2)
+# scrcpy (v3.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
-[TCP/IP](doc/connection.md#tcpip-wireless) and allows control using the
-computer's keyboard and mouse. It does not require _root_ access or an app
-installed on the device. It works on _Linux_, _Windows_, and _macOS_.
+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
+device with the keyboard and the mouse of the computer. It does not require any
+_root_ access. It works on _Linux_, _Windows_ and _macOS_.

 ![screenshot](assets/screenshot-debian-600.jpg)

@@ -78,16 +78,6 @@ Note that USB debugging is not required to run scrcpy in [OTG mode](doc/otg.md).
 - [macOS](doc/macos.md)


-## Must-know tips
-
- - [Reducing resolution](doc/video.md#size) may greatly improve performance
-   (`scrcpy -m1024`)
- - [_Right-click_](doc/mouse.md#mouse-bindings) triggers `BACK`
- - [_Middle-click_](doc/mouse.md#mouse-bindings) triggers `HOME`
- - <kbd>Alt</kbd>+<kbd>f</kbd> toggles [fullscreen](doc/window.md#fullscreen)
- - There are many other [shortcuts](doc/shortcuts.md)
-
-
 ## Usage examples

 There are a lot of options, [documented](#user-documentation) in separate pages.
@@ -210,7 +200,7 @@ work][donate]:
 ## Licence

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

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -23,7 +23,6 @@ _scrcpy() {
        -d --select-usb
        --disable-screensaver
        --display-id=
-        --display-ime-policy=
        --display-orientation=
        -e --select-tcpip
        -f --fullscreen
@@ -58,7 +57,6 @@ _scrcpy() {
        --no-mipmaps
        --no-mouse-hover
        --no-power-on
-        --no-vd-destroy-content
        --no-vd-system-decorations
        --no-video
        --no-video-playback
@@ -122,7 +120,7 @@ _scrcpy() {
            return
            ;;
        --audio-source)
-            COMPREPLY=($(compgen -W 'output playback mic mic-unprocessed mic-camcorder mic-voice-recognition mic-voice-communication voice-call voice-call-uplink voice-call-downlink voice-performance' -- "$cur"))
+            COMPREPLY=($(compgen -W 'output mic playback' -- "$cur"))
            return
            ;;
        --camera-facing)
@@ -149,10 +147,6 @@ _scrcpy() {
            COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
            return
            ;;
-        --display-ime-policy)
-            COMPREPLY=($(compgen -W 'local fallback hide' -- "$cur"))
-            return
-            ;;
        --record-orientation)
            COMPREPLY=($(compgen -W '0 90 180 270' -- "$cur"))
            return
--- a/app/data/scrcpy_static_wrapper.sh
+++ b/app/data/scrcpy_static_wrapper.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd "$(dirname ${BASH_SOURCE[0]})"
+export ADB="${ADB:-./adb}"
+export SCRCPY_SERVER_PATH="${SCRCPY_SERVER_PATH:-./scrcpy-server}"
+export SCRCPY_ICON_PATH="${SCRCPY_ICON_PATH:-./icon.png}"
+./scrcpy_bin "$@"
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -16,7 +16,7 @@ arguments=(
    '--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
    '--audio-dup=[Duplicate audio]'
    '--audio-encoder=[Use a specific MediaCodec audio encoder]'
-    '--audio-source=[Select the audio source]:source:(output playback mic mic-unprocessed mic-camcorder mic-voice-recognition mic-voice-communication voice-call voice-call-uplink voice-call-downlink voice-performance)'
+    '--audio-source=[Select the audio source]:source:(output mic playback)'
    '--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]'
@@ -30,7 +30,6 @@ arguments=(
    {-d,--select-usb}'[Use USB device]'
    '--disable-screensaver[Disable screensaver while scrcpy is running]'
    '--display-id=[Specify the display id to mirror]'
-    '--display-ime-policy[Set the policy for selecting where the IME should be displayed]'
    '--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]'
@@ -64,7 +63,6 @@ arguments=(
    '--no-mipmaps[Disable the generation of mipmaps]'
    '--no-mouse-hover[Do not forward mouse hover events]'
    '--no-power-on[Do not power on the device on start]'
-    '--no-vd-destroy-content[Disable virtual display "destroy content on removal" flag]'
    '--no-vd-system-decorations[Disable virtual display system decorations flag]'
    '--no-video[Disable video forwarding]'
    '--no-video-playback[Disable video playback]'
--- a/app/deps/dav1d.sh
+++ b/app/deps/dav1d.sh
@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DEPS_DIR"
-. common
-process_args "$@"
-
-VERSION=1.5.0
-FILENAME=dav1d-$VERSION.tar.gz
-PROJECT_DIR=dav1d-$VERSION
-SHA256SUM=78b15d9954b513ea92d27f39362535ded2243e1b0924fde39f37a31ebed5f76b
-
-cd "$SOURCES_DIR"
-
-if [[ -d "$PROJECT_DIR" ]]
-then
-    echo "$PWD/$PROJECT_DIR" found
-else
-    get_file "https://code.videolan.org/videolan/dav1d/-/archive/$VERSION/$FILENAME" "$FILENAME" "$SHA256SUM"
-    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
-fi
-
-mkdir -p "$BUILD_DIR/$PROJECT_DIR"
-cd "$BUILD_DIR/$PROJECT_DIR"
-
-if [[ -d "$DIRNAME" ]]
-then
-    echo "'$PWD/$DIRNAME' already exists, not reconfigured"
-    cd "$DIRNAME"
-else
-    mkdir "$DIRNAME"
-    cd "$DIRNAME"
-
-    conf=(
-        --prefix="$INSTALL_DIR/$DIRNAME"
-        --libdir=lib
-        -Denable_tests=false
-        -Denable_tools=false
-        # Always build dav1d statically
-        --default-library=static
-    )
-
-    if [[ "$BUILD_TYPE" == cross ]]
-    then
-        case "$HOST" in
-            win32)
-                conf+=(
-                    --cross-file="$SOURCES_DIR/$PROJECT_DIR/package/crossfiles/i686-w64-mingw32.meson"
-                )
-                ;;
-
-            win64)
-                conf+=(
-                    --cross-file="$SOURCES_DIR/$PROJECT_DIR/package/crossfiles/x86_64-w64-mingw32.meson"
-                )
-                ;;
-
-            *)
-                echo "Unsupported host: $HOST" >&2
-                exit 1
-        esac
-    fi
-
-    meson setup . "$SOURCES_DIR/$PROJECT_DIR" "${conf[@]}"
-fi
-
-ninja
-ninja install
--- a/app/deps/ffmpeg.sh
+++ b/app/deps/ffmpeg.sh
@@ -5,10 +5,10 @@ cd "$DEPS_DIR"
 . common
 process_args "$@"

-VERSION=7.1.1
+VERSION=7.1
 FILENAME=ffmpeg-$VERSION.tar.xz
 PROJECT_DIR=ffmpeg-$VERSION
-SHA256SUM=733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1
+SHA256SUM=40973D44970DBC83EF302B0609F2E74982BE2D85916DD2EE7472D30678A7ABE6

 cd "$SOURCES_DIR"

@@ -40,14 +40,16 @@ else
        export LDFLAGS='-static-libgcc -static'
    elif [[ "$HOST" == "macos" ]]
    then
+        export LDFLAGS="$LDFLAGS -L/opt/homebrew/opt/zlib/lib"
+        export CPPFLAGS="$CPPFLAGS -I/opt/homebrew/opt/zlib/include"
+
+        export LDFLAGS="$LDFLAGS-L/opt/homebrew/opt/libiconv/lib"
+        export CPPFLAGS="$CPPFLAGS -I/opt/homebrew/opt/libiconv/include"
        export PKG_CONFIG_PATH="/opt/homebrew/opt/zlib/lib/pkgconfig"
    fi

-    export PKG_CONFIG_PATH="$INSTALL_DIR/$DIRNAME/lib/pkgconfig:$PKG_CONFIG_PATH"
-
    conf=(
        --prefix="$INSTALL_DIR/$DIRNAME"
-        --pkg-config-flags="--static"
        --extra-cflags="-O2 -fPIC"
        --disable-programs
        --disable-doc
@@ -60,11 +62,9 @@ else
        --disable-vaapi
        --disable-vdpau
        --enable-swresample
-        --enable-libdav1d
        --enable-decoder=h264
        --enable-decoder=hevc
        --enable-decoder=av1
-        --enable-decoder=libdav1d
        --enable-decoder=pcm_s16le
        --enable-decoder=opus
        --enable-decoder=aac
--- a/app/deps/libusb.sh
+++ b/app/deps/libusb.sh
@@ -5,10 +5,10 @@ cd "$DEPS_DIR"
 . common
 process_args "$@"

-VERSION=1.0.28
+VERSION=1.0.27
 FILENAME=libusb-$VERSION.tar.gz
 PROJECT_DIR=libusb-$VERSION
-SHA256SUM=378b3709a405065f8f9fb9f35e82d666defde4d342c2a1b181a9ac134d23c6fe
+SHA256SUM=e8f18a7a36ecbb11fb820bd71540350d8f61bcd9db0d2e8c18a6fb80b214a3de

 cd "$SOURCES_DIR"

--- a/app/deps/patches/SDL-pipewire-Ensure-that-the-correct-struct-is-used-for-.patch
+++ b/app/deps/patches/SDL-pipewire-Ensure-that-the-correct-struct-is-used-for-.patch
@@ -1,33 +0,0 @@
-From 6be87ceb33a9aad3bf5204bb13b3a5e8b498fd26 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Mon, 10 Feb 2025 05:00:56 -0500
-Subject: [PATCH] pipewire: Ensure that the correct struct is used for
- enumeration APIs
-
-PipeWire now requires the correct struct type is used, otherwise
-it will fail to compile.
-
-Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f
-
-Fixes: https://github.com/libsdl-org/SDL/issues/12224
-(cherry picked from commit d35bef64e913dd7d5dd3153a4b61f10ef837dad6)
---
- src/audio/pipewire/SDL_pipewire.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c
-index 889e05decb..5d1bfc28de 100644
--- a/src/audio/pipewire/SDL_pipewire.c
-+++ b/src/audio/pipewire/SDL_pipewire.c
-@@ -590,7 +590,7 @@ static void node_event_info(void *object, const struct pw_node_info *info)
- 
-         /* Need to parse the parameters to get the sample rate */
-         for (i = 0; i < info->n_params; ++i) {
-            pw_node_enum_params(node->proxy, 0, info->params[i].id, 0, 0, NULL);
-+            pw_node_enum_params((struct pw_node*)node->proxy, 0, info->params[i].id, 0, 0, NULL);
-         }
- 
-         hotplug_core_sync(node);
-- 
-2.49.0
-
--- a/app/deps/sdl.sh
+++ b/app/deps/sdl.sh
@@ -5,10 +5,10 @@ cd "$DEPS_DIR"
 . common
 process_args "$@"

-VERSION=2.32.2
+VERSION=2.30.9
 FILENAME=SDL-$VERSION.tar.gz
 PROJECT_DIR=SDL-release-$VERSION
-SHA256SUM=f2c7297ae7b3d3910a8b131e1e2a558fdd6d1a4443d5e345374d45cadfcb05a4
+SHA256SUM=682a055004081e37d81a7d4ce546c3ee3ef2e0e6a675ed2651e430ccd14eb407

 cd "$SOURCES_DIR"

@@ -18,7 +18,6 @@ then
 else
    get_file "https://github.com/libsdl-org/SDL/archive/refs/tags/release-$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"
    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
-    patch -d "$PROJECT_DIR" -p1 < "$PATCHES_DIR"/SDL-pipewire-Ensure-that-the-correct-struct-is-used-for-.patch
 fi

 mkdir -p "$BUILD_DIR/$PROJECT_DIR"
--- a/app/meson.build
+++ b/app/meson.build
@@ -46,7 +46,6 @@ src = [
    'src/util/acksync.c',
    'src/util/audiobuf.c',
    'src/util/average.c',
-    'src/util/env.c',
    'src/util/file.c',
    'src/util/intmap.c',
    'src/util/intr.c',
@@ -192,19 +191,19 @@ datadir = get_option('datadir') # by default 'share'
 install_man('scrcpy.1')
 install_data('data/icon.png',
             rename: 'scrcpy.png',
-             install_dir: datadir / 'icons/hicolor/256x256/apps')
+             install_dir: join_paths(datadir, 'icons/hicolor/256x256/apps'))
 install_data('data/zsh-completion/_scrcpy',
-             install_dir: datadir / 'zsh/site-functions')
+             install_dir: join_paths(datadir, 'zsh/site-functions'))
 install_data('data/bash-completion/scrcpy',
-             install_dir: datadir / 'bash-completion/completions')
+             install_dir: join_paths(datadir, 'bash-completion/completions'))

 # Desktop entry file for application launchers
 if host_machine.system() == 'linux'
    # Install a launcher (ex: /usr/local/share/applications/scrcpy.desktop)
    install_data('data/scrcpy.desktop',
-                 install_dir: datadir / 'applications')
+                 install_dir: join_paths(datadir, 'applications'))
    install_data('data/scrcpy-console.desktop',
-                 install_dir: datadir / 'applications')
+                 install_dir: join_paths(datadir, 'applications'))
 endif


@@ -279,9 +278,3 @@ if get_option('buildtype') == 'debug'
        test(t[0], exe)
    endforeach
 endif
-
-if meson.version().version_compare('>= 0.58.0')
-       devenv = environment()
-       devenv.set('SCRCPY_ICON_PATH', meson.current_source_dir() / 'data/icon.png')
-       meson.add_devenv(devenv)
-endif
--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@@ -13,7 +13,7 @@ BEGIN
      VALUE "LegalCopyright", "Romain Vimont, Genymobile"
      VALUE "OriginalFilename", "scrcpy.exe"
      VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "3.2"
+      VALUE "ProductVersion", "3.0"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -67,19 +67,13 @@ The available encoders can be listed by \fB\-\-list\-encoders\fR.

 .TP
 .BI "\-\-audio\-source " source
-Select the audio source. Possible values are:
+Select the audio source (output, mic or playback).

- - "output": forwards the whole audio output, and disables playback on the device.
- - "playback": captures the audio playback (Android apps can opt-out, so the whole output is not necessarily captured).
- - "mic": captures the microphone.
- - "mic-unprocessed": captures the microphone unprocessed (raw) sound.
- - "mic-camcorder": captures the microphone tuned for video recording, with the same orientation as the camera if available.
- - "mic-voice-recognition": captures the microphone tuned for voice recognition.
- - "mic-voice-communication": captures the microphone tuned for voice communications (it will for instance take advantage of echo cancellation or automatic gain control if available).
- - "voice-call": captures voice call.
- - "voice-call-uplink": captures voice call uplink only.
- - "voice-call-downlink": captures voice call downlink only.
- - "voice-performance": captures audio meant to be processed for live performance (karaoke), includes both the microphone and the device playback.
+The "output" source forwards the whole audio output, and disables playback on the device.
+
+The "playback" source captures the audio playback (Android apps can opt-out, so the whole output is not necessarily captured).
+
+The "mic" source captures the microphone.

 Default is output.

@@ -167,19 +161,6 @@ The available display ids can be listed by \fB\-\-list\-displays\fR.

 Default is 0.

-.TP
-.BI "\-\-display\-ime\-policy " value
-Set the policy for selecting where the IME should be displayed.
-
-Possible values are "local", "fallback" and "hide":
-
- - "local" means that the IME should appear on the local display.
- - "fallback" means that the IME should appear on a fallback display (the default display).
- - "hide" means that the IME should be hidden.
-
-By default, the IME policy is left unchanged.
-
-
 .TP
 .BI "\-\-display\-orientation " value
 Set the initial display orientation.
@@ -388,12 +369,6 @@ Do not forward mouse hover (mouse motion without any clicks) events.
 .B \-\-no\-power\-on
 Do not power on the device on start.

-.TP
-.B \-\-no\-vd\-destroy\-content
-Disable virtual display "destroy content on removal" flag.
-
-With this option, when the virtual display is closed, the running apps are moved to the main display rather than being destroyed.
-
 .TP
 .B \-\-no\-vd\-system\-decorations
 Disable virtual display system decorations flag.
@@ -408,7 +383,7 @@ Disable video playback on the computer.

 .TP
 .B \-\-no\-window
-Disable scrcpy window. Implies --no-video-playback.
+Disable scrcpy window. Implies --no-video-playback and --no-control.

 .TP
 .BI "\-\-orientation " value
@@ -543,15 +518,13 @@ Enable "show touches" on start, restore the initial value on exit.
 It only shows physical touches (not clicks from scrcpy).

 .TP
-.BI "\-\-tcpip\fR[=[+]\fIip\fR[:\fIport\fR]]
-Configure and connect the device over TCP/IP.
+.BI "\-\-tcpip\fR[=\fIip\fR[:\fIport\fR]]
+Configure and reconnect the device over TCP/IP.

 If a destination address is provided, then scrcpy connects to this address before starting. The device must listen on the given TCP port (default is 5555).

 If no destination address is provided, then scrcpy attempts to find the IP address and adb port of the current device (typically connected over USB), enables TCP/IP mode if necessary, then connects to this address before starting.

-Prefix the address with a '+' to force a reconnection.
-
 .TP
 .BI "\-\-time\-limit " seconds
 Set the maximum mirroring time, in seconds.
@@ -848,7 +821,7 @@ Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
 .SH COPYRIGHT
 Copyright \(co 2018 Genymobile <https://www.genymobile.com>

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

 Licensed under the Apache License, Version 2.0.

--- a/app/src/adb/adb.c
+++ b/app/src/adb/adb.c
@@ -4,11 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>

-#include "adb/adb_device.h"
-#include "adb/adb_parser.h"
-#include "util/env.h"
+#include "adb_device.h"
+#include "adb_parser.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/process_intr.h"
@@ -26,45 +24,15 @@
 */
 #define SC_ADB_COMMAND(...) { sc_adb_get_executable(), __VA_ARGS__, NULL }

-static char *adb_executable;
-
-bool
-sc_adb_init(void) {
-    adb_executable = sc_get_env("ADB");
-    if (adb_executable) {
-        LOGD("Using adb: %s", adb_executable);
-        return true;
-    }
-
-#if !defined(PORTABLE) || defined(_WIN32)
-    adb_executable = strdup("adb");
-    if (!adb_executable) {
-        LOG_OOM();
-        return false;
-    }
-#else
-    // For portable builds, use the absolute path to the adb executable
-    // in the same directory as scrcpy (except on Windows, where "adb"
-    // is sufficient)
-    adb_executable = sc_file_get_local_path("adb");
-    if (!adb_executable) {
-        // Error already logged
-        return false;
-    }
-
-    LOGD("Using adb (portable): %s", adb_executable);
-#endif
-
-    return true;
-}
-
-void
-sc_adb_destroy(void) {
-    free(adb_executable);
-}
+static const char *adb_executable;

 const char *
 sc_adb_get_executable(void) {
+    if (!adb_executable) {
+        adb_executable = getenv("ADB");
+        if (!adb_executable)
+            adb_executable = "adb";
+    }
    return adb_executable;
 }

@@ -413,7 +381,7 @@ sc_adb_connect(struct sc_intr *intr, const char *ip_port, unsigned flags) {

    // "adb connect" always returns successfully (with exit code 0), even in
    // case of failure. As a workaround, check if its output starts with
-    // "connected" or "already connected".
+    // "connected".
    char buf[128];
    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
    sc_pipe_close(pout);
@@ -430,8 +398,7 @@ sc_adb_connect(struct sc_intr *intr, const char *ip_port, unsigned flags) {
    assert((size_t) r < sizeof(buf));
    buf[r] = '\0';

-    ok = !strncmp("connected", buf, sizeof("connected") - 1)
-        || !strncmp("already connected", buf, sizeof("already connected") - 1);
+    ok = !strncmp("connected", buf, sizeof("connected") - 1);
    if (!ok && !(flags & SC_ADB_NO_STDERR)) {
        // "adb connect" also prints errors to stdout. Since we capture it,
        // re-print the error to stderr.
--- a/app/src/adb/adb.h
+++ b/app/src/adb/adb.h
@@ -6,7 +6,7 @@
 #include <stdbool.h>
 #include <inttypes.h>

-#include "adb/adb_device.h"
+#include "adb_device.h"
 #include "util/intr.h"

 #define SC_ADB_NO_STDOUT (1 << 0)
@@ -15,12 +15,6 @@

 #define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)

-bool
-sc_adb_init(void);
-
-void
-sc_adb_destroy(void);
-
 const char *
 sc_adb_get_executable(void);

--- a/app/src/adb/adb_device.h
+++ b/app/src/adb/adb_device.h
@@ -4,6 +4,7 @@
 #include "common.h"

 #include <stdbool.h>
+#include <stddef.h>

 #include "util/vector.h"

--- a/app/src/adb/adb_parser.c
+++ b/app/src/adb/adb_parser.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>

 #include "util/log.h"
 #include "util/str.h"
--- a/app/src/adb/adb_parser.h
+++ b/app/src/adb/adb_parser.h
@@ -3,9 +3,9 @@

 #include "common.h"

-#include <stdbool.h>
+#include <stddef.h>

-#include "adb/adb_device.h"
+#include "adb_device.h"

 /**
 * Parse the available devices from the output of `adb devices`
--- a/app/src/adb/adb_tunnel.c
+++ b/app/src/adb/adb_tunnel.c
@@ -1,11 +1,11 @@
 #include "adb_tunnel.h"

 #include <assert.h>
-#include <inttypes.h>

-#include "adb/adb.h"
+#include "adb.h"
 #include "util/log.h"
 #include "util/net_intr.h"
+#include "util/process_intr.h"

 static bool
 listen_on_port(struct sc_intr *intr, sc_socket socket, uint16_t port) {
--- a/app/src/audio_player.h
+++ b/app/src/audio_player.h
@@ -3,7 +3,9 @@

 #include "common.h"

-#include <SDL2/SDL_audio.h>
+#include <stdatomic.h>
+#include <stdbool.h>
+#include <SDL2/SDL.h>

 #include "audio_regulator.h"
 #include "trait/frame_sink.h"
--- a/app/src/audio_regulator.c
+++ b/app/src/audio_regulator.c
@@ -1,9 +1,5 @@
 #include "audio_regulator.h"

-#include <assert.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/opt.h>

@@ -76,10 +72,8 @@ sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
        // Wait until the buffer is filled up to at least target_buffering
        // before playing
        if (buffered_samples < ar->target_buffering) {
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-            LOGD("[Audio] Inserting initial buffering silence: %" PRIu32
+            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
                 " samples", out_samples);
-#endif
            // Delay playback starting to reach the target buffering. Fill the
            // whole buffer with silence (len is small compared to the
            // arbitrary margin value).
@@ -100,10 +94,8 @@ sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
        // dropped to keep the latency minimal. However, this would cause very
        // audible glitches, so let the clock compensation restore the target
        // latency.
-#ifdef SC_AUDIO_REGULATOR_DEBUG
        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
             silence);
-#endif
        memset(out + TO_BYTES(read), 0, TO_BYTES(silence));

        bool received = atomic_load_explicit(&ar->received,
@@ -141,36 +133,6 @@ bool
 sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
    SwrContext *swr_ctx = ar->swr_ctx;

-    uint32_t input_samples = frame->nb_samples;
-
-    assert(frame->pts >= 0);
-    int64_t pts = frame->pts;
-    if (ar->next_expected_pts && pts - ar->next_expected_pts > 100000) {
-        LOGV("[Audio] Discontinuity detected: %" PRIi64 "µs",
-             pts - ar->next_expected_pts);
-        // More than 100ms: consider it as a discontinuity
-        // (typically because silence packets were not captured)
-        uint32_t can_read = sc_audiobuf_can_read(&ar->buf);
-        if (input_samples + can_read < ar->target_buffering) {
-            // Adjust buffering to the target value directly
-            uint32_t silence = ar->target_buffering - can_read - input_samples;
-            sc_audiobuf_write_silence(&ar->buf, silence);
-        }
-
-        // Reset state
-        ar->avg_buffering.avg = ar->target_buffering;
-        int ret = swr_set_compensation(swr_ctx, 0, 0);
-        (void) ret;
-        assert(!ret); // disabling compensation should never fail
-        ar->compensation_active = false;
-        ar->samples_since_resync = 0;
-        atomic_store_explicit(&ar->underflow, 0, memory_order_relaxed);
-    }
-
-    int64_t packet_duration = input_samples * INT64_C(1000000)
-                            / ar->sample_rate;
-    ar->next_expected_pts = pts + packet_duration;
-
    int64_t swr_delay = swr_get_delay(swr_ctx, ar->sample_rate);
    // No need to av_rescale_rnd(), input and output sample rates are the same.
    // Add more space (256) for clock compensation.
@@ -243,7 +205,6 @@ sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
    if (played) {
        underflow = atomic_exchange_explicit(&ar->underflow, 0,
                                             memory_order_relaxed);
-        ar->underflow_report += underflow;

        max_buffered_samples = ar->target_buffering * 11 / 10
                             + 60 * ar->sample_rate / 1000 /* 60 ms */;
@@ -290,7 +251,7 @@ sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
    }

    // Number of samples added (or removed, if negative) for compensation
-    int32_t instant_compensation = (int32_t) written - input_samples;
+    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
    // Inserting silence instantly increases buffering
    int32_t inserted_silence = (int32_t) underflow;
    // Dropping input samples instantly decreases buffering
@@ -346,9 +307,7 @@ sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
        int abs_max_diff = distance / 50;
        diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
        LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
-             " compensation=%d (underflow=%" PRIu32 ")",
-             ar->target_buffering, avg, can_read, diff, ar->underflow_report);
-        ar->underflow_report = 0;
+             " compensation=%d", ar->target_buffering, avg, can_read, diff);

        int ret = swr_set_compensation(swr_ctx, diff, distance);
        if (ret < 0) {
@@ -431,9 +390,7 @@ sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
    atomic_init(&ar->played, false);
    atomic_init(&ar->received, false);
    atomic_init(&ar->underflow, 0);
-    ar->underflow_report = 0;
    ar->compensation_active = false;
-    ar->next_expected_pts = 0;

    return true;

--- a/app/src/audio_regulator.h
+++ b/app/src/audio_regulator.h
@@ -5,8 +5,6 @@

 #include <stdatomic.h>
 #include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <libavcodec/avcodec.h>
 #include <libswresample/swresample.h>
 #include "util/audiobuf.h"
@@ -46,9 +44,6 @@ struct sc_audio_regulator {
    // Number of silence samples inserted since the last received packet
    atomic_uint_least32_t underflow;

-    // Number of silence samples inserted since the last log
-    uint32_t underflow_report;
-
    // Non-zero compensation applied (only used by the receiver thread)
    bool compensation_active;

@@ -57,9 +52,6 @@ struct sc_audio_regulator {

    // Set to true the first time samples are pulled by the player
    atomic_bool played;
-
-    // PTS of the next expected packet (useful to detect discontinuities)
-    int64_t next_expected_pts;
 };

 bool
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>

 #include "options.h"
@@ -14,7 +13,6 @@
 #include "util/str.h"
 #include "util/strbuf.h"
 #include "util/term.h"
-#include "util/tick.h"

 #define STR_IMPL_(x) #x
 #define STR(x) STR_IMPL_(x)
@@ -112,8 +110,6 @@ enum {
    OPT_CAPTURE_ORIENTATION,
    OPT_ANGLE,
    OPT_NO_VD_SYSTEM_DECORATIONS,
-    OPT_NO_VD_DESTROY_CONTENT,
-    OPT_DISPLAY_IME_POLICY,
 };

 struct sc_option {
@@ -217,31 +213,13 @@ static const struct sc_option options[] = {
        .longopt_id = OPT_AUDIO_SOURCE,
        .longopt = "audio-source",
        .argdesc = "source",
-        .text = "Select the audio source. Possible values are:\n"
-                " - \"output\": forwards the whole audio output, and disables "
-                "playback on the device.\n"
-                " - \"playback\": captures the audio playback (Android apps "
-                "can opt-out, so the whole output is not necessarily "
+        .text = "Select the audio source (output, mic or playback).\n"
+                "The \"output\" source forwards the whole audio output, and "
+                "disables playback on the device.\n"
+                "The \"playback\" source captures the audio playback (Android "
+                "apps can opt-out, so the whole output is not necessarily "
                "captured).\n"
-                " - \"mic\": captures the microphone.\n"
-                " - \"mic-unprocessed\": captures the microphone unprocessed "
-                "(raw) sound.\n"
-                " - \"mic-camcorder\": captures the microphone tuned for video "
-                "recording, with the same orientation as the camera if "
-                "available.\n"
-                " - \"mic-voice-recognition\": captures the microphone tuned "
-                "for voice recognition.\n"
-                " - \"mic-voice-communication\": captures the microphone tuned "
-                "for voice communications (it will for instance take advantage "
-                "of echo cancellation or automatic gain control if "
-                "available).\n"
-                " - \"voice-call\": captures voice call.\n"
-                " - \"voice-call-uplink\": captures voice call uplink only.\n"
-                " - \"voice-call-downlink\": captures voice call downlink "
-                "only.\n"
-                " - \"voice-performance\": captures audio meant to be "
-                "processed for live performance (karaoke), includes both the "
-                "microphone and the device playback.\n"
+                "The \"mic\" source captures the microphone.\n"
                "Default is output.",
    },
    {
@@ -385,19 +363,6 @@ static const struct sc_option options[] = {
                "    scrcpy --list-displays\n"
                "Default is 0.",
    },
-    {
-        .longopt_id = OPT_DISPLAY_IME_POLICY,
-        .longopt = "display-ime-policy",
-        .argdesc = "value",
-        .text = "Set the policy for selecting where the IME should be "
-                "displayed.\n"
-                "Possible values are \"local\", \"fallback\" and \"hide\".\n"
-                "\"local\" means that the IME should appear on the local "
-                "display.\n"
-                "\"fallback\" means that the IME should appear on a fallback "
-                "display (the default display).\n"
-                "\"hide\" means that the IME should be hidden.",
-    },
    {
        .longopt_id = OPT_DISPLAY_ORIENTATION,
        .longopt = "display-orientation",
@@ -694,15 +659,6 @@ static const struct sc_option options[] = {
        .longopt = "no-power-on",
        .text = "Do not power on the device on start.",
    },
-    {
-        .longopt_id = OPT_NO_VD_DESTROY_CONTENT,
-        .longopt = "no-vd-destroy-content",
-        .text = "Disable virtual display \"destroy content on removal\" "
-                "flag.\n"
-                "With this option, when the virtual display is closed, the "
-                "running apps are moved to the main display rather than being "
-                "destroyed.",
-    },
    {
        .longopt_id = OPT_NO_VD_SYSTEM_DECORATIONS,
        .longopt = "no-vd-system-decorations",
@@ -721,7 +677,8 @@ static const struct sc_option options[] = {
    {
        .longopt_id = OPT_NO_WINDOW,
        .longopt = "no-window",
-        .text = "Disable scrcpy window. Implies --no-video-playback.",
+        .text = "Disable scrcpy window. Implies --no-video-playback and "
+                "--no-control.",
    },
    {
        .longopt_id = OPT_ORIENTATION,
@@ -903,17 +860,16 @@ static const struct sc_option options[] = {
    {
        .longopt_id = OPT_TCPIP,
        .longopt = "tcpip",
-        .argdesc = "[+]ip[:port]",
+        .argdesc = "ip[:port]",
        .optional_arg = true,
-        .text = "Configure and connect the device over TCP/IP.\n"
+        .text = "Configure and reconnect the device over TCP/IP.\n"
                "If a destination address is provided, then scrcpy connects to "
                "this address before starting. The device must listen on the "
                "given TCP port (default is 5555).\n"
                "If no destination address is provided, then scrcpy attempts "
                "to find the IP address of the current device (typically "
                "connected over USB), enables TCP/IP mode, then connects to "
-                "this address before starting.\n"
-                "Prefix the address with a '+' to force a reconnection.",
+                "this address before starting.",
    },
    {
        .longopt_id = OPT_TIME_LIMIT,
@@ -1646,25 +1602,6 @@ parse_audio_output_buffer(const char *s, sc_tick *tick) {
    return true;
 }

-static bool
-parse_display_ime_policy(const char *s, enum sc_display_ime_policy *policy) {
-    if (!strcmp(s, "local")) {
-        *policy = SC_DISPLAY_IME_POLICY_LOCAL;
-        return true;
-    }
-    if (!strcmp(s, "fallback")) {
-        *policy = SC_DISPLAY_IME_POLICY_FALLBACK;
-        return true;
-    }
-    if (!strcmp(s, "hide")) {
-        *policy = SC_DISPLAY_IME_POLICY_HIDE;
-        return true;
-    }
-    LOGE("Unsupported display IME policy: %s (expected local, fallback or "
-         "hide)", s);
-    return false;
-}
-
 static bool
 parse_orientation(const char *s, enum sc_orientation *orientation) {
    if (!strcmp(s, "0")) {
@@ -2054,50 +1991,8 @@ parse_audio_source(const char *optarg, enum sc_audio_source *source) {
        return true;
    }

-    if (!strcmp(optarg, "mic-unprocessed")) {
-        *source = SC_AUDIO_SOURCE_MIC_UNPROCESSED;
-        return true;
-    }
-
-    if (!strcmp(optarg, "mic-camcorder")) {
-        *source = SC_AUDIO_SOURCE_MIC_CAMCORDER;
-        return true;
-    }
-
-    if (!strcmp(optarg, "mic-voice-recognition")) {
-        *source = SC_AUDIO_SOURCE_MIC_VOICE_RECOGNITION;
-        return true;
-    }
-
-    if (!strcmp(optarg, "mic-voice-communication")) {
-        *source = SC_AUDIO_SOURCE_MIC_VOICE_COMMUNICATION;
-        return true;
-    }
-
-    if (!strcmp(optarg, "voice-call")) {
-        *source = SC_AUDIO_SOURCE_VOICE_CALL;
-        return true;
-    }
-
-    if (!strcmp(optarg, "voice-call-uplink")) {
-        *source = SC_AUDIO_SOURCE_VOICE_CALL_UPLINK;
-        return true;
-    }
-
-    if (!strcmp(optarg, "voice-call-downlink")) {
-        *source = SC_AUDIO_SOURCE_VOICE_CALL_DOWNLINK;
-        return true;
-    }
-
-    if (!strcmp(optarg, "voice-performance")) {
-        *source = SC_AUDIO_SOURCE_VOICE_PERFORMANCE;
-        return true;
-    }
-
-    LOGE("Unsupported audio source: %s (expected output, mic, playback, "
-         "mic-unprocessed, mic-camcorder, mic-voice-recognition, "
-         "mic-voice-communication, voice-call, voice-call-uplink, "
-         "voice-call-downlink, voice-performance)", optarg);
+    LOGE("Unsupported audio source: %s (expected output, mic or playback)",
+         optarg);
    return false;
 }

@@ -2809,17 +2704,8 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_ANGLE:
                opts->angle = optarg;
                break;
-            case OPT_NO_VD_DESTROY_CONTENT:
-                opts->vd_destroy_content = false;
-                break;
            case OPT_NO_VD_SYSTEM_DECORATIONS:
-                opts->vd_system_decorations = false;
-                break;
-            case OPT_DISPLAY_IME_POLICY:
-                if (!parse_display_ime_policy(optarg,
-                                              &opts->display_ime_policy)) {
-                    return false;
-                }
+                opts->vd_system_decorations = optarg;
                break;
            default:
                // getopt prints the error message on stderr
@@ -2859,10 +2745,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
 #endif

    if (!opts->window) {
-        // Without window, there cannot be any video playback
+        // Without window, there cannot be any video playback or control
        opts->video_playback = false;
-        // Controls are still possible, allowing for options like
-        // --turn-screen-off
+        opts->control = false;
    }

    if (!opts->video) {
@@ -3077,12 +2962,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            return false;
        }

-        if (opts->display_ime_policy != SC_DISPLAY_IME_POLICY_UNDEFINED) {
-            LOGE("--display-ime-policy is only available with "
-                 "--video-source=display");
-            return false;
-        }
-
        if (opts->camera_id && opts->camera_facing != SC_CAMERA_FACING_ANY) {
            LOGE("Cannot specify both --camera-id and --camera-facing");
            return false;
@@ -3124,12 +3003,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        return false;
    }

-    if (opts->display_ime_policy != SC_DISPLAY_IME_POLICY_UNDEFINED
-            && opts->display_id == 0 && !opts->new_display) {
-        LOGE("--display-ime-policy is only supported on a secondary display");
-        return false;
-    }
-
    if (opts->audio && opts->audio_source == SC_AUDIO_SOURCE_AUTO) {
        // Select the audio source according to the video source
        if (opts->video_source == SC_VIDEO_SOURCE_DISPLAY) {
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -152,10 +152,8 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
            return 2;
        case SC_CONTROL_MSG_TYPE_UHID_CREATE:
            sc_write16be(&buf[1], msg->uhid_create.id);
-            sc_write16be(&buf[3], msg->uhid_create.vendor_id);
-            sc_write16be(&buf[5], msg->uhid_create.product_id);

-            size_t index = 7;
+            size_t index = 3;
            index += write_string_tiny(&buf[index], msg->uhid_create.name, 127);

            sc_write16be(&buf[index], msg->uhid_create.report_desc_size);
@@ -280,13 +278,9 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
            // Quote only if name is not null
            const char *name = msg->uhid_create.name;
            const char *quote = name ? "\"" : "";
-            LOG_CMSG("UHID create [%" PRIu16 "] %04" PRIx16 ":%04" PRIx16
-                     " name=%s%s%s report_desc_size=%" PRIu16,
-                     msg->uhid_create.id,
-                     msg->uhid_create.vendor_id,
-                     msg->uhid_create.product_id,
-                     quote, name, quote,
-                     msg->uhid_create.report_desc_size);
+            LOG_CMSG("UHID create [%" PRIu16 "] name=%s%s%s "
+                     "report_desc_size=%" PRIu16, msg->uhid_create.id,
+                     quote, name, quote, msg->uhid_create.report_desc_size);
            break;
        }
        case SC_CONTROL_MSG_TYPE_UHID_INPUT: {
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -94,8 +94,6 @@ struct sc_control_msg {
        } set_display_power;
        struct {
            uint16_t id;
-            uint16_t vendor_id;
-            uint16_t product_id;
            const char *name; // pointer to static data
            uint16_t report_desc_size;
            const uint8_t *report_desc; // pointer to static data
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@@ -1,9 +1,11 @@
 #include "decoder.h"

-#include <errno.h>
-#include <libavcodec/packet.h>
-#include <libavutil/avutil.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/channel_layout.h>

+#include "events.h"
+#include "trait/frame_sink.h"
 #include "util/log.h"

 /** Downcast packet_sink to decoder */
--- a/app/src/decoder.h
+++ b/app/src/decoder.h
@@ -3,11 +3,13 @@

 #include "common.h"

-#include <libavcodec/avcodec.h>
-
 #include "trait/frame_source.h"
 #include "trait/packet_sink.h"

+#include <stdbool.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+
 struct sc_decoder {
    struct sc_packet_sink packet_sink; // packet sink trait
    struct sc_frame_source frame_source; // frame source trait
--- a/app/src/delay_buffer.c
+++ b/app/src/delay_buffer.c
@@ -2,7 +2,9 @@

 #include <assert.h>
 #include <stdlib.h>
-#include <libavcodec/avcodec.h>
+
+#include <libavutil/avutil.h>
+#include <libavformat/avformat.h>

 #include "util/log.h"

--- a/app/src/delay_buffer.h
+++ b/app/src/delay_buffer.h
@@ -4,7 +4,6 @@
 #include "common.h"

 #include <stdbool.h>
-#include <libavutil/frame.h>

 #include "clock.h"
 #include "trait/frame_source.h"
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -1,11 +1,14 @@
 #include "demuxer.h"

 #include <assert.h>
-#include <inttypes.h>
-#include <libavcodec/avcodec.h>
 #include <libavutil/channel_layout.h>
+#include <libavutil/time.h>
+#include <unistd.h>

+#include "decoder.h"
+#include "events.h"
 #include "packet_merger.h"
+#include "recorder.h"
 #include "util/binary.h"
 #include "util/log.h"

--- a/app/src/demuxer.h
+++ b/app/src/demuxer.h
@@ -4,8 +4,12 @@
 #include "common.h"

 #include <stdbool.h>
+#include <stdint.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>

 #include "trait/packet_source.h"
+#include "trait/packet_sink.h"
 #include "util/net.h"
 #include "util/thread.h"

--- a/app/src/device_msg.h
+++ b/app/src/device_msg.h
@@ -3,9 +3,9 @@

 #include "common.h"

-#include <stddef.h>
+#include <stdbool.h>
 #include <stdint.h>
-#include <sys/types.h>
+#include <unistd.h>

 #define DEVICE_MSG_MAX_SIZE (1 << 18) // 256k
 // type: 1 byte; length: 4 bytes
--- a/app/src/display.c
+++ b/app/src/display.c
@@ -1,8 +1,6 @@
 #include "display.h"

 #include <assert.h>
-#include <inttypes.h>
-#include <string.h>
 #include <libavutil/pixfmt.h>

 #include "util/log.h"
--- a/app/src/display.h
+++ b/app/src/display.h
@@ -4,8 +4,7 @@
 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>
-#include <libavutil/frame.h>
+#include <libavformat/avformat.h>
 #include <SDL2/SDL.h>

 #include "coords.h"
--- a/app/src/events.c
+++ b/app/src/events.c
@@ -1,7 +1,5 @@
 #include "events.h"

-#include <assert.h>
-
 #include "util/log.h"
 #include "util/thread.h"

--- a/app/src/file_pusher.c
+++ b/app/src/file_pusher.c
@@ -1,11 +1,11 @@
 #include "file_pusher.h"

 #include <assert.h>
-#include <stdlib.h>
 #include <string.h>

 #include "adb/adb.h"
 #include "util/log.h"
+#include "util/process_intr.h"

 #define DEFAULT_PUSH_TARGET "/sdcard/Download/"

--- a/app/src/fps_counter.c
+++ b/app/src/fps_counter.c
@@ -1,7 +1,6 @@
 #include "fps_counter.h"

 #include <assert.h>
-#include <stdint.h>

 #include "util/log.h"

--- a/app/src/fps_counter.h
+++ b/app/src/fps_counter.h
@@ -5,9 +5,9 @@

 #include <stdatomic.h>
 #include <stdbool.h>
+#include <stdint.h>

 #include "util/thread.h"
-#include "util/tick.h"

 struct sc_fps_counter {
    sc_thread thread;
--- a/app/src/frame_buffer.c
+++ b/app/src/frame_buffer.c
@@ -1,6 +1,8 @@
 #include "frame_buffer.h"

 #include <assert.h>
+#include <libavutil/avutil.h>
+#include <libavformat/avformat.h>

 #include "util/log.h"

--- a/app/src/frame_buffer.h
+++ b/app/src/frame_buffer.h
@@ -4,7 +4,6 @@
 #include "common.h"

 #include <stdbool.h>
-#include <libavutil/frame.h>

 #include "util/thread.h"

--- a/app/src/hid/hid_event.h
+++ b/app/src/hid/hid_event.h
@@ -3,7 +3,6 @@

 #include "common.h"

-#include <stddef.h>
 #include <stdint.h>

 #define SC_HID_MAX_SIZE 15
@@ -16,6 +15,7 @@ struct sc_hid_input {

 struct sc_hid_open {
    uint16_t hid_id;
+    const char *name; // pointer to static memory
    const uint8_t *report_desc; // pointer to static memory
    size_t report_desc_size;
 };
--- a/app/src/hid/hid_gamepad.c
+++ b/app/src/hid/hid_gamepad.c
@@ -2,8 +2,6 @@

 #include <assert.h>
 #include <inttypes.h>
-#include <stddef.h>
-#include <sys/types.h>

 #include "util/binary.h"
 #include "util/log.h"
@@ -54,10 +52,10 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
    0x09, 0x30,
    // Usage (Y)   Left stick y
    0x09, 0x31,
-    // Usage (Rx)  Right stick x
-    0x09, 0x33,
-    // Usage (Ry)  Right stick y
-    0x09, 0x34,
+    // Usage (Z)   Right stick x
+    0x09, 0x32,
+    // Usage (Rz)  Right stick y
+    0x09, 0x35,
    // Logical Minimum (0)
    0x15, 0x00,
    // Logical Maximum (65535)
@@ -67,15 +65,15 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
    0x75, 0x10,
    // Report Count (4)
    0x95, 0x04,
-    // Input (Data, Variable, Absolute): 4x2 bytes (X, Y, Z, Rz)
+    // Input (Data, Variable, Absolute): 4 bytes (X, Y, Z, Rz)
    0x81, 0x02,

-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Z)
-    0x09, 0x32,
-    // Usage (Rz)
-    0x09, 0x35,
+    // Usage Page (Simulation Controls)
+    0x05, 0x02,
+    // Usage (Brake)
+    0x09, 0xC5,
+    // Usage (Accelerator)
+    0x09, 0xC4,
    // Logical Minimum (0)
    0x15, 0x00,
    // Logical Maximum (32767)
@@ -84,7 +82,7 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
    0x75, 0x10,
    // Report Count (2)
    0x95, 0x02,
-    // Input (Data, Variable, Absolute): 2x2 bytes (L2, R2)
+    // Input (Data, Variable, Absolute): 2 bytes (L2, R2)
    0x81, 0x02,

    // Usage Page (Buttons)
@@ -184,7 +182,7 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
 *                     `------------- SC_GAMEPAD_BUTTON_RIGHT_STICK
 *
 *                  +---------------+
- *        byte 14:  |0 0 0 0 . . . .| hat switch (dpad) position (0-8)
+ *        byte 14:  |0 0 0 . . . . .| hat switch (dpad) position (0-8)
 *                  +---------------+
 *                     9 possible positions and their values:
 *                             8 1 2
@@ -193,19 +191,16 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
 *                     (8 is top-left, 1 is top, 2 is top-right, etc.)
 */

-// [-32768 to 32767] -> [0 to 65535]
-#define AXIS_RESCALE(V) (uint16_t) (((int32_t) V) + 0x8000)
-
 static void
 sc_hid_gamepad_slot_init(struct sc_hid_gamepad_slot *slot,
                         uint32_t gamepad_id) {
    assert(gamepad_id != SC_GAMEPAD_ID_INVALID);
    slot->gamepad_id = gamepad_id;
    slot->buttons = 0;
-    slot->axis_left_x = AXIS_RESCALE(0);
-    slot->axis_left_y = AXIS_RESCALE(0);
-    slot->axis_right_x = AXIS_RESCALE(0);
-    slot->axis_right_y = AXIS_RESCALE(0);
+    slot->axis_left_x = 0;
+    slot->axis_left_y = 0;
+    slot->axis_right_x = 0;
+    slot->axis_right_y = 0;
    slot->axis_left_trigger = 0;
    slot->axis_right_trigger = 0;
 }
@@ -248,8 +243,14 @@ sc_hid_gamepad_generate_open(struct sc_hid_gamepad *hid,

    sc_hid_gamepad_slot_init(&hid->slots[slot_idx], gamepad_id);

+    SDL_GameController* game_controller =
+        SDL_GameControllerFromInstanceID(gamepad_id);
+    assert(game_controller);
+    const char *name = SDL_GameControllerName(game_controller);
+
    uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
    hid_open->hid_id = hid_id;
+    hid_open->name = name;
    hid_open->report_desc = SC_HID_GAMEPAD_REPORT_DESC;
    hid_open->report_desc_size = sizeof(SC_HID_GAMEPAD_REPORT_DESC);

@@ -422,6 +423,8 @@ sc_hid_gamepad_generate_input_from_axis(struct sc_hid_gamepad *hid,

    struct sc_hid_gamepad_slot *slot = &hid->slots[slot_idx];

+// [-32768 to 32767] -> [0 to 65535]
+#define AXIS_RESCALE(V) (uint16_t) (((int32_t) V) + 0x8000)
    switch (event->axis) {
        case SC_GAMEPAD_AXIS_LEFTX:
            slot->axis_left_x = AXIS_RESCALE(event->value);
--- a/app/src/hid/hid_gamepad.h
+++ b/app/src/hid/hid_gamepad.h
@@ -4,7 +4,6 @@
 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>

 #include "hid/hid_event.h"
 #include "input_events.h"
--- a/app/src/hid/hid_keyboard.c
+++ b/app/src/hid/hid_keyboard.c
@@ -1,6 +1,5 @@
 #include "hid_keyboard.h"

-#include <assert.h>
 #include <string.h>

 #include "util/log.h"
@@ -336,6 +335,7 @@ sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,

 void sc_hid_keyboard_generate_open(struct sc_hid_open *hid_open) {
    hid_open->hid_id = SC_HID_ID_KEYBOARD;
+    hid_open->name = NULL; // No name specified after "scrcpy"
    hid_open->report_desc = SC_HID_KEYBOARD_REPORT_DESC;
    hid_open->report_desc_size = sizeof(SC_HID_KEYBOARD_REPORT_DESC);
 }
--- a/app/src/hid/hid_keyboard.h
+++ b/app/src/hid/hid_keyboard.h
@@ -4,7 +4,6 @@
 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>

 #include "hid/hid_event.h"
 #include "input_events.h"
--- a/app/src/hid/hid_mouse.c
+++ b/app/src/hid/hid_mouse.c
@@ -1,7 +1,5 @@
 #include "hid_mouse.h"

-#include <stdint.h>
-
 // 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position,
 // 1 byte for wheel motion
 #define SC_HID_MOUSE_INPUT_SIZE 4
@@ -192,6 +190,7 @@ sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,

 void sc_hid_mouse_generate_open(struct sc_hid_open *hid_open) {
    hid_open->hid_id = SC_HID_ID_MOUSE;
+    hid_open->name = NULL; // No name specified after "scrcpy"
    hid_open->report_desc = SC_HID_MOUSE_REPORT_DESC;
    hid_open->report_desc_size = sizeof(SC_HID_MOUSE_REPORT_DESC);
 }
--- a/app/src/hid/hid_mouse.h
+++ b/app/src/hid/hid_mouse.h
@@ -3,6 +3,8 @@

 #include "common.h"

+#include <stdbool.h>
+
 #include "hid/hid_event.h"
 #include "input_events.h"

--- a/app/src/icon.c
+++ b/app/src/icon.c
@@ -2,22 +2,16 @@

 #include <assert.h>
 #include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/pixfmt.h>
-#include <SDL2/SDL.h>

 #include "config.h"
-#include "util/env.h"
-#ifdef PORTABLE
-# include "util/file.h"
-#endif
+#include "compat.h"
+#include "util/file.h"
 #include "util/log.h"
+#include "util/str.h"

 #define SCRCPY_PORTABLE_ICON_FILENAME "icon.png"
 #define SCRCPY_DEFAULT_ICON_PATH \
@@ -25,22 +19,35 @@

 static char *
 get_icon_path(void) {
-    char *icon_path = sc_get_env("SCRCPY_ICON_PATH");
-    if (icon_path) {
+#ifdef __WINDOWS__
+    const wchar_t *icon_path_env = _wgetenv(L"SCRCPY_ICON_PATH");
+#else
+    const char *icon_path_env = getenv("SCRCPY_ICON_PATH");
+#endif
+    if (icon_path_env) {
        // if the envvar is set, use it
+#ifdef __WINDOWS__
+        char *icon_path = sc_str_from_wchars(icon_path_env);
+#else
+        char *icon_path = strdup(icon_path_env);
+#endif
+        if (!icon_path) {
+            LOG_OOM();
+            return NULL;
+        }
        LOGD("Using SCRCPY_ICON_PATH: %s", icon_path);
        return icon_path;
    }

 #ifndef PORTABLE
    LOGD("Using icon: " SCRCPY_DEFAULT_ICON_PATH);
-    icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
+    char *icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
    if (!icon_path) {
        LOG_OOM();
        return NULL;
    }
 #else
-    icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
+    char *icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
    if (!icon_path) {
        LOGE("Could not get icon path");
        return NULL;
--- a/app/src/icon.h
+++ b/app/src/icon.h
@@ -3,7 +3,9 @@

 #include "common.h"

-#include <SDL2/SDL_surface.h>
+#include <stdbool.h>
+#include <SDL2/SDL.h>
+#include <libavformat/avformat.h>

 SDL_Surface *
 scrcpy_icon_load(void);
--- a/app/src/input_events.h
+++ b/app/src/input_events.h
@@ -9,6 +9,7 @@
 #include <SDL2/SDL_events.h>

 #include "coords.h"
+#include "options.h"

 /* The representation of input events in scrcpy is very close to the SDL API,
 * for simplicity.
@@ -411,12 +412,18 @@ struct sc_touch_event {
    float pressure;
 };

+enum sc_gamepad_device_event_type {
+    SC_GAMEPAD_DEVICE_ADDED,
+    SC_GAMEPAD_DEVICE_REMOVED,
+};
+
 // As documented in <https://wiki.libsdl.org/SDL2/SDL_JoystickID>:
 // The ID value starts at 0 and increments from there. The value -1 is an
 // invalid ID.
 #define SC_GAMEPAD_ID_INVALID UINT32_C(-1)

 struct sc_gamepad_device_event {
+    enum sc_gamepad_device_event_type type;
    uint32_t gamepad_id;
 };

@@ -496,6 +503,16 @@ sc_mouse_buttons_state_from_sdl(uint32_t buttons_state) {
    return buttons_state;
 }

+static inline enum sc_gamepad_device_event_type
+sc_gamepad_device_event_type_from_sdl_type(uint32_t type) {
+    assert(type == SDL_CONTROLLERDEVICEADDED
+        || type == SDL_CONTROLLERDEVICEREMOVED);
+    if (type == SDL_CONTROLLERDEVICEADDED) {
+        return SC_GAMEPAD_DEVICE_ADDED;
+    }
+    return SC_GAMEPAD_DEVICE_REMOVED;
+}
+
 static inline enum sc_gamepad_axis
 sc_gamepad_axis_from_sdl(uint8_t axis) {
    if (axis <= SDL_CONTROLLER_AXIS_TRIGGERRIGHT) {
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -1,12 +1,8 @@
 #include "input_manager.h"

 #include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_keycode.h>

-#include "android/input.h"
-#include "android/keycodes.h"
 #include "input_events.h"
 #include "screen.h"
 #include "shortcut_mod.h"
@@ -912,6 +908,7 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
 static void
 sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
                                       const SDL_ControllerDeviceEvent *event) {
+    SDL_JoystickID id;
    if (event->type == SDL_CONTROLLERDEVICEADDED) {
        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
        if (!gc) {
@@ -926,12 +923,9 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
            return;
        }

-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_JoystickInstanceID(joystick),
-        };
-        im->gp->ops->process_gamepad_added(im->gp, &evt);
+        id = SDL_JoystickInstanceID(joystick);
    } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        SDL_JoystickID id = event->which;
+        id = event->which;

        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
        if (gc) {
@@ -939,15 +933,16 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
        } else {
            LOGW("Unknown gamepad device removed");
        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = id,
-        };
-        im->gp->ops->process_gamepad_removed(im->gp, &evt);
    } else {
        // Nothing to do
        return;
    }
+
+    struct sc_gamepad_device_event evt = {
+        .type = sc_gamepad_device_event_type_from_sdl_type(event->type),
+        .gamepad_id = id,
+    };
+    im->gp->ops->process_gamepad_device(im->gp, &evt);
 }

 static void
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@@ -4,12 +4,12 @@
 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>
-#include <SDL2/SDL_events.h>
-#include <SDL2/SDL_keycode.h>
+
+#include <SDL2/SDL.h>

 #include "controller.h"
 #include "file_pusher.h"
+#include "fps_counter.h"
 #include "options.h"
 #include "trait/gamepad_processor.h"
 #include "trait/key_processor.h"
--- a/app/src/keyboard_sdk.c
+++ b/app/src/keyboard_sdk.c
@@ -1,13 +1,8 @@
 #include "keyboard_sdk.h"

 #include <assert.h>
-#include <ctype.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>

 #include "android/input.h"
-#include "android/keycodes.h"
 #include "control_msg.h"
 #include "controller.h"
 #include "input_events.h"
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -1,6 +1,9 @@
 #include "common.h"

+#include <assert.h>
 #include <stdbool.h>
+#include <unistd.h>
+#include <libavformat/avformat.h>
 #ifdef HAVE_V4L2
 # include <libavdevice/avdevice.h>
 #endif
--- a/app/src/mouse_sdk.c
+++ b/app/src/mouse_sdk.c
@@ -1,12 +1,12 @@
 #include "mouse_sdk.h"

 #include <assert.h>
-#include <stdint.h>

 #include "android/input.h"
 #include "control_msg.h"
 #include "controller.h"
 #include "input_events.h"
+#include "util/intmap.h"
 #include "util/log.h"

 /** Downcast mouse processor to sc_mouse_sdk */
--- a/app/src/mouse_sdk.h
+++ b/app/src/mouse_sdk.h
@@ -6,6 +6,7 @@
 #include <stdbool.h>

 #include "controller.h"
+#include "screen.h"
 #include "trait/mouse_processor.h"

 struct sc_mouse_sdk {
--- a/app/src/opengl.c
+++ b/app/src/opengl.c
@@ -2,8 +2,7 @@

 #include <assert.h>
 #include <stdio.h>
-#include <string.h>
-#include <SDL2/SDL.h>
+#include "SDL2/SDL.h"

 void
 sc_opengl_init(struct sc_opengl *gl) {
--- a/app/src/options.c
+++ b/app/src/options.c
@@ -1,7 +1,5 @@
 #include "options.h"

-#include <stddef.h>
-
 const struct scrcpy_options scrcpy_options_default = {
    .serial = NULL,
    .crop = NULL,
@@ -56,7 +54,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .capture_orientation_lock = SC_ORIENTATION_UNLOCKED,
    .display_orientation = SC_ORIENTATION_0,
    .record_orientation = SC_ORIENTATION_0,
-    .display_ime_policy = SC_DISPLAY_IME_POLICY_UNDEFINED,
    .window_x = SC_WINDOW_POSITION_UNDEFINED,
    .window_y = SC_WINDOW_POSITION_UNDEFINED,
    .window_width = 0,
@@ -111,7 +108,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .new_display = NULL,
    .start_app = NULL,
    .angle = NULL,
-    .vd_destroy_content = true,
    .vd_system_decorations = true,
 };

--- a/app/src/options.h
+++ b/app/src/options.h
@@ -5,6 +5,7 @@

 #include <assert.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>

 #include "util/tick.h"
@@ -59,14 +60,6 @@ enum sc_audio_source {
    SC_AUDIO_SOURCE_OUTPUT,
    SC_AUDIO_SOURCE_MIC,
    SC_AUDIO_SOURCE_PLAYBACK,
-    SC_AUDIO_SOURCE_MIC_UNPROCESSED,
-    SC_AUDIO_SOURCE_MIC_CAMCORDER,
-    SC_AUDIO_SOURCE_MIC_VOICE_RECOGNITION,
-    SC_AUDIO_SOURCE_MIC_VOICE_COMMUNICATION,
-    SC_AUDIO_SOURCE_VOICE_CALL,
-    SC_AUDIO_SOURCE_VOICE_CALL_UPLINK,
-    SC_AUDIO_SOURCE_VOICE_CALL_DOWNLINK,
-    SC_AUDIO_SOURCE_VOICE_PERFORMANCE,
 };

 enum sc_camera_facing {
@@ -97,13 +90,6 @@ enum sc_orientation_lock {
    SC_ORIENTATION_LOCKED_INITIAL, // lock to initial device orientation
 };

-enum sc_display_ime_policy {
-    SC_DISPLAY_IME_POLICY_UNDEFINED,
-    SC_DISPLAY_IME_POLICY_LOCAL,
-    SC_DISPLAY_IME_POLICY_FALLBACK,
-    SC_DISPLAY_IME_POLICY_HIDE,
-};
-
 static inline bool
 sc_orientation_is_mirror(enum sc_orientation orientation) {
    assert(!(orientation & ~7));
@@ -266,7 +252,6 @@ struct scrcpy_options {
    enum sc_orientation_lock capture_orientation_lock;
    enum sc_orientation display_orientation;
    enum sc_orientation record_orientation;
-    enum sc_display_ime_policy display_ime_policy;
    int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
    int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
    uint16_t window_width;
@@ -325,7 +310,6 @@ struct scrcpy_options {
    bool audio_dup;
    const char *new_display; // [<width>x<height>][/<dpi>] parsed by the server
    const char *start_app;
-    bool vd_destroy_content;
    bool vd_system_decorations;
 };

--- a/app/src/packet_merger.c
+++ b/app/src/packet_merger.c
@@ -1,9 +1,5 @@
 #include "packet_merger.h"

-#include <stdlib.h>
-#include <string.h>
-#include <libavutil/avutil.h>
-
 #include "util/log.h"

 void
--- a/app/src/packet_merger.h
+++ b/app/src/packet_merger.h
@@ -5,7 +5,7 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <libavcodec/packet.h>
+#include <libavcodec/avcodec.h>

 /**
 * Config packets (containing the SPS/PPS) are sent in-band. A new config
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@@ -2,6 +2,7 @@

 #include <assert.h>
 #include <inttypes.h>
+#include <stdint.h>
 #include <SDL2/SDL_clipboard.h>

 #include "device_msg.h"
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -1,9 +1,6 @@
 #include "recorder.h"

 #include <assert.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
--- a/app/src/recorder.h
+++ b/app/src/recorder.h
@@ -4,10 +4,9 @@
 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>
-#include <libavcodec/packet.h>
 #include <libavformat/avformat.h>

+#include "coords.h"
 #include "options.h"
 #include "trait/packet_sink.h"
 #include "util/thread.h"
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -1,11 +1,10 @@
 #include "scrcpy.h"

-#include <assert.h>
-#include <inttypes.h>
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <libavformat/avformat.h>
+#include <sys/time.h>
 #include <SDL2/SDL.h>

 #ifdef _WIN32
@@ -38,9 +37,9 @@
 #endif
 #include "util/acksync.h"
 #include "util/log.h"
+#include "util/net.h"
 #include "util/rand.h"
 #include "util/timeout.h"
-#include "util/tick.h"
 #ifdef HAVE_V4L2
 # include "v4l2_sink.h"
 #endif
@@ -436,7 +435,6 @@ scrcpy(struct scrcpy_options *options) {
        .control = options->control,
        .display_id = options->display_id,
        .new_display = options->new_display,
-        .display_ime_policy = options->display_ime_policy,
        .video = options->video,
        .audio = options->audio,
        .audio_dup = options->audio_dup,
@@ -460,7 +458,6 @@ scrcpy(struct scrcpy_options *options) {
        .power_on = options->power_on,
        .kill_adb_on_close = options->kill_adb_on_close,
        .camera_high_speed = options->camera_high_speed,
-        .vd_destroy_content = options->vd_destroy_content,
        .vd_system_decorations = options->vd_system_decorations,
        .list = options->list,
    };
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -3,6 +3,7 @@

 #include "common.h"

+#include <stdbool.h>
 #include "options.h"

 enum scrcpy_exit_code {
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -1,14 +1,11 @@
-#ifndef SC_SCREEN_H
-#define SC_SCREEN_H
+#ifndef SCREEN_H
+#define SCREEN_H

 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>
 #include <SDL2/SDL.h>
-#include <libavcodec/avcodec.h>
-#include <libavutil/frame.h>
-#include <libavutil/pixfmt.h>
+#include <libavformat/avformat.h>

 #include "controller.h"
 #include "coords.h"
@@ -17,6 +14,7 @@
 #include "frame_buffer.h"
 #include "input_manager.h"
 #include "mouse_capture.h"
+#include "opengl.h"
 #include "options.h"
 #include "trait/key_processor.h"
 #include "trait/frame_sink.h"
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -1,18 +1,18 @@
 #include "server.h"

 #include <assert.h>
+#include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
+#include <SDL2/SDL_timer.h>
+#include <SDL2/SDL_platform.h>

 #include "adb/adb.h"
-#include "util/env.h"
+#include "util/binary.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/net_intr.h"
-#include "util/process.h"
+#include "util/process_intr.h"
 #include "util/str.h"

 #define SC_SERVER_FILENAME "scrcpy-server"
@@ -25,22 +25,35 @@

 static char *
 get_server_path(void) {
-    char *server_path = sc_get_env("SCRCPY_SERVER_PATH");
-    if (server_path) {
+#ifdef __WINDOWS__
+    const wchar_t *server_path_env = _wgetenv(L"SCRCPY_SERVER_PATH");
+#else
+    const char *server_path_env = getenv("SCRCPY_SERVER_PATH");
+#endif
+    if (server_path_env) {
        // if the envvar is set, use it
+#ifdef __WINDOWS__
+        char *server_path = sc_str_from_wchars(server_path_env);
+#else
+        char *server_path = strdup(server_path_env);
+#endif
+        if (!server_path) {
+            LOG_OOM();
+            return NULL;
+        }
        LOGD("Using SCRCPY_SERVER_PATH: %s", server_path);
        return server_path;
    }

 #ifndef PORTABLE
    LOGD("Using server: " SC_SERVER_PATH_DEFAULT);
-    server_path = strdup(SC_SERVER_PATH_DEFAULT);
+    char *server_path = strdup(SC_SERVER_PATH_DEFAULT);
    if (!server_path) {
        LOG_OOM();
        return NULL;
    }
 #else
-    server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
+    char *server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
    if (!server_path) {
        LOGE("Could not get local file path, "
             "using " SC_SERVER_FILENAME " from current directory");
@@ -149,43 +162,12 @@ sc_server_get_audio_source_name(enum sc_audio_source audio_source) {
            return "mic";
        case SC_AUDIO_SOURCE_PLAYBACK:
            return "playback";
-        case SC_AUDIO_SOURCE_MIC_UNPROCESSED:
-            return "mic-unprocessed";
-        case SC_AUDIO_SOURCE_MIC_CAMCORDER:
-            return "mic-camcorder";
-        case SC_AUDIO_SOURCE_MIC_VOICE_RECOGNITION:
-            return "mic-voice-recognition";
-        case SC_AUDIO_SOURCE_MIC_VOICE_COMMUNICATION:
-            return "mic-voice-communication";
-        case SC_AUDIO_SOURCE_VOICE_CALL:
-            return "voice-call";
-        case SC_AUDIO_SOURCE_VOICE_CALL_UPLINK:
-            return "voice-call-uplink";
-        case SC_AUDIO_SOURCE_VOICE_CALL_DOWNLINK:
-            return "voice-call-downlink";
-        case SC_AUDIO_SOURCE_VOICE_PERFORMANCE:
-            return "voice-performance";
        default:
            assert(!"unexpected audio source");
            return NULL;
    }
 }

-static const char *
-sc_server_get_display_ime_policy_name(enum sc_display_ime_policy policy) {
-    switch (policy) {
-        case SC_DISPLAY_IME_POLICY_LOCAL:
-            return "local";
-        case SC_DISPLAY_IME_POLICY_FALLBACK:
-            return "fallback";
-        case SC_DISPLAY_IME_POLICY_HIDE:
-            return "hide";
-        default:
-            assert(!"unexpected display IME policy");
-            return NULL;
-    }
-}
-
 static bool
 validate_string(const char *s) {
    // The parameters values are passed as command line arguments to adb, so
@@ -407,13 +389,6 @@ execute_server(struct sc_server *server,
        VALIDATE_STRING(params->new_display);
        ADD_PARAM("new_display=%s", params->new_display);
    }
-    if (params->display_ime_policy != SC_DISPLAY_IME_POLICY_UNDEFINED) {
-        ADD_PARAM("display_ime_policy=%s",
-            sc_server_get_display_ime_policy_name(params->display_ime_policy));
-    }
-    if (!params->vd_destroy_content) {
-        ADD_PARAM("vd_destroy_content=false");
-    }
    if (!params->vd_system_decorations) {
        ADD_PARAM("vd_system_decorations=false");
    }
@@ -522,21 +497,14 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
    // end of the program
    server->params = *params;

-    bool ok = sc_adb_init();
+    bool ok = sc_mutex_init(&server->mutex);
    if (!ok) {
        return false;
    }

-    ok = sc_mutex_init(&server->mutex);
-    if (!ok) {
-        sc_adb_destroy();
-        return false;
-    }
-
    ok = sc_cond_init(&server->cond_stopped);
    if (!ok) {
        sc_mutex_destroy(&server->mutex);
-        sc_adb_destroy();
        return false;
    }

@@ -544,7 +512,6 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
    if (!ok) {
        sc_cond_destroy(&server->cond_stopped);
        sc_mutex_destroy(&server->mutex);
-        sc_adb_destroy();
        return false;
    }

@@ -866,14 +833,11 @@ sc_server_switch_to_tcpip(struct sc_server *server, const char *serial) {
 }

 static bool
-sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port,
-                           bool disconnect) {
+sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port) {
    struct sc_intr *intr = &server->intr;

-    if (disconnect) {
-        // Error expected if not connected, do not report any error
-        sc_adb_disconnect(intr, ip_port, SC_ADB_SILENT);
-    }
+    // Error expected if not connected, do not report any error
+    sc_adb_disconnect(intr, ip_port, SC_ADB_SILENT);

    LOGI("Connecting to %s...", ip_port);

@@ -889,7 +853,7 @@ sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port,

 static bool
 sc_server_configure_tcpip_known_address(struct sc_server *server,
-                                        const char *addr, bool disconnect) {
+                                        const char *addr) {
    // Append ":5555" if no port is present
    bool contains_port = strchr(addr, ':');
    char *ip_port = contains_port ? strdup(addr)
@@ -900,7 +864,7 @@ sc_server_configure_tcpip_known_address(struct sc_server *server,
    }

    server->serial = ip_port;
-    return sc_server_connect_to_tcpip(server, ip_port, disconnect);
+    return sc_server_connect_to_tcpip(server, ip_port);
 }

 static bool
@@ -925,7 +889,7 @@ sc_server_configure_tcpip_unknown_address(struct sc_server *server,
    }

    server->serial = ip_port;
-    return sc_server_connect_to_tcpip(server, ip_port, false);
+    return sc_server_connect_to_tcpip(server, ip_port);
 }

 static void
@@ -1012,13 +976,7 @@ run_server(void *data) {
            sc_adb_device_destroy(&device);
        }
    } else {
-        // If the user passed a '+' (--tcpip=+ip), then disconnect first
-        const char *tcpip_dst = params->tcpip_dst;
-        bool plus = tcpip_dst[0] == '+';
-        if (plus) {
-            ++tcpip_dst;
-        }
-        ok = sc_server_configure_tcpip_known_address(server, tcpip_dst, plus);
+        ok = sc_server_configure_tcpip_known_address(server, params->tcpip_dst);
        if (!ok) {
            goto error_connection_failed;
        }
@@ -1195,6 +1153,4 @@ sc_server_destroy(struct sc_server *server) {
    sc_intr_destroy(&server->intr);
    sc_cond_destroy(&server->cond_stopped);
    sc_mutex_destroy(&server->mutex);
-
-    sc_adb_destroy();
 }
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -1,17 +1,19 @@
-#ifndef SC_SERVER_H
-#define SC_SERVER_H
+#ifndef SERVER_H
+#define SERVER_H

 #include "common.h"

+#include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>

 #include "adb/adb_tunnel.h"
+#include "coords.h"
 #include "options.h"
 #include "util/intr.h"
+#include "util/log.h"
 #include "util/net.h"
 #include "util/thread.h"
-#include "util/tick.h"

 #define SC_DEVICE_NAME_FIELD_LENGTH 64
 struct sc_server_info {
@@ -50,7 +52,6 @@ struct sc_server_params {
    bool control;
    uint32_t display_id;
    const char *new_display;
-    enum sc_display_ime_policy display_ime_policy;
    bool video;
    bool audio;
    bool audio_dup;
@@ -68,7 +69,6 @@ struct sc_server_params {
    bool power_on;
    bool kill_adb_on_close;
    bool camera_high_speed;
-    bool vd_destroy_content;
    bool vd_system_decorations;
    uint8_t list;
 };
--- a/app/src/shortcut_mod.h
+++ b/app/src/shortcut_mod.h
@@ -3,7 +3,6 @@

 #include "common.h"

-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <SDL2/SDL_keycode.h>
--- a/app/src/sys/unix/file.c
+++ b/app/src/sys/unix/file.c
@@ -1,15 +1,11 @@
 #include "util/file.h"

 #include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
-#ifdef __APPLE__
-# include <mach-o/dyld.h> // for _NSGetExecutablePath()
-#endif

 #include "util/log.h"

@@ -64,22 +60,11 @@ sc_file_get_executable_path(void) {
    }
    buf[len] = '\0';
    return strdup(buf);
-#elif defined(__APPLE__)
-    char buf[PATH_MAX];
-    uint32_t bufsize = PATH_MAX;
-    if (_NSGetExecutablePath(buf, &bufsize) != 0) {
-        LOGE("Executable path buffer too small; need %u bytes", bufsize);
-        return NULL;
-    }
-    return realpath(buf, NULL);
 #else
-    // "_" is often used to store the full path of the command being executed
-    char *path = getenv("_");
-    if (!path) {
-        LOGE("Could not determine executable path");
-        return NULL;
-    }
-    return strdup(path);
+    // in practice, we only need this feature for portable builds, only used on
+    // Windows, so we don't care implementing it for every platform
+    // (it's useful to have a working version on Linux for debugging though)
+    return NULL;
 #endif
 }

--- a/app/src/sys/unix/process.c
+++ b/app/src/sys/unix/process.c
@@ -4,8 +4,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
--- a/app/src/trait/frame_sink.h
+++ b/app/src/trait/frame_sink.h
@@ -3,6 +3,7 @@

 #include "common.h"

+#include <assert.h>
 #include <stdbool.h>
 #include <libavcodec/avcodec.h>

--- a/app/src/trait/frame_source.c
+++ b/app/src/trait/frame_source.c
@@ -1,7 +1,5 @@
 #include "frame_source.h"

-#include <assert.h>
-
 void
 sc_frame_source_init(struct sc_frame_source *source) {
    source->sink_count = 0;
--- a/app/src/trait/frame_source.h
+++ b/app/src/trait/frame_source.h
@@ -3,9 +3,7 @@

 #include "common.h"

-#include <stdbool.h>
-
-#include "trait/frame_sink.h"
+#include "frame_sink.h"

 #define SC_FRAME_SOURCE_MAX_SINKS 2

--- a/app/src/trait/gamepad_processor.h
+++ b/app/src/trait/gamepad_processor.h
@@ -3,6 +3,9 @@

 #include "common.h"

+#include <assert.h>
+#include <stdbool.h>
+
 #include "input_events.h"

 /**
@@ -17,22 +20,13 @@ struct sc_gamepad_processor {
 struct sc_gamepad_processor_ops {

    /**
-     * Process a gamepad device added event
+     * Process a gamepad device added or removed
     *
     * This function is mandatory.
     */
    void
-    (*process_gamepad_added)(struct sc_gamepad_processor *gp,
-                             const struct sc_gamepad_device_event *event);
-
-    /**
-     * Process a gamepad device removed event
-     *
-     * This function is mandatory.
-     */
-    void
-    (*process_gamepad_removed)(struct sc_gamepad_processor *gp,
-                               const struct sc_gamepad_device_event *event);
+    (*process_gamepad_device)(struct sc_gamepad_processor *gp,
+                              const struct sc_gamepad_device_event *event);

    /**
     * Process a gamepad axis event
--- a/app/src/trait/key_processor.h
+++ b/app/src/trait/key_processor.h
@@ -3,6 +3,7 @@

 #include "common.h"

+#include <assert.h>
 #include <stdbool.h>

 #include "input_events.h"
--- a/app/src/trait/mouse_processor.h
+++ b/app/src/trait/mouse_processor.h
@@ -3,6 +3,7 @@

 #include "common.h"

+#include <assert.h>
 #include <stdbool.h>

 #include "input_events.h"
--- a/app/src/trait/packet_sink.h
+++ b/app/src/trait/packet_sink.h
@@ -3,6 +3,7 @@

 #include "common.h"

+#include <assert.h>
 #include <stdbool.h>
 #include <libavcodec/avcodec.h>

--- a/app/src/trait/packet_source.c
+++ b/app/src/trait/packet_source.c
@@ -1,7 +1,5 @@
 #include "packet_source.h"

-#include <assert.h>
-
 void
 sc_packet_source_init(struct sc_packet_source *source) {
    source->sink_count = 0;
--- a/app/src/trait/packet_source.h
+++ b/app/src/trait/packet_source.h
@@ -3,9 +3,7 @@

 #include "common.h"

-#include <stdbool.h>
-
-#include "trait/packet_sink.h"
+#include "packet_sink.h"

 #define SC_PACKET_SOURCE_MAX_SINKS 2

--- a/app/src/uhid/gamepad_uhid.c
+++ b/app/src/uhid/gamepad_uhid.c
@@ -1,10 +1,5 @@
 #include "gamepad_uhid.h"

-#include <assert.h>
-#include <inttypes.h>
-#include <string.h>
-#include <SDL2/SDL_gamecontroller.h>
-
 #include "hid/hid_gamepad.h"
 #include "input_events.h"
 #include "util/log.h"
@@ -12,11 +7,6 @@
 /** Downcast gamepad processor to sc_gamepad_uhid */
 #define DOWNCAST(GP) container_of(GP, struct sc_gamepad_uhid, gamepad_processor)

-// Xbox 360
-#define SC_GAMEPAD_UHID_VENDOR_ID UINT16_C(0x045e)
-#define SC_GAMEPAD_UHID_PRODUCT_ID UINT16_C(0x028e)
-#define SC_GAMEPAD_UHID_NAME "Microsoft X-Box 360 Pad"
-
 static void
 sc_gamepad_uhid_send_input(struct sc_gamepad_uhid *gamepad,
                           const struct sc_hid_input *hid_input,
@@ -40,9 +30,7 @@ sc_gamepad_uhid_send_open(struct sc_gamepad_uhid *gamepad,
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
    msg.uhid_create.id = hid_open->hid_id;
-    msg.uhid_create.vendor_id = SC_GAMEPAD_UHID_VENDOR_ID;
-    msg.uhid_create.product_id = SC_GAMEPAD_UHID_PRODUCT_ID;
-    msg.uhid_create.name = SC_GAMEPAD_UHID_NAME;
+    msg.uhid_create.name = hid_open->name;
    msg.uhid_create.report_desc = hid_open->report_desc;
    msg.uhid_create.report_desc_size = hid_open->report_desc_size;

@@ -64,39 +52,29 @@ sc_gamepad_uhid_send_close(struct sc_gamepad_uhid *gamepad,
 }

 static void
-sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
+sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
                                const struct sc_gamepad_device_event *event) {
    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);

-    struct sc_hid_open hid_open;
-    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                      event->gamepad_id)) {
-        return;
+    if (event->type == SC_GAMEPAD_DEVICE_ADDED) {
+        struct sc_hid_open hid_open;
+        if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
+                                          event->gamepad_id)) {
+            return;
+        }
+
+        sc_gamepad_uhid_send_open(gamepad, &hid_open);
+    } else {
+        assert(event->type == SC_GAMEPAD_DEVICE_REMOVED);
+
+        struct sc_hid_close hid_close;
+        if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
+                                           event->gamepad_id)) {
+            return;
+        }
+
+        sc_gamepad_uhid_send_close(gamepad, &hid_close);
    }
-
-    SDL_GameController* game_controller =
-        SDL_GameControllerFromInstanceID(event->gamepad_id);
-    assert(game_controller);
-    const char *name = SDL_GameControllerName(game_controller);
-    LOGI("Gamepad added: [%" PRIu32 "] %s", event->gamepad_id, name);
-
-    sc_gamepad_uhid_send_open(gamepad, &hid_open);
-}
-
-static void
-sc_gamepad_processor_process_gamepad_removed(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_device_event *event) {
-    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_close hid_close;
-    if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
-                                       event->gamepad_id)) {
-        return;
-    }
-
-    LOGI("Gamepad removed: [%" PRIu32 "]", event->gamepad_id);
-
-    sc_gamepad_uhid_send_close(gamepad, &hid_close);
 }

 static void
@@ -136,8 +114,7 @@ sc_gamepad_uhid_init(struct sc_gamepad_uhid *gamepad,
    gamepad->controller = controller;

    static const struct sc_gamepad_processor_ops ops = {
-        .process_gamepad_added = sc_gamepad_processor_process_gamepad_added,
-        .process_gamepad_removed = sc_gamepad_processor_process_gamepad_removed,
+        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
        .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
    };
--- a/app/src/uhid/gamepad_uhid.h
+++ b/app/src/uhid/gamepad_uhid.h
@@ -3,6 +3,8 @@

 #include "common.h"

+#include <stdbool.h>
+
 #include "controller.h"
 #include "hid/hid_gamepad.h"
 #include "trait/gamepad_processor.h"
--- a/app/src/uhid/keyboard_uhid.c
+++ b/app/src/uhid/keyboard_uhid.c
@@ -1,12 +1,6 @@
 #include "keyboard_uhid.h"

-#include <assert.h>
-#include <string.h>
-#include <SDL2/SDL_keyboard.h>
-#include <SDL2/SDL_keycode.h>
-
 #include "util/log.h"
-#include "util/thread.h"

 /** Downcast key processor to keyboard_uhid */
 #define DOWNCAST(KP) container_of(KP, struct sc_keyboard_uhid, key_processor)
@@ -147,9 +141,7 @@ sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
    msg.uhid_create.id = SC_HID_ID_KEYBOARD;
-    msg.uhid_create.vendor_id = 0;
-    msg.uhid_create.product_id = 0;
-    msg.uhid_create.name = NULL;
+    msg.uhid_create.name = hid_open.name;
    msg.uhid_create.report_desc = hid_open.report_desc;
    msg.uhid_create.report_desc_size = hid_open.report_desc_size;
    if (!sc_controller_push_msg(controller, &msg)) {
--- a/app/src/uhid/mouse_uhid.c
+++ b/app/src/uhid/mouse_uhid.c
@@ -1,8 +1,5 @@
 #include "mouse_uhid.h"

-#include <assert.h>
-#include <string.h>
-
 #include "hid/hid_mouse.h"
 #include "input_events.h"
 #include "util/log.h"
@@ -84,9 +81,7 @@ sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
    msg.uhid_create.id = SC_HID_ID_MOUSE;
-    msg.uhid_create.vendor_id = 0;
-    msg.uhid_create.product_id = 0;
-    msg.uhid_create.name = NULL;
+    msg.uhid_create.name = hid_open.name;
    msg.uhid_create.report_desc = hid_open.report_desc;
    msg.uhid_create.report_desc_size = hid_open.report_desc_size;
    if (!sc_controller_push_msg(controller, &msg)) {
--- a/app/src/uhid/uhid_output.c
+++ b/app/src/uhid/uhid_output.c
@@ -1,5 +1,6 @@
 #include "uhid_output.h"

+#include <assert.h>
 #include <inttypes.h>

 #include "uhid/keyboard_uhid.h"
--- a/app/src/uhid/uhid_output.h
+++ b/app/src/uhid/uhid_output.h
@@ -3,7 +3,7 @@

 #include "common.h"

-#include <stddef.h>
+#include <stdbool.h>
 #include <stdint.h>

 /**
--- a/app/src/usb/aoa_hid.c
+++ b/app/src/usb/aoa_hid.c
@@ -1,16 +1,13 @@
-#include "aoa_hid.h"
+#include "util/log.h"

 #include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <libusb-1.0/libusb.h>

+#include "aoa_hid.h"
 #include "events.h"
 #include "util/log.h"
 #include "util/str.h"
-#include "util/tick.h"
 #include "util/vector.h"

 // See <https://source.android.com/devices/accessories/aoa2#hid-support>.
--- a/app/src/usb/aoa_hid.h
+++ b/app/src/usb/aoa_hid.h
@@ -3,13 +3,16 @@

 #include "common.h"

-#include <stdbool.h>
 #include <stdint.h>
+#include <stdbool.h>
+
+#include <libusb-1.0/libusb.h>

 #include "hid/hid_event.h"
-#include "usb/usb.h"
+#include "usb.h"
 #include "util/acksync.h"
 #include "util/thread.h"
+#include "util/tick.h"
 #include "util/vecdeque.h"

 enum sc_aoa_event_type {
--- a/app/src/usb/gamepad_aoa.c
+++ b/app/src/usb/gamepad_aoa.c
@@ -1,7 +1,5 @@
 #include "gamepad_aoa.h"

-#include <stdbool.h>
-
 #include "input_events.h"
 #include "util/log.h"

@@ -9,35 +7,33 @@
 #define DOWNCAST(GP) container_of(GP, struct sc_gamepad_aoa, gamepad_processor)

 static void
-sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
+sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
                                const struct sc_gamepad_device_event *event) {
    struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);

-    struct sc_hid_open hid_open;
-    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                      event->gamepad_id)) {
-        return;
-    }
+    if (event->type == SC_GAMEPAD_DEVICE_ADDED) {
+        struct sc_hid_open hid_open;
+        if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
+                                          event->gamepad_id)) {
+            return;
+        }

-    // exit_on_error: false (a gamepad open failure should not exit scrcpy)
-    if (!sc_aoa_push_open(gamepad->aoa, &hid_open, false)) {
-        LOGW("Could not push AOA HID open (gamepad)");
-    }
-}
+        // exit_on_error: false (a gamepad open failure should not exit scrcpy)
+        if (!sc_aoa_push_open(gamepad->aoa, &hid_open, false)) {
+            LOGW("Could not push AOA HID open (gamepad)");
+        }
+    } else {
+        assert(event->type == SC_GAMEPAD_DEVICE_REMOVED);

-static void
-sc_gamepad_processor_process_gamepad_removed(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_device_event *event) {
-    struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);
+        struct sc_hid_close hid_close;
+        if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
+                                           event->gamepad_id)) {
+            return;
+        }

-    struct sc_hid_close hid_close;
-    if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
-                                       event->gamepad_id)) {
-        return;
-    }
-
-    if (!sc_aoa_push_close(gamepad->aoa, &hid_close)) {
-        LOGW("Could not push AOA HID close (gamepad)");
+        if (!sc_aoa_push_close(gamepad->aoa, &hid_close)) {
+            LOGW("Could not push AOA HID close (gamepad)");
+        }
    }
 }

@@ -80,8 +76,7 @@ sc_gamepad_aoa_init(struct sc_gamepad_aoa *gamepad, struct sc_aoa *aoa) {
    sc_hid_gamepad_init(&gamepad->hid);

    static const struct sc_gamepad_processor_ops ops = {
-        .process_gamepad_added = sc_gamepad_processor_process_gamepad_added,
-        .process_gamepad_removed = sc_gamepad_processor_process_gamepad_removed,
+        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
        .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
    };
--- a/app/src/usb/gamepad_aoa.h
+++ b/app/src/usb/gamepad_aoa.h
@@ -3,8 +3,10 @@

 #include "common.h"

+#include <stdbool.h>
+
+#include "aoa_hid.h"
 #include "hid/hid_gamepad.h"
-#include "usb/aoa_hid.h"
 #include "trait/gamepad_processor.h"

 struct sc_gamepad_aoa {
--- a/app/src/usb/keyboard_aoa.h
+++ b/app/src/usb/keyboard_aoa.h
@@ -5,8 +5,8 @@

 #include <stdbool.h>

+#include "aoa_hid.h"
 #include "hid/hid_keyboard.h"
-#include "usb/aoa_hid.h"
 #include "trait/key_processor.h"

 struct sc_keyboard_aoa {
--- a/app/src/usb/mouse_aoa.c
+++ b/app/src/usb/mouse_aoa.c
@@ -1,7 +1,6 @@
 #include "mouse_aoa.h"

 #include <assert.h>
-#include <stddef.h>

 #include "hid/hid_mouse.h"
 #include "input_events.h"
--- a/app/src/usb/mouse_aoa.h
+++ b/app/src/usb/mouse_aoa.h
@@ -5,7 +5,7 @@

 #include <stdbool.h>

-#include "usb/aoa_hid.h"
+#include "aoa_hid.h"
 #include "trait/mouse_processor.h"

 struct sc_mouse_aoa {
--- a/app/src/usb/scrcpy_otg.c
+++ b/app/src/usb/scrcpy_otg.c
@@ -1,19 +1,10 @@
 #include "scrcpy_otg.h"

-#include <assert.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <SDL2/SDL.h>

-#ifdef _WIN32
-# include "adb/adb.h"
-#endif
+#include "adb/adb.h"
 #include "events.h"
-#include "usb/screen_otg.h"
-#include "usb/aoa_hid.h"
-#include "usb/gamepad_aoa.h"
-#include "usb/keyboard_aoa.h"
-#include "usb/mouse_aoa.h"
+#include "screen_otg.h"
 #include "util/log.h"

 struct scrcpy_otg {
@@ -104,14 +95,9 @@ scrcpy_otg(struct scrcpy_options *options) {
    // On Windows, only one process could open a USB device
    // <https://github.com/Genymobile/scrcpy/issues/2773>
    LOGI("Killing adb server (if any)...");
-    if (sc_adb_init()) {
-        unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR;
-        // uninterruptible (intr == NULL), but in practice it's very quick
-        sc_adb_kill_server(NULL, flags);
-        sc_adb_destroy();
-    } else {
-        LOGW("Could not call adb executable, adb server not killed");
-    }
+    unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR;
+    // uninterruptible (intr == NULL), but in practice it's very quick
+    sc_adb_kill_server(NULL, flags);
 #endif

    static const struct sc_usb_callbacks cbs = {
--- a/app/src/usb/screen_otg.c
+++ b/app/src/usb/screen_otg.c
@@ -1,11 +1,7 @@
 #include "screen_otg.h"

-#include <assert.h>
-#include <stddef.h>
-
 #include "icon.h"
 #include "options.h"
-#include "util/acksync.h"
 #include "util/log.h"

 static void
@@ -179,6 +175,7 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
    assert(screen->gamepad);
    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;

+    SDL_JoystickID id;
    if (event->type == SDL_CONTROLLERDEVICEADDED) {
        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
        if (!gc) {
@@ -193,12 +190,9 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
            return;
        }

-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_JoystickInstanceID(joystick),
-        };
-        gp->ops->process_gamepad_added(gp, &evt);
+        id = SDL_JoystickInstanceID(joystick);
    } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        SDL_JoystickID id = event->which;
+        id = event->which;

        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
        if (gc) {
@@ -206,12 +200,16 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
        } else {
            LOGW("Unknown gamepad device removed");
        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = id,
-        };
-        gp->ops->process_gamepad_removed(gp, &evt);
+    } else {
+        // Nothing to do
+        return;
    }
+
+    struct sc_gamepad_device_event evt = {
+        .type = sc_gamepad_device_event_type_from_sdl_type(event->type),
+        .gamepad_id = id,
+    };
+    gp->ops->process_gamepad_device(gp, &evt);
 }

 static void
--- a/app/src/usb/screen_otg.h
+++ b/app/src/usb/screen_otg.h
@@ -4,13 +4,12 @@
 #include "common.h"

 #include <stdbool.h>
-#include <stdint.h>
 #include <SDL2/SDL.h>

+#include "keyboard_aoa.h"
+#include "mouse_aoa.h"
 #include "mouse_capture.h"
-#include "usb/gamepad_aoa.h"
-#include "usb/keyboard_aoa.h"
-#include "usb/mouse_aoa.h"
+#include "gamepad_aoa.h"

 struct sc_screen_otg {
    struct sc_keyboard_aoa *keyboard;
--- a/app/src/util/acksync.c
+++ b/app/src/util/acksync.c
@@ -1,6 +1,7 @@
 #include "acksync.h"

 #include <assert.h>
+#include "util/log.h"

 bool
 sc_acksync_init(struct sc_acksync *as) {
--- a/app/src/util/acksync.h
+++ b/app/src/util/acksync.h
@@ -3,10 +3,7 @@

 #include "common.h"

-#include <stdbool.h>
-#include <stdint.h>
-#include "util/thread.h"
-#include "util/tick.h"
+#include "thread.h"

 #define SC_SEQUENCE_INVALID 0

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Genxster1998	e3ecc6a59f	Build macOS x86_64 release Add actions to build a release for macOS x86_64 in addition to the aarch64 version.	2024-11-26 00:20:25 +01:00
Romain Vimont	6a2f35e7dc	Specify architecture for Linux and macOS releases Co-authored-by: Genxster1998 <ck.2229.ck@gmail.com>	2024-11-26 00:18:27 +01:00
Romain Vimont	4f74bf7f2b	Rename TARGET to TARGET_DIRNAME	2024-11-26 00:18:03 +01:00
Romain Vimont	5c7d0717a2	Use FORMAT variable name in package_client.sh The format is used several times, avoid using "$2" directly.	2024-11-26 00:16:46 +01:00
Romain Vimont	f7ff391afd	Simplify GitHub actions step descriptions Each step is executed within the context of an action, so there is no need to mention the name of the action.	2024-11-26 00:16:04 +01:00
Romain Vimont	b901cb1c40	Remove apt update on GitHub Actions Assume the image is up-to-date.	2024-11-26 00:13:02 +01:00