Fix PTS produced by the default OPUS encoder

The default OPUS encoder on Android rewrites the PTS so that it exactly matches the number of samples. As a consequence: - audio clock drift is not compensated - hard silences are ignored To fix this behavior, recreate the PTS based on the current time (after encoding) and the packet duration.
Add audio sources
2026-02-24 15:24:28 +01:00 · 2025-03-02 18:00:12 +01:00 · 2025-03-02 17:17:01 +01:00 · 2025-02-22 12:46:06 +01:00 · 2025-02-22 12:46:06 +01:00 · 2025-02-22 12:26:27 +01:00
112 changed files with 1395 additions and 1805 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -80,19 +80,11 @@ jobs:
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             libv4l-dev

-        # SDL3 is not available in Ubuntu yet
-      - name: Install SDL3
-        run: |
-          app/deps/sdl.sh linux native shared
-
      - name: Test
-        run: |
-          export PKG_CONFIG_PATH="$PWD"/app/deps/work/install/linux-native-shared/lib/pkgconfig
-          export LD_LIBRARY_PATH="$PWD"/app/deps/work/install/linux-native-shared/lib
-          release/test_client.sh
+        run: release/test_client.sh

  build-linux-x86_64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Check architecture
        run: |
@@ -210,7 +202,8 @@ jobs:

      - name: Install dependencies
        run: |
-            brew install meson nasm libiconv zlib automake autoconf libtool
+            brew install meson ninja nasm libiconv zlib automake autoconf \
+                libtool

      - name: Build
        env:
@@ -252,7 +245,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Install dependencies
-        run: brew install meson nasm libiconv zlib automake
+        run: brew install meson ninja nasm libiconv zlib automake
             # autoconf and libtool are already installed on macos-13

      - name: Build
--- a/FAQ.md
+++ b/FAQ.md
@@ -166,13 +166,14 @@ Rebooting the device is necessary once this option is set.

 ### Special characters do not work

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

 To avoid the problem, [change the keyboard mode to simulate a physical
 keyboard][hid].

+[text-input]: https://github.com/Genymobile/scrcpy/issues?q=is%3Aopen+is%3Aissue+label%3Aunicode
 [accented-characters]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-accented-characters
 [#37]: https://github.com/Genymobile/scrcpy/issues/37
 [hid]: doc/keyboard.md#physical-keyboard-simulation
--- 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.3.3)
+# scrcpy (v3.1)

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

@@ -58,7 +58,7 @@ Make sure you [enabled USB debugging][enable-adb] on your device(s).
 On some devices (especially Xiaomi), you might get the following error:

 ```
-Injecting input events requires the caller (or the source of the instrumentation, if any) to have the INJECT_EVENTS permission.
+java.lang.SecurityException: Injecting input events requires the caller (or the source of the instrumentation, if any) to have the INJECT_EVENTS permission.
 ```

 In that case, you need to enable [an additional option][control] `USB debugging
@@ -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.
@@ -207,10 +197,10 @@ work][donate]:

 [donate]: https://blog.rom1v.com/about/#support-my-open-source-work

-## License
+## 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
@@ -205,7 +205,6 @@ _scrcpy() {
        |-p|--port \
        |--push-target \
        |--rotation \
-        |--screen-off-timeout \
        |--tunnel-host \
        |--tunnel-port \
        |--v4l2-buffer \
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -1,4 +1,4 @@
-#compdef scrcpy scrcpy.exe
+#compdef -N scrcpy -N scrcpy.exe
 #
 # name: scrcpy
 # auth: hltdev [hltdev8642@gmail.com]
@@ -11,7 +11,7 @@ arguments=(
    '--always-on-top[Make scrcpy window always on top \(above other windows\)]'
    '--angle=[Rotate the video content by a custom angle, in degrees]'
    '--audio-bit-rate=[Encode the audio at the given bit-rate]'
-    '--audio-buffer=[Configure the audio buffering delay \(in milliseconds\)]'
+    '--audio-buffer=[Configure the audio buffering delay (in milliseconds)]'
    '--audio-codec=[Select the audio codec]:codec:(opus aac flac raw)'
    '--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
    '--audio-dup=[Duplicate audio]'
@@ -35,10 +35,10 @@ arguments=(
    {-e,--select-tcpip}'[Use TCP/IP device]'
    {-f,--fullscreen}'[Start in fullscreen]'
    '--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
-    '-G[Use UHID/AOA gamepad \(same as --gamepad=uhid or --gamepad=aoa, depending on OTG mode\)]'
+    '-G[Use UHID/AOA gamepad (same as --gamepad=uhid or --gamepad=aoa, depending on OTG mode)]'
    '--gamepad=[Set the gamepad input mode]:mode:(disabled uhid aoa)'
    {-h,--help}'[Print the help]'
-    '-K[Use UHID/AOA keyboard \(same as --keyboard=uhid or --keyboard=aoa, depending on OTG mode\)]'
+    '-K[Use UHID/AOA keyboard (same as --keyboard=uhid or --keyboard=aoa, depending on OTG mode)]'
    '--keyboard=[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'
    '--kill-adb-on-close[Kill adb when scrcpy terminates]'
    '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
@@ -48,7 +48,7 @@ arguments=(
    '--list-displays[List displays available on the device]'
    '--list-encoders[List video and audio encoders available on the device]'
    {-m,--max-size=}'[Limit both the width and height of the video to value]'
-    '-M[Use UHID/AOA mouse \(same as --mouse=uhid or --mouse=aoa, depending on OTG mode\)]'
+    '-M[Use UHID/AOA mouse (same as --mouse=uhid or --mouse=aoa, depending on OTG mode)]'
    '--max-fps=[Limit the frame rate of screen capture]'
    '--mouse=[Set the mouse input mode]:mode:(disabled sdk uhid aoa)'
    '--mouse-bind=[Configure bindings of secondary clicks]'
--- a/app/deps/adb_linux.sh
+++ b/app/deps/adb_linux.sh
@@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common

-VERSION=36.0.0
+VERSION=35.0.2
 FILENAME=platform-tools_r$VERSION-linux.zip
 PROJECT_DIR=platform-tools-$VERSION-linux
-SHA256SUM=0ead642c943ffe79701fccca8f5f1c69c4ce4f43df2eefee553f6ccb27cbfbe8
+SHA256SUM=acfdcccb123a8718c46c46c059b2f621140194e5ec1ac9d81715be3d6ab6cd0a

 cd "$SOURCES_DIR"

--- a/app/deps/adb_macos.sh
+++ b/app/deps/adb_macos.sh
@@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common

-VERSION=36.0.0
+VERSION=35.0.2
 FILENAME=platform-tools_r$VERSION-darwin.zip
 PROJECT_DIR=platform-tools-$VERSION-darwin
-SHA256SUM=d3e9fa1df3345cf728586908426615a60863d2632f73f1ce14f0f1349ef000fd
+SHA256SUM=1820078db90bf21628d257ff052528af1c61bb48f754b3555648f5652fa35d78

 cd "$SOURCES_DIR"

--- a/app/deps/adb_windows.sh
+++ b/app/deps/adb_windows.sh
@@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common

-VERSION=36.0.0
+VERSION=35.0.2
 FILENAME=platform-tools_r$VERSION-win.zip
 PROJECT_DIR=platform-tools-$VERSION-windows
-SHA256SUM=12c2841f354e92a0eb2fd7bf6f0f9bf8538abce7bd6b060ac8349d6f6a61107c
+SHA256SUM=2975a3eac0b19182748d64195375ad056986561d994fffbdc64332a516300bb9

 cd "$SOURCES_DIR"

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

--- a/app/deps/libusb.sh
+++ b/app/deps/libusb.sh
@@ -5,10 +5,10 @@ cd "$DEPS_DIR"
 . common
 process_args "$@"

-VERSION=1.0.29
+VERSION=1.0.27
 FILENAME=libusb-$VERSION.tar.gz
 PROJECT_DIR=libusb-$VERSION
-SHA256SUM=7c2dd39c0b2589236e48c93247c986ae272e27570942b4163cb00a060fcf1b74
+SHA256SUM=e8f18a7a36ecbb11fb820bd71540350d8f61bcd9db0d2e8c18a6fb80b214a3de

 cd "$SOURCES_DIR"

--- a/app/deps/sdl.sh
+++ b/app/deps/sdl.sh
@@ -5,10 +5,10 @@ cd "$DEPS_DIR"
 . common
 process_args "$@"

-VERSION=3.2.18
+VERSION=2.30.10
 FILENAME=SDL-$VERSION.tar.gz
 PROJECT_DIR=SDL-release-$VERSION
-SHA256SUM=51539fa13e546bc50c632beed3f34257de2baa38a4c642048de56377903b4265
+SHA256SUM=35a8b9c4f3635d85762b904ac60ca4e0806bff89faeb269caafbe80860d67168

 cd "$SOURCES_DIR"

@@ -28,55 +28,52 @@ export CXXFLAGS="$CFLAGS"

 if [[ -d "$DIRNAME" ]]
 then
-    echo "'$PWD/$DIRNAME' already exists, not reconfigured"
+    echo "'$PWD/$HDIRNAME' already exists, not reconfigured"
    cd "$DIRNAME"
 else
    mkdir "$DIRNAME"
    cd "$DIRNAME"

    conf=(
-        -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR/$DIRNAME"
+        --prefix="$INSTALL_DIR/$DIRNAME"
    )

    if [[ "$HOST" == linux ]]
    then
        conf+=(
-            -DSDL_WAYLAND=ON
-            -DSDL_X11=ON
+            --enable-video-wayland
+            --enable-video-x11
        )
    fi

    if [[ "$LINK_TYPE" == static ]]
    then
        conf+=(
-            -DBUILD_SHARED_LIBS=OFF
+            --enable-static
+            --disable-shared
        )
    else
        conf+=(
-            -DBUILD_SHARED_LIBS=ON
+            --disable-static
+            --enable-shared
        )
    fi

    if [[ "$BUILD_TYPE" == cross ]]
    then
-        if [[ "$HOST" = win32 ]]
-        then
-            TOOLCHAIN_FILENAME="cmake-toolchain-mingw64-i686.cmake"
-        elif [[ "$HOST" = win64 ]]
-        then
-            TOOLCHAIN_FILENAME="cmake-toolchain-mingw64-x86_64.cmake"
-        else
-            echo "Unsupported cross-build to host: $HOST" >&2
-            exit 1
-        fi
-
        conf+=(
-            -DCMAKE_TOOLCHAIN_FILE="$SOURCES_DIR/$PROJECT_DIR/build-scripts/$TOOLCHAIN_FILENAME"
+            --host="$HOST_TRIPLET"
        )
    fi

-    cmake "$SOURCES_DIR/$PROJECT_DIR" "${conf[@]}"
+    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
 fi

-cmake --build .
-cmake --install .
+make -j
+# There is no "make install-strip"
+make install
+# Strip manually
+if [[ "$LINK_TYPE" == shared && "$HOST" == win* ]]
+then
+    ${HOST_TRIPLET}-strip "$INSTALL_DIR/$DIRNAME/bin/SDL2.dll"
+fi
--- a/app/meson.build
+++ b/app/meson.build
@@ -63,7 +63,6 @@ src = [
    'src/util/thread.c',
    'src/util/tick.c',
    'src/util/timeout.c',
-    'src/util/window.c',
 ]

 conf = configuration_data()
@@ -118,7 +117,7 @@ dependencies = [
    dependency('libavcodec', version: '>= 57.37', static: static),
    dependency('libavutil', static: static),
    dependency('libswresample', static: static),
-    dependency('sdl3', version: '>= 3.2.0', static: static),
+    dependency('sdl2', version: '>= 2.0.5', static: static),
 ]

 if v4l2_support
--- 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.3.3"
+      VALUE "ProductVersion", "3.1"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -510,10 +510,6 @@ The device serial number. Mandatory only if several devices are connected to adb
 .B \-S, \-\-turn\-screen\-off
 Turn the device screen off immediately.

-.TP
-.B "\-\-screen\-off\-timeout " seconds
-Set the screen off timeout while scrcpy is running (restore the initial value on exit).
-
 .TP
 .BI "\-\-shortcut\-mod " key\fR[+...]][,...]
 Specify the modifiers to use for scrcpy shortcuts. Possible keys are "lctrl", "rctrl", "lalt", "ralt", "lsuper" and "rsuper".
@@ -852,7 +848,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
@@ -103,14 +103,14 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {

 static void
 show_adb_installation_msg(void) {
-#ifndef _WIN32
+#ifndef __WINDOWS__
    static const struct {
        const char *binary;
        const char *command;
    } pkg_managers[] = {
        {"apt", "apt install adb"},
        {"apt-get", "apt-get install adb"},
-        {"brew", "brew install --cask android-platform-tools"},
+        {"brew", "brew cask install android-platform-tools"},
        {"dnf", "dnf install android-tools"},
        {"emerge", "emerge dev-util/android-tools"},
        {"pacman", "pacman -S android-tools"},
@@ -331,7 +331,7 @@ sc_adb_reverse_remove(struct sc_intr *intr, const char *serial,
 bool
 sc_adb_push(struct sc_intr *intr, const char *serial, const char *local,
            const char *remote, unsigned flags) {
-#ifdef _WIN32
+#ifdef __WINDOWS__
    // Windows will parse the string, so the paths must be quoted
    // (see sys/win/command.c)
    local = sc_str_quote(local);
@@ -351,7 +351,7 @@ sc_adb_push(struct sc_intr *intr, const char *serial, const char *local,

    sc_pid pid = sc_adb_execute(argv, flags);

-#ifdef _WIN32
+#ifdef __WINDOWS__
    free((void *) remote);
    free((void *) local);
 #endif
@@ -362,7 +362,7 @@ sc_adb_push(struct sc_intr *intr, const char *serial, const char *local,
 bool
 sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
               unsigned flags) {
-#ifdef _WIN32
+#ifdef __WINDOWS__
    // Windows will parse the string, so the local name must be quoted
    // (see sys/win/command.c)
    local = sc_str_quote(local);
@@ -377,7 +377,7 @@ sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,

    sc_pid pid = sc_adb_execute(argv, flags);

-#ifdef _WIN32
+#ifdef __WINDOWS__
    free((void *) local);
 #endif

--- a/app/src/audio_player.c
+++ b/app/src/audio_player.c
@@ -1,40 +1,23 @@
 #include "audio_player.h"

 #include "util/log.h"
-#include "SDL3/SDL_hints.h"

 /** Downcast frame_sink to sc_audio_player */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_audio_player, frame_sink)

-#define SC_SDL_SAMPLE_FMT SDL_AUDIO_F32LE
+#define SC_SDL_SAMPLE_FMT AUDIO_F32

 static void SDLCALL
-sc_audio_player_stream_callback(void *userdata, SDL_AudioStream *stream,
-                                int additional_amount, int total_amount) {
-    (void) total_amount;
-
+sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
    struct sc_audio_player *ap = userdata;

-    size_t len = additional_amount;
+    assert(len_int > 0);
+    size_t len = len_int;
+
    assert(len % ap->audioreg.sample_size == 0);
+    uint32_t out_samples = len / ap->audioreg.sample_size;

-    // The requested amount may exceed the internal aout_buffer size.
-    // In this (unlikely) case, send the data to the stream in multiple chunks.
-    while (len) {
-        size_t chunk_size = MIN(ap->aout_buffer_size, len);
-        uint32_t out_samples = chunk_size / ap->audioreg.sample_size;
-        sc_audio_regulator_pull(&ap->audioreg, ap->aout_buffer,
-                                out_samples);
-
-        assert(chunk_size <= len);
-        len -= chunk_size;
-        bool ok =
-            SDL_PutAudioStreamData(stream, ap->aout_buffer, chunk_size);
-        if (!ok) {
-            LOGW("Audio stream error: %s", SDL_GetError());
-            return;
-        }
-    }
+    sc_audio_regulator_pull(&ap->audioreg, stream, out_samples);
 }

 static bool
@@ -47,10 +30,7 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,

 static bool
 sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
-                                const AVCodecContext *ctx,
-                                const struct sc_stream_session *session) {
-    (void) session;
-
+                                const AVCodecContext *ctx) {
    struct sc_audio_player *ap = DOWNCAST(sink);

 #ifdef SCRCPY_LAVU_HAS_CHLAYOUT
@@ -81,45 +61,23 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
                                                       / SC_TICK_FREQ;
    assert(aout_samples <= 0xFFFF);

-    char str[5 + 1]; // max 65535
-    int r = snprintf(str, sizeof(str), "%" PRIu16, (uint16_t) aout_samples);
-    assert(r >= 0 && (size_t) r < sizeof(str));
-    (void) r;
-    if (!SDL_SetHint(SDL_HINT_AUDIO_DEVICE_SAMPLE_FRAMES, str)) {
-        LOGE("Could not set audio output buffer");
-        sc_audio_regulator_destroy(&ap->audioreg);
-        return false;
-    }
-
-    // Make the buffer at least 1024 samples long (the hint is not always
-    // honored)
-    uint64_t aout_buffer_samples = MAX(1024, aout_samples);
-    ap->aout_buffer_size = aout_buffer_samples * sample_size;
-    ap->aout_buffer = malloc(ap->aout_buffer_size);
-    if (!ap->aout_buffer) {
-        sc_audio_regulator_destroy(&ap->audioreg);
-        return false;
-    }
-
-    SDL_AudioSpec spec = {
+    SDL_AudioSpec desired = {
        .freq = ctx->sample_rate,
        .format = SC_SDL_SAMPLE_FMT,
        .channels = nb_channels,
+        .samples = aout_samples,
+        .callback = sc_audio_player_sdl_callback,
+        .userdata = ap,
    };
+    SDL_AudioSpec obtained;

-    ap->stream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK,
-                                           &spec,
-                                           sc_audio_player_stream_callback, ap);
-    if (!ap->stream) {
+    ap->device = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
+    if (!ap->device) {
        LOGE("Could not open audio device: %s", SDL_GetError());
-        free(ap->aout_buffer);
        sc_audio_regulator_destroy(&ap->audioreg);
        return false;
    }

-    ap->device = SDL_GetAudioStreamDevice(ap->stream);
-    assert(ap->device);
-
    // The thread calling open() is the thread calling push(), which fills the
    // audio buffer consumed by the SDL audio thread.
    ok = sc_thread_set_priority(SC_THREAD_PRIORITY_TIME_CRITICAL);
@@ -128,14 +86,7 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
        (void) ok; // We don't care if it worked, at least we tried
    }

-    ok = SDL_ResumeAudioDevice(ap->device);
-    if (!ok) {
-        LOGE("Could not resume audio device: %s", SDL_GetError());
-        SDL_DestroyAudioStream(ap->stream);
-        free(ap->aout_buffer);
-        sc_audio_regulator_destroy(&ap->audioreg);
-        return false;
-    }
+    SDL_PauseAudioDevice(ap->device, 0);

    return true;
 }
@@ -144,16 +95,11 @@ static void
 sc_audio_player_frame_sink_close(struct sc_frame_sink *sink) {
    struct sc_audio_player *ap = DOWNCAST(sink);

-    assert(ap->stream);
    assert(ap->device);
-    SDL_PauseAudioDevice(ap->device);
-
-    // ap->device is owned by ap->stream
-    SDL_DestroyAudioStream(ap->stream);
+    SDL_PauseAudioDevice(ap->device, 1);
+    SDL_CloseAudioDevice(ap->device);

    sc_audio_regulator_destroy(&ap->audioreg);
-
-    free(ap->aout_buffer);
 }

 void
--- a/app/src/audio_player.h
+++ b/app/src/audio_player.h
@@ -3,7 +3,7 @@

 #include "common.h"

-#include <SDL3/SDL_audio.h>
+#include <SDL2/SDL_audio.h>

 #include "audio_regulator.h"
 #include "trait/frame_sink.h"
@@ -22,11 +22,7 @@ struct sc_audio_player {
    // SDL audio output buffer size
    sc_tick output_buffer_duration;

-    uint8_t *aout_buffer;
-    size_t aout_buffer_size;
-
-    SDL_AudioStream *stream;
-    SDL_AudioDeviceID device; // owned by the audio stream
+    SDL_AudioDeviceID device;
    struct sc_audio_regulator audioreg;
 };

--- a/app/src/audio_regulator.c
+++ b/app/src/audio_regulator.c
@@ -160,7 +160,6 @@ sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
        // 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;
--- a/app/src/compat.h
+++ b/app/src/compat.h
@@ -6,7 +6,7 @@
 #include <libavcodec/version.h>
 #include <libavformat/version.h>
 #include <libavutil/version.h>
-#include <SDL3/SDL_version.h>
+#include <SDL2/SDL_version.h>

 #ifndef _WIN32
 # define PRIu64_ PRIu64
@@ -61,6 +61,20 @@
 # define SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
 #endif

+#if SDL_VERSION_ATLEAST(2, 0, 6)
+// <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
+# define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 8)
+// <https://hg.libsdl.org/SDL/rev/dfde5d3f9781>
+# define SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 16)
+# define SCRCPY_SDL_HAS_THREAD_PRIORITY_TIME_CRITICAL
+#endif
+
 #ifndef HAVE_STRDUP
 char *strdup(const char *s);
 #endif
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -127,14 +127,10 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
            return 32;
        case SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:
            write_position(&buf[1], &msg->inject_scroll_event.position);
-            // Accept values in the range [-16, 16].
-            // Normalize to [-1, 1] in order to use sc_float_to_i16fp().
-            float hscroll_norm = msg->inject_scroll_event.hscroll / 16;
-            hscroll_norm = CLAMP(hscroll_norm, -1, 1);
-            float vscroll_norm = msg->inject_scroll_event.vscroll / 16;
-            vscroll_norm = CLAMP(vscroll_norm, -1, 1);
-            int16_t hscroll = sc_float_to_i16fp(hscroll_norm);
-            int16_t vscroll = sc_float_to_i16fp(vscroll_norm);
+            int16_t hscroll =
+                sc_float_to_i16fp(msg->inject_scroll_event.hscroll);
+            int16_t vscroll =
+                sc_float_to_i16fp(msg->inject_scroll_event.vscroll);
            sc_write16be(&buf[13], (uint16_t) hscroll);
            sc_write16be(&buf[15], (uint16_t) vscroll);
            sc_write32be(&buf[17], msg->inject_scroll_event.buttons);
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@@ -10,30 +10,20 @@
 #define DOWNCAST(SINK) container_of(SINK, struct sc_decoder, packet_sink)

 static bool
-sc_decoder_open(struct sc_decoder *decoder, AVCodecContext *ctx,
-                const struct sc_stream_session *session) {
+sc_decoder_open(struct sc_decoder *decoder, AVCodecContext *ctx) {
    decoder->frame = av_frame_alloc();
    if (!decoder->frame) {
        LOG_OOM();
        return false;
    }

-    if (!sc_frame_source_sinks_open(&decoder->frame_source, ctx, session)) {
+    if (!sc_frame_source_sinks_open(&decoder->frame_source, ctx)) {
        av_frame_free(&decoder->frame);
        return false;
    }

    decoder->ctx = ctx;

-    // A video stream must have a session
-    assert(session || ctx->codec_type != AVMEDIA_TYPE_VIDEO);
-
-    if (session) {
-        decoder->session = *session;
-    }
-
-    memset(&decoder->frame_size, 0, sizeof(decoder->frame_size));
-
    return true;
 }

@@ -71,32 +61,6 @@ sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
        }

        // a frame was received
-
-        if (decoder->ctx->codec_type == AVMEDIA_TYPE_VIDEO) {
-            assert(decoder->frame->width >= 0);
-            assert(decoder->frame->height >= 0);
-            struct sc_size frame_size = {
-                .width = decoder->frame->width,
-                .height = decoder->frame->height,
-            };
-            if (decoder->frame_size.width != frame_size.width
-                    || decoder->frame_size.height != frame_size.height) {
-                // The frame size has changed, check if it matches the session
-                uint32_t sw = decoder->session.video.width;
-                uint32_t sh = decoder->session.video.height;
-                if (frame_size.width != sw || frame_size.height != sh) {
-                    LOGW("Unexpected video size: %" PRIu32 "x%" PRIu32
-                         " (expected %" PRIu32 "x%" PRIu32 ")",
-                         frame_size.width, frame_size.height, sw, sh);
-
-                    LOGW("The encoder did not respect the requested size, "
-                         "please retry with a lower resolution (-m/--max-size)");
-                }
-            }
-
-            decoder->frame_size = frame_size;
-        }
-
        bool ok = sc_frame_source_sinks_push(&decoder->frame_source,
                                             decoder->frame);
        av_frame_unref(decoder->frame);
@@ -110,17 +74,9 @@ sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
 }

 static bool
-sc_decoder_push_session(struct sc_decoder *decoder,
-                        const struct sc_stream_session *session) {
-    decoder->session = *session;
-    return sc_frame_source_sinks_push_session(&decoder->frame_source, session);
-}
-
-static bool
-sc_decoder_packet_sink_open(struct sc_packet_sink *sink, AVCodecContext *ctx,
-                            const struct sc_stream_session *session) {
+sc_decoder_packet_sink_open(struct sc_packet_sink *sink, AVCodecContext *ctx) {
    struct sc_decoder *decoder = DOWNCAST(sink);
-    return sc_decoder_open(decoder, ctx, session);
+    return sc_decoder_open(decoder, ctx);
 }

 static void
@@ -136,14 +92,6 @@ sc_decoder_packet_sink_push(struct sc_packet_sink *sink,
    return sc_decoder_push(decoder, packet);
 }

-static bool
-sc_decoder_packet_sink_push_session(struct sc_packet_sink *sink,
-                                    const struct sc_stream_session *session) {
-
-    struct sc_decoder *decoder = DOWNCAST(sink);
-    return sc_decoder_push_session(decoder, session);
-}
-
 void
 sc_decoder_init(struct sc_decoder *decoder, const char *name) {
    decoder->name = name; // statically allocated
@@ -153,7 +101,6 @@ sc_decoder_init(struct sc_decoder *decoder, const char *name) {
        .open = sc_decoder_packet_sink_open,
        .close = sc_decoder_packet_sink_close,
        .push = sc_decoder_packet_sink_push,
-        .push_session = sc_decoder_packet_sink_push_session,
    };

    decoder->packet_sink.ops = &ops;
--- a/app/src/decoder.h
+++ b/app/src/decoder.h
@@ -5,7 +5,6 @@

 #include <libavcodec/avcodec.h>

-#include "coords.h"
 #include "trait/frame_source.h"
 #include "trait/packet_sink.h"

@@ -17,9 +16,6 @@ struct sc_decoder {

    AVCodecContext *ctx;
    AVFrame *frame;
-
-    struct sc_stream_session session; // only initialized for video stream
-    struct sc_size frame_size;
 };

 // The name must be statically allocated (e.g. a string literal)
--- a/app/src/delay_buffer.c
+++ b/app/src/delay_buffer.c
@@ -10,18 +10,16 @@
 #define DOWNCAST(SINK) container_of(SINK, struct sc_delay_buffer, frame_sink)

 static bool
-sc_delayed_packet_init_frame(struct sc_delayed_packet *dpacket,
-                             const AVFrame *frame) {
-    dpacket->type = SC_DELAYED_PACKET_TYPE_FRAME;
-    dpacket->frame = av_frame_alloc();
-    if (!dpacket->frame) {
+sc_delayed_frame_init(struct sc_delayed_frame *dframe, const AVFrame *frame) {
+    dframe->frame = av_frame_alloc();
+    if (!dframe->frame) {
        LOG_OOM();
        return false;
    }

-    if (av_frame_ref(dpacket->frame, frame)) {
+    if (av_frame_ref(dframe->frame, frame)) {
        LOG_OOM();
-        av_frame_free(&dpacket->frame);
+        av_frame_free(&dframe->frame);
        return false;
    }

@@ -29,18 +27,9 @@ sc_delayed_packet_init_frame(struct sc_delayed_packet *dpacket,
 }

 static void
-sc_delayed_packet_init_session(struct sc_delayed_packet *dpacket,
-                               const struct sc_stream_session *session) {
-    dpacket->type = SC_DELAYED_PACKET_TYPE_SESSION;
-    dpacket->session = *session;
-}
-
-static void
-sc_delayed_packet_destroy(struct sc_delayed_packet *dpacket) {
-    if (dpacket->type == SC_DELAYED_PACKET_TYPE_FRAME) {
-        av_frame_unref(dpacket->frame);
-        av_frame_free(&dpacket->frame);
-    }
+sc_delayed_frame_destroy(struct sc_delayed_frame *dframe) {
+    av_frame_unref(dframe->frame);
+    av_frame_free(&dframe->frame);
 }

 static int
@@ -61,52 +50,43 @@ run_buffering(void *data) {
            goto stopped;
        }

-        struct sc_delayed_packet dpacket = sc_vecdeque_pop(&db->queue);
+        struct sc_delayed_frame dframe = sc_vecdeque_pop(&db->queue);

-        bool ok;
-        if (dpacket.type == SC_DELAYED_PACKET_TYPE_FRAME) {
-            sc_tick max_deadline = sc_tick_now() + db->delay;
-            // PTS (written by the server) are expressed in microseconds
-            sc_tick pts = SC_TICK_FROM_US(dpacket.frame->pts);
+        sc_tick max_deadline = sc_tick_now() + db->delay;
+        // PTS (written by the server) are expressed in microseconds
+        sc_tick pts = SC_TICK_FROM_US(dframe.frame->pts);

-            bool timed_out = false;
-            while (!db->stopped && !timed_out) {
-                sc_tick deadline = sc_clock_to_system_time(&db->clock, pts)
-                                 + db->delay;
-                if (deadline > max_deadline) {
-                    deadline = max_deadline;
-                }
-
-                timed_out =
-                    !sc_cond_timedwait(&db->wait_cond, &db->mutex, deadline);
+        bool timed_out = false;
+        while (!db->stopped && !timed_out) {
+            sc_tick deadline = sc_clock_to_system_time(&db->clock, pts)
+                             + db->delay;
+            if (deadline > max_deadline) {
+                deadline = max_deadline;
            }

-            bool stopped = db->stopped;
-            sc_mutex_unlock(&db->mutex);
-
-            if (stopped) {
-                sc_delayed_packet_destroy(&dpacket);
-                goto stopped;
-            }
-
-#ifdef SC_BUFFERING_DEBUG
-            LOGD("Buffering: %" PRItick ";%" PRItick ";%" PRItick,
-                 pts, dframe.push_date, sc_tick_now());
-#endif
-
-            ok = sc_frame_source_sinks_push(&db->frame_source, dpacket.frame);
-        } else {
-            assert(dpacket.type == SC_DELAYED_PACKET_TYPE_SESSION);
-            sc_mutex_unlock(&db->mutex);
-            ok = sc_frame_source_sinks_push_session(&db->frame_source,
-                                                    &dpacket.session);
+            timed_out =
+                !sc_cond_timedwait(&db->wait_cond, &db->mutex, deadline);
        }

-        sc_delayed_packet_destroy(&dpacket);
+        bool stopped = db->stopped;
+        sc_mutex_unlock(&db->mutex);
+
+        if (stopped) {
+            sc_delayed_frame_destroy(&dframe);
+            goto stopped;
+        }
+
+#ifdef SC_BUFFERING_DEBUG
+        LOGD("Buffering: %" PRItick ";%" PRItick ";%" PRItick,
+             pts, dframe.push_date, sc_tick_now());
+#endif
+
+        bool ok = sc_frame_source_sinks_push(&db->frame_source, dframe.frame);
+        sc_delayed_frame_destroy(&dframe);
        if (!ok) {
-            LOGE("Delayed packet could not be pushed, stopping");
+            LOGE("Delayed frame could not be pushed, stopping");
            sc_mutex_lock(&db->mutex);
-            // Prevent to push any new packet
+            // Prevent to push any new frame
            db->stopped = true;
            sc_mutex_unlock(&db->mutex);
            goto stopped;
@@ -118,8 +98,8 @@ stopped:

    // Flush queue
    while (!sc_vecdeque_is_empty(&db->queue)) {
-        struct sc_delayed_packet *dpacket = sc_vecdeque_popref(&db->queue);
-        sc_delayed_packet_destroy(dpacket);
+        struct sc_delayed_frame *dframe = sc_vecdeque_popref(&db->queue);
+        sc_delayed_frame_destroy(dframe);
    }

    LOGD("Buffering thread ended");
@@ -129,11 +109,9 @@ stopped:

 static bool
 sc_delay_buffer_frame_sink_open(struct sc_frame_sink *sink,
-                                const AVCodecContext *ctx,
-                                const struct sc_stream_session *session) {
+                                const AVCodecContext *ctx) {
    struct sc_delay_buffer *db = DOWNCAST(sink);
    (void) ctx;
-    (void) session;

    bool ok = sc_mutex_init(&db->mutex);
    if (!ok) {
@@ -154,7 +132,7 @@ sc_delay_buffer_frame_sink_open(struct sc_frame_sink *sink,
    sc_vecdeque_init(&db->queue);
    db->stopped = false;

-    if (!sc_frame_source_sinks_open(&db->frame_source, ctx, session)) {
+    if (!sc_frame_source_sinks_open(&db->frame_source, ctx)) {
        goto error_destroy_wait_cond;
    }

@@ -218,56 +196,24 @@ sc_delay_buffer_frame_sink_push(struct sc_frame_sink *sink,
        return sc_frame_source_sinks_push(&db->frame_source, frame);
    }

-    struct sc_delayed_packet *dpacket = sc_vecdeque_push_hole(&db->queue);
-    if (!dpacket) {
+    struct sc_delayed_frame dframe;
+    bool ok = sc_delayed_frame_init(&dframe, frame);
+    if (!ok) {
        sc_mutex_unlock(&db->mutex);
-        LOG_OOM();
        return false;
    }

-    bool ok = sc_delayed_packet_init_frame(dpacket, frame);
+#ifdef SC_BUFFERING_DEBUG
+    dframe.push_date = sc_tick_now();
+#endif
+
+    ok = sc_vecdeque_push(&db->queue, dframe);
    if (!ok) {
        sc_mutex_unlock(&db->mutex);
        LOG_OOM();
        return false;
    }

-#ifdef SC_BUFFERING_DEBUG
-    dpacket->push_date = sc_tick_now();
-#endif
-
-    sc_cond_signal(&db->queue_cond);
-
-    sc_mutex_unlock(&db->mutex);
-
-    return true;
-}
-
-static bool
-sc_delay_buffer_frame_sink_push_session(struct sc_frame_sink *sink,
-                                      const struct sc_stream_session *session) {
-    struct sc_delay_buffer *db = DOWNCAST(sink);
-
-    sc_mutex_lock(&db->mutex);
-
-    if (db->stopped) {
-        sc_mutex_unlock(&db->mutex);
-        return false;
-    }
-
-    struct sc_delayed_packet *dpacket = sc_vecdeque_push_hole(&db->queue);
-    if (!dpacket) {
-        sc_mutex_unlock(&db->mutex);
-        LOG_OOM();
-        return false;
-    }
-
-    sc_delayed_packet_init_session(dpacket, session);
-
-#ifdef SC_BUFFERING_DEBUG
-    dpacket->push_date = sc_tick_now();
-#endif
-
    sc_cond_signal(&db->queue_cond);

    sc_mutex_unlock(&db->mutex);
@@ -289,7 +235,6 @@ sc_delay_buffer_init(struct sc_delay_buffer *db, sc_tick delay,
        .open = sc_delay_buffer_frame_sink_open,
        .close = sc_delay_buffer_frame_sink_close,
        .push = sc_delay_buffer_frame_sink_push,
-        .push_session = sc_delay_buffer_frame_sink_push_session,
    };

    db->frame_sink.ops = &ops;
--- a/app/src/delay_buffer.h
+++ b/app/src/delay_buffer.h
@@ -18,23 +18,14 @@
 // forward declarations
 typedef struct AVFrame AVFrame;

-enum sc_delayed_packet_type {
-    SC_DELAYED_PACKET_TYPE_FRAME,
-    SC_DELAYED_PACKET_TYPE_SESSION,
-};
-
-struct sc_delayed_packet {
-    enum sc_delayed_packet_type type;
-    union {
-        AVFrame *frame;
-        struct sc_stream_session session;
-    };
+struct sc_delayed_frame {
+    AVFrame *frame;
 #ifdef SC_BUFFERING_DEBUG
    sc_tick push_date;
 #endif
 };

-struct sc_delayed_packet_queue SC_VECDEQUE(struct sc_delayed_packet);
+struct sc_delayed_frame_queue SC_VECDEQUE(struct sc_delayed_frame);

 struct sc_delay_buffer {
    struct sc_frame_source frame_source; // frame source trait
@@ -49,7 +40,7 @@ struct sc_delay_buffer {
    sc_cond wait_cond;

    struct sc_clock clock;
-    struct sc_delayed_packet_queue queue;
+    struct sc_delayed_frame_queue queue;
    bool stopped;
 };

--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -11,8 +11,8 @@

 #define SC_PACKET_HEADER_SIZE 12

-#define SC_PACKET_FLAG_CONFIG    (UINT64_C(1) << 62)
-#define SC_PACKET_FLAG_KEY_FRAME (UINT64_C(1) << 61)
+#define SC_PACKET_FLAG_CONFIG    (UINT64_C(1) << 63)
+#define SC_PACKET_FLAG_KEY_FRAME (UINT64_C(1) << 62)

 #define SC_PACKET_PTS_MASK (SC_PACKET_FLAG_KEY_FRAME - 1)

@@ -63,75 +63,48 @@ sc_demuxer_recv_codec_id(struct sc_demuxer *demuxer, uint32_t *codec_id) {
    return true;
 }

-static inline bool
-sc_demuxer_recv_header(struct sc_demuxer *demuxer,
-                       uint8_t buf[static SC_PACKET_HEADER_SIZE]) {
+static bool
+sc_demuxer_recv_video_size(struct sc_demuxer *demuxer, uint32_t *width,
+                           uint32_t *height) {
+    uint8_t data[8];
+    ssize_t r = net_recv_all(demuxer->socket, data, 8);
+    if (r < 8) {
+        return false;
+    }
+
+    *width = sc_read32be(data);
+    *height = sc_read32be(data + 4);
+    return true;
+}
+
+static bool
+sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
    // The video and audio streams contain a sequence of raw packets (as
    // provided by MediaCodec), each prefixed with a "meta" header.
    //
-    // The "meta" header length is 12 bytes.
-    //
-    //
-    // If the MSB is 1, then it is a session packet (for a video stream only),
-    // which only contains a 12-byte header:
-    //
-    //  byte 0   byte 1   byte 2   byte 3
-    // 10000000 00000000 00000000 00000000
-    // ^<-------------------------------->
-    // |               padding
-    //  `- session packet flag
-    //
-    //  byte 4   byte 5   byte 6   byte 7   byte 8   byte 9   byte 10  byte 11
-    // ........ ........ ........ ........ ........ ........ ........ ........
-    // <---------------------------------> <--------------------------------->
-    //             video width                         video height
-    //
-    //
-    // If the MSB is 0, then it is a media packet, comprised of a 12-byte header
-    // followed by <packet_size> bytes containing the packet/frame:
-    //
+    // The "meta" header length is 12 bytes:
    // [. . . . . . . .|. . . .]. . . . . . . . . . . . . . . ...
    //  <-------------> <-----> <-----------------------------...
    //        PTS        packet        raw packet
    //                    size
    //
+    // It is followed by <packet_size> bytes containing the packet/frame.
+    //
    // The most significant bits of the PTS are used for packet flags:
    //
-    //  byte 0   byte 1   byte 2   byte 3   byte 4   byte 5   byte 6   byte 7
-    // 0CK..... ........ ........ ........ ........ ........ ........ ........
-    // ^^^<------------------------------------------------------------------>
-    // |||                                PTS
-    // || `- key frame
-    // | `-- config packet
-    //  `--- media packet flag
-    //
-    //  byte 8   byte 9   byte 10  byte 11
-    // ........ ........ ........ ........ ........ ........ . . .
-    // <---------------------------------> <---------------- . . .
-    //            packet size                       raw packet
-    //
-    ssize_t r = net_recv_all(demuxer->socket, buf, SC_PACKET_HEADER_SIZE);
-    assert(r <= SC_PACKET_HEADER_SIZE);
-    return r == SC_PACKET_HEADER_SIZE;
-}
+    //  byte 7   byte 6   byte 5   byte 4   byte 3   byte 2   byte 1   byte 0
+    // CK...... ........ ........ ........ ........ ........ ........ ........
+    // ^^<------------------------------------------------------------------->
+    // ||                                PTS
+    // | `- key frame
+    //  `-- config packet

-static bool
-sc_demuxer_is_session(const uint8_t *header) {
-    return header[0] & 0x80;
-}
+    uint8_t header[SC_PACKET_HEADER_SIZE];
+    ssize_t r = net_recv_all(demuxer->socket, header, SC_PACKET_HEADER_SIZE);
+    if (r < SC_PACKET_HEADER_SIZE) {
+        return false;
+    }

-static void
-sc_demuxer_parse_session(const uint8_t *header,
-                         struct sc_stream_session *session) {
-    assert(sc_demuxer_is_session(header));
-    session->video.width = sc_read32be(&header[4]);
-    session->video.height = sc_read32be(&header[8]);
-}
-
-static bool
-sc_demuxer_recv_packet(struct sc_demuxer *demuxer, const uint8_t *header,
-                       AVPacket *packet) {
-    assert(!sc_demuxer_is_session(header));
    uint64_t pts_flags = sc_read64be(header);
    uint32_t len = sc_read32be(&header[8]);
    assert(len);
@@ -141,7 +114,7 @@ sc_demuxer_recv_packet(struct sc_demuxer *demuxer, const uint8_t *header,
        return false;
    }

-    ssize_t r = net_recv_all(demuxer->socket, packet->data, len);
+    r = net_recv_all(demuxer->socket, packet->data, len);
    if (r < 0 || ((uint32_t) r) < len) {
        av_packet_unref(packet);
        return false;
@@ -214,28 +187,17 @@ run_demuxer(void *data) {

    codec_ctx->flags |= AV_CODEC_FLAG_LOW_DELAY;

-    uint8_t header[SC_PACKET_HEADER_SIZE];
-    struct sc_stream_session session_data;
-
-    struct sc_stream_session *session = NULL;
    if (codec->type == AVMEDIA_TYPE_VIDEO) {
-        bool ok = sc_demuxer_recv_header(demuxer, header);
+        uint32_t width;
+        uint32_t height;
+        ok = sc_demuxer_recv_video_size(demuxer, &width, &height);
        if (!ok) {
            goto finally_free_context;
        }

-        if (!sc_demuxer_is_session(header)) {
-            LOGE("Unexpected packet (not a session header)");
-            goto finally_free_context;
-        }
-
-        session = &session_data;
-        sc_demuxer_parse_session(header, session);
-
-        codec_ctx->width = session_data.video.width;
-        codec_ctx->height = session_data.video.height;
+        codec_ctx->width = width;
+        codec_ctx->height = height;
        codec_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-
    } else {
        // Hardcoded audio properties
 #ifdef SCRCPY_LAVU_HAS_CHLAYOUT
@@ -257,8 +219,7 @@ run_demuxer(void *data) {
        goto finally_free_context;
    }

-    if (!sc_packet_source_sinks_open(&demuxer->packet_source, codec_ctx,
-                                     session)) {
+    if (!sc_packet_source_sinks_open(&demuxer->packet_source, codec_ctx)) {
        goto finally_free_context;
    }

@@ -280,39 +241,27 @@ run_demuxer(void *data) {
    }

    for (;;) {
-        bool ok = sc_demuxer_recv_header(demuxer, header);
+        bool ok = sc_demuxer_recv_packet(demuxer, packet);
        if (!ok) {
            // end of stream
            status = SC_DEMUXER_STATUS_EOS;
            break;
        }

-        if (sc_demuxer_is_session(header)) {
-            sc_demuxer_parse_session(header, &session_data);
-            ok = sc_packet_source_sinks_push_session(&demuxer->packet_source,
-                                                     &session_data);
+        if (must_merge_config_packet) {
+            // Prepend any config packet to the next media packet
+            ok = sc_packet_merger_merge(&merger, packet);
            if (!ok) {
-                // The sink already logged its concrete error
+                av_packet_unref(packet);
                break;
            }
-        } else {
-            sc_demuxer_recv_packet(demuxer, header, packet);
+        }

-            if (must_merge_config_packet) {
-                // Prepend any config packet to the next media packet
-                ok = sc_packet_merger_merge(&merger, packet);
-                if (!ok) {
-                    av_packet_unref(packet);
-                    break;
-                }
-            }
-
-            ok = sc_packet_source_sinks_push(&demuxer->packet_source, packet);
-            av_packet_unref(packet);
-            if (!ok) {
-                // The sink already logged its concrete error
-                break;
-            }
+        ok = sc_packet_source_sinks_push(&demuxer->packet_source, packet);
+        av_packet_unref(packet);
+        if (!ok) {
+            // The sink already logged its concrete error
+            break;
        }
    }

--- a/app/src/device_msg.c
+++ b/app/src/device_msg.c
@@ -53,7 +53,7 @@ sc_device_msg_deserialize(const uint8_t *buf, size_t len,
            }
            uint16_t id = sc_read16be(&buf[1]);
            size_t size = sc_read16be(&buf[3]);
-            if (size > len - 5) {
+            if (size < len - 5) {
                return 0; // not available
            }
            uint8_t *data = malloc(size);
--- a/app/src/display.c
+++ b/app/src/display.c
@@ -12,11 +12,8 @@ sc_display_init_novideo_icon(struct sc_display *display,
                             SDL_Surface *icon_novideo) {
    assert(icon_novideo);

-    bool ok = SDL_SetRenderLogicalPresentation(display->renderer,
-                                               icon_novideo->w,
-                                               icon_novideo->h,
-                                        SDL_LOGICAL_PRESENTATION_LETTERBOX);
-    if (!ok) {
+    if (SDL_RenderSetLogicalSize(display->renderer,
+                                 icon_novideo->w, icon_novideo->h)) {
        LOGW("Could not set renderer logical size: %s", SDL_GetError());
        // don't fail
    }
@@ -34,13 +31,16 @@ sc_display_init_novideo_icon(struct sc_display *display,
 bool
 sc_display_init(struct sc_display *display, SDL_Window *window,
                SDL_Surface *icon_novideo, bool mipmaps) {
-    display->renderer = SDL_CreateRenderer(window, NULL);
+    display->renderer =
+        SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
    if (!display->renderer) {
        LOGE("Could not create renderer: %s", SDL_GetError());
        return false;
    }

-    const char *renderer_name = SDL_GetRendererName(display->renderer);
+    SDL_RendererInfo renderer_info;
+    int r = SDL_GetRendererInfo(display->renderer, &renderer_info);
+    const char *renderer_name = r ? NULL : renderer_info.name;
    LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");

    display->mipmaps = false;
@@ -56,11 +56,8 @@ sc_display_init(struct sc_display *display, SDL_Window *window,
 #ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
        // Persuade macOS to give us something better than OpenGL 2.1.
        // If we create a Core Profile context, we get the best OpenGL version.
-        bool ok = SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
-                                      SDL_GL_CONTEXT_PROFILE_CORE);
-        if (!ok) {
-            LOGW("Could not set a GL Core Profile Context");
-        }
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
+                            SDL_GL_CONTEXT_PROFILE_CORE);

        LOGD("Creating OpenGL Core Profile context");
        display->gl_context = SDL_GL_CreateContext(window);
@@ -97,13 +94,14 @@ sc_display_init(struct sc_display *display, SDL_Window *window,
    display->texture = NULL;
    display->pending.flags = 0;
    display->pending.frame = NULL;
+    display->has_frame = false;

    if (icon_novideo) {
        // Without video, set a static scrcpy icon as window content
        bool ok = sc_display_init_novideo_icon(display, icon_novideo);
        if (!ok) {
 #ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-            SDL_GL_DestroyContext(display->gl_context);
+            SDL_GL_DeleteContext(display->gl_context);
 #endif
            SDL_DestroyRenderer(display->renderer);
            return false;
@@ -119,7 +117,7 @@ sc_display_destroy(struct sc_display *display) {
        av_frame_free(&display->pending.frame);
    }
 #ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-    SDL_GL_DestroyContext(display->gl_context);
+    SDL_GL_DeleteContext(display->gl_context);
 #endif
    if (display->texture) {
        SDL_DestroyTexture(display->texture);
@@ -127,63 +125,13 @@ sc_display_destroy(struct sc_display *display) {
    SDL_DestroyRenderer(display->renderer);
 }

-static enum SDL_Colorspace
-sc_display_to_sdl_color_space(enum AVColorSpace color_space,
-                              enum AVColorRange color_range) {
-    bool full_range = color_range == AVCOL_RANGE_JPEG;
-
-    switch (color_space) {
-        case AVCOL_SPC_BT709:
-        case AVCOL_SPC_RGB:
-            return full_range ? SDL_COLORSPACE_BT709_FULL
-                              : SDL_COLORSPACE_BT709_LIMITED;
-        case AVCOL_SPC_BT470BG:
-        case AVCOL_SPC_SMPTE170M:
-            return full_range ? SDL_COLORSPACE_BT601_FULL
-                              : SDL_COLORSPACE_BT601_LIMITED;
-        case AVCOL_SPC_BT2020_NCL:
-        case AVCOL_SPC_BT2020_CL:
-            return full_range ? SDL_COLORSPACE_BT2020_FULL
-                              : SDL_COLORSPACE_BT2020_LIMITED;
-        default:
-            return SDL_COLORSPACE_JPEG;
-    }
-}
-
 static SDL_Texture *
 sc_display_create_texture(struct sc_display *display,
-                          struct sc_size size, enum AVColorSpace color_space,
-                          enum AVColorRange color_range) {
-    SDL_PropertiesID props = SDL_CreateProperties();
-    if (!props) {
-        return NULL;
-    }
-
-    enum SDL_Colorspace sdl_color_space =
-        sc_display_to_sdl_color_space(color_space, color_range);
-
-    bool ok =
-        SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_FORMAT_NUMBER,
-                              SDL_PIXELFORMAT_YV12);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_ACCESS_NUMBER,
-                                SDL_TEXTUREACCESS_STREAMING);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER,
-                                size.width);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_HEIGHT_NUMBER,
-                                size.height);
-    ok &= SDL_SetNumberProperty(props,
-                                SDL_PROP_TEXTURE_CREATE_COLORSPACE_NUMBER,
-                                sdl_color_space);
-
-    if (!ok) {
-        LOGE("Could not set texture properties");
-        SDL_DestroyProperties(props);
-        return NULL;
-    }
-
+                          struct sc_size size) {
    SDL_Renderer *renderer = display->renderer;
-    SDL_Texture *texture = SDL_CreateTextureWithProperties(renderer, props);
-    SDL_DestroyProperties(props);
+    SDL_Texture *texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12,
+                                             SDL_TEXTUREACCESS_STREAMING,
+                                             size.width, size.height);
    if (!texture) {
        LOGD("Could not create texture: %s", SDL_GetError());
        return NULL;
@@ -192,49 +140,24 @@ sc_display_create_texture(struct sc_display *display,
    if (display->mipmaps) {
        struct sc_opengl *gl = &display->gl;

-        SDL_PropertiesID props = SDL_GetTextureProperties(texture);
-        if (!props) {
-            LOGE("Could not get texture properties: %s", SDL_GetError());
-            SDL_DestroyTexture(texture);
-            return NULL;
-        }
-
-        const char *renderer_name = SDL_GetRendererName(display->renderer);
-        const char *key = !renderer_name || !strcmp(renderer_name, "opengl")
-                        ? SDL_PROP_TEXTURE_OPENGL_TEXTURE_NUMBER
-                        : SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_NUMBER;
-
-        int64_t texture_id = SDL_GetNumberProperty(props, key, 0);
-        SDL_DestroyProperties(props);
-        if (!texture_id) {
-            LOGE("Could not get texture id: %s", SDL_GetError());
-            SDL_DestroyTexture(texture);
-            return NULL;
-        }
-
-        assert(!(texture_id & ~0xFFFFFFFF)); // fits in uint32_t
-        display->texture_id = texture_id;
-        gl->BindTexture(GL_TEXTURE_2D, display->texture_id);
+        SDL_GL_BindTexture(texture, NULL, NULL);

        // Enable trilinear filtering for downscaling
        gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
                          GL_LINEAR_MIPMAP_LINEAR);
        gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -1.f);

-        gl->BindTexture(GL_TEXTURE_2D, 0);
+        SDL_GL_UnbindTexture(texture);
    }

    return texture;
 }

 static inline void
-sc_display_set_pending_texture(struct sc_display *display,
-                               struct sc_size size,
-                               enum AVColorRange color_range) {
+sc_display_set_pending_size(struct sc_display *display, struct sc_size size) {
    assert(!display->texture);
-    display->pending.texture.size = size;
-    display->pending.texture.color_range = color_range;
-    display->pending.flags |= SC_DISPLAY_PENDING_FLAG_TEXTURE;
+    display->pending.size = size;
+    display->pending.flags |= SC_DISPLAY_PENDING_FLAG_SIZE;
 }

 static bool
@@ -247,7 +170,6 @@ sc_display_set_pending_frame(struct sc_display *display, const AVFrame *frame) {
        }
    }

-    av_frame_unref(display->pending.frame);
    int r = av_frame_ref(display->pending.frame, frame);
    if (r) {
        LOGE("Could not ref frame: %d", r);
@@ -259,31 +181,22 @@ sc_display_set_pending_frame(struct sc_display *display, const AVFrame *frame) {
    return true;
 }

-// Forward declaration
-static bool
-sc_display_update_texture_internal(struct sc_display *display,
-                                   const AVFrame *frame);
-
 static bool
 sc_display_apply_pending(struct sc_display *display) {
-    if (display->pending.flags & SC_DISPLAY_PENDING_FLAG_TEXTURE) {
+    if (display->pending.flags & SC_DISPLAY_PENDING_FLAG_SIZE) {
        assert(!display->texture);
        display->texture =
-            sc_display_create_texture(display,
-                                      display->pending.texture.size,
-                                      display->pending.texture.color_space,
-                                      display->pending.texture.color_range);
+            sc_display_create_texture(display, display->pending.size);
        if (!display->texture) {
            return false;
        }

-        display->pending.flags &= ~SC_DISPLAY_PENDING_FLAG_TEXTURE;
+        display->pending.flags &= ~SC_DISPLAY_PENDING_FLAG_SIZE;
    }

    if (display->pending.flags & SC_DISPLAY_PENDING_FLAG_FRAME) {
        assert(display->pending.frame);
-        bool ok = sc_display_update_texture_internal(display,
-                                                     display->pending.frame);
+        bool ok = sc_display_update_texture(display, display->pending.frame);
        if (!ok) {
            return false;
        }
@@ -296,18 +209,15 @@ sc_display_apply_pending(struct sc_display *display) {
 }

 static bool
-sc_display_prepare_texture_internal(struct sc_display *display,
-                                    struct sc_size size,
-                                    enum AVColorSpace color_space,
-                                    enum AVColorRange color_range) {
+sc_display_set_texture_size_internal(struct sc_display *display,
+                                     struct sc_size size) {
    assert(size.width && size.height);

    if (display->texture) {
        SDL_DestroyTexture(display->texture);
    }

-    display->texture =
-            sc_display_create_texture(display, size, color_space, color_range);
+    display->texture = sc_display_create_texture(display, size);
    if (!display->texture) {
        return false;
    }
@@ -317,13 +227,10 @@ sc_display_prepare_texture_internal(struct sc_display *display,
 }

 enum sc_display_result
-sc_display_prepare_texture(struct sc_display *display, struct sc_size size,
-                           enum AVColorSpace color_space,
-                           enum AVColorRange color_range) {
-    bool ok = sc_display_prepare_texture_internal(display, size, color_space,
-                                                  color_range);
+sc_display_set_texture_size(struct sc_display *display, struct sc_size size) {
+    bool ok = sc_display_set_texture_size_internal(display, size);
    if (!ok) {
-        sc_display_set_pending_texture(display, size, color_range);
+        sc_display_set_pending_size(display, size);
        return SC_DISPLAY_RESULT_PENDING;

    }
@@ -331,25 +238,38 @@ sc_display_prepare_texture(struct sc_display *display, struct sc_size size,
    return SC_DISPLAY_RESULT_OK;
 }

+static SDL_YUV_CONVERSION_MODE
+sc_display_to_sdl_color_range(enum AVColorRange color_range) {
+    return color_range == AVCOL_RANGE_JPEG ? SDL_YUV_CONVERSION_JPEG
+                                           : SDL_YUV_CONVERSION_AUTOMATIC;
+}
+
 static bool
 sc_display_update_texture_internal(struct sc_display *display,
                                   const AVFrame *frame) {
-    bool ok = SDL_UpdateYUVTexture(display->texture, NULL,
+    if (!display->has_frame) {
+        // First frame
+        display->has_frame = true;
+
+        // Configure YUV color range conversion
+        SDL_YUV_CONVERSION_MODE sdl_color_range =
+            sc_display_to_sdl_color_range(frame->color_range);
+        SDL_SetYUVConversionMode(sdl_color_range);
+    }
+
+    int ret = SDL_UpdateYUVTexture(display->texture, NULL,
                                   frame->data[0], frame->linesize[0],
                                   frame->data[1], frame->linesize[1],
                                   frame->data[2], frame->linesize[2]);
-    if (!ok) {
+    if (ret) {
        LOGD("Could not update texture: %s", SDL_GetError());
        return false;
    }

    if (display->mipmaps) {
-        assert(display->texture_id);
-        struct sc_opengl *gl = &display->gl;
-
-        gl->BindTexture(GL_TEXTURE_2D, display->texture_id);
+        SDL_GL_BindTexture(display->texture, NULL, NULL);
        display->gl.GenerateMipmap(GL_TEXTURE_2D);
-        gl->BindTexture(GL_TEXTURE_2D, 0);
+        SDL_GL_UnbindTexture(display->texture);
    }

    return true;
@@ -374,9 +294,7 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame) {
 enum sc_display_result
 sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
                  enum sc_orientation orientation) {
-    bool always_ok = SDL_RenderClear(display->renderer);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_RenderClear(display->renderer);

    if (display->pending.flags) {
        bool ok = sc_display_apply_pending(display);
@@ -389,10 +307,8 @@ sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
    SDL_Texture *texture = display->texture;

    if (orientation == SC_ORIENTATION_0) {
-        SDL_FRect frect;
-        SDL_RectToFRect(geometry, &frect);
-        bool ok = SDL_RenderTexture(renderer, texture, NULL, &frect);
-        if (!ok) {
+        int ret = SDL_RenderCopy(renderer, texture, NULL, geometry);
+        if (ret) {
            LOGE("Could not render texture: %s", SDL_GetError());
            return SC_DISPLAY_RESULT_ERROR;
        }
@@ -400,29 +316,29 @@ sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
        unsigned cw_rotation = sc_orientation_get_rotation(orientation);
        double angle = 90 * cw_rotation;

-        SDL_FRect frect;
+        const SDL_Rect *dstrect = NULL;
+        SDL_Rect rect;
        if (sc_orientation_is_swap(orientation)) {
-            frect.x = geometry->x + (geometry->w - geometry->h) / 2.f;
-            frect.y = geometry->y + (geometry->h - geometry->w) / 2.f;
-            frect.w = geometry->h;
-            frect.h = geometry->w;
+            rect.x = geometry->x + (geometry->w - geometry->h) / 2;
+            rect.y = geometry->y + (geometry->h - geometry->w) / 2;
+            rect.w = geometry->h;
+            rect.h = geometry->w;
+            dstrect = &rect;
        } else {
-            SDL_RectToFRect(geometry, &frect);
+            dstrect = geometry;
        }

-        SDL_FlipMode flip = sc_orientation_is_mirror(orientation)
+        SDL_RendererFlip flip = sc_orientation_is_mirror(orientation)
                              ? SDL_FLIP_HORIZONTAL : 0;

-        bool ok = SDL_RenderTextureRotated(renderer, texture, NULL, &frect,
-                                           angle, NULL, flip);
-        if (!ok) {
+        int ret = SDL_RenderCopyEx(renderer, texture, NULL, dstrect, angle,
+                                   NULL, flip);
+        if (ret) {
            LOGE("Could not render texture: %s", SDL_GetError());
            return SC_DISPLAY_RESULT_ERROR;
        }
    }

-    always_ok = SDL_RenderPresent(display->renderer);
-    assert(always_ok);
-
+    SDL_RenderPresent(display->renderer);
    return SC_DISPLAY_RESULT_OK;
 }
--- a/app/src/display.h
+++ b/app/src/display.h
@@ -6,7 +6,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <libavutil/frame.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 #include "coords.h"
 #include "opengl.h"
@@ -22,23 +22,20 @@ struct sc_display {

    struct sc_opengl gl;
 #ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-    SDL_GLContext gl_context;
+    SDL_GLContext *gl_context;
 #endif

    bool mipmaps;
-    uint32_t texture_id; // only set if mipmaps is enabled

    struct {
-#define SC_DISPLAY_PENDING_FLAG_TEXTURE 1
+#define SC_DISPLAY_PENDING_FLAG_SIZE 1
 #define SC_DISPLAY_PENDING_FLAG_FRAME 2
        int8_t flags;
-        struct {
-            struct sc_size size;
-            enum AVColorSpace color_space;
-            enum AVColorRange color_range;
-        } texture;
+        struct sc_size size;
        AVFrame *frame;
    } pending;
+
+    bool has_frame;
 };

 enum sc_display_result {
@@ -55,9 +52,7 @@ void
 sc_display_destroy(struct sc_display *display);

 enum sc_display_result
-sc_display_prepare_texture(struct sc_display *display, struct sc_size size,
-                           enum AVColorSpace color_space,
-                           enum AVColorRange color_range);
+sc_display_set_texture_size(struct sc_display *display, struct sc_size size);

 enum sc_display_result
 sc_display_update_texture(struct sc_display *display, const AVFrame *frame);
--- a/app/src/events.c
+++ b/app/src/events.c
@@ -9,8 +9,11 @@ bool
 sc_push_event_impl(uint32_t type, const char *name) {
    SDL_Event event;
    event.type = type;
-    bool ok = SDL_PushEvent(&event);
-    if (!ok) {
+    int ret = SDL_PushEvent(&event);
+    // ret < 0: error (queue full)
+    // ret == 0: event was filtered
+    // ret == 1: success
+    if (ret != 1) {
        LOGE("Could not post %s event: %s", name, SDL_GetError());
        return false;
    }
@@ -27,25 +30,34 @@ sc_post_to_main_thread(sc_runnable_fn run, void *userdata) {
            .data2 = userdata,
        },
    };
-    bool ok = SDL_PushEvent(&event);
-    if (!ok) {
-        LOGW("Could not post runnable to main thread: %s", SDL_GetError());
+    int ret = SDL_PushEvent(&event);
+    // ret < 0: error (queue full)
+    // ret == 0: event was filtered
+    // ret == 1: success
+    if (ret != 1) {
+        if (ret == 0) {
+            // if ret == 0, this is expected on exit, log in debug mode
+            LOGD("Could not post runnable to main thread (filtered)");
+        } else {
+            assert(ret < 0);
+            LOGW("Could not post runnable to main thread: %s", SDL_GetError());
+        }
        return false;
    }

    return true;
 }

-static bool SDLCALL
+static int SDLCALL
 task_event_filter(void *userdata, SDL_Event *event) {
    (void) userdata;

    if (event->type == SC_EVENT_RUN_ON_MAIN_THREAD) {
        // Reject this event type from now on
-        return false;
+        return 0;
    }

-    return true;
+    return 1;
 }

 void
--- a/app/src/events.h
+++ b/app/src/events.h
@@ -5,10 +5,10 @@

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

 enum {
-    SC_EVENT_NEW_FRAME = SDL_EVENT_USER,
+    SC_EVENT_NEW_FRAME = SDL_USEREVENT,
    SC_EVENT_RUN_ON_MAIN_THREAD,
    SC_EVENT_DEVICE_DISCONNECTED,
    SC_EVENT_SERVER_CONNECTION_FAILED,
@@ -16,6 +16,7 @@ enum {
    SC_EVENT_USB_DEVICE_DISCONNECTED,
    SC_EVENT_DEMUXER_ERROR,
    SC_EVENT_RECORDER_ERROR,
+    SC_EVENT_SCREEN_INIT_SIZE,
    SC_EVENT_TIME_LIMIT_REACHED,
    SC_EVENT_CONTROLLER_ERROR,
    SC_EVENT_AOA_OPEN_ERROR,
--- a/app/src/hid/hid_mouse.c
+++ b/app/src/hid/hid_mouse.c
@@ -3,8 +3,8 @@
 #include <stdint.h>

 // 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position,
-// 1 byte for wheel motion, 1 byte for hozizontal scrolling
-#define SC_HID_MOUSE_INPUT_SIZE 5
+// 1 byte for wheel motion
+#define SC_HID_MOUSE_INPUT_SIZE 4

 /**
 * Mouse descriptor from the specification:
@@ -75,21 +75,6 @@ static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
    // Input (Data, Variable, Relative): 3 position bytes (X, Y, Wheel)
    0x81, 0x06,

-    // Usage Page (Consumer Page)
-    0x05, 0x0C,
-    // Usage(AC Pan)
-    0x0A, 0x38, 0x02,
-    // Logical Minimum (-127)
-    0x15, 0x81,
-    // Logical Maximum (127)
-    0x25, 0x7F,
-    // Report Size (8)
-    0x75, 0x08,
-    // Report Count (1)
-    0x95, 0x01,
-    // Input (Data, Variable, Relative): 1 byte (AC Pan)
-    0x81, 0x06,
-
    // End Collection
    0xC0,

@@ -166,12 +151,6 @@ sc_hid_buttons_from_buttons_state(uint8_t buttons_state) {
    return c;
 }

-void
-sc_hid_mouse_init(struct sc_hid_mouse *hid) {
-    hid->residual_hscroll = 0;
-    hid->residual_vscroll = 0;
-}
-
 void
 sc_hid_mouse_generate_input_from_motion(struct sc_hid_input *hid_input,
                                    const struct sc_mouse_motion_event *event) {
@@ -181,8 +160,7 @@ sc_hid_mouse_generate_input_from_motion(struct sc_hid_input *hid_input,
    data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
    data[1] = CLAMP(event->xrel, -127, 127);
    data[2] = CLAMP(event->yrel, -127, 127);
-    data[3] = 0; // no vertical scrolling
-    data[4] = 0; // no horizontal scrolling
+    data[3] = 0; // wheel coordinates only used for scrolling
 }

 void
@@ -194,42 +172,22 @@ sc_hid_mouse_generate_input_from_click(struct sc_hid_input *hid_input,
    data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
    data[1] = 0; // no x motion
    data[2] = 0; // no y motion
-    data[3] = 0; // no vertical scrolling
-    data[4] = 0; // no horizontal scrolling
+    data[3] = 0; // wheel coordinates only used for scrolling
 }

-static int8_t
-consume_scroll_integer(float *scroll) {
-    float value = CLAMP(*scroll, -127, 127);
-    int8_t consume = value; // truncate towards 0
-    float residual = value - consume;
-    *scroll = residual;
-    return consume;
-}
-
-bool
-sc_hid_mouse_generate_input_from_scroll(struct sc_hid_mouse *hid,
-                                        struct sc_hid_input *hid_input,
+void
+sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,
                                    const struct sc_mouse_scroll_event *event) {
    sc_hid_mouse_input_init(hid_input);

-    hid->residual_hscroll += event->hscroll;
-    hid->residual_vscroll += event->vscroll;
-    int8_t hscroll = consume_scroll_integer(&hid->residual_hscroll);
-    int8_t vscroll = consume_scroll_integer(&hid->residual_vscroll);
-
-    if (!hscroll && !vscroll) {
-        // Not enough scrolling to inject a scroll event
-        return false;
-    }
-
    uint8_t *data = hid_input->data;
    data[0] = 0; // buttons state irrelevant (and unknown)
    data[1] = 0; // no x motion
    data[2] = 0; // no y motion
-    data[3] = vscroll;
-    data[4] = hscroll;
-    return true;
+    // In practice, vscroll is always -1, 0 or 1, but in theory other values
+    // are possible
+    data[3] = CLAMP(event->vscroll, -127, 127);
+    // Horizontal scrolling ignored
 }

 void sc_hid_mouse_generate_open(struct sc_hid_open *hid_open) {
--- a/app/src/hid/hid_mouse.h
+++ b/app/src/hid/hid_mouse.h
@@ -8,13 +8,6 @@

 #define SC_HID_ID_MOUSE 2

-struct sc_hid_mouse {
-    float residual_hscroll;
-    float residual_vscroll;
-};
-
-void sc_hid_mouse_init(struct sc_hid_mouse *hid);
-
 void
 sc_hid_mouse_generate_open(struct sc_hid_open *hid_open);

@@ -29,9 +22,8 @@ void
 sc_hid_mouse_generate_input_from_click(struct sc_hid_input *hid_input,
                                    const struct sc_mouse_click_event *event);

-bool
-sc_hid_mouse_generate_input_from_scroll(struct sc_hid_mouse *hid,
-                                        struct sc_hid_input *hid_input,
+void
+sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,
                                    const struct sc_mouse_scroll_event *event);

 #endif
--- a/app/src/icon.c
+++ b/app/src/icon.c
@@ -10,7 +10,7 @@
 #include <libavutil/avutil.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/pixfmt.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 #include "config.h"
 #include "util/env.h"
@@ -156,7 +156,13 @@ free_ctx:
    return result;
 }

-static SDL_PixelFormat
+#if !SDL_VERSION_ATLEAST(2, 0, 10)
+// SDL_PixelFormatEnum has been introduced in SDL 2.0.10. Use int for older SDL
+// versions.
+typedef int SDL_PixelFormatEnum;
+#endif
+
+static SDL_PixelFormatEnum
 to_sdl_pixel_format(enum AVPixelFormat fmt) {
    switch (fmt) {
        case AV_PIX_FMT_RGB24: return SDL_PIXELFORMAT_RGB24;
@@ -166,11 +172,13 @@ to_sdl_pixel_format(enum AVPixelFormat fmt) {
        case AV_PIX_FMT_ABGR: return SDL_PIXELFORMAT_ABGR32;
        case AV_PIX_FMT_BGRA: return SDL_PIXELFORMAT_BGRA32;
        case AV_PIX_FMT_RGB565BE: return SDL_PIXELFORMAT_RGB565;
-        case AV_PIX_FMT_RGB555BE: return SDL_PIXELFORMAT_XRGB1555;
+        case AV_PIX_FMT_RGB555BE: return SDL_PIXELFORMAT_RGB555;
        case AV_PIX_FMT_BGR565BE: return SDL_PIXELFORMAT_BGR565;
-        case AV_PIX_FMT_BGR555BE: return SDL_PIXELFORMAT_XBGR1555;
-        case AV_PIX_FMT_RGB444BE: return SDL_PIXELFORMAT_XRGB4444;
-        case AV_PIX_FMT_BGR444BE: return SDL_PIXELFORMAT_XBGR4444;
+        case AV_PIX_FMT_BGR555BE: return SDL_PIXELFORMAT_BGR555;
+        case AV_PIX_FMT_RGB444BE: return SDL_PIXELFORMAT_RGB444;
+#if SDL_VERSION_ATLEAST(2, 0, 12)
+        case AV_PIX_FMT_BGR444BE: return SDL_PIXELFORMAT_BGR444;
+#endif
        case AV_PIX_FMT_PAL8: return SDL_PIXELFORMAT_INDEX8;
        default: return SDL_PIXELFORMAT_UNKNOWN;
    }
@@ -195,16 +203,20 @@ load_from_path(const char *path) {
        goto error;
    }

-    SDL_PixelFormat format = to_sdl_pixel_format(frame->format);
+    SDL_PixelFormatEnum format = to_sdl_pixel_format(frame->format);
    if (format == SDL_PIXELFORMAT_UNKNOWN) {
        LOGE("Unsupported icon pixel format: %s (%d)", desc->name,
                                                       frame->format);
        goto error;
    }

+    int bits_per_pixel = av_get_bits_per_pixel(desc);
    SDL_Surface *surface =
-        SDL_CreateSurfaceFrom(frame->width, frame->height, format,
-                              frame->data[0], frame->linesize[0]);
+        SDL_CreateRGBSurfaceWithFormatFrom(frame->data[0],
+                                           frame->width, frame->height,
+                                           bits_per_pixel,
+                                           frame->linesize[0],
+                                           format);

    if (!surface) {
        LOGE("Could not create icon surface");
@@ -236,35 +248,17 @@ load_from_path(const char *path) {
 #endif
        }

-        SDL_Palette *palette = SDL_CreateSurfacePalette(surface);
-        if (!palette) {
-            LOGE("Could not create palette");
-            SDL_DestroySurface(surface);
-            goto error;
-        }
-
-        bool ok = SDL_SetPaletteColors(palette, colors, 0, 256);
-        if (!ok) {
+        SDL_Palette *palette = surface->format->palette;
+        assert(palette);
+        int ret = SDL_SetPaletteColors(palette, colors, 0, 256);
+        if (ret) {
            LOGE("Could not set palette colors");
-            SDL_DestroySurface(surface);
+            SDL_FreeSurface(surface);
            goto error;
        }
    }

-    SDL_PropertiesID props = SDL_GetSurfaceProperties(surface);
-    if (!props) {
-        LOGE("Could not get surface properties: %s", SDL_GetError());
-        SDL_DestroySurface(surface);
-        goto error;
-    }
-
-    // frame owns the data
-    bool ok = SDL_SetPointerProperty(props, "sc_frame", frame);
-    if (!ok) {
-        LOGE("Could not get surface properties: %s", SDL_GetError());
-        SDL_DestroySurface(surface);
-        goto error;
-    }
+    surface->userdata = frame; // frame owns the data

    return surface;

@@ -287,10 +281,8 @@ scrcpy_icon_load(void) {

 void
 scrcpy_icon_destroy(SDL_Surface *icon) {
-    SDL_PropertiesID props = SDL_GetSurfaceProperties(icon);
-    assert(props);
-    AVFrame *frame = SDL_GetPointerProperty(props, "sc_frame", NULL);
+    AVFrame *frame = icon->userdata;
    assert(frame);
    av_frame_free(&frame);
-    SDL_DestroySurface(icon);
+    SDL_FreeSurface(icon);
 }
--- a/app/src/icon.h
+++ b/app/src/icon.h
@@ -3,7 +3,7 @@

 #include "common.h"

-#include <SDL3/SDL_surface.h>
+#include <SDL2/SDL_surface.h>

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

 #include "coords.h"

@@ -43,17 +43,17 @@
 */

 enum sc_mod {
-    SC_MOD_LSHIFT = SDL_KMOD_LSHIFT,
-    SC_MOD_RSHIFT = SDL_KMOD_RSHIFT,
-    SC_MOD_LCTRL = SDL_KMOD_LCTRL,
-    SC_MOD_RCTRL = SDL_KMOD_RCTRL,
-    SC_MOD_LALT = SDL_KMOD_LALT,
-    SC_MOD_RALT = SDL_KMOD_RALT,
-    SC_MOD_LGUI = SDL_KMOD_LGUI,
-    SC_MOD_RGUI = SDL_KMOD_RGUI,
+    SC_MOD_LSHIFT = KMOD_LSHIFT,
+    SC_MOD_RSHIFT = KMOD_RSHIFT,
+    SC_MOD_LCTRL = KMOD_LCTRL,
+    SC_MOD_RCTRL = KMOD_RCTRL,
+    SC_MOD_LALT = KMOD_LALT,
+    SC_MOD_RALT = KMOD_RALT,
+    SC_MOD_LGUI = KMOD_LGUI,
+    SC_MOD_RGUI = KMOD_RGUI,

-    SC_MOD_NUM = SDL_KMOD_NUM,
-    SC_MOD_CAPS = SDL_KMOD_CAPS,
+    SC_MOD_NUM = KMOD_NUM,
+    SC_MOD_CAPS = KMOD_CAPS,
 };

 enum sc_action {
@@ -70,12 +70,12 @@ enum sc_keycode {
    SC_KEYCODE_TAB = SDLK_TAB,
    SC_KEYCODE_SPACE = SDLK_SPACE,
    SC_KEYCODE_EXCLAIM = SDLK_EXCLAIM,
-    SC_KEYCODE_QUOTEDBL = SDLK_DBLAPOSTROPHE,
+    SC_KEYCODE_QUOTEDBL = SDLK_QUOTEDBL,
    SC_KEYCODE_HASH = SDLK_HASH,
    SC_KEYCODE_PERCENT = SDLK_PERCENT,
    SC_KEYCODE_DOLLAR = SDLK_DOLLAR,
    SC_KEYCODE_AMPERSAND = SDLK_AMPERSAND,
-    SC_KEYCODE_QUOTE = SDLK_APOSTROPHE,
+    SC_KEYCODE_QUOTE = SDLK_QUOTE,
    SC_KEYCODE_LEFTPAREN = SDLK_LEFTPAREN,
    SC_KEYCODE_RIGHTPAREN = SDLK_RIGHTPAREN,
    SC_KEYCODE_ASTERISK = SDLK_ASTERISK,
@@ -107,33 +107,33 @@ enum sc_keycode {
    SC_KEYCODE_RIGHTBRACKET = SDLK_RIGHTBRACKET,
    SC_KEYCODE_CARET = SDLK_CARET,
    SC_KEYCODE_UNDERSCORE = SDLK_UNDERSCORE,
-    SC_KEYCODE_BACKQUOTE = SDLK_GRAVE,
-    SC_KEYCODE_a = SDLK_A,
-    SC_KEYCODE_b = SDLK_B,
-    SC_KEYCODE_c = SDLK_C,
-    SC_KEYCODE_d = SDLK_D,
-    SC_KEYCODE_e = SDLK_E,
-    SC_KEYCODE_f = SDLK_F,
-    SC_KEYCODE_g = SDLK_G,
-    SC_KEYCODE_h = SDLK_H,
-    SC_KEYCODE_i = SDLK_I,
-    SC_KEYCODE_j = SDLK_J,
-    SC_KEYCODE_k = SDLK_K,
-    SC_KEYCODE_l = SDLK_L,
-    SC_KEYCODE_m = SDLK_M,
-    SC_KEYCODE_n = SDLK_N,
-    SC_KEYCODE_o = SDLK_O,
-    SC_KEYCODE_p = SDLK_P,
-    SC_KEYCODE_q = SDLK_Q,
-    SC_KEYCODE_r = SDLK_R,
-    SC_KEYCODE_s = SDLK_S,
-    SC_KEYCODE_t = SDLK_T,
-    SC_KEYCODE_u = SDLK_U,
-    SC_KEYCODE_v = SDLK_V,
-    SC_KEYCODE_w = SDLK_W,
-    SC_KEYCODE_x = SDLK_X,
-    SC_KEYCODE_y = SDLK_Y,
-    SC_KEYCODE_z = SDLK_Z,
+    SC_KEYCODE_BACKQUOTE = SDLK_BACKQUOTE,
+    SC_KEYCODE_a = SDLK_a,
+    SC_KEYCODE_b = SDLK_b,
+    SC_KEYCODE_c = SDLK_c,
+    SC_KEYCODE_d = SDLK_d,
+    SC_KEYCODE_e = SDLK_e,
+    SC_KEYCODE_f = SDLK_f,
+    SC_KEYCODE_g = SDLK_g,
+    SC_KEYCODE_h = SDLK_h,
+    SC_KEYCODE_i = SDLK_i,
+    SC_KEYCODE_j = SDLK_j,
+    SC_KEYCODE_k = SDLK_k,
+    SC_KEYCODE_l = SDLK_l,
+    SC_KEYCODE_m = SDLK_m,
+    SC_KEYCODE_n = SDLK_n,
+    SC_KEYCODE_o = SDLK_o,
+    SC_KEYCODE_p = SDLK_p,
+    SC_KEYCODE_q = SDLK_q,
+    SC_KEYCODE_r = SDLK_r,
+    SC_KEYCODE_s = SDLK_s,
+    SC_KEYCODE_t = SDLK_t,
+    SC_KEYCODE_u = SDLK_u,
+    SC_KEYCODE_v = SDLK_v,
+    SC_KEYCODE_w = SDLK_w,
+    SC_KEYCODE_x = SDLK_x,
+    SC_KEYCODE_y = SDLK_y,
+    SC_KEYCODE_z = SDLK_z,

    SC_KEYCODE_CAPSLOCK = SDLK_CAPSLOCK,

@@ -315,11 +315,11 @@ enum sc_scancode {
 // to avoid unnecessary conversions (and confusion).
 enum sc_mouse_button {
    SC_MOUSE_BUTTON_UNKNOWN = 0,
-    SC_MOUSE_BUTTON_LEFT = SDL_BUTTON_MASK(SDL_BUTTON_LEFT),
-    SC_MOUSE_BUTTON_RIGHT = SDL_BUTTON_MASK(SDL_BUTTON_RIGHT),
-    SC_MOUSE_BUTTON_MIDDLE = SDL_BUTTON_MASK(SDL_BUTTON_MIDDLE),
-    SC_MOUSE_BUTTON_X1 = SDL_BUTTON_MASK(SDL_BUTTON_X1),
-    SC_MOUSE_BUTTON_X2 = SDL_BUTTON_MASK(SDL_BUTTON_X2),
+    SC_MOUSE_BUTTON_LEFT = SDL_BUTTON(SDL_BUTTON_LEFT),
+    SC_MOUSE_BUTTON_RIGHT = SDL_BUTTON(SDL_BUTTON_RIGHT),
+    SC_MOUSE_BUTTON_MIDDLE = SDL_BUTTON(SDL_BUTTON_MIDDLE),
+    SC_MOUSE_BUTTON_X1 = SDL_BUTTON(SDL_BUTTON_X1),
+    SC_MOUSE_BUTTON_X2 = SDL_BUTTON(SDL_BUTTON_X2),
 };

 // Use the naming from SDL3 for gamepad axis and buttons:
@@ -327,31 +327,31 @@ enum sc_mouse_button {

 enum sc_gamepad_axis {
    SC_GAMEPAD_AXIS_UNKNOWN = -1,
-    SC_GAMEPAD_AXIS_LEFTX = SDL_GAMEPAD_AXIS_LEFTX,
-    SC_GAMEPAD_AXIS_LEFTY = SDL_GAMEPAD_AXIS_LEFTY,
-    SC_GAMEPAD_AXIS_RIGHTX = SDL_GAMEPAD_AXIS_RIGHTX,
-    SC_GAMEPAD_AXIS_RIGHTY = SDL_GAMEPAD_AXIS_RIGHTY,
-    SC_GAMEPAD_AXIS_LEFT_TRIGGER = SDL_GAMEPAD_AXIS_LEFT_TRIGGER,
-    SC_GAMEPAD_AXIS_RIGHT_TRIGGER = SDL_GAMEPAD_AXIS_RIGHT_TRIGGER,
+    SC_GAMEPAD_AXIS_LEFTX = SDL_CONTROLLER_AXIS_LEFTX,
+    SC_GAMEPAD_AXIS_LEFTY = SDL_CONTROLLER_AXIS_LEFTY,
+    SC_GAMEPAD_AXIS_RIGHTX = SDL_CONTROLLER_AXIS_RIGHTX,
+    SC_GAMEPAD_AXIS_RIGHTY = SDL_CONTROLLER_AXIS_RIGHTY,
+    SC_GAMEPAD_AXIS_LEFT_TRIGGER = SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+    SC_GAMEPAD_AXIS_RIGHT_TRIGGER = SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
 };

 enum sc_gamepad_button {
    SC_GAMEPAD_BUTTON_UNKNOWN = -1,
-    SC_GAMEPAD_BUTTON_SOUTH = SDL_GAMEPAD_BUTTON_SOUTH,
-    SC_GAMEPAD_BUTTON_EAST = SDL_GAMEPAD_BUTTON_EAST,
-    SC_GAMEPAD_BUTTON_WEST = SDL_GAMEPAD_BUTTON_WEST,
-    SC_GAMEPAD_BUTTON_NORTH = SDL_GAMEPAD_BUTTON_NORTH,
-    SC_GAMEPAD_BUTTON_BACK = SDL_GAMEPAD_BUTTON_BACK,
-    SC_GAMEPAD_BUTTON_GUIDE = SDL_GAMEPAD_BUTTON_GUIDE,
-    SC_GAMEPAD_BUTTON_START = SDL_GAMEPAD_BUTTON_START,
-    SC_GAMEPAD_BUTTON_LEFT_STICK = SDL_GAMEPAD_BUTTON_LEFT_STICK,
-    SC_GAMEPAD_BUTTON_RIGHT_STICK = SDL_GAMEPAD_BUTTON_RIGHT_STICK,
-    SC_GAMEPAD_BUTTON_LEFT_SHOULDER = SDL_GAMEPAD_BUTTON_LEFT_SHOULDER,
-    SC_GAMEPAD_BUTTON_RIGHT_SHOULDER = SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER,
-    SC_GAMEPAD_BUTTON_DPAD_UP = SDL_GAMEPAD_BUTTON_DPAD_UP,
-    SC_GAMEPAD_BUTTON_DPAD_DOWN = SDL_GAMEPAD_BUTTON_DPAD_DOWN,
-    SC_GAMEPAD_BUTTON_DPAD_LEFT = SDL_GAMEPAD_BUTTON_DPAD_LEFT,
-    SC_GAMEPAD_BUTTON_DPAD_RIGHT = SDL_GAMEPAD_BUTTON_DPAD_RIGHT,
+    SC_GAMEPAD_BUTTON_SOUTH = SDL_CONTROLLER_BUTTON_A,
+    SC_GAMEPAD_BUTTON_EAST = SDL_CONTROLLER_BUTTON_B,
+    SC_GAMEPAD_BUTTON_WEST = SDL_CONTROLLER_BUTTON_X,
+    SC_GAMEPAD_BUTTON_NORTH = SDL_CONTROLLER_BUTTON_Y,
+    SC_GAMEPAD_BUTTON_BACK = SDL_CONTROLLER_BUTTON_BACK,
+    SC_GAMEPAD_BUTTON_GUIDE = SDL_CONTROLLER_BUTTON_GUIDE,
+    SC_GAMEPAD_BUTTON_START = SDL_CONTROLLER_BUTTON_START,
+    SC_GAMEPAD_BUTTON_LEFT_STICK = SDL_CONTROLLER_BUTTON_LEFTSTICK,
+    SC_GAMEPAD_BUTTON_RIGHT_STICK = SDL_CONTROLLER_BUTTON_RIGHTSTICK,
+    SC_GAMEPAD_BUTTON_LEFT_SHOULDER = SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+    SC_GAMEPAD_BUTTON_RIGHT_SHOULDER = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
+    SC_GAMEPAD_BUTTON_DPAD_UP = SDL_CONTROLLER_BUTTON_DPAD_UP,
+    SC_GAMEPAD_BUTTON_DPAD_DOWN = SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+    SC_GAMEPAD_BUTTON_DPAD_LEFT = SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+    SC_GAMEPAD_BUTTON_DPAD_RIGHT = SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
 };

 static_assert(sizeof(enum sc_mod) >= sizeof(SDL_Keymod),
@@ -449,8 +449,8 @@ sc_scancode_from_sdl(SDL_Scancode scancode) {

 static inline enum sc_action
 sc_action_from_sdl_keyboard_type(uint32_t type) {
-    assert(type == SDL_EVENT_KEY_DOWN || type == SDL_EVENT_KEY_UP);
-    if (type == SDL_EVENT_KEY_DOWN) {
+    assert(type == SDL_KEYDOWN || type == SDL_KEYUP);
+    if (type == SDL_KEYDOWN) {
        return SC_ACTION_DOWN;
    }
    return SC_ACTION_UP;
@@ -458,8 +458,8 @@ sc_action_from_sdl_keyboard_type(uint32_t type) {

 static inline enum sc_action
 sc_action_from_sdl_mousebutton_type(uint32_t type) {
-    assert(type == SDL_EVENT_MOUSE_BUTTON_DOWN || type == SDL_EVENT_MOUSE_BUTTON_UP);
-    if (type == SDL_EVENT_MOUSE_BUTTON_DOWN) {
+    assert(type == SDL_MOUSEBUTTONDOWN || type == SDL_MOUSEBUTTONUP);
+    if (type == SDL_MOUSEBUTTONDOWN) {
        return SC_ACTION_DOWN;
    }
    return SC_ACTION_UP;
@@ -467,12 +467,12 @@ sc_action_from_sdl_mousebutton_type(uint32_t type) {

 static inline enum sc_touch_action
 sc_touch_action_from_sdl(uint32_t type) {
-    assert(type == SDL_EVENT_FINGER_MOTION || type == SDL_EVENT_FINGER_DOWN ||
-           type == SDL_EVENT_FINGER_UP);
-    if (type == SDL_EVENT_FINGER_MOTION) {
+    assert(type == SDL_FINGERMOTION || type == SDL_FINGERDOWN ||
+           type == SDL_FINGERUP);
+    if (type == SDL_FINGERMOTION) {
        return SC_TOUCH_ACTION_MOVE;
    }
-    if (type == SDL_EVENT_FINGER_DOWN) {
+    if (type == SDL_FINGERDOWN) {
        return SC_TOUCH_ACTION_DOWN;
    }
    return SC_TOUCH_ACTION_UP;
@@ -482,7 +482,7 @@ static inline enum sc_mouse_button
 sc_mouse_button_from_sdl(uint8_t button) {
    if (button >= SDL_BUTTON_LEFT && button <= SDL_BUTTON_X2) {
        // SC_MOUSE_BUTTON_* constants are initialized from SDL_BUTTON(index)
-        return SDL_BUTTON_MASK(button);
+        return SDL_BUTTON(button);
    }

    return SC_MOUSE_BUTTON_UNKNOWN;
@@ -498,7 +498,7 @@ sc_mouse_buttons_state_from_sdl(uint32_t buttons_state) {

 static inline enum sc_gamepad_axis
 sc_gamepad_axis_from_sdl(uint8_t axis) {
-    if (axis <= SDL_GAMEPAD_AXIS_RIGHT_TRIGGER) {
+    if (axis <= SDL_CONTROLLER_AXIS_TRIGGERRIGHT) {
        // SC_GAMEPAD_AXIS_* constants are initialized from
        // SDL_CONTROLLER_AXIS_*
        return axis;
@@ -508,7 +508,7 @@ sc_gamepad_axis_from_sdl(uint8_t axis) {

 static inline enum sc_gamepad_button
 sc_gamepad_button_from_sdl(uint8_t button) {
-    if (button <= SDL_GAMEPAD_BUTTON_DPAD_RIGHT) {
+    if (button <= SDL_CONTROLLER_BUTTON_DPAD_RIGHT) {
        // SC_GAMEPAD_BUTTON_* constants are initialized from
        // SDL_CONTROLLER_BUTTON_*
        return button;
@@ -518,8 +518,8 @@ sc_gamepad_button_from_sdl(uint8_t button) {

 static inline enum sc_action
 sc_action_from_sdl_controllerbutton_type(uint32_t type) {
-    assert(type == SDL_EVENT_GAMEPAD_BUTTON_DOWN || type == SDL_EVENT_GAMEPAD_BUTTON_UP);
-    if (type == SDL_EVENT_GAMEPAD_BUTTON_DOWN) {
+    assert(type == SDL_CONTROLLERBUTTONDOWN || type == SDL_CONTROLLERBUTTONUP);
+    if (type == SDL_CONTROLLERBUTTONDOWN) {
        return SC_ACTION_DOWN;
    }
    return SC_ACTION_UP;
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 #include "android/input.h"
 #include "android/keycodes.h"
@@ -374,11 +374,11 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    bool paused = im->screen->paused;
    bool video = im->screen->video;

-    SDL_Keycode sdl_keycode = event->key;
-    uint16_t mod = event->mod;
-    bool down = event->type == SDL_EVENT_KEY_DOWN;
-    bool ctrl = event->mod & SDL_KMOD_CTRL;
-    bool shift = event->mod & SDL_KMOD_SHIFT;
+    SDL_Keycode sdl_keycode = event->keysym.sym;
+    uint16_t mod = event->keysym.mod;
+    bool down = event->type == SDL_KEYDOWN;
+    bool ctrl = event->keysym.mod & KMOD_CTRL;
+    bool shift = event->keysym.mod & KMOD_SHIFT;
    bool repeat = event->repeat;

    // Either the modifier includes a shortcut modifier, or the key
@@ -402,39 +402,39 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    if (is_shortcut) {
        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
        switch (sdl_keycode) {
-            case SDLK_H:
+            case SDLK_h:
                if (im->kp && !shift && !repeat && !paused) {
                    action_home(im, action);
                }
                return;
-            case SDLK_B: // fall-through
+            case SDLK_b: // fall-through
            case SDLK_BACKSPACE:
                if (im->kp && !shift && !repeat && !paused) {
                    action_back(im, action);
                }
                return;
-            case SDLK_S:
+            case SDLK_s:
                if (im->kp && !shift && !repeat && !paused) {
                    action_app_switch(im, action);
                }
                return;
-            case SDLK_M:
+            case SDLK_m:
                if (im->kp && !shift && !repeat && !paused) {
                    action_menu(im, action);
                }
                return;
-            case SDLK_P:
+            case SDLK_p:
                if (im->kp && !shift && !repeat && !paused) {
                    action_power(im, action);
                }
                return;
-            case SDLK_O:
+            case SDLK_o:
                if (control && !repeat && down && !paused) {
                    bool on = shift;
                    set_display_power(im, on);
                }
                return;
-            case SDLK_Z:
+            case SDLK_z:
                if (video && down && !repeat) {
                    sc_screen_set_paused(im->screen, !shift);
                }
@@ -483,17 +483,17 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                    }
                }
                return;
-            case SDLK_C:
+            case SDLK_c:
                if (im->kp && !shift && !repeat && down && !paused) {
                    get_device_clipboard(im, SC_COPY_KEY_COPY);
                }
                return;
-            case SDLK_X:
+            case SDLK_x:
                if (im->kp && !shift && !repeat && down && !paused) {
                    get_device_clipboard(im, SC_COPY_KEY_CUT);
                }
                return;
-            case SDLK_V:
+            case SDLK_v:
                if (im->kp && !repeat && down && !paused) {
                    if (shift || im->legacy_paste) {
                        // inject the text as input events
@@ -505,27 +505,27 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                    }
                }
                return;
-            case SDLK_F:
+            case SDLK_f:
                if (video && !shift && !repeat && down) {
                    sc_screen_toggle_fullscreen(im->screen);
                }
                return;
-            case SDLK_W:
+            case SDLK_w:
                if (video && !shift && !repeat && down) {
                    sc_screen_resize_to_fit(im->screen);
                }
                return;
-            case SDLK_G:
+            case SDLK_g:
                if (video && !shift && !repeat && down) {
                    sc_screen_resize_to_pixel_perfect(im->screen);
                }
                return;
-            case SDLK_I:
+            case SDLK_i:
                if (video && !shift && !repeat && down) {
                    switch_fps_counter_state(im);
                }
                return;
-            case SDLK_N:
+            case SDLK_n:
                if (control && !repeat && down && !paused) {
                    if (shift) {
                        collapse_panels(im);
@@ -536,7 +536,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                    }
                }
                return;
-            case SDLK_R:
+            case SDLK_r:
                if (control && !repeat && down && !paused) {
                    if (shift) {
                        reset_video(im);
@@ -545,7 +545,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                    }
                }
                return;
-            case SDLK_K:
+            case SDLK_k:
                if (control && !shift && !repeat && down && !paused
                        && im->kp && im->kp->hid) {
                    // Only if the current keyboard is hid
@@ -562,7 +562,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    }

    uint64_t ack_to_wait = SC_SEQUENCE_INVALID;
-    bool is_ctrl_v = ctrl && !shift && sdl_keycode == SDLK_V && down && !repeat;
+    bool is_ctrl_v = ctrl && !shift && sdl_keycode == SDLK_v && down && !repeat;
    if (im->clipboard_autosync && is_ctrl_v) {
        if (im->legacy_paste) {
            // inject the text as input events
@@ -595,7 +595,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        return;
    }

-    enum sc_scancode scancode = sc_scancode_from_sdl(event->scancode);
+    enum sc_scancode scancode = sc_scancode_from_sdl(event->keysym.scancode);
    if (scancode == SC_SCANCODE_UNKNOWN) {
        return;
    }
@@ -605,7 +605,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        .keycode = keycode,
        .scancode = scancode,
        .repeat = event->repeat,
-        .mods_state = sc_mods_state_from_sdl(event->mod),
+        .mods_state = sc_mods_state_from_sdl(event->keysym.mod),
    };

    assert(im->kp->ops->process_key);
@@ -674,9 +674,7 @@ sc_input_manager_process_touch(struct sc_input_manager *im,

    int dw;
    int dh;
-    bool always_ok = SDL_GetWindowSizeInPixels(im->screen->window, &dw, &dh);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_GL_GetDrawableSize(im->screen->window, &dw, &dh);

    // SDL touch event coordinates are normalized in the range [0; 1]
    int32_t x = event->x * dw;
@@ -689,7 +687,7 @@ sc_input_manager_process_touch(struct sc_input_manager *im,
                sc_screen_convert_drawable_to_frame_coords(im->screen, x, y),
        },
        .action = sc_touch_action_from_sdl(event->type),
-        .pointer_id = event->fingerID,
+        .pointer_id = event->fingerId,
        .pressure = event->pressure,
    };

@@ -725,7 +723,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,

    bool control = im->controller;
    bool paused = im->screen->paused;
-    bool down = event->type == SDL_EVENT_MOUSE_BUTTON_DOWN;
+    bool down = event->type == SDL_MOUSEBUTTONDOWN;

    enum sc_mouse_button button = sc_mouse_button_from_sdl(event->button);
    if (button == SC_MOUSE_BUTTON_UNKNOWN) {
@@ -738,8 +736,8 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
    }

    SDL_Keymod keymod = SDL_GetModState();
-    bool ctrl_pressed = keymod & SDL_KMOD_CTRL;
-    bool shift_pressed = keymod & SDL_KMOD_SHIFT;
+    bool ctrl_pressed = keymod & KMOD_CTRL;
+    bool shift_pressed = keymod & KMOD_SHIFT;

    if (control && !paused) {
        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
@@ -891,15 +889,20 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
    }

    // mouse_x and mouse_y are expressed in pixels relative to the window
-    float mouse_x;
-    float mouse_y;
+    int mouse_x;
+    int mouse_y;
    uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);
    (void) buttons; // Actual buttons are tracked manually to ignore shortcuts

    struct sc_mouse_scroll_event evt = {
        .position = sc_input_manager_get_position(im, mouse_x, mouse_y),
-        .hscroll = event->x,
-        .vscroll = event->y,
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+        .hscroll = CLAMP(event->preciseX, -1.0f, 1.0f),
+        .vscroll = CLAMP(event->preciseY, -1.0f, 1.0f),
+#else
+        .hscroll = CLAMP(event->x, -1, 1),
+        .vscroll = CLAMP(event->y, -1, 1),
+#endif
        .buttons_state = im->mouse_buttons_state,
    };

@@ -908,31 +911,31 @@ 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_GamepadDeviceEvent *event) {
-    if (event->type == SDL_EVENT_GAMEPAD_ADDED) {
-        SDL_Gamepad *gc = SDL_OpenGamepad(event->which);
+                                       const SDL_ControllerDeviceEvent *event) {
+    if (event->type == SDL_CONTROLLERDEVICEADDED) {
+        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
        if (!gc) {
            LOGW("Could not open game controller");
            return;
        }

-        SDL_Joystick *joystick = SDL_GetGamepadJoystick(gc);
+        SDL_Joystick *joystick = SDL_GameControllerGetJoystick(gc);
        if (!joystick) {
            LOGW("Could not get controller joystick");
-            SDL_CloseGamepad(gc);
+            SDL_GameControllerClose(gc);
            return;
        }

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

-        SDL_Gamepad *gc = SDL_GetGamepadFromID(id);
+        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
        if (gc) {
-            SDL_CloseGamepad(gc);
+            SDL_GameControllerClose(gc);
        } else {
            LOGW("Unknown gamepad device removed");
        }
@@ -949,7 +952,7 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,

 static void
 sc_input_manager_process_gamepad_axis(struct sc_input_manager *im,
-                                      const SDL_GamepadAxisEvent *event) {
+                                      const SDL_ControllerAxisEvent *event) {
    enum sc_gamepad_axis axis = sc_gamepad_axis_from_sdl(event->axis);
    if (axis == SC_GAMEPAD_AXIS_UNKNOWN) {
        return;
@@ -965,7 +968,7 @@ sc_input_manager_process_gamepad_axis(struct sc_input_manager *im,

 static void
 sc_input_manager_process_gamepad_button(struct sc_input_manager *im,
-                                       const SDL_GamepadButtonEvent *event) {
+                                       const SDL_ControllerButtonEvent *event) {
    enum sc_gamepad_button button = sc_gamepad_button_from_sdl(event->button);
    if (button == SC_GAMEPAD_BUTTON_UNKNOWN) {
        return;
@@ -988,8 +991,8 @@ is_apk(const char *file) {
 static void
 sc_input_manager_process_file(struct sc_input_manager *im,
                              const SDL_DropEvent *event) {
-    assert(event->type == SDL_EVENT_DROP_FILE);
-    char *file = strdup(event->data);
+    char *file = strdup(event->file);
+    SDL_free(event->file);
    if (!file) {
        LOG_OOM();
        return;
@@ -1013,66 +1016,66 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
    bool control = im->controller;
    bool paused = im->screen->paused;
    switch (event->type) {
-        case SDL_EVENT_TEXT_INPUT:
+        case SDL_TEXTINPUT:
            if (!im->kp || paused) {
                break;
            }
            sc_input_manager_process_text_input(im, &event->text);
            break;
-        case SDL_EVENT_KEY_DOWN:
-        case SDL_EVENT_KEY_UP:
+        case SDL_KEYDOWN:
+        case SDL_KEYUP:
            // some key events do not interact with the device, so process the
            // event even if control is disabled
            sc_input_manager_process_key(im, &event->key);
            break;
-        case SDL_EVENT_MOUSE_MOTION:
+        case SDL_MOUSEMOTION:
            if (!im->mp || paused) {
                break;
            }
            sc_input_manager_process_mouse_motion(im, &event->motion);
            break;
-        case SDL_EVENT_MOUSE_WHEEL:
+        case SDL_MOUSEWHEEL:
            if (!im->mp || paused) {
                break;
            }
            sc_input_manager_process_mouse_wheel(im, &event->wheel);
            break;
-        case SDL_EVENT_MOUSE_BUTTON_DOWN:
-        case SDL_EVENT_MOUSE_BUTTON_UP:
+        case SDL_MOUSEBUTTONDOWN:
+        case SDL_MOUSEBUTTONUP:
            // some mouse events do not interact with the device, so process
            // the event even if control is disabled
            sc_input_manager_process_mouse_button(im, &event->button);
            break;
-        case SDL_EVENT_FINGER_MOTION:
-        case SDL_EVENT_FINGER_DOWN:
-        case SDL_EVENT_FINGER_UP:
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
            if (!im->mp || paused) {
                break;
            }
            sc_input_manager_process_touch(im, &event->tfinger);
            break;
-        case SDL_EVENT_GAMEPAD_ADDED:
-        case SDL_EVENT_GAMEPAD_REMOVED:
+        case SDL_CONTROLLERDEVICEADDED:
+        case SDL_CONTROLLERDEVICEREMOVED:
            // Handle device added or removed even if paused
            if (!im->gp) {
                break;
            }
-            sc_input_manager_process_gamepad_device(im, &event->gdevice);
+            sc_input_manager_process_gamepad_device(im, &event->cdevice);
            break;
-        case SDL_EVENT_GAMEPAD_AXIS_MOTION:
+        case SDL_CONTROLLERAXISMOTION:
            if (!im->gp || paused) {
                break;
            }
-            sc_input_manager_process_gamepad_axis(im, &event->gaxis);
+            sc_input_manager_process_gamepad_axis(im, &event->caxis);
            break;
-        case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
-        case SDL_EVENT_GAMEPAD_BUTTON_UP:
+        case SDL_CONTROLLERBUTTONDOWN:
+        case SDL_CONTROLLERBUTTONUP:
            if (!im->gp || paused) {
                break;
            }
-            sc_input_manager_process_gamepad_button(im, &event->gbutton);
+            sc_input_manager_process_gamepad_button(im, &event->cbutton);
            break;
-        case SDL_EVENT_DROP_FILE: {
+        case SDL_DROPFILE: {
            if (!control) {
                break;
            }
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@@ -5,8 +5,8 @@

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

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

 #include <stdbool.h>
-#include <stdio.h>
 #ifdef HAVE_V4L2
 # include <libavdevice/avdevice.h>
 #endif
-#define SDL_FUNCTION_POINTER_IS_VOID_POINTER
-#include <SDL3/SDL_stdinc.h>
-#include <SDL3/SDL.h>
+#define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem
+#include <SDL2/SDL.h>

 #include "cli.h"
 #include "options.h"
--- a/app/src/mouse_capture.c
+++ b/app/src/mouse_capture.c
@@ -20,11 +20,14 @@ bool
 sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
                              const SDL_Event *event) {
    switch (event->type) {
-        case SDL_EVENT_WINDOW_FOCUS_LOST:
-            sc_mouse_capture_set_active(mc, false);
-            return true;
-        case SDL_EVENT_KEY_DOWN: {
-            SDL_Keycode key = event->key.key;
+        case SDL_WINDOWEVENT:
+            if (event->window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
+                sc_mouse_capture_set_active(mc, false);
+                return true;
+            }
+            break;
+        case SDL_KEYDOWN: {
+            SDL_Keycode key = event->key.keysym.sym;
            if (sc_mouse_capture_is_capture_key(mc, key)) {
                if (!mc->mouse_capture_key_pressed) {
                    mc->mouse_capture_key_pressed = key;
@@ -38,8 +41,8 @@ sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
            }
            break;
        }
-        case SDL_EVENT_KEY_UP: {
-            SDL_Keycode key = event->key.key;
+        case SDL_KEYUP: {
+            SDL_Keycode key = event->key.keysym.sym;
            SDL_Keycode cap = mc->mouse_capture_key_pressed;
            mc->mouse_capture_key_pressed = 0;
            if (sc_mouse_capture_is_capture_key(mc, key)) {
@@ -53,24 +56,24 @@ sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
            }
            break;
        }
-        case SDL_EVENT_MOUSE_WHEEL:
-        case SDL_EVENT_MOUSE_MOTION:
-        case SDL_EVENT_MOUSE_BUTTON_DOWN:
+        case SDL_MOUSEWHEEL:
+        case SDL_MOUSEMOTION:
+        case SDL_MOUSEBUTTONDOWN:
            if (!sc_mouse_capture_is_active(mc)) {
                // The mouse will be captured on SDL_MOUSEBUTTONUP, so consume
                // the event
                return true;
            }
            break;
-        case SDL_EVENT_MOUSE_BUTTON_UP:
+        case SDL_MOUSEBUTTONUP:
            if (!sc_mouse_capture_is_active(mc)) {
                sc_mouse_capture_set_active(mc, true);
                return true;
            }
            break;
-        case SDL_EVENT_FINGER_MOTION:
-        case SDL_EVENT_FINGER_DOWN:
-        case SDL_EVENT_FINGER_UP:
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
            // Touch events are not compatible with relative mode
            // (coordinates are not relative), so consume the event
            return true;
@@ -81,8 +84,27 @@ sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,

 void
 sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture) {
-    bool ok = SDL_SetWindowRelativeMouseMode(mc->window, capture);
-    if (!ok) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(mc->window, &x, &y);
+        SDL_GetWindowSize(mc->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(mc->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) mc;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
        LOGE("Could not set relative mouse mode to %s: %s",
             capture ? "true" : "false", SDL_GetError());
    }
@@ -90,7 +112,8 @@ sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture) {

 bool
 sc_mouse_capture_is_active(struct sc_mouse_capture *mc) {
-    return SDL_GetWindowRelativeMouseMode(mc->window);
+    (void) mc;
+    return SDL_GetRelativeMouseMode();
 }

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

 #include <stdbool.h>

-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 struct sc_mouse_capture {
    SDL_Window *window;
--- a/app/src/opengl.c
+++ b/app/src/opengl.c
@@ -3,29 +3,21 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 void
 sc_opengl_init(struct sc_opengl *gl) {
-    gl->GetString = (const GLubyte *(*)(GLenum))
-                    SDL_GL_GetProcAddress("glGetString");
+    gl->GetString = SDL_GL_GetProcAddress("glGetString");
    assert(gl->GetString);

-    gl->BindTexture = (void (*)(GLenum, GLuint))
-                      SDL_GL_GetProcAddress("glBindTexture");
-    assert(gl->BindTexture);
-
-    gl->TexParameterf = (void (*)(GLenum, GLenum, GLfloat))
-                        SDL_GL_GetProcAddress("glTexParameterf");
+    gl->TexParameterf = SDL_GL_GetProcAddress("glTexParameterf");
    assert(gl->TexParameterf);

-    gl->TexParameteri = (void (*)(GLenum, GLenum, GLint))
-                        SDL_GL_GetProcAddress("glTexParameteri");
+    gl->TexParameteri = SDL_GL_GetProcAddress("glTexParameteri");
    assert(gl->TexParameteri);

    // optional
-    gl->GenerateMipmap = (void (*)(GLenum))
-                         SDL_GL_GetProcAddress("glGenerateMipmap");
+    gl->GenerateMipmap = SDL_GL_GetProcAddress("glGenerateMipmap");

    const char *version = (const char *) gl->GetString(GL_VERSION);
    assert(version);
--- a/app/src/opengl.h
+++ b/app/src/opengl.h
@@ -4,7 +4,7 @@
 #include "common.h"

 #include <stdbool.h>
-#include <SDL3/SDL_opengl.h>
+#include <SDL2/SDL_opengl.h>

 struct sc_opengl {
    const char *version;
@@ -15,9 +15,6 @@ struct sc_opengl {
    const GLubyte *
    (*GetString)(GLenum name);

-    void
-    (*BindTexture)(GLenum target, GLuint texture);
-
    void
    (*TexParameterf)(GLenum target, GLenum pname, GLfloat param);

--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@@ -2,8 +2,7 @@

 #include <assert.h>
 #include <inttypes.h>
-#include <stdlib.h>
-#include <SDL3/SDL_clipboard.h>
+#include <SDL2/SDL_clipboard.h>

 #include "device_msg.h"
 #include "events.h"
@@ -54,12 +53,8 @@ task_set_clipboard(void *userdata) {
    if (same) {
        LOGD("Computer clipboard unchanged");
    } else {
-        bool ok = SDL_SetClipboardText(text);
-        if (ok) {
-            LOGI("Device clipboard copied");
-        } else {
-            LOGE("Could not set clipboard: %s", SDL_GetError());
-        }
+        LOGI("Device clipboard copied");
+        SDL_SetClipboardText(text);
    }

    free(text);
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -541,10 +541,7 @@ sc_recorder_set_orientation(AVStream *stream, enum sc_orientation orientation) {

 static bool
 sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
-                                   AVCodecContext *ctx,
-                                   const struct sc_stream_session *session) {
-    (void) session;
-
+                                   AVCodecContext *ctx) {
    struct sc_recorder *recorder = DOWNCAST_VIDEO(sink);
    // only written from this thread, no need to lock
    assert(!recorder->video_init);
@@ -638,10 +635,7 @@ sc_recorder_video_packet_sink_push(struct sc_packet_sink *sink,

 static bool
 sc_recorder_audio_packet_sink_open(struct sc_packet_sink *sink,
-                                   AVCodecContext *ctx,
-                                   const struct sc_stream_session *session) {
-    (void) session;
-
+                                   AVCodecContext *ctx) {
    struct sc_recorder *recorder = DOWNCAST_AUDIO(sink);
    assert(recorder->audio);
    // only written from this thread, no need to lock
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 #ifdef _WIN32
 // not needed here, but winsock2.h must never be included AFTER windows.h
@@ -93,8 +93,8 @@ struct scrcpy {

 #ifdef _WIN32
 static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
-    if (ctrl_type == CTRL_C_EVENT || ctrl_type == CTRL_BREAK_EVENT) {
-        sc_push_event(SDL_EVENT_QUIT);
+    if (ctrl_type == CTRL_C_EVENT) {
+        sc_push_event(SDL_QUIT);
        return TRUE;
    }
    return FALSE;
@@ -107,9 +107,9 @@ sdl_set_hints(const char *render_driver) {
        LOGW("Could not set render driver");
    }

-    // App name used in various contexts (such as PulseAudio)
-    if (!SDL_SetHint(SDL_HINT_APP_NAME, "scrcpy")) {
-        LOGW("Could not set app name");
+    // Linear filtering
+    if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1")) {
+        LOGW("Could not enable linear filtering");
    }

    // Handle a click to gain focus as any other click
@@ -117,17 +117,21 @@ sdl_set_hints(const char *render_driver) {
        LOGW("Could not enable mouse focus clickthrough");
    }

+#ifdef SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
    // Disable synthetic mouse events from touch events
    // Touch events with id SDL_TOUCH_MOUSEID are ignored anyway, but it is
    // better not to generate them in the first place.
    if (!SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0")) {
        LOGW("Could not disable synthetic mouse events");
    }
+#endif

+#ifdef SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
    // Disable compositor bypassing on X11
    if (!SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0")) {
        LOGW("Could not disable X11 compositor bypass");
    }
+#endif

    // Do not minimize on focus loss
    if (!SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0")) {
@@ -154,20 +158,14 @@ sdl_configure(bool video_playback, bool disable_screensaver) {
    }

    if (disable_screensaver) {
-        bool ok = SDL_DisableScreenSaver();
-        if (!ok) {
-            LOGW("Could not disable screen saver");
-        }
+        SDL_DisableScreenSaver();
    } else {
-        bool ok = SDL_EnableScreenSaver();
-        if (!ok) {
-            LOGW("Could not enable screen saver");
-        }
+        SDL_EnableScreenSaver();
    }
 }

 static enum scrcpy_exit_code
-event_loop(struct scrcpy *s, bool has_screen) {
+event_loop(struct scrcpy *s) {
    SDL_Event event;
    while (SDL_WaitEvent(&event)) {
        switch (event.type) {
@@ -189,7 +187,7 @@ event_loop(struct scrcpy *s, bool has_screen) {
            case SC_EVENT_TIME_LIMIT_REACHED:
                LOGI("Time limit reached");
                return SCRCPY_EXIT_SUCCESS;
-            case SDL_EVENT_QUIT:
+            case SDL_QUIT:
                LOGD("User requested to quit");
                return SCRCPY_EXIT_SUCCESS;
            case SC_EVENT_RUN_ON_MAIN_THREAD: {
@@ -199,7 +197,7 @@ event_loop(struct scrcpy *s, bool has_screen) {
                break;
            }
            default:
-                if (has_screen && !sc_screen_handle_event(&s->screen, &event)) {
+                if (!sc_screen_handle_event(&s->screen, &event)) {
                    return SCRCPY_EXIT_FAILURE;
                }
                break;
@@ -229,7 +227,7 @@ await_for_server(bool *connected) {
    SDL_Event event;
    while (SDL_WaitEvent(&event)) {
        switch (event.type) {
-            case SDL_EVENT_QUIT:
+            case SDL_QUIT:
                if (connected) {
                    *connected = false;
                }
@@ -357,19 +355,12 @@ static void
 init_sdl_gamepads(void) {
    // Trigger a SDL_CONTROLLERDEVICEADDED event for all gamepads already
    // connected
-    int count;
-    SDL_JoystickID *joysticks = SDL_GetJoysticks(&count);
-    if (!joysticks) {
-        LOGE("Could not list joysticks: %s", SDL_GetError());
-        return;
-    }
-
-    for (int i = 0; i < count; ++i) {
-        SDL_JoystickID joystick = joysticks[i];
-        if (SDL_IsGamepad(joystick)) {
+    int num_joysticks = SDL_NumJoysticks();
+    for (int i = 0; i < num_joysticks; ++i) {
+        if (SDL_IsGameController(i)) {
            SDL_Event event;
-            event.gdevice.type = SDL_EVENT_GAMEPAD_ADDED;
-            event.gdevice.which = i;
+            event.cdevice.type = SDL_CONTROLLERDEVICEADDED;
+            event.cdevice.which = i;
            SDL_PushEvent(&event);
        }
    }
@@ -385,7 +376,7 @@ scrcpy(struct scrcpy_options *options) {
    struct scrcpy *s = &scrcpy;

    // Minimal SDL initialization
-    if (!SDL_Init(SDL_INIT_EVENTS)) {
+    if (SDL_Init(SDL_INIT_EVENTS)) {
        LOGE("Could not initialize SDL: %s", SDL_GetError());
        return SCRCPY_EXIT_FAILURE;
    }
@@ -511,7 +502,7 @@ scrcpy(struct scrcpy_options *options) {
        // --no-video-playback is passed so that clipboard synchronization
        // still works.
        // <https://github.com/Genymobile/scrcpy/issues/4418>
-        if (!SDL_Init(SDL_INIT_VIDEO)) {
+        if (SDL_Init(SDL_INIT_VIDEO)) {
            // If it fails, it is an error only if video playback is enabled
            if (options->video_playback) {
                LOGE("Could not initialize SDL video: %s", SDL_GetError());
@@ -523,14 +514,14 @@ scrcpy(struct scrcpy_options *options) {
    }

    if (options->audio_playback) {
-        if (!SDL_Init(SDL_INIT_AUDIO)) {
+        if (SDL_Init(SDL_INIT_AUDIO)) {
            LOGE("Could not initialize SDL audio: %s", SDL_GetError());
            goto end;
        }
    }

    if (options->gamepad_input_mode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
-        if (!SDL_Init(SDL_INIT_GAMEPAD)) {
+        if (SDL_Init(SDL_INIT_GAMECONTROLLER)) {
            LOGE("Could not initialize SDL gamepad: %s", SDL_GetError());
            goto end;
        }
@@ -942,7 +933,7 @@ aoa_complete:
        }
    }

-    ret = event_loop(s, options->window);
+    ret = event_loop(s);
    terminate_event_loop();
    LOGD("quit...");

--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -2,13 +2,12 @@

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

 #include "events.h"
 #include "icon.h"
 #include "options.h"
 #include "util/log.h"
-#include "util/window.h"

 #define DISPLAY_MARGINS 96

@@ -32,9 +31,7 @@ static struct sc_size
 get_window_size(const struct sc_screen *screen) {
    int width;
    int height;
-    bool always_ok = SDL_GetWindowSize(screen->window, &width, &height);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_GetWindowSize(screen->window, &width, &height);

    struct sc_size size;
    size.width = width;
@@ -46,9 +43,7 @@ static struct sc_point
 get_window_position(const struct sc_screen *screen) {
    int x;
    int y;
-    bool always_ok = SDL_GetWindowPosition(screen->window, &x, &y);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_GetWindowPosition(screen->window, &x, &y);

    struct sc_point point;
    point.x = x;
@@ -62,19 +57,14 @@ set_window_size(struct sc_screen *screen, struct sc_size new_size) {
    assert(!screen->fullscreen);
    assert(!screen->maximized);
    assert(!screen->minimized);
-    bool always_ok =
-        SDL_SetWindowSize(screen->window, new_size.width, new_size.height);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_SetWindowSize(screen->window, new_size.width, new_size.height);
 }

 // get the preferred display bounds (i.e. the screen bounds with some margins)
 static bool
 get_preferred_display_bounds(struct sc_size *bounds) {
    SDL_Rect rect;
-    SDL_DisplayID display = SDL_GetPrimaryDisplay();
-    bool ok = SDL_GetDisplayUsableBounds(display, &rect);
-    if (!ok) {
+    if (SDL_GetDisplayUsableBounds(0, &rect)) {
        LOGW("Could not get display usable bounds: %s", SDL_GetError());
        return false;
    }
@@ -178,9 +168,7 @@ sc_screen_update_content_rect(struct sc_screen *screen) {

    int dw;
    int dh;
-    bool always_ok = SDL_GetWindowSizeInPixels(screen->window, &dw, &dh);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);

    struct sc_size content_size = screen->content_size;
    // The drawable size is the window size * the HiDPI scale
@@ -220,7 +208,6 @@ sc_screen_update_content_rect(struct sc_screen *screen) {
 static void
 sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
    assert(screen->video);
-    assert(screen->has_video_window);

    if (update_content_rect) {
        sc_screen_update_content_rect(screen);
@@ -238,7 +225,7 @@ sc_screen_render_novideo(struct sc_screen *screen) {
    (void) res; // any error already logged
 }

-#if defined(__APPLE__) || defined(_WIN32)
+#if defined(__APPLE__) || defined(__WINDOWS__)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif

@@ -248,31 +235,28 @@ sc_screen_render_novideo(struct sc_screen *screen) {
 //
 // <https://bugzilla.libsdl.org/show_bug.cgi?id=2077>
 // <https://stackoverflow.com/a/40693139/1987178>
-static bool
+static int
 event_watcher(void *data, SDL_Event *event) {
    struct sc_screen *screen = data;
    assert(screen->video);

-    if (event->type == SDL_EVENT_WINDOW_EXPOSED) {
+    if (event->type == SDL_WINDOWEVENT
+            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
        // In practice, it seems to always be called from the same thread in
        // that specific case. Anyway, it's just a workaround.
        sc_screen_render(screen, true);
    }
-
-    return true;
+    return 0;
 }
 #endif

 static bool
 sc_screen_frame_sink_open(struct sc_frame_sink *sink,
-                          const AVCodecContext *ctx,
-                          const struct sc_stream_session *session) {
+                          const AVCodecContext *ctx) {
    assert(ctx->pix_fmt == AV_PIX_FMT_YUV420P);
    (void) ctx;
-    (void) session;

    struct sc_screen *screen = DOWNCAST(sink);
-    (void) screen;

    if (ctx->width <= 0 || ctx->width > 0xFFFF
            || ctx->height <= 0 || ctx->height > 0xFFFF) {
@@ -280,6 +264,19 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink,
        return false;
    }

+    assert(ctx->width > 0 && ctx->width <= 0xFFFF);
+    assert(ctx->height > 0 && ctx->height <= 0xFFFF);
+    // screen->frame_size is never used before the event is pushed, and the
+    // event acts as a memory barrier so it is safe without mutex
+    screen->frame_size.width = ctx->width;
+    screen->frame_size.height = ctx->height;
+
+    // Post the event on the UI thread (the texture must be created from there)
+    bool ok = sc_push_event(SC_EVENT_SCREEN_INIT_SIZE);
+    if (!ok) {
+        return false;
+    }
+
 #ifndef NDEBUG
    screen->open = true;
 #endif
@@ -330,7 +327,6 @@ sc_screen_init(struct sc_screen *screen,
               const struct sc_screen_params *params) {
    screen->resize_pending = false;
    screen->has_frame = false;
-    screen->has_video_window = false;
    screen->fullscreen = false;
    screen->maximized = false;
    screen->minimized = false;
@@ -364,7 +360,7 @@ sc_screen_init(struct sc_screen *screen,
        }
    }

-    uint32_t window_flags = SDL_WINDOW_HIGH_PIXEL_DENSITY;
+    uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
    if (params->always_on_top) {
        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
    }
@@ -398,31 +394,22 @@ sc_screen_init(struct sc_screen *screen,
    }

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

-    ok = SDL_StartTextInput(screen->window);
-    if (!ok) {
-        LOGE("Could not enable text input: %s", SDL_GetError());
-        goto error_destroy_window;
-    }
-
    SDL_Surface *icon = scrcpy_icon_load();
    if (icon) {
-        if (!SDL_SetWindowIcon(screen->window, icon)) {
-            LOGW("Could not set window icon: %s", SDL_GetError());
-        }
+        SDL_SetWindowIcon(screen->window, icon);
    } else if (params->video) {
        // just a warning
        LOGW("Could not load icon");
    } else {
        // without video, the icon is used as window content, it must be present
        LOGE("Could not load icon");
-        goto error_destroy_window;
+        goto error_destroy_fps_counter;
    }

    SDL_Surface *icon_novideo = params->video ? NULL : icon;
@@ -462,11 +449,7 @@ sc_screen_init(struct sc_screen *screen,

 #ifdef CONTINUOUS_RESIZING_WORKAROUND
    if (screen->video) {
-        ok = SDL_AddEventWatch(event_watcher, screen);
-        if (!ok) {
-            LOGW("Could not add event watcher for continuous resizing: %s",
-                 SDL_GetError());
-        }
+        SDL_AddEventWatch(event_watcher, screen);
    }
 #endif

@@ -513,12 +496,7 @@ sc_screen_show_initial_window(struct sc_screen *screen) {
                                                       screen->req.height);

    set_window_size(screen, window_size);
-
-    bool always_ok;
-    (void) always_ok;
-
-    always_ok = SDL_SetWindowPosition(screen->window, x, y);
-    assert(always_ok);
+    SDL_SetWindowPosition(screen->window, x, y);

    if (screen->req.fullscreen) {
        sc_screen_toggle_fullscreen(screen);
@@ -528,17 +506,13 @@ sc_screen_show_initial_window(struct sc_screen *screen) {
        sc_fps_counter_start(&screen->fps_counter);
    }

-    always_ok = SDL_ShowWindow(screen->window);
-    assert(always_ok);
-
+    SDL_ShowWindow(screen->window);
    sc_screen_update_content_rect(screen);
 }

 void
 sc_screen_hide_window(struct sc_screen *screen) {
-    bool always_ok = SDL_HideWindow(screen->window);
-    (void) always_ok;
-    assert(always_ok);
+    SDL_HideWindow(screen->window);
 }

 void
@@ -629,6 +603,44 @@ sc_screen_set_orientation(struct sc_screen *screen,
    sc_screen_render(screen, true);
 }

+static bool
+sc_screen_init_size(struct sc_screen *screen) {
+    // Before first frame
+    assert(!screen->has_frame);
+
+    // The requested size is passed via screen->frame_size
+
+    struct sc_size content_size =
+        get_oriented_size(screen->frame_size, screen->orientation);
+    screen->content_size = content_size;
+
+    enum sc_display_result res =
+        sc_display_set_texture_size(&screen->display, screen->frame_size);
+    return res != SC_DISPLAY_RESULT_ERROR;
+}
+
+// recreate the texture and resize the window if the frame size has changed
+static enum sc_display_result
+prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
+    assert(screen->video);
+
+    if (screen->frame_size.width == new_frame_size.width
+            && screen->frame_size.height == new_frame_size.height) {
+        return SC_DISPLAY_RESULT_OK;
+    }
+
+    // frame dimension changed
+    screen->frame_size = new_frame_size;
+
+    struct sc_size new_content_size =
+        get_oriented_size(new_frame_size, screen->orientation);
+    set_content_size(screen, new_content_size);
+
+    sc_screen_update_content_rect(screen);
+
+    return sc_display_set_texture_size(&screen->display, screen->frame_size);
+}
+
 static bool
 sc_screen_apply_frame(struct sc_screen *screen) {
    assert(screen->video);
@@ -637,38 +649,7 @@ sc_screen_apply_frame(struct sc_screen *screen) {

    AVFrame *frame = screen->frame;
    struct sc_size new_frame_size = {frame->width, frame->height};
-
-    if (!screen->has_frame
-            || screen->frame_size.width != new_frame_size.width
-            || screen->frame_size.height != new_frame_size.height) {
-        // frame dimension changed
-        screen->frame_size = new_frame_size;
-
-        struct sc_size new_content_size =
-            get_oriented_size(new_frame_size, screen->orientation);
-        if (screen->has_frame) {
-            set_content_size(screen, new_content_size);
-            sc_screen_update_content_rect(screen);
-        } else {
-            // This is the first frame
-            screen->has_frame = true;
-            screen->content_size = new_content_size;
-        }
-
-        enum sc_display_result res =
-            sc_display_prepare_texture(&screen->display, screen->frame_size,
-                                       frame->colorspace, frame->color_range);
-        if (res == SC_DISPLAY_RESULT_ERROR) {
-            return false;
-        }
-        if (res == SC_DISPLAY_RESULT_PENDING) {
-            // Not an error, but do not continue
-            return true;
-        }
-    }
-
-    enum sc_display_result res =
-        sc_display_update_texture(&screen->display, frame);
+    enum sc_display_result res = prepare_for_frame(screen, new_frame_size);
    if (res == SC_DISPLAY_RESULT_ERROR) {
        return false;
    }
@@ -677,9 +658,17 @@ sc_screen_apply_frame(struct sc_screen *screen) {
        return true;
    }

-    assert(screen->has_frame);
-    if (!screen->has_video_window) {
-        screen->has_video_window = true;
+    res = sc_display_update_texture(&screen->display, frame);
+    if (res == SC_DISPLAY_RESULT_ERROR) {
+        return false;
+    }
+    if (res == SC_DISPLAY_RESULT_PENDING) {
+        // Not an error, but do not continue
+        return true;
+    }
+
+    if (!screen->has_frame) {
+        screen->has_frame = true;
        // this is the very first frame, show the window
        sc_screen_show_initial_window(screen);

@@ -749,8 +738,8 @@ void
 sc_screen_toggle_fullscreen(struct sc_screen *screen) {
    assert(screen->video);

-    bool ok = SDL_SetWindowFullscreen(screen->window, !screen->fullscreen);
-    if (!ok) {
+    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
+    if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
        LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
        return;
    }
@@ -784,16 +773,8 @@ sc_screen_resize_to_fit(struct sc_screen *screen) {
    uint32_t new_x = point.x + (window_size.width - optimal_size.width) / 2;
    uint32_t new_y = point.y + (window_size.height - optimal_size.height) / 2;

-    bool always_ok;
-    (void) always_ok;
-
-    always_ok = SDL_SetWindowSize(screen->window, optimal_size.width,
-                                                  optimal_size.height);
-    assert(always_ok);
-
-    always_ok = SDL_SetWindowPosition(screen->window, new_x, new_y);
-    assert(always_ok);
-
+    SDL_SetWindowSize(screen->window, optimal_size.width, optimal_size.height);
+    SDL_SetWindowPosition(screen->window, new_x, new_y);
    LOGD("Resized to optimal size: %ux%u", optimal_size.width,
                                           optimal_size.height);
 }
@@ -806,29 +787,29 @@ sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
        return;
    }

-    bool always_ok;
-    (void) always_ok;
-
    if (screen->maximized) {
-        always_ok = SDL_RestoreWindow(screen->window);
-        assert(always_ok);
+        SDL_RestoreWindow(screen->window);
        screen->maximized = false;
    }

    struct sc_size content_size = screen->content_size;
-    always_ok = SDL_SetWindowSize(screen->window, content_size.width,
-                                                  content_size.height);
-    assert(always_ok);
-
+    SDL_SetWindowSize(screen->window, content_size.width, content_size.height);
    LOGD("Resized to pixel-perfect: %ux%u", content_size.width,
                                            content_size.height);
 }

 bool
 sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
-    // !video implies !has_video_window
-    assert(screen->video || !screen->has_video_window);
    switch (event->type) {
+        case SC_EVENT_SCREEN_INIT_SIZE: {
+            // The initial size is passed via screen->frame_size
+            bool ok = sc_screen_init_size(screen);
+            if (!ok) {
+                LOGE("Could not initialize screen size");
+                return false;
+            }
+            return true;
+        }
        case SC_EVENT_NEW_FRAME: {
            bool ok = sc_screen_update_frame(screen);
            if (!ok) {
@@ -837,38 +818,45 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
            }
            return true;
        }
-        case SDL_EVENT_WINDOW_EXPOSED:
-            if (!screen->video) {
+        case SDL_WINDOWEVENT:
+            if (!screen->video
+                    && event->window.event == SDL_WINDOWEVENT_EXPOSED) {
                sc_screen_render_novideo(screen);
-            } else if (screen->has_video_window) {
-                sc_screen_render(screen, true);
            }
-            return true;
-        case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
-            if (screen->has_video_window) {
-                sc_screen_render(screen, true);
-            }
-            return true;
-        case SDL_EVENT_WINDOW_MAXIMIZED:
-            screen->maximized = true;
-            return true;
-        case SDL_EVENT_WINDOW_MINIMIZED:
-            screen->minimized = true;
-            return true;
-        case SDL_EVENT_WINDOW_RESTORED:
-            if (screen->fullscreen) {
-                // On Windows, in maximized+fullscreen, disabling
-                // fullscreen mode unexpectedly triggers the "restored"
-                // then "maximized" events, leaving the window in a
-                // weird state (maximized according to the events, but
-                // not maximized visually).
+
+            // !video implies !has_frame
+            assert(screen->video || !screen->has_frame);
+            if (!screen->has_frame) {
+                // Do nothing
                return true;
            }
-            screen->maximized = false;
-            screen->minimized = false;
-            if (screen->has_video_window) {
-                apply_pending_resize(screen);
-                sc_screen_render(screen, true);
+            switch (event->window.event) {
+                case SDL_WINDOWEVENT_EXPOSED:
+                    sc_screen_render(screen, true);
+                    break;
+                case SDL_WINDOWEVENT_SIZE_CHANGED:
+                    sc_screen_render(screen, true);
+                    break;
+                case SDL_WINDOWEVENT_MAXIMIZED:
+                    screen->maximized = true;
+                    break;
+                case SDL_WINDOWEVENT_MINIMIZED:
+                    screen->minimized = true;
+                    break;
+                case SDL_WINDOWEVENT_RESTORED:
+                    if (screen->fullscreen) {
+                        // On Windows, in maximized+fullscreen, disabling
+                        // fullscreen mode unexpectedly triggers the "restored"
+                        // then "maximized" events, leaving the window in a
+                        // weird state (maximized according to the events, but
+                        // not maximized visually).
+                        break;
+                    }
+                    screen->maximized = false;
+                    screen->minimized = false;
+                    apply_pending_resize(screen);
+                    sc_screen_render(screen, true);
+                    break;
            }
            return true;
    }
@@ -948,16 +936,10 @@ sc_screen_convert_window_to_frame_coords(struct sc_screen *screen,

 void
 sc_screen_hidpi_scale_coords(struct sc_screen *screen, int32_t *x, int32_t *y) {
-    bool always_ok;
-    (void) always_ok;
-
    // take the HiDPI scaling (dw/ww and dh/wh) into account
    int ww, wh, dw, dh;
-    always_ok = SDL_GetWindowSize(screen->window, &ww, &wh);
-    assert(always_ok);
-
-    always_ok = SDL_GetWindowSizeInPixels(screen->window, &dw, &dh);
-    assert(always_ok);
+    SDL_GetWindowSize(screen->window, &ww, &wh);
+    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);

    // scale for HiDPI (64 bits for intermediate multiplications)
    *x = (int64_t) *x * dw / ww;
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -5,7 +5,7 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/frame.h>
 #include <libavutil/pixfmt.h>
@@ -61,7 +61,6 @@ struct sc_screen {
    // rectangle of the content (excluding black borders)
    struct SDL_Rect rect;
    bool has_frame;
-    bool has_video_window;
    bool fullscreen;
    bool maximized;
    bool minimized;
--- a/app/src/shortcut_mod.h
+++ b/app/src/shortcut_mod.h
@@ -6,11 +6,11 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL3/SDL_keycode.h>
+#include <SDL2/SDL_keycode.h>

 #include "options.h"

-#define SC_SDL_SHORTCUT_MODS_MASK (SDL_KMOD_CTRL | SDL_KMOD_ALT | SDL_KMOD_GUI)
+#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)

 // input: OR of enum sc_shortcut_mod
 // output: OR of SDL_Keymod
@@ -18,22 +18,22 @@ static inline uint16_t
 sc_shortcut_mods_to_sdl(uint8_t shortcut_mods) {
    uint16_t sdl_mod = 0;
    if (shortcut_mods & SC_SHORTCUT_MOD_LCTRL) {
-        sdl_mod |= SDL_KMOD_LCTRL;
+        sdl_mod |= KMOD_LCTRL;
    }
    if (shortcut_mods & SC_SHORTCUT_MOD_RCTRL) {
-        sdl_mod |= SDL_KMOD_RCTRL;
+        sdl_mod |= KMOD_RCTRL;
    }
    if (shortcut_mods & SC_SHORTCUT_MOD_LALT) {
-        sdl_mod |= SDL_KMOD_LALT;
+        sdl_mod |= KMOD_LALT;
    }
    if (shortcut_mods & SC_SHORTCUT_MOD_RALT) {
-        sdl_mod |= SDL_KMOD_RALT;
+        sdl_mod |= KMOD_RALT;
    }
    if (shortcut_mods & SC_SHORTCUT_MOD_LSUPER) {
-        sdl_mod |= SDL_KMOD_LGUI;
+        sdl_mod |= KMOD_LGUI;
    }
    if (shortcut_mods & SC_SHORTCUT_MOD_RSUPER) {
-        sdl_mod |= SDL_KMOD_RGUI;
+        sdl_mod |= KMOD_RGUI;
    }
    return sdl_mod;
 }
@@ -50,12 +50,12 @@ sc_shortcut_mods_is_shortcut_mod(uint16_t sdl_shortcut_mods, uint16_t sdl_mod) {
 static inline bool
 sc_shortcut_mods_is_shortcut_key(uint16_t sdl_shortcut_mods,
                                 SDL_Keycode keycode) {
-    return (sdl_shortcut_mods & SDL_KMOD_LCTRL && keycode == SDLK_LCTRL)
-        || (sdl_shortcut_mods & SDL_KMOD_RCTRL && keycode == SDLK_RCTRL)
-        || (sdl_shortcut_mods & SDL_KMOD_LALT  && keycode == SDLK_LALT)
-        || (sdl_shortcut_mods & SDL_KMOD_RALT  && keycode == SDLK_RALT)
-        || (sdl_shortcut_mods & SDL_KMOD_LGUI  && keycode == SDLK_LGUI)
-        || (sdl_shortcut_mods & SDL_KMOD_RGUI  && keycode == SDLK_RGUI);
+    return (sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
+        || (sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
+        || (sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
+        || (sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
+        || (sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
+        || (sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
 }

 #endif
--- a/app/src/trait/frame_sink.h
+++ b/app/src/trait/frame_sink.h
@@ -6,8 +6,6 @@
 #include <stdbool.h>
 #include <libavcodec/avcodec.h>

-#include "trait/packet_sink.h"
-
 /**
 * Frame sink trait.
 *
@@ -19,16 +17,9 @@ struct sc_frame_sink {

 struct sc_frame_sink_ops {
    /* The codec context is valid until the sink is closed */
-    bool (*open)(struct sc_frame_sink *sink, const AVCodecContext *ctx,
-                 const struct sc_stream_session *session);
+    bool (*open)(struct sc_frame_sink *sink, const AVCodecContext *ctx);
    void (*close)(struct sc_frame_sink *sink);
    bool (*push)(struct sc_frame_sink *sink, const AVFrame *frame);
-
-    /**
-     * Optional callback to be notified of a new stream session.
-     */
-    bool (*push_session)(struct sc_frame_sink *sink,
-                         const struct sc_stream_session *session);
 };

 #endif
--- a/app/src/trait/frame_source.c
+++ b/app/src/trait/frame_source.c
@@ -27,12 +27,11 @@ sc_frame_source_sinks_close_firsts(struct sc_frame_source *source,

 bool
 sc_frame_source_sinks_open(struct sc_frame_source *source,
-                           const AVCodecContext *ctx,
-                           const struct sc_stream_session *session) {
+                           const AVCodecContext *ctx) {
    assert(source->sink_count);
    for (unsigned i = 0; i < source->sink_count; ++i) {
        struct sc_frame_sink *sink = source->sinks[i];
-        if (!sink->ops->open(sink, ctx, session)) {
+        if (!sink->ops->open(sink, ctx)) {
            sc_frame_source_sinks_close_firsts(source, i);
            return false;
        }
@@ -60,18 +59,3 @@ sc_frame_source_sinks_push(struct sc_frame_source *source,

    return true;
 }
-
-bool
-sc_frame_source_sinks_push_session(struct sc_frame_source *source,
-                                   const struct sc_stream_session *session) {
-    assert(source->sink_count);
-    for (unsigned i = 0; i < source->sink_count; ++i) {
-        struct sc_frame_sink *sink = source->sinks[i];
-        if (sink->ops->push_session &&
-                !sink->ops->push_session(sink, session)) {
-            return false;
-        }
-    }
-
-    return true;
-}
--- a/app/src/trait/frame_source.h
+++ b/app/src/trait/frame_source.h
@@ -28,8 +28,7 @@ sc_frame_source_add_sink(struct sc_frame_source *source,

 bool
 sc_frame_source_sinks_open(struct sc_frame_source *source,
-                           const AVCodecContext *ctx,
-                           const struct sc_stream_session *session);
+                           const AVCodecContext *ctx);

 void
 sc_frame_source_sinks_close(struct sc_frame_source *source);
@@ -38,8 +37,4 @@ bool
 sc_frame_source_sinks_push(struct sc_frame_source *source,
                           const AVFrame *frame);

-bool
-sc_frame_source_sinks_push_session(struct sc_frame_source *source,
-                                   const struct sc_stream_session *session);
-
 #endif
--- a/app/src/trait/packet_sink.h
+++ b/app/src/trait/packet_sink.h
@@ -15,28 +15,12 @@ struct sc_packet_sink {
    const struct sc_packet_sink_ops *ops;
 };

-struct sc_stream_session_video {
-    uint32_t width;
-    uint32_t height;
-};
-
-struct sc_stream_session {
-    struct sc_stream_session_video video;
-};
-
 struct sc_packet_sink_ops {
    /* The codec context is valid until the sink is closed */
-    bool (*open)(struct sc_packet_sink *sink, AVCodecContext *ctx,
-                 const struct sc_stream_session *session);
+    bool (*open)(struct sc_packet_sink *sink, AVCodecContext *ctx);
    void (*close)(struct sc_packet_sink *sink);
    bool (*push)(struct sc_packet_sink *sink, const AVPacket *packet);

-    /**
-     * Optional callback to be notified of a new stream session.
-     */
-    bool (*push_session)(struct sc_packet_sink *sink,
-                         const struct sc_stream_session *session);
-
    /*/
     * Called when the input stream has been disabled at runtime.
     *
--- a/app/src/trait/packet_source.c
+++ b/app/src/trait/packet_source.c
@@ -27,12 +27,11 @@ sc_packet_source_sinks_close_firsts(struct sc_packet_source *source,

 bool
 sc_packet_source_sinks_open(struct sc_packet_source *source,
-                            AVCodecContext *ctx,
-                            const struct sc_stream_session *session) {
+                            AVCodecContext *ctx) {
    assert(source->sink_count);
    for (unsigned i = 0; i < source->sink_count; ++i) {
        struct sc_packet_sink *sink = source->sinks[i];
-        if (!sink->ops->open(sink, ctx, session)) {
+        if (!sink->ops->open(sink, ctx)) {
            sc_packet_source_sinks_close_firsts(source, i);
            return false;
        }
@@ -61,20 +60,6 @@ sc_packet_source_sinks_push(struct sc_packet_source *source,
    return true;
 }

-bool
-sc_packet_source_sinks_push_session(struct sc_packet_source *source,
-                                    const struct sc_stream_session *session) {
-    assert(source->sink_count);
-    for (unsigned i = 0; i < source->sink_count; ++i) {
-        struct sc_packet_sink *sink = source->sinks[i];
-        if (!sink->ops->push_session(sink, session)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
 void
 sc_packet_source_sinks_disable(struct sc_packet_source *source) {
    assert(source->sink_count);
--- a/app/src/trait/packet_source.h
+++ b/app/src/trait/packet_source.h
@@ -28,8 +28,7 @@ sc_packet_source_add_sink(struct sc_packet_source *source,

 bool
 sc_packet_source_sinks_open(struct sc_packet_source *source,
-                            AVCodecContext *ctx,
-                            const struct sc_stream_session *session);
+                            AVCodecContext *ctx);

 void
 sc_packet_source_sinks_close(struct sc_packet_source *source);
@@ -38,10 +37,6 @@ bool
 sc_packet_source_sinks_push(struct sc_packet_source *source,
                            const AVPacket *packet);

-bool
-sc_packet_source_sinks_push_session(struct sc_packet_source *source,
-                                    const struct sc_stream_session *session);
-
 void
 sc_packet_source_sinks_disable(struct sc_packet_source *source);

--- a/app/src/uhid/gamepad_uhid.c
+++ b/app/src/uhid/gamepad_uhid.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <inttypes.h>
 #include <string.h>
-#include <SDL3/SDL_gamepad.h>
+#include <SDL2/SDL_gamecontroller.h>

 #include "hid/hid_gamepad.h"
 #include "input_events.h"
@@ -74,10 +74,10 @@ sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
        return;
    }

-    SDL_Gamepad * game_controller =
-        SDL_GetGamepadFromID(event->gamepad_id);
+    SDL_GameController* game_controller =
+        SDL_GameControllerFromInstanceID(event->gamepad_id);
    assert(game_controller);
-    const char *name = SDL_GetGamepadName(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);
--- a/app/src/uhid/keyboard_uhid.c
+++ b/app/src/uhid/keyboard_uhid.c
@@ -2,8 +2,8 @@

 #include <assert.h>
 #include <string.h>
-#include <SDL3/SDL_keyboard.h>
-#include <SDL3/SDL_keycode.h>
+#include <SDL2/SDL_keyboard.h>
+#include <SDL2/SDL_keycode.h>

 #include "util/log.h"
 #include "util/thread.h"
--- a/app/src/uhid/mouse_uhid.c
+++ b/app/src/uhid/mouse_uhid.c
@@ -55,10 +55,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
    struct sc_mouse_uhid *mouse = DOWNCAST(mp);

    struct sc_hid_input hid_input;
-    if (!sc_hid_mouse_generate_input_from_scroll(&mouse->hid, &hid_input,
-                                                 event)) {
-        return;
-    }
+    sc_hid_mouse_generate_input_from_scroll(&hid_input, event);

    sc_mouse_uhid_send_input(mouse, &hid_input, "mouse scroll");
 }
@@ -66,8 +63,6 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
 bool
 sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,
                   struct sc_controller *controller) {
-    sc_hid_mouse_init(&mouse->hid);
-
    mouse->controller = controller;

    static const struct sc_mouse_processor_ops ops = {
--- a/app/src/uhid/mouse_uhid.h
+++ b/app/src/uhid/mouse_uhid.h
@@ -4,13 +4,11 @@
 #include <stdbool.h>

 #include "controller.h"
-#include "hid/hid_mouse.h"
 #include "trait/mouse_processor.h"

 struct sc_mouse_uhid {
    struct sc_mouse_processor mouse_processor; // mouse processor trait

-    struct sc_hid_mouse hid;
    struct sc_controller *controller;
 };

--- a/app/src/usb/mouse_aoa.c
+++ b/app/src/usb/mouse_aoa.c
@@ -42,10 +42,7 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
    struct sc_mouse_aoa *mouse = DOWNCAST(mp);

    struct sc_hid_input hid_input;
-    if (!sc_hid_mouse_generate_input_from_scroll(&mouse->hid, &hid_input,
-                                                 event)) {
-        return;
-    }
+    sc_hid_mouse_generate_input_from_scroll(&hid_input, event);

    if (!sc_aoa_push_input(mouse->aoa, &hid_input)) {
        LOGW("Could not push AOA HID input (mouse scroll)");
@@ -65,8 +62,6 @@ sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa) {
        return false;
    }

-    sc_hid_mouse_init(&mouse->hid);
-
    static const struct sc_mouse_processor_ops ops = {
        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
        .process_mouse_click = sc_mouse_processor_process_mouse_click,
--- a/app/src/usb/mouse_aoa.h
+++ b/app/src/usb/mouse_aoa.h
@@ -6,13 +6,11 @@
 #include <stdbool.h>

 #include "usb/aoa_hid.h"
-#include "hid/hid_mouse.h"
 #include "trait/mouse_processor.h"

 struct sc_mouse_aoa {
    struct sc_mouse_processor mouse_processor; // mouse processor trait

-    struct sc_hid_mouse hid;
    struct sc_aoa *aoa;
 };

--- a/app/src/usb/scrcpy_otg.c
+++ b/app/src/usb/scrcpy_otg.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <SDL3/SDL.h>
+#include <SDL2/SDL.h>

 #ifdef _WIN32
 # include "adb/adb.h"
@@ -45,7 +45,7 @@ event_loop(struct scrcpy_otg *s) {
            case SC_EVENT_AOA_OPEN_ERROR:
                LOGE("AOA open error");
                return SCRCPY_EXIT_FAILURE;
-            case SDL_EVENT_QUIT:
+            case SDL_QUIT:
                LOGD("User requested to quit");
                return SCRCPY_EXIT_SUCCESS;
            default:
@@ -63,18 +63,22 @@ scrcpy_otg(struct scrcpy_options *options) {

    const char *serial = options->serial;

+    if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1")) {
+        LOGW("Could not enable linear filtering");
+    }
+
    if (!SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1")) {
        LOGW("Could not allow joystick background events");
    }

    // Minimal SDL initialization
-    if (!SDL_Init(SDL_INIT_EVENTS)) {
+    if (SDL_Init(SDL_INIT_EVENTS)) {
        LOGE("Could not initialize SDL: %s", SDL_GetError());
        return SCRCPY_EXIT_FAILURE;
    }

    if (options->gamepad_input_mode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
-        if (!SDL_Init(SDL_INIT_GAMEPAD)) {
+        if (SDL_Init(SDL_INIT_GAMECONTROLLER)) {
            LOGE("Could not initialize SDL controller: %s", SDL_GetError());
            // Not fatal, keyboard/mouse should still work
        }
--- a/app/src/usb/screen_otg.c
+++ b/app/src/usb/screen_otg.c
@@ -7,24 +7,14 @@
 #include "options.h"
 #include "util/acksync.h"
 #include "util/log.h"
-#include "util/window.h"

 static void
 sc_screen_otg_render(struct sc_screen_otg *screen) {
-    bool always_ok = SDL_RenderClear(screen->renderer);
-    (void) always_ok;
-    assert(always_ok);
-
+    SDL_RenderClear(screen->renderer);
    if (screen->texture) {
-        bool ok =
-            SDL_RenderTexture(screen->renderer, screen->texture, NULL, NULL);
-        if (!ok) {
-            LOGW("Could not render texture: %s", SDL_GetError());
-        }
+        SDL_RenderCopy(screen->renderer, screen->texture, NULL, NULL);
    }
-
-    always_ok = SDL_RenderPresent(screen->renderer);
-    assert(always_ok);
+    SDL_RenderPresent(screen->renderer);
 }

 bool
@@ -44,7 +34,7 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
    int width = params->window_width ? params->window_width : 256;
    int height = params->window_height ? params->window_height : 256;

-    uint32_t window_flags = SDL_WINDOW_HIGH_PIXEL_DENSITY;
+    uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
    if (params->always_on_top) {
        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
    }
@@ -52,14 +42,13 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
        window_flags |= SDL_WINDOW_BORDERLESS;
    }

-    screen->window =
-        sc_create_sdl_window(title, x, y, width, height, window_flags);
+    screen->window = SDL_CreateWindow(title, x, y, width, height, window_flags);
    if (!screen->window) {
        LOGE("Could not create window: %s", SDL_GetError());
        return false;
    }

-    screen->renderer = SDL_CreateRenderer(screen->window, NULL);
+    screen->renderer = SDL_CreateRenderer(screen->window, -1, 0);
    if (!screen->renderer) {
        LOGE("Could not create renderer: %s", SDL_GetError());
        goto error_destroy_window;
@@ -68,15 +57,9 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
    SDL_Surface *icon = scrcpy_icon_load();

    if (icon) {
-        bool ok = SDL_SetWindowIcon(screen->window, icon);
-        if (!ok) {
-            LOGW("Could not set window icon: %s", SDL_GetError());
-        }
+        SDL_SetWindowIcon(screen->window, icon);

-        ok = SDL_SetRenderLogicalPresentation(screen->renderer, icon->w,
-                                              icon->h,
-                                         SDL_LOGICAL_PRESENTATION_LETTERBOX);
-        if (!ok) {
+        if (SDL_RenderSetLogicalSize(screen->renderer, icon->w, icon->h)) {
            LOGW("Could not set renderer logical size: %s", SDL_GetError());
            // don't fail
        }
@@ -125,10 +108,10 @@ sc_screen_otg_process_key(struct sc_screen_otg *screen,

    struct sc_key_event evt = {
        .action = sc_action_from_sdl_keyboard_type(event->type),
-        .keycode = sc_keycode_from_sdl(event->key),
-        .scancode = sc_scancode_from_sdl(event->scancode),
+        .keycode = sc_keycode_from_sdl(event->keysym.sym),
+        .scancode = sc_scancode_from_sdl(event->keysym.scancode),
        .repeat = event->repeat,
-        .mods_state = sc_mods_state_from_sdl(event->mod),
+        .mods_state = sc_mods_state_from_sdl(event->keysym.mod),
    };

    assert(kp->ops->process_key);
@@ -192,34 +175,34 @@ sc_screen_otg_process_mouse_wheel(struct sc_screen_otg *screen,

 static void
 sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
-                                     const SDL_GamepadDeviceEvent *event) {
+                                     const SDL_ControllerDeviceEvent *event) {
    assert(screen->gamepad);
    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;

-    if (event->type == SDL_EVENT_GAMEPAD_ADDED) {
-        SDL_Gamepad *gc = SDL_OpenGamepad(event->which);
+    if (event->type == SDL_CONTROLLERDEVICEADDED) {
+        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
        if (!gc) {
            LOGW("Could not open game controller");
            return;
        }

-        SDL_Joystick *joystick = SDL_GetGamepadJoystick(gc);
+        SDL_Joystick *joystick = SDL_GameControllerGetJoystick(gc);
        if (!joystick) {
            LOGW("Could not get controller joystick");
-            SDL_CloseGamepad(gc);
+            SDL_GameControllerClose(gc);
            return;
        }

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

-        SDL_Gamepad *gc = SDL_GetGamepadFromID(id);
+        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
        if (gc) {
-            SDL_CloseGamepad(gc);
+            SDL_GameControllerClose(gc);
        } else {
            LOGW("Unknown gamepad device removed");
        }
@@ -233,7 +216,7 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,

 static void
 sc_screen_otg_process_gamepad_axis(struct sc_screen_otg *screen,
-                                   const SDL_GamepadAxisEvent *event) {
+                                   const SDL_ControllerAxisEvent *event) {
    assert(screen->gamepad);
    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;

@@ -252,7 +235,7 @@ sc_screen_otg_process_gamepad_axis(struct sc_screen_otg *screen,

 static void
 sc_screen_otg_process_gamepad_button(struct sc_screen_otg *screen,
-                                     const SDL_GamepadButtonEvent *event) {
+                                     const SDL_ControllerButtonEvent *event) {
    assert(screen->gamepad);
    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;

@@ -277,55 +260,59 @@ sc_screen_otg_handle_event(struct sc_screen_otg *screen, SDL_Event *event) {
    }

    switch (event->type) {
-        case SDL_EVENT_WINDOW_EXPOSED:
-            sc_screen_otg_render(screen);
-            break;
-        case SDL_EVENT_KEY_DOWN:
+        case SDL_WINDOWEVENT:
+            switch (event->window.event) {
+                case SDL_WINDOWEVENT_EXPOSED:
+                    sc_screen_otg_render(screen);
+                    break;
+            }
+            return;
+        case SDL_KEYDOWN:
            if (screen->keyboard) {
                sc_screen_otg_process_key(screen, &event->key);
            }
            break;
-        case SDL_EVENT_KEY_UP:
+        case SDL_KEYUP:
            if (screen->keyboard) {
                sc_screen_otg_process_key(screen, &event->key);
            }
            break;
-        case SDL_EVENT_MOUSE_MOTION:
+        case SDL_MOUSEMOTION:
            if (screen->mouse) {
                sc_screen_otg_process_mouse_motion(screen, &event->motion);
            }
            break;
-        case SDL_EVENT_MOUSE_BUTTON_DOWN:
+        case SDL_MOUSEBUTTONDOWN:
            if (screen->mouse) {
                sc_screen_otg_process_mouse_button(screen, &event->button);
            }
            break;
-        case SDL_EVENT_MOUSE_BUTTON_UP:
+        case SDL_MOUSEBUTTONUP:
            if (screen->mouse) {
                sc_screen_otg_process_mouse_button(screen, &event->button);
            }
            break;
-        case SDL_EVENT_MOUSE_WHEEL:
+        case SDL_MOUSEWHEEL:
            if (screen->mouse) {
                sc_screen_otg_process_mouse_wheel(screen, &event->wheel);
            }
            break;
-        case SDL_EVENT_GAMEPAD_ADDED:
-        case SDL_EVENT_GAMEPAD_REMOVED:
+        case SDL_CONTROLLERDEVICEADDED:
+        case SDL_CONTROLLERDEVICEREMOVED:
            // Handle device added or removed even if paused
            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_device(screen, &event->gdevice);
+                sc_screen_otg_process_gamepad_device(screen, &event->cdevice);
            }
            break;
-        case SDL_EVENT_GAMEPAD_AXIS_MOTION:
+        case SDL_CONTROLLERAXISMOTION:
            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_axis(screen, &event->gaxis);
+                sc_screen_otg_process_gamepad_axis(screen, &event->caxis);
            }
            break;
-        case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
-        case SDL_EVENT_GAMEPAD_BUTTON_UP:
+        case SDL_CONTROLLERBUTTONDOWN:
+        case SDL_CONTROLLERBUTTONUP:
            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_button(screen, &event->gbutton);
+                sc_screen_otg_process_gamepad_button(screen, &event->cbutton);
            }
            break;
    }
--- a/app/src/usb/screen_otg.h
+++ b/app/src/usb/screen_otg.h
@@ -5,7 +5,7 @@

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

 #include "mouse_capture.h"
 #include "usb/gamepad_aoa.h"
--- a/app/src/util/log.c
+++ b/app/src/util/log.c
@@ -50,13 +50,13 @@ log_level_sdl_to_sc(SDL_LogPriority priority) {
 void
 sc_set_log_level(enum sc_log_level level) {
    SDL_LogPriority sdl_log = log_level_sc_to_sdl(level);
-    SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, sdl_log);
-    SDL_SetLogPriority(SDL_LOG_CATEGORY_CUSTOM, sdl_log);
+    SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, sdl_log);
+    SDL_LogSetPriority(SDL_LOG_CATEGORY_CUSTOM, sdl_log);
 }

 enum sc_log_level
 sc_get_log_level(void) {
-    SDL_LogPriority sdl_log = SDL_GetLogPriority(SDL_LOG_CATEGORY_APPLICATION);
+    SDL_LogPriority sdl_log = SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION);
    return log_level_sdl_to_sc(sdl_log);
 }

@@ -128,7 +128,7 @@ sc_av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
    free(local_fmt);
 }

-static const char *const sc_sdl_log_priority_names[SDL_LOG_PRIORITY_COUNT] = {
+static const char *const sc_sdl_log_priority_names[SDL_NUM_LOG_PRIORITIES] = {
    [SDL_LOG_PRIORITY_VERBOSE] = "VERBOSE",
    [SDL_LOG_PRIORITY_DEBUG] = "DEBUG",
    [SDL_LOG_PRIORITY_INFO] = "INFO",
@@ -144,14 +144,14 @@ sc_sdl_log_print(void *userdata, int category, SDL_LogPriority priority,
    (void) category;

    FILE *out = priority < SDL_LOG_PRIORITY_WARN ? stdout : stderr;
-    assert(priority < SDL_LOG_PRIORITY_COUNT);
+    assert(priority < SDL_NUM_LOG_PRIORITIES);
    const char *prio_name = sc_sdl_log_priority_names[priority];
    fprintf(out, "%s: %s\n", prio_name, message);
 }

 void
 sc_log_configure(void) {
-    SDL_SetLogOutputFunction(sc_sdl_log_print, NULL);
+    SDL_LogSetOutputFunction(sc_sdl_log_print, NULL);
    // Redirect FFmpeg logs to SDL logs
    av_log_set_callback(sc_av_log_callback);
 }
--- a/app/src/util/log.h
+++ b/app/src/util/log.h
@@ -3,7 +3,7 @@

 #include "common.h"

-#include <SDL3/SDL_log.h>
+#include <SDL2/SDL_log.h>

 #include "options.h"

--- a/app/src/util/net.c
+++ b/app/src/util/net.c
@@ -2,7 +2,6 @@

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

 #ifdef _WIN32
 # include <ws2tcpip.h>
--- a/app/src/util/thread.c
+++ b/app/src/util/thread.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL3/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

 #include "util/log.h"

@@ -31,7 +31,11 @@ static SDL_ThreadPriority
 to_sdl_thread_priority(enum sc_thread_priority priority) {
    switch (priority) {
        case SC_THREAD_PRIORITY_TIME_CRITICAL:
+#ifdef SCRCPY_SDL_HAS_THREAD_PRIORITY_TIME_CRITICAL
            return SDL_THREAD_PRIORITY_TIME_CRITICAL;
+#else
+            // fall through
+#endif
        case SC_THREAD_PRIORITY_HIGH:
            return SDL_THREAD_PRIORITY_HIGH;
        case SC_THREAD_PRIORITY_NORMAL:
@@ -47,8 +51,8 @@ to_sdl_thread_priority(enum sc_thread_priority priority) {
 bool
 sc_thread_set_priority(enum sc_thread_priority priority) {
    SDL_ThreadPriority sdl_priority = to_sdl_thread_priority(priority);
-    bool ok = SDL_SetCurrentThreadPriority(sdl_priority);
-    if (!ok) {
+    int r = SDL_SetThreadPriority(sdl_priority);
+    if (r) {
        LOGD("Could not set thread priority: %s", SDL_GetError());
        return false;
    }
@@ -63,7 +67,7 @@ sc_thread_join(sc_thread *thread, int *status) {

 bool
 sc_mutex_init(sc_mutex *mutex) {
-    SDL_Mutex *sdl_mutex = SDL_CreateMutex();
+    SDL_mutex *sdl_mutex = SDL_CreateMutex();
    if (!sdl_mutex) {
        LOG_OOM();
        return false;
@@ -85,25 +89,40 @@ void
 sc_mutex_lock(sc_mutex *mutex) {
    // SDL mutexes are recursive, but we don't want to use recursive mutexes
    assert(!sc_mutex_held(mutex));
-    SDL_LockMutex(mutex->mutex);
+    int r = SDL_LockMutex(mutex->mutex);
 #ifndef NDEBUG
+    if (r) {
+        LOGE("Could not lock mutex: %s", SDL_GetError());
+        abort();
+    }
+
    atomic_store_explicit(&mutex->locker, sc_thread_get_id(),
                          memory_order_relaxed);
+#else
+    (void) r;
 #endif
 }

 void
 sc_mutex_unlock(sc_mutex *mutex) {
-    assert(sc_mutex_held(mutex));
 #ifndef NDEBUG
+    assert(sc_mutex_held(mutex));
    atomic_store_explicit(&mutex->locker, 0, memory_order_relaxed);
 #endif
-    SDL_UnlockMutex(mutex->mutex);
+    int r = SDL_UnlockMutex(mutex->mutex);
+#ifndef NDEBUG
+    if (r) {
+        LOGE("Could not lock mutex: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
 }

 sc_thread_id
 sc_thread_get_id(void) {
-    return SDL_GetCurrentThreadID();
+    return SDL_ThreadID();
 }

 #ifndef NDEBUG
@@ -117,7 +136,7 @@ sc_mutex_held(struct sc_mutex *mutex) {

 bool
 sc_cond_init(sc_cond *cond) {
-    SDL_Condition *sdl_cond = SDL_CreateCondition();
+    SDL_cond *sdl_cond = SDL_CreateCond();
    if (!sdl_cond) {
        LOG_OOM();
        return false;
@@ -129,15 +148,22 @@ sc_cond_init(sc_cond *cond) {

 void
 sc_cond_destroy(sc_cond *cond) {
-    SDL_DestroyCondition(cond->cond);
+    SDL_DestroyCond(cond->cond);
 }

 void
 sc_cond_wait(sc_cond *cond, sc_mutex *mutex) {
-    SDL_WaitCondition(cond->cond, mutex->mutex);
+    int r = SDL_CondWait(cond->cond, mutex->mutex);
 #ifndef NDEBUG
+    if (r) {
+        LOGE("Could not wait on condition: %s", SDL_GetError());
+        abort();
+    }
+
    atomic_store_explicit(&mutex->locker, sc_thread_get_id(),
                          memory_order_relaxed);
+#else
+    (void) r;
 #endif
 }

@@ -151,22 +177,44 @@ sc_cond_timedwait(sc_cond *cond, sc_mutex *mutex, sc_tick deadline) {
    // Round up to the next millisecond to guarantee that the deadline is
    // reached when returning due to timeout
    uint32_t ms = SC_TICK_TO_MS(deadline - now + SC_TICK_FROM_MS(1) - 1);
-    bool signaled = SDL_WaitConditionTimeout(cond->cond, mutex->mutex, ms);
+    int r = SDL_CondWaitTimeout(cond->cond, mutex->mutex, ms);
 #ifndef NDEBUG
+    if (r < 0) {
+        LOGE("Could not wait on condition with timeout: %s", SDL_GetError());
+        abort();
+    }
+
    atomic_store_explicit(&mutex->locker, sc_thread_get_id(),
                          memory_order_relaxed);
 #endif
+    assert(r == 0 || r == SDL_MUTEX_TIMEDOUT);
    // The deadline is reached on timeout
-    assert(signaled || sc_tick_now() >= deadline);
-    return signaled;
+    assert(r != SDL_MUTEX_TIMEDOUT || sc_tick_now() >= deadline);
+    return r == 0;
 }

 void
 sc_cond_signal(sc_cond *cond) {
-    SDL_SignalCondition(cond->cond);
+    int r = SDL_CondSignal(cond->cond);
+#ifndef NDEBUG
+    if (r) {
+        LOGE("Could not signal a condition: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
 }

 void
 sc_cond_broadcast(sc_cond *cond) {
-    SDL_BroadcastCondition(cond->cond);
+    int r = SDL_CondBroadcast(cond->cond);
+#ifndef NDEBUG
+    if (r) {
+        LOGE("Could not broadcast a condition: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
 }
--- a/app/src/util/thread.h
+++ b/app/src/util/thread.h
@@ -10,8 +10,8 @@

 /* Forward declarations */
 typedef struct SDL_Thread SDL_Thread;
-typedef struct SDL_Mutex SDL_Mutex;
-typedef struct SDL_Condition SDL_Condition;
+typedef struct SDL_mutex SDL_mutex;
+typedef struct SDL_cond SDL_cond;

 typedef int sc_thread_fn(void *);
 typedef unsigned sc_thread_id;
@@ -29,14 +29,14 @@ enum sc_thread_priority {
 };

 typedef struct sc_mutex {
-    SDL_Mutex *mutex;
+    SDL_mutex *mutex;
 #ifndef NDEBUG
    sc_atomic_thread_id locker;
 #endif
 } sc_mutex;

 typedef struct sc_cond {
-    SDL_Condition *cond;
+    SDL_cond *cond;
 } sc_cond;

 extern sc_thread_id SC_MAIN_THREAD_ID;
--- a/app/src/util/vecdeque.h
+++ b/app/src/util/vecdeque.h
@@ -191,8 +191,7 @@ sc_vecdeque_reallocdata_(void *ptr, size_t newcap, size_t item_size,

    size_t right_len = MIN(size, oldcap - oldorigin);
    assert(right_len);
-    memcpy(newptr, (char *) ptr + (oldorigin * item_size),
-           right_len * item_size);
+    memcpy(newptr, (char *) ptr + (oldorigin * item_size), right_len * item_size);

    if (size > right_len) {
        memcpy((char *) newptr + (right_len * item_size), ptr,
--- a/app/src/util/window.c
+++ b/app/src/util/window.c
@@ -1,33 +0,0 @@
-#include "window.h"
-
-SDL_Window *
-sc_create_sdl_window(const char *title, int64_t x, int64_t y, int64_t width,
-                     int64_t height, int64_t flags) {
-    SDL_Window *window = NULL;
-
-    SDL_PropertiesID props = SDL_CreateProperties();
-    if (!props) {
-        return NULL;
-    }
-
-    bool ok =
-        SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING,
-                              title);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_X_NUMBER, x);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_Y_NUMBER, y);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER,
-                                width);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER,
-                                height);
-    ok &= SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER,
-                                flags);
-
-    if (!ok) {
-        SDL_DestroyProperties(props);
-        return NULL;
-    }
-
-    window = SDL_CreateWindowWithProperties(props);
-    SDL_DestroyProperties(props);
-    return window;
-}
--- a/app/src/util/window.h
+++ b/app/src/util/window.h
@@ -1,13 +0,0 @@
-#ifndef SC_WINDOW_H
-#define SC_WINDOW_H
-
-#include "common.h"
-
-#include <stdint.h>
-#include <SDL3/SDL_video.h>
-
-SDL_Window *
-sc_create_sdl_window(const char *title, int64_t x, int64_t y, int64_t width,
-                     int64_t height, int64_t flags);
-
-#endif
--- a/app/src/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@@ -146,11 +146,9 @@ run_v4l2_sink(void *data) {
 }

 static bool
-sc_v4l2_sink_open(struct sc_v4l2_sink *vs, const AVCodecContext *ctx,
-                  const struct sc_stream_session *session) {
+sc_v4l2_sink_open(struct sc_v4l2_sink *vs, const AVCodecContext *ctx) {
    assert(ctx->pix_fmt == AV_PIX_FMT_YUV420P);
    (void) ctx;
-    (void) session;

    bool ok = sc_frame_buffer_init(&vs->fb);
    if (!ok) {
@@ -328,10 +326,9 @@ sc_v4l2_sink_push(struct sc_v4l2_sink *vs, const AVFrame *frame) {
 }

 static bool
-sc_v4l2_frame_sink_open(struct sc_frame_sink *sink, const AVCodecContext *ctx,
-                        const struct sc_stream_session *session) {
+sc_v4l2_frame_sink_open(struct sc_frame_sink *sink, const AVCodecContext *ctx) {
    struct sc_v4l2_sink *vs = DOWNCAST(sink);
-    return sc_v4l2_sink_open(vs, ctx, session);
+    return sc_v4l2_sink_open(vs, ctx);
 }

 static void
--- a/app/src/version.c
+++ b/app/src/version.c
@@ -10,20 +10,17 @@
 #ifdef HAVE_USB
 # include <libusb-1.0/libusb.h>
 #endif
-#include <SDL3/SDL_version.h>
+#include <SDL2/SDL_version.h>

 void
 scrcpy_print_version(void) {
    printf("\nDependencies (compiled / linked):\n");

-    int sdl = SDL_GetVersion();
+    SDL_version sdl;
+    SDL_GetVersion(&sdl);
    printf(" - SDL: %u.%u.%u / %u.%u.%u\n",
-           SDL_MAJOR_VERSION,
-           SDL_MINOR_VERSION,
-           SDL_MICRO_VERSION,
-           SDL_VERSIONNUM_MAJOR(sdl),
-           SDL_VERSIONNUM_MINOR(sdl),
-           SDL_VERSIONNUM_MICRO(sdl));
+           SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL,
+           (unsigned) sdl.major, (unsigned) sdl.minor, (unsigned) sdl.patch);

    unsigned avcodec = avcodec_version();
    printf(" - libavcodec: %u.%u.%u / %u.%u.%u\n",
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -127,8 +127,8 @@ static void test_serialize_inject_scroll_event(void) {
                    .height = 1920,
                },
            },
-            .hscroll = 16,
-            .vscroll = -16,
+            .hscroll = 1,
+            .vscroll = -1,
            .buttons = 1,
        },
    };
@@ -141,8 +141,8 @@ static void test_serialize_inject_scroll_event(void) {
        SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
        0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
        0x04, 0x38, 0x07, 0x80, // 1080 1920
-        0x7F, 0xFF, // 16 (float encoded as i16 in the range [-16, 16])
-        0x80, 0x00, // -16 (float encoded as i16 in the range [-16, 16])
+        0x7F, 0xFF, // 1 (float encoded as i16)
+        0x80, 0x00, // -1 (float encoded as i16)
        0x00, 0x00, 0x00, 0x01, // 1
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
--- a/doc/build.md
+++ b/doc/build.md
@@ -233,10 +233,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v3.3.3`][direct-scrcpy-server]  
-   <sub>SHA-256: `7e70323ba7f259649dd4acce97ac4fefbae8102b2c6d91e2e7be613fd5354be0`</sub>
+ - [`scrcpy-server-v3.1`][direct-scrcpy-server]  
+   <sub>SHA-256: `958f0944a62f23b1f33a16e9eb14844c1a04b882ca175a738c16d23cb22b86c0`</sub>

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-server-v3.3.3
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-server-v3.1

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/doc/connection.md
+++ b/doc/connection.md
@@ -113,17 +113,16 @@ with the device IP address you found)_.
 7. Run `scrcpy` as usual.
 8. Run `adb disconnect` once you're done.

-Since Android 11, a [wireless debugging option][adb-wireless] allows you to
-bypass having to physically connect your device to your computer.
+Since Android 11, a [wireless debugging option][adb-wireless] allows to bypass
+having to physically connect your device directly to your computer.

 [adb-wireless]: https://developer.android.com/studio/command-line/adb#wireless-android11-command-line


 ## Autostart

-A small tool (by the scrcpy author) allows you to run arbitrary commands
-whenever a new Android device is connected: [AutoAdb]. It can be used to start
-scrcpy:
+A small tool (by the scrcpy author) allows to run arbitrary commands whenever a
+new Android device is connected: [AutoAdb]. It can be used to start scrcpy:

 ```bash
 autoadb scrcpy -s '{}'
--- a/doc/develop.md
+++ b/doc/develop.md
@@ -409,11 +409,12 @@ with any client which uses the same protocol.

 For simplicity, some [server-specific options] have been added to produce raw
 streams easily:
- - `send_device_meta=false`: disable device metadata (in practice, the device
+ - `send_device_meta=false`: disable the device metata (in practice, the device
   name) sent on the _first_ socket
 - `send_frame_meta=false`: disable the 12-byte header for each packet
 - `send_dummy_byte`: disable the dummy byte sent on forward connections
- - `send_stream_meta`: disable codec and video size metadata
+ - `send_codec_meta`: disable the codec information (and initial device size for
+   video)
 - `raw_stream`: disable all the above

 [server-specific options]: https://github.com/Genymobile/scrcpy/blob/a3cdf1a6b86ea22786e1f7d09b9c202feabc6949/server/src/main/java/com/genymobile/scrcpy/Options.java#L309-L329
--- a/doc/device.md
+++ b/doc/device.md
@@ -34,31 +34,6 @@ adb shell settings put global stay_on_while_plugged_in 0
 ```


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

 It is possible to turn the device screen off while mirroring on start with a
@@ -96,6 +71,31 @@ adb shell cmd display power-on 0
 ```


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

 For presentations, it may be useful to show physical touches (on the physical
--- a/doc/linux.md
+++ b/doc/linux.md
@@ -6,11 +6,11 @@

 Download a static build of the [latest release]:

- - [`scrcpy-linux-x86_64-v3.3.3.tar.gz`][direct-linux-x86_64] (x86_64)  
-   <sub>SHA-256: `9b30e813e8191329ba8025dc80cb0f198fb0a318960a3b5c15395cf675c9c638`</sub>
+ - [`scrcpy-linux-x86_64-v3.1.tar.gz`][direct-linux-x86_64] (x86_64)  
+   <sub>SHA-256: `37dba54092ed9ec6b2f8f95432f61b8ea124aec9f1e9f2b3d22d4b10bb04c59a`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-linux-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-linux-x86_64-v3.3.3.tar.gz
+[direct-linux-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-linux-x86_64-v3.1.tar.gz

 and extract it.

@@ -27,7 +27,7 @@ Scrcpy is packaged in several distributions and package managers:
 - Arch Linux: `pacman -S scrcpy`
 - Fedora: `dnf copr enable zeno/scrcpy && dnf install scrcpy`
 - Gentoo: `emerge scrcpy`
- - Snap: ~~`snap install scrcpy`~~ _(obsolete version)_
+ - Snap: `snap install scrcpy`
 - … (see [repology](https://repology.org/project/scrcpy/versions))


--- a/doc/macos.md
+++ b/doc/macos.md
@@ -6,15 +6,15 @@

 Download a static build of the [latest release]:

- - [`scrcpy-macos-aarch64-v3.3.3.tar.gz`][direct-macos-aarch64] (aarch64)  
-   <sub>SHA-256: `b93299468f19ae89ac70f7c1453914c41f1f2bcd31f6ab530038da885c19581f`</sub>
+ - [`scrcpy-macos-aarch64-v3.1.tar.gz`][direct-macos-aarch64] (aarch64)  
+   <sub>SHA-256: `478618d940421e5f57942f5479d493ecbb38210682937a200f712aee5f235daf`</sub>

- - [`scrcpy-macos-x86_64-v3.3.3.tar.gz`][direct-macos-x86_64] (x86_64)  
-   <sub>SHA-256: `c767fc1d41e4ae26e40558656570962f474739924fd22ee023d8754889ee4366`</sub>
+ - [`scrcpy-macos-x86_64-v3.1.tar.gz`][direct-macos-x86_64] (x86_64)  
+   <sub>SHA-256: `acde98e29c273710ffa469371dbca4a728a44c41c380381f8a54e5b5301b9e87`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-macos-aarch64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-macos-aarch64-v3.3.3.tar.gz
-[direct-macos-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-macos-x86_64-v3.3.3.tar.gz
+[direct-macos-aarch64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-macos-aarch64-v3.1.tar.gz
+[direct-macos-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-macos-x86_64-v3.1.tar.gz

 and extract it.

--- a/doc/mouse.md
+++ b/doc/mouse.md
@@ -83,9 +83,9 @@ process like the _adb daemon_).
 ## Mouse bindings

 By default, with SDK mouse:
- - right-click triggers `BACK` (or `POWER` on)
- - middle-click triggers `HOME`
- - the 4th click triggers `APP_SWITCH`
+ - right-click triggers BACK (or POWER on)
+ - middle-click triggers HOME
+ - the 4th click triggers APP_SWITCH
 - the 5th click expands the notification panel

 The secondary clicks may be forwarded to the device instead by pressing the
@@ -121,9 +121,9 @@ Each character must be one of the following:

 - `+`: forward the click to the device
 - `-`: ignore the click
- - `b`: trigger shortcut `BACK` (or turn screen on if off)
- - `h`: trigger shortcut `HOME`
- - `s`: trigger shortcut `APP_SWITCH`
+ - `b`: trigger shortcut BACK (or turn screen on if off)
+ - `h`: trigger shortcut HOME
+ - `s`: trigger shortcut APP_SWITCH
 - `n`: trigger shortcut "expand notification panel"

 For example:
--- a/doc/virtual_display.md
+++ b/doc/virtual_display.md
@@ -11,8 +11,6 @@ scrcpy --new-display         # use the main display size and density
 scrcpy --new-display=/240    # use the main display size and 240 dpi
 ```

-The new virtual display is destroyed on exit.
-
 ## Start app

 On some devices, a launcher is available in the virtual display.
--- a/doc/windows.md
+++ b/doc/windows.md
@@ -6,26 +6,20 @@

 Download the [latest release]:

- - [`scrcpy-win64-v3.3.3.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `4b458d33d0436688c69875cd267cae6fa8be08aa3c17772edf3a940a3dc4b17e`</sub>
- - [`scrcpy-win32-v3.3.3.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `e3d43e21c0bd6e070381c390c1e4cccd48a1e71ae73a8c217e6e6b8506598c79`</sub>
+ - [`scrcpy-win64-v3.1.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `0c05ea395d95cfe36bee974eeb435a3db87ea5594ff738370d5dc3068a9538ca`</sub>
+ - [`scrcpy-win32-v3.1.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `2b4674ef76719680ac5a9b482d1943bdde3fa25821ad2e98f3c40c347d00d560`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-win64-v3.3.3.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-win32-v3.3.3.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-win64-v3.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-win32-v3.1.zip

 and extract it.


 ### From a package manager

-From [WinGet] (ADB and other dependencies will be installed alongside scrcpy):
-
-```bash
-winget install --exact Genymobile.scrcpy
-```
-
 From [Chocolatey]:

 ```bash
@@ -35,12 +29,12 @@ choco install adb    # if you don't have it yet

 From [Scoop]:

+
 ```bash
 scoop install scrcpy
 scoop install adb    # if you don't have it yet
 ```

-[WinGet]: https://github.com/microsoft/winget-cli
 [Chocolatey]: https://chocolatey.org/
 [Scoop]: https://scoop.sh

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

 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.3.3/scrcpy-server-v3.3.3
-PREBUILT_SERVER_SHA256=7e70323ba7f259649dd4acce97ac4fefbae8102b2c6d91e2e7be613fd5354be0
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-server-v3.1
+PREBUILT_SERVER_SHA256=958f0944a62f23b1f33a16e9eb14844c1a04b882ca175a738c16d23cb22b86c0

 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '3.3.3',
+        version: '3.1',
        meson_version: '>= 0.49',
        default_options: [
            'c_std=c11',
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -7,8 +7,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 35
-        versionCode 30303
-        versionName "3.3.3"
+        versionCode 30100
+        versionName "3.1"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -12,7 +12,7 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=3.3.3
+SCRCPY_VERSION_NAME=3.1

 PLATFORM=${ANDROID_PLATFORM:-35}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-35.0.0}
--- a/server/src/main/aidl/android/view/IDisplayWindowListener.aidl
+++ b/server/src/main/aidl/android/view/IDisplayWindowListener.aidl
@@ -48,4 +48,19 @@ oneway interface IDisplayWindowListener {
     * Called when a display is removed from the hierarchy.
     */
    void onDisplayRemoved(int displayId);
+
+    /**
+     * Called when fixed rotation is started on a display.
+     */
+    void onFixedRotationStarted(int displayId, int newRotation);
+
+    /**
+     * Called when the previous fixed rotation on a display is finished.
+     */
+    void onFixedRotationFinished(int displayId);
+
+    /**
+     * Called when the keep clear ares on a display have changed.
+     */
+    void onKeepClearAreasChanged(int displayId, in List<Rect> restricted, in List<Rect> unrestricted);
 }
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -7,7 +7,6 @@ import com.genymobile.scrcpy.util.SettingsException;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

 import android.os.BatteryManager;
-import android.os.Looper;
 import android.system.ErrnoException;
 import android.system.Os;

@@ -180,11 +179,6 @@ public final class CleanUp {
        }
    }

-    @SuppressWarnings("deprecation")
-    private static void prepareMainLooper() {
-        Looper.prepareMainLooper();
-    }
-
    public static void main(String... args) {
        try {
            // Start a new session to avoid being terminated along with the server process on some devices
@@ -194,10 +188,6 @@ public final class CleanUp {
        }
        unlinkSelf();

-        // Needed for workarounds
-        prepareMainLooper();
-        Workarounds.apply();
-
        int displayId = Integer.parseInt(args[0]);
        int restoreStayOn = Integer.parseInt(args[1]);
        boolean disableShowTouches = Boolean.parseBoolean(args[2]);
--- a/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
+++ b/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;

 import com.genymobile.scrcpy.wrappers.ServiceManager;

-import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.AttributionSource;
 import android.content.ContentResolver;
@@ -12,8 +11,6 @@ import android.content.IContentProvider;
 import android.os.Binder;
 import android.os.Process;

-import java.lang.reflect.Field;
-
 public final class FakeContext extends ContextWrapper {

    public static final String PACKAGE_NAME = "com.android.shell";
@@ -75,7 +72,7 @@ public final class FakeContext extends ContextWrapper {
    @Override
    public AttributionSource getAttributionSource() {
        AttributionSource.Builder builder = new AttributionSource.Builder(Process.SHELL_UID);
-        builder.setPackageName(PACKAGE_NAME);
+        builder.setPackageName("shell");
        return builder.build();
    }

@@ -90,36 +87,8 @@ public final class FakeContext extends ContextWrapper {
        return this;
    }

-    @Override
-    public Context createPackageContext(String packageName, int flags) {
-        return this;
-    }
-
    @Override
    public ContentResolver getContentResolver() {
        return contentResolver;
    }
-
-    @SuppressLint("SoonBlockedPrivateApi")
-    @Override
-    public Object getSystemService(String name) {
-        Object service = super.getSystemService(name);
-        if (service == null) {
-            return null;
-        }
-
-        // "semclipboard" is a Samsung-internal service
-        // See <https://github.com/Genymobile/scrcpy/issues/6224>
-        if (Context.CLIPBOARD_SERVICE.equals(name) || "semclipboard".equals(name)) {
-            try {
-                Field field = service.getClass().getDeclaredField("mContext");
-                field.setAccessible(true);
-                field.set(service, this);
-            } catch (ReflectiveOperationException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return service;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -78,7 +78,7 @@ public class Options {
    private boolean sendDeviceMeta = true; // send device name and size
    private boolean sendFrameMeta = true; // send PTS so that the client may record properly
    private boolean sendDummyByte = true; // write a byte on start to detect connection issues
-    private boolean sendStreamMeta = true; // write the stream metadata (codec and session)
+    private boolean sendCodecMeta = true; // write the codec metadata before the stream

    public Ln.Level getLogLevel() {
        return logLevel;
@@ -284,8 +284,8 @@ public class Options {
        return sendDummyByte;
    }

-    public boolean getSendStreamMeta() {
-        return sendStreamMeta;
+    public boolean getSendCodecMeta() {
+        return sendCodecMeta;
    }

    @SuppressWarnings("MethodLength")
@@ -500,8 +500,8 @@ public class Options {
                case "send_dummy_byte":
                    options.sendDummyByte = Boolean.parseBoolean(value);
                    break;
-                case "send_stream_meta":
-                    options.sendStreamMeta = Boolean.parseBoolean(value);
+                case "send_codec_meta":
+                    options.sendCodecMeta = Boolean.parseBoolean(value);
                    break;
                case "raw_stream":
                    boolean rawStream = Boolean.parseBoolean(value);
@@ -509,7 +509,7 @@ public class Options {
                        options.sendDeviceMeta = false;
                        options.sendFrameMeta = false;
                        options.sendDummyByte = false;
-                        options.sendStreamMeta = false;
+                        options.sendCodecMeta = false;
                    }
                    break;
                default:
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -24,13 +24,10 @@ import com.genymobile.scrcpy.video.SurfaceCapture;
 import com.genymobile.scrcpy.video.SurfaceEncoder;
 import com.genymobile.scrcpy.video.VideoSource;

-import android.annotation.SuppressLint;
 import android.os.Build;
-import android.os.Looper;

 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;

@@ -58,7 +55,17 @@ public final class Server {
                this.fatalError = true;
            }
            if (running == 0 || this.fatalError) {
-                Looper.getMainLooper().quitSafely();
+                notify();
+            }
+        }
+
+        synchronized void await() {
+            try {
+                while (running > 0 && !fatalError) {
+                    wait();
+                }
+            } catch (InterruptedException e) {
+                // ignore
            }
        }
    }
@@ -125,7 +132,7 @@ public final class Server {
                    audioCapture = new AudioPlaybackCapture(options.getAudioDup());
                }

-                Streamer audioStreamer = new Streamer(connection.getAudioFd(), audioCodec, options.getSendStreamMeta(), options.getSendFrameMeta());
+                Streamer audioStreamer = new Streamer(connection.getAudioFd(), audioCodec, options.getSendCodecMeta(), options.getSendFrameMeta());
                AsyncProcessor audioRecorder;
                if (audioCodec == AudioCodec.RAW) {
                    audioRecorder = new AudioRawRecorder(audioCapture, audioStreamer);
@@ -136,7 +143,7 @@ public final class Server {
            }

            if (video) {
-                Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendStreamMeta(),
+                Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
                        options.getSendFrameMeta());
                SurfaceCapture surfaceCapture;
                if (options.getVideoSource() == VideoSource.DISPLAY) {
@@ -165,7 +172,7 @@ public final class Server {
                });
            }

-            Looper.loop(); // interrupted by the Completion implementation
+            completion.await();
        } finally {
            if (cleanUp != null) {
                cleanUp.interrupt();
@@ -194,21 +201,6 @@ public final class Server {
        }
    }

-    private static void prepareMainLooper() {
-        // Like Looper.prepareMainLooper(), but with quitAllowed set to true
-        Looper.prepare();
-        synchronized (Looper.class) {
-            try {
-                @SuppressLint("DiscouragedPrivateApi")
-                Field field = Looper.class.getDeclaredField("sMainLooper");
-                field.setAccessible(true);
-                field.set(null, Looper.myLooper());
-            } catch (ReflectiveOperationException e) {
-                throw new AssertionError(e);
-            }
-        }
-    }
-
    public static void main(String... args) {
        int status = 0;
        try {
@@ -229,8 +221,6 @@ public final class Server {
            Ln.e("Exception on thread " + t, e);
        });

-        prepareMainLooper();
-
        Options options = Options.parse(args);

        Ln.disableSystemStreams();
--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
@@ -29,6 +29,8 @@ public final class Workarounds {
    private static final Object ACTIVITY_THREAD;

    static {
+        prepareMainLooper();
+
        try {
            // ActivityThread activityThread = new ActivityThread();
            ACTIVITY_THREAD_CLASS = Class.forName("android.app.ActivityThread");
@@ -75,6 +77,19 @@ public final class Workarounds {
        fillAppContext();
    }

+    @SuppressWarnings("deprecation")
+    private static void prepareMainLooper() {
+        // Some devices internally create a Handler when creating an input Surface, causing an exception:
+        //   "Can't create handler inside thread that has not called Looper.prepare()"
+        // <https://github.com/Genymobile/scrcpy/issues/240>
+        //
+        // Use Looper.prepareMainLooper() instead of Looper.prepare() to avoid a NullPointerException:
+        //   "Attempt to read from field 'android.os.MessageQueue android.os.Looper.mQueue'
+        //    on a null object reference"
+        // <https://github.com/Genymobile/scrcpy/issues/921>
+        Looper.prepareMainLooper();
+    }
+
    private static void fillAppInfo() {
        try {
            // ActivityThread.AppBindData appBindData = new ActivityThread.AppBindData();
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioEncoder.java
@@ -142,7 +142,6 @@ public final class AudioEncoder implements AsyncProcessor {
        long pts = bufferInfo.presentationTimeUs;
        if (previousPts != 0) {
            long now = System.nanoTime() / 1000;
-            // This specific encoder produces PTS matching the exact number of samples
            long duration = pts - previousPts;
            bufferInfo.presentationTimeUs = now - duration;
        }
@@ -219,11 +218,10 @@ public final class AudioEncoder implements AsyncProcessor {
            Codec codec = streamer.getCodec();
            mediaCodec = createMediaCodec(codec, encoderName);

-            // The default OPUS and FLAC encoders overwrite the input PTS with a value that matches the number of samples. This is not the behavior
-            // we want: it ignores any audio clock drift and hard silences (packets not produced on silence). To work around this behavior,
-            // regenerate PTS based on the current time and the packet duration.
-            String codecName = mediaCodec.getCanonicalName();
-            recreatePts = "c2.android.opus.encoder".equals(codecName) || "c2.android.flac.encoder".equals(codecName);
+            // The default OPUS encoder generates its own input PTS which matches the number of samples. This is not the behavior we want: it
+            // ignores any audio clock drift and hard silences (packets not produced on silence). To fix this behavior, regenerate PTS based on the
+            // current time and the packet duration.
+            recreatePts = "c2.android.opus.encoder".equals(mediaCodec.getName());

            mediaCodecThread = new HandlerThread("media-codec");
            mediaCodecThread.start();
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
@@ -13,8 +13,8 @@ public enum AudioSource {
    MIC_VOICE_RECOGNITION("mic-voice-recognition", MediaRecorder.AudioSource.VOICE_RECOGNITION),
    MIC_VOICE_COMMUNICATION("mic-voice-communication", MediaRecorder.AudioSource.VOICE_COMMUNICATION),
    VOICE_CALL("voice-call", MediaRecorder.AudioSource.VOICE_CALL),
-    VOICE_CALL_UPLINK("voice-call-uplink", MediaRecorder.AudioSource.VOICE_UPLINK),
-    VOICE_CALL_DOWNLINK("voice-call-downlink", MediaRecorder.AudioSource.VOICE_DOWNLINK),
+    VOICE_CALL_UPLINK("voice-call-uplink", MediaRecorder.AudioSource.VOICE_CALL),
+    VOICE_CALL_DOWNLINK("voice-call-downlink", MediaRecorder.AudioSource.VOICE_CALL),
    VOICE_PERFORMANCE("voice-performance", MediaRecorder.AudioSource.VOICE_PERFORMANCE);

    private final String name;
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@@ -112,9 +112,8 @@ public class ControlMessageReader {

    private ControlMessage parseInjectScrollEvent() throws IOException {
        Position position = parsePosition();
-        // Binary.i16FixedPointToFloat() decodes values assuming the full range is [-1, 1], but the actual range is [-16, 16].
-        float hScroll = Binary.i16FixedPointToFloat(dis.readShort()) * 16;
-        float vScroll = Binary.i16FixedPointToFloat(dis.readShort()) * 16;
+        float hScroll = Binary.i16FixedPointToFloat(dis.readShort());
+        float vScroll = Binary.i16FixedPointToFloat(dis.readShort());
        int buttons = dis.readInt();
        return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll, buttons);
    }
--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@@ -6,7 +6,6 @@ import com.genymobile.scrcpy.CleanUp;
 import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.device.Device;
 import com.genymobile.scrcpy.device.DeviceApp;
-import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.Point;
 import com.genymobile.scrcpy.device.Position;
 import com.genymobile.scrcpy.device.Size;
@@ -18,6 +17,7 @@ import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

+import android.content.IOnPrimaryClipChangedListener;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
@@ -114,20 +114,22 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
            Ln.w("Input events are not supported for secondary displays before Android 10");
        }

-        // Make sure the clipboard manager is always created from the main thread (even if clipboardAutosync is disabled)
-        ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
        if (clipboardAutosync) {
            // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
+            ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
            if (clipboardManager != null) {
-                clipboardManager.addPrimaryClipChangedListener(() -> {
-                    if (isSettingClipboard.get()) {
-                        // This is a notification for the change we are currently applying, ignore it
-                        return;
-                    }
-                    String text = Device.getClipboardText();
-                    if (text != null) {
-                        DeviceMessage msg = DeviceMessage.createClipboard(text);
-                        sender.send(msg);
+                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
+                    @Override
+                    public void dispatchPrimaryClipChanged() {
+                        if (isSettingClipboard.get()) {
+                            // This is a notification for the change we are currently applying, ignore it
+                            return;
+                        }
+                        String text = Device.getClipboardText();
+                        if (text != null) {
+                            DeviceMessage msg = DeviceMessage.createClipboard(text);
+                            sender.send(msg);
+                        }
                    }
                });
            } else {
@@ -154,34 +156,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

    private UhidManager getUhidManager() {
        if (uhidManager == null) {
-            int uhidDisplayId = displayId;
-            if (Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
-                if (displayId == Device.DISPLAY_ID_NONE) {
-                    // Mirroring a new virtual display id (using --new-display-id feature) on Android >= 15, where the UHID mouse pointer can be
-                    // associated to the virtual display
-                    try {
-                        // Wait for at most 1 second until a virtual display id is known
-                        DisplayData data = waitDisplayData(1000);
-                        if (data != null) {
-                            uhidDisplayId = data.virtualDisplayId;
-                        }
-                    } catch (InterruptedException e) {
-                        // do nothing
-                    }
-                }
-            }
-
-            String displayUniqueId = null;
-            if (uhidDisplayId > 0) {
-                // Ignore Device.DISPLAY_ID_NONE and 0 (main display)
-                DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(uhidDisplayId);
-                if (displayInfo != null) {
-                    displayUniqueId = displayInfo.getUniqueId();
-                }
-            }
-            uhidManager = new UhidManager(sender, displayUniqueId);
+            uhidManager = new UhidManager(sender);
        }
-
        return uhidManager;
    }

@@ -723,9 +699,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                if (timeout < 0) {
                    return null;
                }
-                if (timeout > 0) {
-                    displayDataAvailable.wait(timeout);
-                }
+                displayDataAvailable.wait(timeout);
                data = displayData.get();
            }

--- a/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
@@ -3,7 +3,6 @@ package com.genymobile.scrcpy.control;
 import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.util.StringUtils;
-import com.genymobile.scrcpy.wrappers.ServiceManager;

 import android.os.Build;
 import android.os.HandlerThread;
@@ -32,20 +31,14 @@ public final class UhidManager {

    private static final int SIZE_OF_UHID_EVENT = 4380; // sizeof(struct uhid_event)

-    // Must be unique across the system
-    private static final String INPUT_PORT = "scrcpy:" + Os.getpid();
-
-    private final String displayUniqueId;
-
    private final ArrayMap<Integer, FileDescriptor> fds = new ArrayMap<>();
    private final ByteBuffer buffer = ByteBuffer.allocate(SIZE_OF_UHID_EVENT).order(ByteOrder.nativeOrder());

    private final DeviceMessageSender sender;
    private final MessageQueue queue;

-    public UhidManager(DeviceMessageSender sender, String displayUniqueId) {
+    public UhidManager(DeviceMessageSender sender) {
        this.sender = sender;
-        this.displayUniqueId = displayUniqueId;
        if (Build.VERSION.SDK_INT >= AndroidVersions.API_23_ANDROID_6_0) {
            HandlerThread thread = new HandlerThread("UHidManager");
            thread.start();
@@ -59,22 +52,15 @@ public final class UhidManager {
        try {
            FileDescriptor fd = Os.open("/dev/uhid", OsConstants.O_RDWR, 0);
            try {
-                // First UHID device added
-                boolean firstDevice = fds.isEmpty();
-
                FileDescriptor old = fds.put(id, fd);
                if (old != null) {
                    Ln.w("Duplicate UHID id: " + id);
                    close(old);
                }

-                String phys = mustUseInputPort() ? INPUT_PORT : null;
-                byte[] req = buildUhidCreate2Req(vendorId, productId, name, reportDesc, phys);
+                byte[] req = buildUhidCreate2Req(vendorId, productId, name, reportDesc);
                Os.write(fd, req, 0, req.length);

-                if (firstDevice) {
-                    addUniqueIdAssociation();
-                }
                registerUhidListener(id, fd);
            } catch (Exception e) {
                close(fd);
@@ -162,7 +148,7 @@ public final class UhidManager {
        }
    }

-    private static byte[] buildUhidCreate2Req(int vendorId, int productId, String name, byte[] reportDesc, String phys) {
+    private static byte[] buildUhidCreate2Req(int vendorId, int productId, String name, byte[] reportDesc) {
        /*
         * struct uhid_event {
         *     uint32_t type;
@@ -184,23 +170,17 @@ public final class UhidManager {
         * } __attribute__((__packed__));
         */

+        byte[] empty = new byte[256];
        ByteBuffer buf = ByteBuffer.allocate(280 + reportDesc.length).order(ByteOrder.nativeOrder());
        buf.putInt(UHID_CREATE2);

        String actualName = name.isEmpty() ? "scrcpy" : name;
-        byte[] nameBytes = actualName.getBytes(StandardCharsets.UTF_8);
-        int nameLen = StringUtils.getUtf8TruncationIndex(nameBytes, 127);
-        assert nameLen <= 127;
-        buf.put(nameBytes, 0, nameLen);
+        byte[] utf8Name = actualName.getBytes(StandardCharsets.UTF_8);
+        int len = StringUtils.getUtf8TruncationIndex(utf8Name, 127);
+        assert len <= 127;
+        buf.put(utf8Name, 0, len);
+        buf.put(empty, 0, 256 - len);

-        if (phys != null) {
-            buf.position(4 + 128);
-            byte[] physBytes = phys.getBytes(StandardCharsets.US_ASCII);
-            assert physBytes.length <= 63;
-            buf.put(physBytes);
-        }
-
-        buf.position(4 + 256);
        buf.putShort((short) reportDesc.length);
        buf.putShort(BUS_VIRTUAL);
        buf.putInt(vendorId);
@@ -239,26 +219,15 @@ public final class UhidManager {
        if (fd != null) {
            unregisterUhidListener(fd);
            close(fd);
-
-            if (fds.isEmpty()) {
-                // Last UHID device removed
-                removeUniqueIdAssociation();
-            }
        } else {
            Ln.w("Closing unknown UHID device: " + id);
        }
    }

    public void closeAll() {
-        if (fds.isEmpty()) {
-            return;
-        }
-
        for (FileDescriptor fd : fds.values()) {
            close(fd);
        }
-
-        removeUniqueIdAssociation();
    }

    private static void close(FileDescriptor fd) {
@@ -268,20 +237,4 @@ public final class UhidManager {
            Ln.e("Failed to close uhid: " + e.getMessage());
        }
    }
-
-    private boolean mustUseInputPort() {
-        return Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15 && displayUniqueId != null;
-    }
-
-    private void addUniqueIdAssociation() {
-        if (mustUseInputPort()) {
-            ServiceManager.getInputManager().addUniqueIdAssociationByPort(INPUT_PORT, displayUniqueId);
-        }
-    }
-
-    private void removeUniqueIdAssociation() {
-        if (mustUseInputPort()) {
-            ServiceManager.getInputManager().removeUniqueIdAssociationByPort(INPUT_PORT);
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
@@ -7,18 +7,16 @@ public final class DisplayInfo {
    private final int layerStack;
    private final int flags;
    private final int dpi;
-    private final String uniqueId;

    public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 0x00000001;

-    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags, int dpi, String uniqueId) {
+    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags, int dpi) {
        this.displayId = displayId;
        this.size = size;
        this.rotation = rotation;
        this.layerStack = layerStack;
        this.flags = flags;
        this.dpi = dpi;
-        this.uniqueId = uniqueId;
    }

    public int getDisplayId() {
@@ -44,8 +42,5 @@ public final class DisplayInfo {
    public int getDpi() {
        return dpi;
    }
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
 }
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Romain Vimont	63d848fc55	Fix PTS produced by the default OPUS encoder The default OPUS encoder on Android rewrites the PTS so that it exactly matches the number of samples. As a consequence: - audio clock drift is not compensated - hard silences are ignored To fix this behavior, recreate the PTS based on the current time (after encoding) and the packet duration.	2025-03-02 18:00:12 +01:00
Romain Vimont	b292e356de	Add audio sources	2025-03-02 17:17:01 +01:00
Romain Vimont	9fb7446b88	Refactor audio sources Store the target audio source integer (one of the constants in android.media.MediaRecorder.AudioSource) in the AudioSource enum (or -1 if not relevant). This will simplify adding new audio sources.	2025-02-22 12:46:06 +01:00
Romain Vimont	671025cb68	Handle audio stream discontinuities The audio regulator assumed a continuous audio stream. But some audio sources (like the "voice call" audio source) do not produce any packets on silence, breaking this assumption. Use PTS to detect such discontinuities. TODO: if PTS values are broken, the detection is also broken.	2025-02-22 12:46:06 +01:00
Romain Vimont	8925bdc8fd	Report underflow samples in verbose mode Report the number of silence samples inserted due to underflow every second, along with the other metrics.	2025-02-22 12:26:27 +01:00
Romain Vimont	ea4c076345	Disable audio regulator underflow logs Only enable them if SC_AUDIO_REGULATOR_DEBUG is set, as they may spam the output.	2025-02-22 12:26:27 +01:00