audioplayer without locks

Use current time as initial timestamp on error
If the initial timestamp could not be retrieved, use the current time as returned by System.nanoTime(). In practice, it is the same time base as AudioRecord timestamps. Fixes #4536 <https://github.com/Genymobile/scrcpy/issues/4536>
2026-03-14 08:04:35 +01:00 · 2024-01-01 19:22:55 +01:00 · 2023-12-16 20:17:33 +01:00 · 2023-12-16 20:16:31 +01:00 · 2023-12-16 20:12:58 +01:00 · 2023-12-15 22:12:07 +01:00
65 changed files with 1390 additions and 839 deletions
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# scrcpy (v2.2)
+# scrcpy (v2.3.1)

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

--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -21,6 +21,7 @@ _scrcpy() {
        --disable-screensaver
        --display-buffer=
        --display-id=
+        --display-orientation=
        -e --select-tcpip
        -f --fullscreen
        --force-adb-forward
@@ -50,6 +51,7 @@ _scrcpy() {
        --no-power-on
        --no-video
        --no-video-playback
+        --orientation=
        --otg
        -p --port=
        --pause-on-exit
@@ -61,6 +63,7 @@ _scrcpy() {
        -r --record=
        --raw-key-events
        --record-format=
+        --record-orientation=
        --render-driver=
        --require-audio
        --rotation=
@@ -112,8 +115,16 @@ _scrcpy() {
            COMPREPLY=($(compgen -W 'front back external' -- "$cur"))
            return
            ;;
+        --orientation|--display-orientation)
+            COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
+            return
+            ;;
+        --record-orientation)
+            COMPREPLY=($(compgen -W '0 90 180 270' -- "$cur"))
+            return
+            ;;
        --lock-video-orientation)
-            COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
+            COMPREPLY=($(compgen -W 'unlocked initial 0 90 180 270' -- "$cur"))
            return
            ;;
        --pause-on-exit)
@@ -132,10 +143,6 @@ _scrcpy() {
            COMPREPLY=($(compgen -W 'direct3d opengl opengles2 opengles metal software' -- "$cur"))
            return
            ;;
-        --rotation)
-            COMPREPLY=($(compgen -W '0 1 2 3' -- "$cur"))
-            return
-            ;;
        --shortcut-mod)
            # Only auto-complete a single key
            COMPREPLY=($(compgen -W 'lctrl rctrl lalt ralt lsuper rsuper' -- "$cur"))
--- a/app/data/scrcpy-console.desktop
+++ b/app/data/scrcpy-console.desktop
@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy --pause-on-exit=if-error"
+Exec=/bin/sh -c "\\$SHELL -i -c 'scrcpy --pause-on-exit=if-error'"
 Icon=scrcpy
 Terminal=true
 Type=Application
--- a/app/data/scrcpy.desktop
+++ b/app/data/scrcpy.desktop
@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy"
+Exec=/bin/sh -c "\\$SHELL -i -c scrcpy"
 Icon=scrcpy
 Terminal=false
 Type=Application
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -28,6 +28,7 @@ arguments=(
    '--disable-screensaver[Disable screensaver while scrcpy is running]'
    '--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
    '--display-id=[Specify the display id to mirror]'
+    '--display-orientation=[Set the initial display orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
    {-e,--select-tcpip}'[Use TCP/IP device]'
    {-f,--fullscreen}'[Start in fullscreen]'
    '--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
@@ -40,7 +41,7 @@ arguments=(
    '--list-cameras[List cameras available on the device]'
    '--list-displays[List displays available on the device]'
    '--list-encoders[List video and audio encoders available on the device]'
-    '--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 1 2 3)'
+    '--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 90 180 270)'
    {-m,--max-size=}'[Limit both the width and height of the video to value]'
    {-M,--hid-mouse}'[Simulate a physical mouse by using HID over AOAv2]'
    '--max-fps=[Limit the frame rate of screen capture]'
@@ -56,6 +57,7 @@ arguments=(
    '--no-power-on[Do not power on the device on start]'
    '--no-video[Disable video forwarding]'
    '--no-video-playback[Disable video playback]'
+    '--orientation=[Set the video orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
    '--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
    {-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
    '--pause-on-exit=[Make scrcpy pause before exiting]:mode:(true false if-error)'
@@ -66,9 +68,9 @@ arguments=(
    {-r,--record=}'[Record screen to file]:record file:_files'
    '--raw-key-events[Inject key events for all input keys, and ignore text events]'
    '--record-format=[Force recording format]:format:(mp4 mkv m4a mka opus aac flac wav)'
+    '--record-orientation=[Set the record orientation]:orientation values:(0 90 180 270)'
    '--render-driver=[Request SDL to use the given render driver]:driver name:(direct3d opengl opengles2 opengles metal software)'
    '--require-audio=[Make scrcpy fail if audio is enabled but does not work]'
-    '--rotation=[Set the initial display rotation]:rotation values:(0 1 2 3)'
    {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
    {-S,--turn-screen-off}'[Turn the device screen off immediately]'
    '--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
--- a/app/meson.build
+++ b/app/meson.build
@@ -34,8 +34,8 @@ src = [
    'src/trait/frame_source.c',
    'src/trait/packet_source.c',
    'src/util/acksync.c',
+    'src/util/audiobuf.c',
    'src/util/average.c',
-    'src/util/bytebuf.c',
    'src/util/file.c',
    'src/util/intmap.c',
    'src/util/intr.c',
@@ -98,77 +98,24 @@ endif

 cc = meson.get_compiler('c')

-crossbuild_windows = meson.is_cross_build() and host_machine.system() == 'windows'
+dependencies = [
+    dependency('libavformat', version: '>= 57.33'),
+    dependency('libavcodec', version: '>= 57.37'),
+    dependency('libavutil'),
+    dependency('libswresample'),
+    dependency('sdl2', version: '>= 2.0.5'),
+]

-if not crossbuild_windows
-
-    # native build
-    dependencies = [
-        dependency('libavformat', version: '>= 57.33'),
-        dependency('libavcodec', version: '>= 57.37'),
-        dependency('libavutil'),
-        dependency('libswresample'),
-        dependency('sdl2', version: '>= 2.0.5'),
-    ]
-
-    if v4l2_support
-        dependencies += dependency('libavdevice')
-    endif
-
-    if usb_support
-        dependencies += dependency('libusb-1.0')
-    endif
-
-else
-    # cross-compile mingw32 build (from Linux to Windows)
-    prebuilt_sdl2 = meson.get_cross_property('prebuilt_sdl2')
-    sdl2_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/bin'
-    sdl2_lib_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_sdl2 + '/lib'
-    sdl2_include_dir = 'prebuilt-deps/data/' + prebuilt_sdl2 + '/include'
-
-    sdl2 = declare_dependency(
-        dependencies: [
-            cc.find_library('SDL2', dirs: sdl2_bin_dir),
-            cc.find_library('SDL2main', dirs: sdl2_lib_dir),
-        ],
-        include_directories: include_directories(sdl2_include_dir)
-    )
-
-    prebuilt_ffmpeg = meson.get_cross_property('prebuilt_ffmpeg')
-    ffmpeg_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_ffmpeg + '/bin'
-    ffmpeg_include_dir = 'prebuilt-deps/data/' + prebuilt_ffmpeg + '/include'
-
-    ffmpeg = declare_dependency(
-        dependencies: [
-            cc.find_library('avcodec-60', dirs: ffmpeg_bin_dir),
-            cc.find_library('avformat-60', dirs: ffmpeg_bin_dir),
-            cc.find_library('avutil-58', dirs: ffmpeg_bin_dir),
-            cc.find_library('swresample-4', dirs: ffmpeg_bin_dir),
-        ],
-        include_directories: include_directories(ffmpeg_include_dir)
-    )
-
-    prebuilt_libusb = meson.get_cross_property('prebuilt_libusb')
-    libusb_bin_dir = meson.current_source_dir() + '/prebuilt-deps/data/' + prebuilt_libusb + '/bin'
-    libusb_include_dir = 'prebuilt-deps/data/' + prebuilt_libusb + '/include'
-
-    libusb = declare_dependency(
-        dependencies: [
-            cc.find_library('msys-usb-1.0', dirs: libusb_bin_dir),
-        ],
-        include_directories: include_directories(libusb_include_dir)
-    )
-
-    dependencies = [
-        ffmpeg,
-        sdl2,
-        libusb,
-        cc.find_library('mingw32')
-    ]
+if v4l2_support
+    dependencies += dependency('libavdevice')
+endif

+if usb_support
+    dependencies += dependency('libusb-1.0')
 endif

 if host_machine.system() == 'windows'
+    dependencies += cc.find_library('mingw32')
    dependencies += cc.find_library('ws2_32')
 endif

@@ -265,9 +212,10 @@ if get_option('buildtype') == 'debug'
        ['test_binary', [
            'tests/test_binary.c',
        ]],
-        ['test_bytebuf', [
-            'tests/test_bytebuf.c',
-            'src/util/bytebuf.c',
+        ['test_audiobuf', [
+            'tests/test_audiobuf.c',
+            'src/util/audiobuf.c',
+            'src/util/memory.c',
        ]],
        ['test_cli', [
            'tests/test_cli.c',
@@ -289,6 +237,10 @@ if get_option('buildtype') == 'debug'
            'tests/test_device_msg_deserialize.c',
            'src/device_msg.c',
        ]],
+        ['test_orientation', [
+            'tests/test_orientation.c',
+            'src/options.c',
+        ]],
        ['test_strbuf', [
            'tests/test_strbuf.c',
            'src/util/strbuf.c',
--- a/app/prebuilt-deps/prepare-ffmpeg.sh
+++ b/app/prebuilt-deps/prepare-ffmpeg.sh
@@ -6,11 +6,11 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"

-VERSION=6.1-scrcpy-2
+VERSION=6.1-scrcpy-3
 DEP_DIR="ffmpeg-$VERSION"

 FILENAME="$DEP_DIR".7z
-SHA256SUM=7f25f638dc24a0f5d4af07a088b6a604cf33548900bbfd2f6ce0bae050b7664d
+SHA256SUM=b646d18a3d543a4e4c46881568213499f22e4454a464e1552f03f2ac9cc3a05a

 if [[ -d "$DEP_DIR" ]]
 then
--- a/app/prebuilt-deps/prepare-libusb.sh
+++ b/app/prebuilt-deps/prepare-libusb.sh
@@ -6,9 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"

-DEP_DIR=libusb-1.0.26
+VERSION=1.0.26
+DEP_DIR="libusb-$VERSION"

-FILENAME=libusb-1.0.26-binaries.7z
+FILENAME="libusb-$VERSION-binaries.7z"
 SHA256SUM=9c242696342dbde9cdc47239391f71833939bf9f7aa2bbb28cdaabe890465ec5

 if [[ -d "$DEP_DIR" ]]
@@ -17,17 +18,22 @@ then
    exit 0
 fi

-get_file "https://github.com/libusb/libusb/releases/download/v1.0.26/$FILENAME" "$FILENAME" "$SHA256SUM"
+get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/$FILENAME" \
+    "$FILENAME" "$SHA256SUM"

 mkdir "$DEP_DIR"
 cd "$DEP_DIR"

 7z x "../$FILENAME" \
-    libusb-1.0.26-binaries/libusb-MinGW-Win32/bin/msys-usb-1.0.dll \
-    libusb-1.0.26-binaries/libusb-MinGW-Win32/include/ \
-    libusb-1.0.26-binaries/libusb-MinGW-x64/bin/msys-usb-1.0.dll \
-    libusb-1.0.26-binaries/libusb-MinGW-x64/include/
+    "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
+    "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
+    "libusb-$VERSION-binaries/libusb-MinGW-x64/" \
+    "libusb-$VERSION-binaries/libusb-MinGW-x64/"

-mv libusb-1.0.26-binaries/libusb-MinGW-Win32 .
-mv libusb-1.0.26-binaries/libusb-MinGW-x64 .
-rm -rf libusb-1.0.26-binaries
+mv "libusb-$VERSION-binaries/libusb-MinGW-Win32" .
+mv "libusb-$VERSION-binaries/libusb-MinGW-x64" .
+rm -rf "libusb-$VERSION-binaries"
+
+# Rename the dll to get the same library name on all platforms
+mv libusb-MinGW-Win32/bin/msys-usb-1.0.dll libusb-MinGW-Win32/bin/libusb-1.0.dll
+mv libusb-MinGW-x64/bin/msys-usb-1.0.dll libusb-MinGW-x64/bin/libusb-1.0.dll
--- a/app/prebuilt-deps/prepare-sdl.sh
+++ b/app/prebuilt-deps/prepare-sdl.sh
@@ -6,10 +6,11 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"

-DEP_DIR=SDL2-2.28.4
+VERSION=2.28.5
+DEP_DIR="SDL2-$VERSION"

-FILENAME=SDL2-devel-2.28.4-mingw.tar.gz
-SHA256SUM=779d091072cf97291f80030f5232d97aa3d48ab0f2c14fe0b9d9a33c593cdc35
+FILENAME="SDL2-devel-$VERSION-mingw.tar.gz"
+SHA256SUM=3c0c655c2ebf67cad48fead72761d1601740ded30808952c3274ba223d226c21

 if [[ -d "$DEP_DIR" ]]
 then
@@ -17,7 +18,8 @@ then
    exit 0
 fi

-get_file "https://libsdl.org/release/$FILENAME" "$FILENAME" "$SHA256SUM"
+get_file "https://github.com/libsdl-org/SDL/releases/download/release-$VERSION/$FILENAME" \
+    "$FILENAME" "$SHA256SUM"

 mkdir "$DEP_DIR"
 cd "$DEP_DIR"
--- 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", "v2.2"
+      VALUE "ProductVersion", "2.3.1"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -124,7 +124,7 @@ Use USB device (if there is exactly one, like adb -d).
 Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).

 .TP
-.BI "\-\-disable-screensaver"
+.BI "\-\-disable\-screensaver"
 Disable screensaver while scrcpy is running.

 .TP
@@ -141,6 +141,14 @@ The available display ids can be listed by \fB\-\-list\-displays\fR.

 Default is 0.

+.TP
+.BI "\-\-display\-orientation " value
+Set the initial display orientation.
+
+Possible values are 0, 90, 180, 270, flip0, flip90, flip180 and flip270. The number represents the clockwise rotation in degrees; the "flip" keyword applies a horizontal flip before the rotation.
+
+Default is 0.
+
 .TP
 .B \-e, \-\-select\-tcpip
 Use TCP/IP device (if there is exactly one, like adb -e).
@@ -207,7 +215,9 @@ List displays available on the device.

 .TP
 \fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
-Lock video orientation to \fIvalue\fR. Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees rotation counterclockwise.
+Lock capture video orientation to \fIvalue\fR.
+
+Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 90, 180, and 270. The values represent the clockwise rotation from the natural device orientation, in degrees.

 Default is "unlocked".

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

+.TP
+.BI "\-\-orientation " value
+Same as --display-orientation=value --record-orientation=value.
+
 .TP
 .B \-\-otg
 Run in OTG mode: simulate physical keyboard and mouse, as if the computer keyboard and mouse were plugged directly to the device via an OTG cable.
@@ -357,6 +371,14 @@ Inject key events for all input keys, and ignore text events.
 .BI "\-\-record\-format " format
 Force recording format (mp4, mkv, m4a, mka, opus, aac, flac or wav).

+.TP
+.BI "\-\-record\-orientation " value
+Set the record orientation.
+
+Possible values are 0, 90, 180 and 270. The number represents the clockwise rotation in degrees.
+
+Default is 0.
+
 .TP
 .BI "\-\-render\-driver " name
 Request SDL to use the given render driver (this is just a hint).
@@ -369,10 +391,6 @@ Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "me
 .B \-\-require\-audio
 By default, scrcpy mirrors only the video if audio capture fails on the device. This option makes scrcpy fail if audio is enabled but does not work.

-.TP
-.BI "\-\-rotation " value
-Set the initial display rotation. Possibles values are 0, 1, 2 and 3. Each increment adds a 90 degrees rotation counterclockwise.
-
 .TP
 .BI "\-s, \-\-serial " number
 The device serial number. Mandatory only if several devices are connected to adb.
@@ -534,6 +552,14 @@ Rotate display left
 .B MOD+Right
 Rotate display right

+.TP
+.B MOD+Shift+Left, MOD+Shift+Right
+Flip display horizontally
+
+.TP
+.B MOD+Shift+Up, MOD+Shift+Down
+Flip display vertically
+
 .TP
 .B MOD+g
 Resize window to 1:1 (pixel\-perfect)
@@ -616,7 +642,11 @@ Enable/disable FPS counter (print frames/second in logs)

 .TP
 .B Ctrl+click-and-move
-Pinch-to-zoom from the center of the screen
+Pinch-to-zoom and rotate from the center of the screen
+
+.TP
+.B Shift+click-and-move
+Tilt (slide vertically with two fingers)

 .TP
 .B Drag & drop APK file
--- a/app/src/audio_player.c
+++ b/app/src/audio_player.c
@@ -66,8 +66,7 @@ static void SDLCALL
 sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
    struct sc_audio_player *ap = userdata;

-    // This callback is called with the lock used by SDL_AudioDeviceLock(), so
-    // the audiobuf is protected
+    // This callback is called with the lock used by SDL_AudioDeviceLock()

    assert(len_int > 0);
    size_t len = len_int;
@@ -77,8 +76,9 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
    LOGD("[Audio] SDL callback requests %" PRIu32 " samples", count);
 #endif

-    uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
-    if (!ap->played) {
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (!played) {
+        uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
        // Part of the buffering is handled by inserting initial silence. The
        // remaining (margin) last samples will be handled by compensation.
        uint32_t margin = 30 * ap->sample_rate / 1000; // 30ms
@@ -93,10 +93,7 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
        }
    }

-    uint32_t read = MIN(buffered_samples, count);
-    if (read) {
-        sc_audiobuf_read(&ap->buf, stream, read);
-    }
+    uint32_t read = sc_audiobuf_read(&ap->buf, stream, count);

    if (read < count) {
        uint32_t silence = count - read;
@@ -109,13 +106,16 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
             silence);
        memset(stream + TO_BYTES(read), 0, TO_BYTES(silence));

-        if (ap->received) {
+        bool received = atomic_load_explicit(&ap->received,
+                                             memory_order_relaxed);
+        if (received) {
            // Inserting additional samples immediately increases buffering
-            ap->underflow += silence;
+            atomic_fetch_add_explicit(&ap->underflow, silence,
+                                      memory_order_relaxed);
        }
    }

-    ap->played = true;
+    atomic_store_explicit(&ap->played, true, memory_order_relaxed);
 }

 static uint8_t *
@@ -162,123 +162,120 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,

    // swr_convert() returns the number of samples which would have been
    // written if the buffer was big enough.
-    uint32_t samples_written = MIN(ret, dst_nb_samples);
+    uint32_t samples = MIN(ret, dst_nb_samples);
 #ifndef SC_AUDIO_PLAYER_NDEBUG
-    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples_written);
+    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
 #endif

-    // Since this function is the only writer, the current available space is
-    // at least the previous available space. In practice, it should almost
-    // always be possible to write without lock.
-    bool lockless_write = samples_written <= ap->previous_can_write;
-    if (lockless_write) {
-        sc_audiobuf_prepare_write(&ap->buf, swr_buf, samples_written);
+    uint32_t cap = sc_audiobuf_capacity(&ap->buf);
+    if (samples > cap) {
+        // Very very unlikely: a single resampled frame should never
+        // exceed the audio buffer size (or something is very wrong).
+        // Ignore the first bytes in swr_buf to avoid memory corruption anyway.
+        //skipped_samples = samples - cap;
+        swr_buf += TO_BYTES(samples - cap);
+        samples = cap;
    }

-    SDL_LockAudioDevice(ap->device);
+    uint32_t written = sc_audiobuf_write(&ap->buf, swr_buf, samples);
+    if (written < samples) {
+        uint32_t remaining = samples - written;

-    uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
+        // All samples that could be written without locking have been written,
+        // now we need to lock to drop/consume old samples
+        SDL_LockAudioDevice(ap->device);

-    if (lockless_write) {
-        sc_audiobuf_commit_write(&ap->buf, samples_written);
-    } else {
-        uint32_t can_write = sc_audiobuf_can_write(&ap->buf);
-        if (samples_written > can_write) {
-            // Entering this branch is very unlikely, the audio buffer is
-            // allocated with a size sufficient to store 1 second more than the
-            // target buffering. If this happens, though, we have to skip old
-            // samples.
-            uint32_t cap = sc_audiobuf_capacity(&ap->buf);
-            if (samples_written > cap) {
-                // Very very unlikely: a single resampled frame should never
-                // exceed the audio buffer size (or something is very wrong).
-                // Ignore the first bytes in swr_buf
-                swr_buf += TO_BYTES(samples_written - cap);
-                // This change in samples_written will impact the
-                // instant_compensation below
-                samples_written = cap;
-            }
+        // Retry with the lock
+        written += sc_audiobuf_write(&ap->buf,
+                                     swr_buf + TO_BYTES(written),
+                                     remaining);
+        if (written < samples) {
+            remaining = samples - written;
+            // Still insufficient, drop old samples to make space
+            uint32_t skipped_samples =
+                sc_audiobuf_read(&ap->buf, NULL, remaining);
+            assert(skipped_samples == remaining);

-            assert(samples_written >= can_write);
-            if (samples_written > can_write) {
-                uint32_t skip_samples = samples_written - can_write;
-                assert(buffered_samples >= skip_samples);
-                sc_audiobuf_skip(&ap->buf, skip_samples);
-                buffered_samples -= skip_samples;
-                if (ap->played) {
-                    // Dropping input samples instantly decreases buffering
-                    ap->avg_buffering.avg -= skip_samples;
-                }
-            }
+            // Dropping input samples instantly decreases buffering
+            ap->avg_buffering.avg -= skipped_samples;

-            // It should remain exactly the expected size to write the new
-            // samples.
-            assert(sc_audiobuf_can_write(&ap->buf) == samples_written);
+            // Now there is enough space
+            uint32_t w = sc_audiobuf_write(&ap->buf,
+                                           swr_buf + TO_BYTES(written),
+                                           remaining);
+            assert(w == remaining);
        }

-        sc_audiobuf_write(&ap->buf, swr_buf, samples_written);
+        SDL_UnlockAudioDevice(ap->device);
    }

-    buffered_samples += samples_written;
-    assert(buffered_samples == sc_audiobuf_can_read(&ap->buf));
-
-    // Read with lock held, to be used after unlocking
-    bool played = ap->played;
-    uint32_t underflow = ap->underflow;
-
+    uint32_t underflow = 0;
+    uint32_t max_buffered_samples;
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
    if (played) {
-        uint32_t max_buffered_samples = ap->target_buffering
-                                      + 12 * ap->output_buffer
-                                      + ap->target_buffering / 10;
-        if (buffered_samples > max_buffered_samples) {
-            uint32_t skip_samples = buffered_samples - max_buffered_samples;
-            sc_audiobuf_skip(&ap->buf, skip_samples);
-            LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
-                 " samples", skip_samples);
-        }
+        underflow = atomic_exchange_explicit(&ap->underflow, 0,
+                                             memory_order_relaxed);

-        // reset (the current value was copied to a local variable)
-        ap->underflow = 0;
+        max_buffered_samples = ap->target_buffering
+                               + 12 * ap->output_buffer
+                               + ap->target_buffering / 10;
    } else {
        // SDL playback not started yet, do not accumulate more than
        // max_initial_buffering samples, this would cause unnecessary delay
        // (and glitches to compensate) on start.
-        uint32_t max_initial_buffering = ap->target_buffering
-                                       + 2 * ap->output_buffer;
-        if (buffered_samples > max_initial_buffering) {
-            uint32_t skip_samples = buffered_samples - max_initial_buffering;
-            sc_audiobuf_skip(&ap->buf, skip_samples);
+        max_buffered_samples = ap->target_buffering + 2 * ap->output_buffer;
+    }
+
+    uint32_t can_read = sc_audiobuf_can_read(&ap->buf);
+    if (can_read > max_buffered_samples) {
+        uint32_t skip_samples = 0;
+
+        SDL_LockAudioDevice(ap->device);
+        can_read = sc_audiobuf_can_read(&ap->buf);
+        if (can_read > max_buffered_samples) {
+            skip_samples = can_read - max_buffered_samples;
+            uint32_t r = sc_audiobuf_read(&ap->buf, NULL, skip_samples);
+            assert(r == skip_samples);
+            LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
+                 " samples", skip_samples);
+        }
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (skip_samples) {
+            // The buffer contained too much data, ignore any reported underflow
+            underflow = 0;
+
+            if (played) {
+                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
+                     " samples", skip_samples);
 #ifndef SC_AUDIO_PLAYER_NDEBUG
-            LOGD("[Audio] Playback not started, skipping %" PRIu32 " samples",
-                 skip_samples);
+            } else {
+                LOGD("[Audio] Playback not started, skipping %" PRIu32
+                     " samples", skip_samples);
 #endif
+            }
        }
    }

-    ap->previous_can_write = sc_audiobuf_can_write(&ap->buf);
-    ap->received = true;
-
-    SDL_UnlockAudioDevice(ap->device);
+    atomic_store_explicit(&ap->received, true, memory_order_relaxed);

    if (played) {
        // Number of samples added (or removed, if negative) for compensation
-        int32_t instant_compensation =
-            (int32_t) samples_written - frame->nb_samples;
+        int32_t instant_compensation = (int32_t) written - frame->nb_samples;
        int32_t inserted_silence = (int32_t) underflow;

        // The compensation must apply instantly, it must not be smoothed
        ap->avg_buffering.avg += instant_compensation + inserted_silence;

-
        // However, the buffering level must be smoothed
-        sc_average_push(&ap->avg_buffering, buffered_samples);
+        sc_average_push(&ap->avg_buffering, can_read);

 #ifndef SC_AUDIO_PLAYER_NDEBUG
        LOGD("[Audio] buffered_samples=%" PRIu32 " avg_buffering=%f",
             buffered_samples, sc_average_get(&ap->avg_buffering));
 #endif

-        ap->samples_since_resync += samples_written;
+        ap->samples_since_resync += written;
        if (ap->samples_since_resync >= ap->sample_rate) {
            // Recompute compensation every second
            ap->samples_since_resync = 0;
@@ -288,7 +285,7 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
            if (abs(diff) < (int) ap->sample_rate / 1000) {
                // Do not compensate for less than 1ms, the error is just noise
                diff = 0;
-            } else if (diff < 0 && buffered_samples < ap->target_buffering) {
+            } else if (diff < 0 && can_read < ap->target_buffering) {
                // Do not accelerate if the instant buffering level is below
                // the average, this would increase underflow
                diff = 0;
@@ -300,8 +297,7 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
            int abs_max_diff = distance / 50;
            diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
            LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
-                 " compensation=%d", ap->target_buffering, avg,
-                 buffered_samples, diff);
+                 " compensation=%d", ap->target_buffering, avg, can_read, diff);

            if (diff != ap->compensation) {
                int ret = swr_set_compensation(swr_ctx, diff, distance);
@@ -413,16 +409,14 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
    }
    ap->swr_buf_alloc_size = initial_swr_buf_size;

-    ap->previous_can_write = sc_audiobuf_can_write(&ap->buf);
-
    // Samples are produced and consumed by blocks, so the buffering must be
    // smoothed to get a relatively stable value.
    sc_average_init(&ap->avg_buffering, 32);
    ap->samples_since_resync = 0;

    ap->received = false;
-    ap->played = false;
-    ap->underflow = 0;
+    atomic_init(&ap->played, false);
+    atomic_init(&ap->underflow, 0);
    ap->compensation = 0;

    // The thread calling open() is the thread calling push(), which fills the
--- a/app/src/audio_player.h
+++ b/app/src/audio_player.h
@@ -32,7 +32,7 @@ struct sc_audio_player {
    uint16_t output_buffer;

    // Audio buffer to communicate between the receiver and the SDL audio
-    // callback (protected by SDL_AudioDeviceLock())
+    // callback
    struct sc_audiobuf buf;

    // The previous empty space in the buffer (only used by the receiver
@@ -61,19 +61,16 @@ struct sc_audio_player {
    uint32_t samples_since_resync;

    // Number of silence samples inserted since the last received packet
-    // (protected by SDL_AudioDeviceLock())
-    uint32_t underflow;
+    atomic_uint_least32_t underflow;

    // Current applied compensation value (only used by the receiver thread)
    int compensation;

-    // Set to true the first time a sample is received (protected by
-    // SDL_AudioDeviceLock())
-    bool received;
+    // Set to true the first time a sample is received
+    atomic_bool received;

-    // Set to true the first time the SDL callback is called (protected by
-    // SDL_AudioDeviceLock())
-    bool played;
+    // Set to true the first time the SDL callback is called
+    atomic_bool played;

    const struct sc_audio_player_callbacks *cbs;
    void *cbs_userdata;
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -90,6 +90,9 @@ enum {
    OPT_CAMERA_AR,
    OPT_CAMERA_FPS,
    OPT_CAMERA_HIGH_SPEED,
+    OPT_DISPLAY_ORIENTATION,
+    OPT_RECORD_ORIENTATION,
+    OPT_ORIENTATION,
 };

 struct sc_option {
@@ -309,6 +312,17 @@ static const struct sc_option options[] = {
                "    scrcpy --list-displays\n"
                "Default is 0.",
    },
+    {
+        .longopt_id = OPT_DISPLAY_ORIENTATION,
+        .longopt = "display-orientation",
+        .argdesc = "value",
+        .text = "Set the initial display orientation.\n"
+                "Possible values are 0, 90, 180, 270, flip0, flip90, flip180 "
+                "and flip270. The number represents the clockwise rotation "
+                "in degrees; the \"flip\" keyword applies a horizontal flip "
+                "before the rotation.\n"
+                "Default is 0.",
+    },
    {
        .shortopt = 'e',
        .longopt = "select-tcpip",
@@ -399,11 +413,11 @@ static const struct sc_option options[] = {
        .longopt = "lock-video-orientation",
        .argdesc = "value",
        .optional_arg = true,
-        .text = "Lock video orientation to value.\n"
+        .text = "Lock capture video orientation to value.\n"
                "Possible values are \"unlocked\", \"initial\" (locked to the "
-                "initial orientation), 0, 1, 2 and 3. Natural device "
-                "orientation is 0, and each increment adds a 90 degrees "
-                "rotation counterclockwise.\n"
+                "initial orientation), 0, 90, 180 and 270. The values "
+                "represent the clockwise rotation from the natural device "
+                "orientation, in degrees.\n"
                "Default is \"unlocked\".\n"
                "Passing the option without argument is equivalent to passing "
                "\"initial\".",
@@ -512,6 +526,13 @@ static const struct sc_option options[] = {
        .longopt = "no-video-playback",
        .text = "Disable video playback on the computer.",
    },
+    {
+        .longopt_id = OPT_ORIENTATION,
+        .longopt = "orientation",
+        .argdesc = "value",
+        .text = "Same as --display-orientation=value "
+                "--record-orientation=value.",
+    },
    {
        .longopt_id = OPT_OTG,
        .longopt = "otg",
@@ -597,6 +618,15 @@ static const struct sc_option options[] = {
        .text = "Force recording format (mp4, mkv, m4a, mka, opus, aac, flac "
                "or wav).",
    },
+    {
+        .longopt_id = OPT_RECORD_ORIENTATION,
+        .longopt = "record-orientation",
+        .argdesc = "value",
+        .text = "Set the record orientation.\n"
+                "Possible values are 0, 90, 180 and 270. The number represents "
+                "the clockwise rotation in degrees.\n"
+                "Default is 0.",
+    },
    {
        .longopt_id = OPT_RENDER_DRIVER,
        .longopt = "render-driver",
@@ -615,12 +645,10 @@ static const struct sc_option options[] = {
                "is enabled but does not work."
    },
    {
+        // deprecated
        .longopt_id = OPT_ROTATION,
        .longopt = "rotation",
        .argdesc = "value",
-        .text = "Set the initial display rotation.\n"
-                "Possible values are 0, 1, 2 and 3. Each increment adds a 90 "
-                "degrees rotation counterclockwise.",
    },
    {
        .shortopt = 's',
@@ -824,6 +852,14 @@ static const struct sc_shortcut shortcuts[] = {
        .shortcuts = { "MOD+Right" },
        .text = "Rotate display right",
    },
+    {
+        .shortcuts = { "MOD+Shift+Left", "MOD+Shift+Right" },
+        .text = "Flip display horizontally",
+    },
+    {
+        .shortcuts = { "MOD+Shift+Up", "MOD+Shift+Down" },
+        .text = "Flip display vertically",
+    },
    {
        .shortcuts = { "MOD+g" },
        .text = "Resize window to 1:1 (pixel-perfect)",
@@ -911,7 +947,11 @@ static const struct sc_shortcut shortcuts[] = {
    },
    {
        .shortcuts = { "Ctrl+click-and-move" },
-        .text = "Pinch-to-zoom from the center of the screen",
+        .text = "Pinch-to-zoom and rotate from the center of the screen",
+    },
+    {
+        .shortcuts = { "Shift+click-and-move" },
+        .text = "Tilt (slide vertically with two fingers)",
    },
    {
        .shortcuts = { "Drag & drop APK file" },
@@ -1382,15 +1422,50 @@ parse_lock_video_orientation(const char *s,
        return true;
    }

-    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 3,
-                                "lock video orientation");
-    if (!ok) {
-        return false;
+    if (!strcmp(s, "0")) {
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_0;
+        return true;
    }

-    *lock_mode = (enum sc_lock_video_orientation) value;
-    return true;
+    if (!strcmp(s, "90")) {
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_90;
+        return true;
+    }
+
+    if (!strcmp(s, "180")) {
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_180;
+        return true;
+    }
+
+    if (!strcmp(s, "270")) {
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_270;
+        return true;
+    }
+
+    if (!strcmp(s, "1")) {
+        LOGW("--lock-video-orientation=1 is deprecated, use "
+             "--lock-video-orientation=270 instead.");
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_270;
+        return true;
+    }
+
+    if (!strcmp(s, "2")) {
+        LOGW("--lock-video-orientation=2 is deprecated, use "
+             "--lock-video-orientation=180 instead.");
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_180;
+        return true;
+    }
+
+    if (!strcmp(s, "3")) {
+        LOGW("--lock-video-orientation=3 is deprecated, use "
+             "--lock-video-orientation=90 instead.");
+        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_90;
+        return true;
+    }
+
+    LOGE("Unsupported --lock-video-orientation value: %s (expected initial, "
+         "unlocked, 0, 90, 180 or 270).", s);
+    return false;
 }

 static bool
@@ -1405,6 +1480,45 @@ parse_rotation(const char *s, uint8_t *rotation) {
    return true;
 }

+static bool
+parse_orientation(const char *s, enum sc_orientation *orientation) {
+    if (!strcmp(s, "0")) {
+        *orientation = SC_ORIENTATION_0;
+        return true;
+    }
+    if (!strcmp(s, "90")) {
+        *orientation = SC_ORIENTATION_90;
+        return true;
+    }
+    if (!strcmp(s, "180")) {
+        *orientation = SC_ORIENTATION_180;
+        return true;
+    }
+    if (!strcmp(s, "270")) {
+        *orientation = SC_ORIENTATION_270;
+        return true;
+    }
+    if (!strcmp(s, "flip0")) {
+        *orientation = SC_ORIENTATION_FLIP_0;
+        return true;
+    }
+    if (!strcmp(s, "flip90")) {
+        *orientation = SC_ORIENTATION_FLIP_90;
+        return true;
+    }
+    if (!strcmp(s, "flip180")) {
+        *orientation = SC_ORIENTATION_FLIP_180;
+        return true;
+    }
+    if (!strcmp(s, "flip270")) {
+        *orientation = SC_ORIENTATION_FLIP_270;
+        return true;
+    }
+    LOGE("Unsupported orientation: %s (expected 0, 90, 180, 270, flip0, "
+         "flip90, flip180 or flip270)", optarg);
+    return false;
+}
+
 static bool
 parse_window_position(const char *s, int16_t *position) {
    // special value for "auto"
@@ -2008,10 +2122,51 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                opts->key_inject_mode = SC_KEY_INJECT_MODE_RAW;
                break;
            case OPT_ROTATION:
-                if (!parse_rotation(optarg, &opts->rotation)) {
+                LOGW("--rotation is deprecated, use --display-orientation "
+                     "instead.");
+                uint8_t rotation;
+                if (!parse_rotation(optarg, &rotation)) {
+                    return false;
+                }
+                assert(rotation <= 3);
+                switch (rotation) {
+                    case 0:
+                        opts->display_orientation = SC_ORIENTATION_0;
+                        break;
+                    case 1:
+                        // rotation 1 was 90° counterclockwise, but orientation
+                        // is expressed clockwise
+                        opts->display_orientation = SC_ORIENTATION_270;
+                        break;
+                    case 2:
+                        opts->display_orientation = SC_ORIENTATION_180;
+                        break;
+                    case 3:
+                        // rotation 3 was 270° counterclockwise, but orientation
+                        // is expressed clockwise
+                        opts->display_orientation = SC_ORIENTATION_90;
+                        break;
+                }
+                break;
+            case OPT_DISPLAY_ORIENTATION:
+                if (!parse_orientation(optarg, &opts->display_orientation)) {
                    return false;
                }
                break;
+            case OPT_RECORD_ORIENTATION:
+                if (!parse_orientation(optarg, &opts->record_orientation)) {
+                    return false;
+                }
+                break;
+            case OPT_ORIENTATION: {
+                enum sc_orientation orientation;
+                if (!parse_orientation(optarg, &orientation)) {
+                    return false;
+                }
+                opts->display_orientation = orientation;
+                opts->record_orientation = orientation;
+                break;
+            }
            case OPT_RENDER_DRIVER:
                opts->render_driver = optarg;
                break;
@@ -2378,6 +2533,15 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            }
        }

+        if (opts->record_orientation != SC_ORIENTATION_0) {
+            if (sc_orientation_is_mirror(opts->record_orientation)) {
+                LOGE("Record orientation only supports rotation, not "
+                     "flipping: %s",
+                     sc_orientation_get_name(opts->record_orientation));
+                return false;
+            }
+        }
+
        if (opts->video
                && sc_record_format_is_audio_only(opts->record_format)) {
            LOGE("Audio container does not support video stream");
--- a/app/src/compat.h
+++ b/app/src/compat.h
@@ -3,7 +3,9 @@

 #include "config.h"

+#include <libavcodec/version.h>
 #include <libavformat/version.h>
+#include <libavutil/version.h>
 #include <SDL2/SDL_version.h>

 #ifndef __WIN32
@@ -50,6 +52,15 @@
 # define SCRCPY_LAVU_HAS_CHLAYOUT
 #endif

+// In ffmpeg/doc/APIchanges:
+// 2023-10-06 - 5432d2aacad - lavc 60.15.100 - avformat.h
+//   Deprecate AVFormatContext.{nb_,}side_data, av_stream_add_side_data(),
+//   av_stream_new_side_data(), and av_stream_get_side_data(). Side data fields
+//   from AVFormatContext.codecpar should be used from now on.
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 15, 100)
+# define SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
+#endif
+
 #if SDL_VERSION_ATLEAST(2, 0, 6)
 // <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
 # define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -227,8 +227,9 @@ run_demuxer(void *data) {
    }

    // Config packets must be merged with the next non-config packet only for
-    // video streams
-    bool must_merge_config_packet = codec->type == AVMEDIA_TYPE_VIDEO;
+    // H.26x
+    bool must_merge_config_packet = raw_codec_id == SC_CODEC_ID_H264
+                                 || raw_codec_id == SC_CODEC_ID_H265;

    struct sc_packet_merger merger;

--- a/app/src/display.c
+++ b/app/src/display.c
@@ -234,7 +234,7 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame) {

 enum sc_display_result
 sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
-                  unsigned rotation) {
+                  enum sc_orientation orientation) {
    SDL_RenderClear(display->renderer);

    if (display->pending.flags) {
@@ -247,33 +247,33 @@ sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
    SDL_Renderer *renderer = display->renderer;
    SDL_Texture *texture = display->texture;

-    if (rotation == 0) {
+    if (orientation == SC_ORIENTATION_0) {
        int ret = SDL_RenderCopy(renderer, texture, NULL, geometry);
        if (ret) {
            LOGE("Could not render texture: %s", SDL_GetError());
            return SC_DISPLAY_RESULT_ERROR;
        }
    } else {
-        // rotation in RenderCopyEx() is clockwise, while screen->rotation is
-        // counterclockwise (to be consistent with --lock-video-orientation)
-        int cw_rotation = (4 - rotation) % 4;
+        unsigned cw_rotation = sc_orientation_get_rotation(orientation);
        double angle = 90 * cw_rotation;

        const SDL_Rect *dstrect = NULL;
        SDL_Rect rect;
-        if (rotation & 1) {
+        if (sc_orientation_is_swap(orientation)) {
            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 {
-            assert(rotation == 2);
            dstrect = geometry;
        }

+        SDL_RendererFlip flip = sc_orientation_is_mirror(orientation)
+                              ? SDL_FLIP_HORIZONTAL : 0;
+
        int ret = SDL_RenderCopyEx(renderer, texture, NULL, dstrect, angle,
-                                   NULL, 0);
+                                   NULL, flip);
        if (ret) {
            LOGE("Could not render texture: %s", SDL_GetError());
            return SC_DISPLAY_RESULT_ERROR;
--- a/app/src/display.h
+++ b/app/src/display.h
@@ -9,6 +9,7 @@

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

 #ifdef __APPLE__
 # define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
@@ -54,6 +55,6 @@ sc_display_update_texture(struct sc_display *display, const AVFrame *frame);

 enum sc_display_result
 sc_display_render(struct sc_display *display, const SDL_Rect *geometry,
-                  unsigned rotation);
+                  enum sc_orientation orientation);

 #endif
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -76,6 +76,8 @@ sc_input_manager_init(struct sc_input_manager *im,
    im->sdl_shortcut_mods.count = shortcut_mods->count;

    im->vfinger_down = false;
+    im->vfinger_invert_x = false;
+    im->vfinger_invert_y = false;

    im->last_keycode = SDLK_UNKNOWN;
    im->last_mod = 0;
@@ -293,15 +295,11 @@ rotate_device(struct sc_controller *controller) {
 }

 static void
-rotate_client_left(struct sc_screen *screen) {
-    unsigned new_rotation = (screen->rotation + 1) % 4;
-    sc_screen_set_rotation(screen, new_rotation);
-}
-
-static void
-rotate_client_right(struct sc_screen *screen) {
-    unsigned new_rotation = (screen->rotation + 3) % 4;
-    sc_screen_set_rotation(screen, new_rotation);
+apply_orientation_transform(struct sc_screen *screen,
+                            enum sc_orientation transform) {
+    enum sc_orientation new_orientation =
+        sc_orientation_apply(screen->orientation, transform);
+    sc_screen_set_orientation(screen, new_orientation);
 }

 static void
@@ -351,9 +349,14 @@ simulate_virtual_finger(struct sc_input_manager *im,
 }

 static struct sc_point
-inverse_point(struct sc_point point, struct sc_size size) {
-    point.x = size.width - point.x;
-    point.y = size.height - point.y;
+inverse_point(struct sc_point point, struct sc_size size,
+              bool invert_x, bool invert_y) {
+    if (invert_x) {
+        point.x = size.width - point.x;
+    }
+    if (invert_y) {
+        point.y = size.height - point.y;
+    }
    return point;
 }

@@ -421,25 +424,47 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_DOWN:
-                if (controller && !shift) {
+                if (shift) {
+                    if (!repeat & down) {
+                        apply_orientation_transform(im->screen,
+                                                    SC_ORIENTATION_FLIP_180);
+                    }
+                } else if (controller) {
                    // forward repeated events
                    action_volume_down(controller, action);
                }
                return;
            case SDLK_UP:
-                if (controller && !shift) {
+                if (shift) {
+                    if (!repeat & down) {
+                        apply_orientation_transform(im->screen,
+                                                    SC_ORIENTATION_FLIP_180);
+                    }
+                } else if (controller) {
                    // forward repeated events
                    action_volume_up(controller, action);
                }
                return;
            case SDLK_LEFT:
-                if (!shift && !repeat && down) {
-                    rotate_client_left(im->screen);
+                if (!repeat && down) {
+                    if (shift) {
+                        apply_orientation_transform(im->screen,
+                                                    SC_ORIENTATION_FLIP_0);
+                    } else {
+                        apply_orientation_transform(im->screen,
+                                                    SC_ORIENTATION_270);
+                    }
                }
                return;
            case SDLK_RIGHT:
-                if (!shift && !repeat && down) {
-                    rotate_client_right(im->screen);
+                if (!repeat && down) {
+                    if (shift) {
+                        apply_orientation_transform(im->screen,
+                                                    SC_ORIENTATION_FLIP_0);
+                    } else {
+                        apply_orientation_transform(im->screen,
+                                                    SC_ORIENTATION_90);
+                    }
                }
                return;
            case SDLK_c:
@@ -587,7 +612,9 @@ sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
        struct sc_point mouse =
           sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                    event->y);
-        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
+        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
+                                                im->vfinger_invert_x,
+                                                im->vfinger_invert_y);
        simulate_virtual_finger(im, AMOTION_EVENT_ACTION_MOVE, vfinger);
    }
 }
@@ -708,7 +735,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
        return;
    }

-    // Pinch-to-zoom simulation.
+    // Pinch-to-zoom, rotate and tilt simulation.
    //
    // If Ctrl is hold when the left-click button is pressed, then
    // pinch-to-zoom mode is enabled: on every mouse event until the left-click
@@ -717,14 +744,29 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
    //
    // In other words, the center of the rotation/scaling is the center of the
    // screen.
-#define CTRL_PRESSED (SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL))
+    //
+    // To simulate a tilt gesture (a vertical slide with two fingers), Shift
+    // can be used instead of Ctrl. The "virtual finger" has a position
+    // inverted with respect to the vertical axis of symmetry in the middle of
+    // the screen.
+    const SDL_Keymod keymod = SDL_GetModState();
+    const bool ctrl_pressed = keymod & KMOD_CTRL;
+    const bool shift_pressed = keymod & KMOD_SHIFT;
    if (event->button == SDL_BUTTON_LEFT &&
-            ((down && !im->vfinger_down && CTRL_PRESSED) ||
+            ((down && !im->vfinger_down &&
+              ((ctrl_pressed && !shift_pressed) ||
+               (!ctrl_pressed && shift_pressed))) ||
             (!down && im->vfinger_down))) {
        struct sc_point mouse =
            sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                                 event->y);
-        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
+        if (down) {
+            im->vfinger_invert_x = ctrl_pressed || shift_pressed;
+            im->vfinger_invert_y = ctrl_pressed;
+        }
+        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
+                                                im->vfinger_invert_x,
+                                                im->vfinger_invert_y);
        enum android_motionevent_action action = down
                                               ? AMOTION_EVENT_ACTION_DOWN
                                               : AMOTION_EVENT_ACTION_UP;
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@@ -32,6 +32,8 @@ struct sc_input_manager {
    } sdl_shortcut_mods;

    bool vfinger_down;
+    bool vfinger_invert_x;
+    bool vfinger_invert_y;

    // Tracks the number of identical consecutive shortcut key down events.
    // Not to be confused with event->repeat, which counts the number of
--- a/app/src/options.c
+++ b/app/src/options.c
@@ -39,7 +39,8 @@ const struct scrcpy_options scrcpy_options_default = {
    .audio_bit_rate = 0,
    .max_fps = 0,
    .lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
-    .rotation = 0,
+    .display_orientation = SC_ORIENTATION_0,
+    .record_orientation = SC_ORIENTATION_0,
    .window_x = SC_WINDOW_POSITION_UNDEFINED,
    .window_y = SC_WINDOW_POSITION_UNDEFINED,
    .window_width = 0,
@@ -89,3 +90,39 @@ const struct scrcpy_options scrcpy_options_default = {
    .camera_high_speed = false,
    .list = 0,
 };
+
+enum sc_orientation
+sc_orientation_apply(enum sc_orientation src, enum sc_orientation transform) {
+    assert(!(src & ~7));
+    assert(!(transform & ~7));
+
+    unsigned transform_hflip = transform & 4;
+    unsigned transform_rotation = transform & 3;
+    unsigned src_hflip = src & 4;
+    unsigned src_rotation = src & 3;
+    unsigned src_swap = src & 1;
+    if (src_swap && transform_hflip) {
+        // If the src is rotated by 90 or 270 degrees, applying a flipped
+        // transformation requires an additional 180 degrees rotation to
+        // compensate for the inversion of the order of multiplication:
+        //
+        //     hflip1 × rotate1 × hflip2 × rotate2
+        //     `--------------'   `--------------'
+        //           src             transform
+        //
+        // In the final result, we want all the hflips then all the rotations,
+        // so we must move hflip2 to the left:
+        //
+        //     hflip1 × hflip2 × rotate1' × rotate2
+        //
+        // with rotate1' = | rotate1           if src is 0° or 180°
+        //                 | rotate1 + 180°    if src is 90° or 270°
+
+        src_rotation += 2;
+    }
+
+    unsigned result_hflip = src_hflip ^ transform_hflip;
+    unsigned result_rotation = (transform_rotation + src_rotation) % 4;
+    enum sc_orientation result = result_hflip | result_rotation;
+    return result;
+}
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -3,6 +3,7 @@

 #include "common.h"

+#include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -67,14 +68,75 @@ enum sc_camera_facing {
    SC_CAMERA_FACING_EXTERNAL,
 };

+                              // ,----- hflip (applied before the rotation)
+                              // | ,--- 180°
+                              // | | ,- 90° clockwise
+                              // | | |
+enum sc_orientation {         // v v v
+    SC_ORIENTATION_0,         // 0 0 0
+    SC_ORIENTATION_90,        // 0 0 1
+    SC_ORIENTATION_180,       // 0 1 0
+    SC_ORIENTATION_270,       // 0 1 1
+    SC_ORIENTATION_FLIP_0,    // 1 0 0
+    SC_ORIENTATION_FLIP_90,   // 1 0 1
+    SC_ORIENTATION_FLIP_180,  // 1 1 0
+    SC_ORIENTATION_FLIP_270,  // 1 1 1
+};
+
+static inline bool
+sc_orientation_is_mirror(enum sc_orientation orientation) {
+    assert(!(orientation & ~7));
+    return orientation & 4;
+}
+
+// Does the orientation swap width and height?
+static inline bool
+sc_orientation_is_swap(enum sc_orientation orientation) {
+    assert(!(orientation & ~7));
+    return orientation & 1;
+}
+
+static inline enum sc_orientation
+sc_orientation_get_rotation(enum sc_orientation orientation) {
+    assert(!(orientation & ~7));
+    return orientation & 3;
+}
+
+enum sc_orientation
+sc_orientation_apply(enum sc_orientation src, enum sc_orientation transform);
+
+static inline const char *
+sc_orientation_get_name(enum sc_orientation orientation) {
+    switch (orientation) {
+        case SC_ORIENTATION_0:
+            return "0";
+        case SC_ORIENTATION_90:
+            return "90";
+        case SC_ORIENTATION_180:
+            return "180";
+        case SC_ORIENTATION_270:
+            return "270";
+        case SC_ORIENTATION_FLIP_0:
+            return "flip0";
+        case SC_ORIENTATION_FLIP_90:
+            return "flip90";
+        case SC_ORIENTATION_FLIP_180:
+            return "flip180";
+        case SC_ORIENTATION_FLIP_270:
+            return "flip270";
+        default:
+            return "(unknown)";
+    }
+}
+
 enum sc_lock_video_orientation {
    SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
    // lock the current orientation when scrcpy starts
    SC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,
    SC_LOCK_VIDEO_ORIENTATION_0 = 0,
-    SC_LOCK_VIDEO_ORIENTATION_1,
-    SC_LOCK_VIDEO_ORIENTATION_2,
-    SC_LOCK_VIDEO_ORIENTATION_3,
+    SC_LOCK_VIDEO_ORIENTATION_90 = 3,
+    SC_LOCK_VIDEO_ORIENTATION_180 = 2,
+    SC_LOCK_VIDEO_ORIENTATION_270 = 1,
 };

 enum sc_keyboard_input_mode {
@@ -157,7 +219,8 @@ struct scrcpy_options {
    uint32_t audio_bit_rate;
    uint16_t max_fps;
    enum sc_lock_video_orientation lock_video_orientation;
-    uint8_t rotation;
+    enum sc_orientation display_orientation;
+    enum sc_orientation record_orientation;
    int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
    int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
    uint16_t window_width;
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -4,6 +4,7 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
+#include <libavutil/display.h>

 #include "util/log.h"
 #include "util/str.h"
@@ -493,6 +494,42 @@ run_recorder(void *data) {
    return 0;
 }

+static bool
+sc_recorder_set_orientation(AVStream *stream, enum sc_orientation orientation) {
+    assert(!sc_orientation_is_mirror(orientation));
+
+    uint8_t *raw_data;
+#ifdef SCRCPY_LAVC_HAS_CODECPAR_CODEC_SIDEDATA
+    AVPacketSideData *sd =
+        av_packet_side_data_new(&stream->codecpar->coded_side_data,
+                                &stream->codecpar->nb_coded_side_data,
+                                AV_PKT_DATA_DISPLAYMATRIX,
+                                sizeof(int32_t) * 9, 0);
+    if (!sd) {
+        LOG_OOM();
+        return false;
+    }
+
+    raw_data = sd->data;
+#else
+    raw_data = av_stream_new_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX,
+                                      sizeof(int32_t) * 9);
+    if (!raw_data) {
+        LOG_OOM();
+        return false;
+    }
+#endif
+
+    int32_t *matrix = (int32_t *) raw_data;
+
+    unsigned rotation = orientation;
+    unsigned angle = rotation * 90;
+
+    av_display_rotation_set(matrix, angle);
+
+    return true;
+}
+
 static bool
 sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,
                                   AVCodecContext *ctx) {
@@ -520,6 +557,16 @@ sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,

    recorder->video_stream.index = stream->index;

+    if (recorder->orientation != SC_ORIENTATION_0) {
+        if (!sc_recorder_set_orientation(stream, recorder->orientation)) {
+            sc_mutex_unlock(&recorder->mutex);
+            return false;
+        }
+
+        LOGI("Record orientation set to %s",
+             sc_orientation_get_name(recorder->orientation));
+    }
+
    recorder->video_init = true;
    sc_cond_signal(&recorder->cond);
    sc_mutex_unlock(&recorder->mutex);
@@ -689,7 +736,10 @@ sc_recorder_stream_init(struct sc_recorder_stream *stream) {
 bool
 sc_recorder_init(struct sc_recorder *recorder, const char *filename,
                 enum sc_record_format format, bool video, bool audio,
+                 enum sc_orientation orientation,
                 const struct sc_recorder_callbacks *cbs, void *cbs_userdata) {
+    assert(!sc_orientation_is_mirror(orientation));
+
    recorder->filename = strdup(filename);
    if (!recorder->filename) {
        LOG_OOM();
@@ -710,6 +760,8 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
    recorder->video = video;
    recorder->audio = audio;

+    recorder->orientation = orientation;
+
    sc_vecdeque_init(&recorder->video_queue);
    sc_vecdeque_init(&recorder->audio_queue);
    recorder->stopped = false;
--- a/app/src/recorder.h
+++ b/app/src/recorder.h
@@ -34,6 +34,8 @@ struct sc_recorder {
    bool audio;
    bool video;

+    enum sc_orientation orientation;
+
    char *filename;
    enum sc_record_format format;
    AVFormatContext *ctx;
@@ -67,6 +69,7 @@ struct sc_recorder_callbacks {
 bool
 sc_recorder_init(struct sc_recorder *recorder, const char *filename,
                 enum sc_record_format format, bool video, bool audio,
+                 enum sc_orientation orientation,
                 const struct sc_recorder_callbacks *cbs, void *cbs_userdata);

 bool
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -419,12 +419,21 @@ scrcpy(struct scrcpy_options *options) {
        sdl_set_hints(options->render_driver);
    }

-    // Initialize the video subsystem even if --no-video or --no-video-playback
-    // is passed so that clipboard synchronization still works.
-    // <https://github.com/Genymobile/scrcpy/issues/4418>
-    if (SDL_Init(SDL_INIT_VIDEO)) {
-        LOGE("Could not initialize SDL video: %s", SDL_GetError());
-        goto end;
+    if (options->video_playback ||
+            (options->control && options->clipboard_autosync)) {
+        // Initialize the video subsystem even if --no-video or
+        // --no-video-playback is passed so that clipboard synchronization
+        // still works.
+        // <https://github.com/Genymobile/scrcpy/issues/4418>
+        if (SDL_Init(SDL_INIT_VIDEO)) {
+            // If it fails, it is an error only if video playback is enabled
+            if (options->video_playback) {
+                LOGE("Could not initialize SDL video: %s", SDL_GetError());
+                goto end;
+            } else {
+                LOGW("Could not initialize SDL video: %s", SDL_GetError());
+            }
+        }
    }

    if (options->audio_playback) {
@@ -507,7 +516,8 @@ scrcpy(struct scrcpy_options *options) {
        };
        if (!sc_recorder_init(&s->recorder, options->record_filename,
                              options->record_format, options->video,
-                              options->audio, &recorder_cbs, NULL)) {
+                              options->audio, options->record_orientation,
+                              &recorder_cbs, NULL)) {
            goto end;
        }
        recorder_initialized = true;
@@ -691,7 +701,7 @@ aoa_hid_end:
            .window_width = options->window_width,
            .window_height = options->window_height,
            .window_borderless = options->window_borderless,
-            .rotation = options->rotation,
+            .orientation = options->display_orientation,
            .mipmaps = options->mipmaps,
            .fullscreen = options->fullscreen,
            .start_fps_counter = options->start_fps_counter,
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -14,16 +14,16 @@
 #define DOWNCAST(SINK) container_of(SINK, struct sc_screen, frame_sink)

 static inline struct sc_size
-get_rotated_size(struct sc_size size, int rotation) {
-    struct sc_size rotated_size;
-    if (rotation & 1) {
-        rotated_size.width = size.height;
-        rotated_size.height = size.width;
+get_oriented_size(struct sc_size size, enum sc_orientation orientation) {
+    struct sc_size oriented_size;
+    if (sc_orientation_is_swap(orientation)) {
+        oriented_size.width = size.height;
+        oriented_size.height = size.width;
    } else {
-        rotated_size.width = size.width;
-        rotated_size.height = size.height;
+        oriented_size.width = size.width;
+        oriented_size.height = size.height;
    }
-    return rotated_size;
+    return oriented_size;
 }

 // get the window size in a struct sc_size
@@ -251,7 +251,7 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
    }

    enum sc_display_result res =
-        sc_display_render(&screen->display, &screen->rect, screen->rotation);
+        sc_display_render(&screen->display, &screen->rect, screen->orientation);
    (void) res; // any error already logged
 }

@@ -379,9 +379,10 @@ sc_screen_init(struct sc_screen *screen,
        goto error_destroy_frame_buffer;
    }

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

    uint32_t window_flags = SDL_WINDOW_HIDDEN
@@ -559,19 +560,19 @@ apply_pending_resize(struct sc_screen *screen) {
 }

 void
-sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation) {
-    assert(rotation < 4);
-    if (rotation == screen->rotation) {
+sc_screen_set_orientation(struct sc_screen *screen,
+                          enum sc_orientation orientation) {
+    if (orientation == screen->orientation) {
        return;
    }

    struct sc_size new_content_size =
-        get_rotated_size(screen->frame_size, rotation);
+        get_oriented_size(screen->frame_size, orientation);

    set_content_size(screen, new_content_size);

-    screen->rotation = rotation;
-    LOGI("Display rotation set to %u", rotation);
+    screen->orientation = orientation;
+    LOGI("Display orientation set to %s", sc_orientation_get_name(orientation));

    sc_screen_render(screen, true);
 }
@@ -584,7 +585,7 @@ sc_screen_init_size(struct sc_screen *screen) {
    // The requested size is passed via screen->frame_size

    struct sc_size content_size =
-        get_rotated_size(screen->frame_size, screen->rotation);
+        get_oriented_size(screen->frame_size, screen->orientation);
    screen->content_size = content_size;

    enum sc_display_result res =
@@ -604,7 +605,7 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
    screen->frame_size = new_frame_size;

    struct sc_size new_content_size =
-        get_rotated_size(new_frame_size, screen->rotation);
+        get_oriented_size(new_frame_size, screen->orientation);
    set_content_size(screen, new_content_size);

    sc_screen_update_content_rect(screen);
@@ -843,8 +844,7 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
 struct sc_point
 sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
                                           int32_t x, int32_t y) {
-    unsigned rotation = screen->rotation;
-    assert(rotation < 4);
+    enum sc_orientation orientation = screen->orientation;

    int32_t w = screen->content_size.width;
    int32_t h = screen->content_size.height;
@@ -855,27 +855,43 @@ sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
    x = (int64_t) (x - screen->rect.x) * w / screen->rect.w;
    y = (int64_t) (y - screen->rect.y) * h / screen->rect.h;

-    // rotate
    struct sc_point result;
-    switch (rotation) {
-        case 0:
+    switch (orientation) {
+        case SC_ORIENTATION_0:
            result.x = x;
            result.y = y;
            break;
-        case 1:
-            result.x = h - y;
-            result.y = x;
-            break;
-        case 2:
-            result.x = w - x;
-            result.y = h - y;
-            break;
-        default:
-            assert(rotation == 3);
+        case SC_ORIENTATION_90:
            result.x = y;
            result.y = w - x;
            break;
+        case SC_ORIENTATION_180:
+            result.x = w - x;
+            result.y = h - y;
+            break;
+        case SC_ORIENTATION_270:
+            result.x = h - y;
+            result.y = x;
+            break;
+        case SC_ORIENTATION_FLIP_0:
+            result.x = w - x;
+            result.y = y;
+            break;
+        case SC_ORIENTATION_FLIP_90:
+            result.x = h - y;
+            result.y = w - x;
+            break;
+        case SC_ORIENTATION_FLIP_180:
+            result.x = x;
+            result.y = h - y;
+            break;
+        default:
+            assert(orientation == SC_ORIENTATION_FLIP_270);
+            result.x = y;
+            result.y = x;
+            break;
    }
+
    return result;
 }

--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -14,6 +14,7 @@
 #include "frame_buffer.h"
 #include "input_manager.h"
 #include "opengl.h"
+#include "options.h"
 #include "trait/key_processor.h"
 #include "trait/frame_sink.h"
 #include "trait/mouse_processor.h"
@@ -49,8 +50,8 @@ struct sc_screen {
    // fullscreen (meaningful only when resize_pending is true)
    struct sc_size windowed_content_size;

-    // client rotation: 0, 1, 2 or 3 (x90 degrees counterclockwise)
-    unsigned rotation;
+    // client orientation
+    enum sc_orientation orientation;
    // rectangle of the content (excluding black borders)
    struct SDL_Rect rect;
    bool has_frame;
@@ -86,7 +87,7 @@ struct sc_screen_params {

    bool window_borderless;

-    uint8_t rotation;
+    enum sc_orientation orientation;
    bool mipmaps;

    bool fullscreen;
@@ -129,9 +130,10 @@ sc_screen_resize_to_fit(struct sc_screen *screen);
 void
 sc_screen_resize_to_pixel_perfect(struct sc_screen *screen);

-// set the display rotation (0, 1, 2 or 3, x90 degrees counterclockwise)
+// set the display orientation
 void
-sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation);
+sc_screen_set_orientation(struct sc_screen *screen,
+                          enum sc_orientation orientation);

 // react to SDL events
 // If this function returns false, scrcpy must exit with an error.
--- a/app/src/util/audiobuf.c
+++ b/app/src/util/audiobuf.c
@@ -0,0 +1,109 @@
+#include "audiobuf.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <util/log.h>
+#include <util/memory.h>
+
+bool
+sc_audiobuf_init(struct sc_audiobuf *buf, size_t sample_size,
+                 uint32_t capacity) {
+    assert(sample_size);
+    assert(capacity);
+
+    // The actual capacity is (alloc_size - 1) so that head == tail is
+    // non-ambiguous
+    buf->alloc_size = capacity + 1;
+    buf->data = sc_allocarray(buf->alloc_size, sample_size);
+    if (!buf->data) {
+        LOG_OOM();
+        return false;
+    }
+
+    buf->sample_size = sample_size;
+    atomic_init(&buf->head, 0);
+    atomic_init(&buf->tail, 0);
+
+    return true;
+}
+
+void
+sc_audiobuf_destroy(struct sc_audiobuf *buf) {
+    free(buf->data);
+}
+
+uint32_t
+sc_audiobuf_read(struct sc_audiobuf *buf, void *to, uint32_t samples_count) {
+    assert(samples_count);
+
+    // Only the reader thread can write tail without synchronization, so
+    // memory_order_relaxed is sufficient
+    uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_relaxed);
+
+    // The head cursor is updated after the data is written to the array
+    uint32_t head = atomic_load_explicit(&buf->head, memory_order_acquire);
+
+    uint32_t can_read = (buf->alloc_size + head - tail) % buf->alloc_size;
+    if (samples_count > can_read) {
+        samples_count = can_read;
+    }
+
+    if (to) {
+        uint32_t right_limit = tail < head ? head : buf->alloc_size;
+        uint32_t right_count = right_limit - tail;
+        if (right_count > samples_count) {
+            right_count = samples_count;
+        }
+        memcpy(to,
+               buf->data + (tail * buf->sample_size),
+               right_count * buf->sample_size);
+
+        if (samples_count > right_count) {
+            uint32_t left_count = samples_count - right_count;
+            memcpy(to + (right_count * buf->sample_size),
+                   buf->data,
+                   left_count * buf->sample_size);
+        }
+    }
+
+    uint32_t new_tail = (tail + samples_count) % buf->alloc_size;
+    atomic_store_explicit(&buf->tail, new_tail, memory_order_release);
+
+    return samples_count;
+}
+
+uint32_t
+sc_audiobuf_write(struct sc_audiobuf *buf, const void *from,
+                  uint32_t samples_count) {
+    // Only the writer thread can write head, so memory_order_relaxed is
+    // sufficient
+    uint32_t head = atomic_load_explicit(&buf->head, memory_order_relaxed);
+
+    // The tail cursor is updated after the data is consumed by the reader
+    uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);
+
+    uint32_t can_write = (buf->alloc_size + tail - head - 1) % buf->alloc_size;
+    if (samples_count > can_write) {
+        samples_count = can_write;
+    }
+
+    uint32_t right_count = buf->alloc_size - head;
+    if (right_count > samples_count) {
+        right_count = samples_count;
+    }
+    memcpy(buf->data + (head * buf->sample_size),
+           from,
+           right_count * buf->sample_size);
+
+    if (samples_count > right_count) {
+        uint32_t left_count = samples_count - right_count;
+        memcpy(buf->data,
+               from + (right_count * buf->sample_size),
+               left_count * buf->sample_size);
+    }
+
+    uint32_t new_head = (head + samples_count) % buf->alloc_size;
+    atomic_store_explicit(&buf->head, new_head, memory_order_release);
+
+    return samples_count;
+}
--- a/app/src/util/audiobuf.h
+++ b/app/src/util/audiobuf.h
@@ -3,19 +3,25 @@

 #include "common.h"

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

-#include "util/bytebuf.h"
-
 /**
 * Wrapper around bytebuf to read and write samples
 *
 * Each sample takes sample_size bytes.
 */
 struct sc_audiobuf {
-    struct sc_bytebuf buf;
-    size_t sample_size;
+    void *data;
+    uint32_t sample_size;
+    uint32_t alloc_size; // in samples
+
+    atomic_uint_least32_t head; // writer cursor, in samples
+    atomic_uint_least32_t tail; // reader cursor, in samples
+    // empty: tail == head
+    // full: ((tail + 1) % alloc_size) == head
 };

 static inline uint32_t
@@ -29,66 +35,31 @@ sc_audiobuf_to_bytes(struct sc_audiobuf *buf, uint32_t samples) {
    return samples * buf->sample_size;
 }

-static inline bool
+bool
 sc_audiobuf_init(struct sc_audiobuf *buf, size_t sample_size,
-                 uint32_t capacity) {
-    buf->sample_size = sample_size;
-    return sc_bytebuf_init(&buf->buf, capacity * sample_size + 1);
-}
+                 uint32_t capacity);

-static inline void
-sc_audiobuf_read(struct sc_audiobuf *buf, uint8_t *to, uint32_t samples) {
-    size_t bytes = sc_audiobuf_to_bytes(buf, samples);
-    sc_bytebuf_read(&buf->buf, to, bytes);
-}
+void
+sc_audiobuf_destroy(struct sc_audiobuf *buf);

-static inline void
-sc_audiobuf_skip(struct sc_audiobuf *buf, uint32_t samples) {
-    size_t bytes = sc_audiobuf_to_bytes(buf, samples);
-    sc_bytebuf_skip(&buf->buf, bytes);
-}
+uint32_t
+sc_audiobuf_read(struct sc_audiobuf *buf, void *to, uint32_t samples_count);

-static inline void
-sc_audiobuf_write(struct sc_audiobuf *buf, const uint8_t *from,
-                  uint32_t samples) {
-    size_t bytes = sc_audiobuf_to_bytes(buf, samples);
-    sc_bytebuf_write(&buf->buf, from, bytes);
-}
+uint32_t
+sc_audiobuf_write(struct sc_audiobuf *buf, const void *from,
+                  uint32_t samples_count);

-static inline void
-sc_audiobuf_prepare_write(struct sc_audiobuf *buf, const uint8_t *from,
-                          uint32_t samples) {
-    size_t bytes = sc_audiobuf_to_bytes(buf, samples);
-    sc_bytebuf_prepare_write(&buf->buf, from, bytes);
-}
-
-static inline void
-sc_audiobuf_commit_write(struct sc_audiobuf *buf, uint32_t samples) {
-    size_t bytes = sc_audiobuf_to_bytes(buf, samples);
-    sc_bytebuf_commit_write(&buf->buf, bytes);
+static inline uint32_t
+sc_audiobuf_capacity(struct sc_audiobuf *buf) {
+    assert(buf->alloc_size);
+    return buf->alloc_size - 1;
 }

 static inline uint32_t
 sc_audiobuf_can_read(struct sc_audiobuf *buf) {
-    size_t bytes = sc_bytebuf_can_read(&buf->buf);
-    return sc_audiobuf_to_samples(buf, bytes);
-}
-
-static inline uint32_t
-sc_audiobuf_can_write(struct sc_audiobuf *buf) {
-    size_t bytes = sc_bytebuf_can_write(&buf->buf);
-    return sc_audiobuf_to_samples(buf, bytes);
-}
-
-static inline uint32_t
-sc_audiobuf_capacity(struct sc_audiobuf *buf) {
-    size_t bytes = sc_bytebuf_capacity(&buf->buf);
-    return sc_audiobuf_to_samples(buf, bytes);
-}
-
-static inline void
-sc_audiobuf_destroy(struct sc_audiobuf *buf) {
-    sc_bytebuf_destroy(&buf->buf);
+    uint32_t head = atomic_load_explicit(&buf->head, memory_order_acquire);
+    uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);
+    return (buf->alloc_size + head - tail) % buf->alloc_size;
 }

 #endif
--- a/app/src/util/bytebuf.c
+++ b/app/src/util/bytebuf.c
@@ -1,104 +0,0 @@
-#include "bytebuf.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util/log.h"
-
-bool
-sc_bytebuf_init(struct sc_bytebuf *buf, size_t alloc_size) {
-    assert(alloc_size);
-    buf->data = malloc(alloc_size);
-    if (!buf->data) {
-        LOG_OOM();
-        return false;
-    }
-
-    buf->alloc_size = alloc_size;
-    buf->head = 0;
-    buf->tail = 0;
-
-    return true;
-}
-
-void
-sc_bytebuf_destroy(struct sc_bytebuf *buf) {
-    free(buf->data);
-}
-
-void
-sc_bytebuf_read(struct sc_bytebuf *buf, uint8_t *to, size_t len) {
-    assert(len);
-    assert(len <= sc_bytebuf_can_read(buf));
-    assert(buf->tail != buf->head); // the buffer could not be empty
-
-    size_t right_limit = buf->tail < buf->head ? buf->head : buf->alloc_size;
-    size_t right_len = right_limit - buf->tail;
-    if (len < right_len) {
-        right_len = len;
-    }
-    memcpy(to, buf->data + buf->tail, right_len);
-
-    if (len > right_len) {
-        memcpy(to + right_len, buf->data, len - right_len);
-    }
-
-    buf->tail = (buf->tail + len) % buf->alloc_size;
-}
-
-void
-sc_bytebuf_skip(struct sc_bytebuf *buf, size_t len) {
-    assert(len);
-    assert(len <= sc_bytebuf_can_read(buf));
-    assert(buf->tail != buf->head); // the buffer could not be empty
-
-    buf->tail = (buf->tail + len) % buf->alloc_size;
-}
-
-static inline void
-sc_bytebuf_write_step0(struct sc_bytebuf *buf, const uint8_t *from,
-                       size_t len) {
-    size_t right_len = buf->alloc_size - buf->head;
-    if (len < right_len) {
-        right_len = len;
-    }
-    memcpy(buf->data + buf->head, from, right_len);
-
-    if (len > right_len) {
-        memcpy(buf->data, from + right_len, len - right_len);
-    }
-}
-
-static inline void
-sc_bytebuf_write_step1(struct sc_bytebuf *buf, size_t len) {
-    buf->head = (buf->head + len) % buf->alloc_size;
-}
-
-void
-sc_bytebuf_write(struct sc_bytebuf *buf, const uint8_t *from, size_t len) {
-    assert(len);
-    assert(len <= sc_bytebuf_can_write(buf));
-
-    sc_bytebuf_write_step0(buf, from, len);
-    sc_bytebuf_write_step1(buf, len);
-}
-
-void
-sc_bytebuf_prepare_write(struct sc_bytebuf *buf, const uint8_t *from,
-                         size_t len) {
-    // *This function MUST NOT access buf->tail (even in assert()).*
-    // The purpose of this function is to allow a reader and a writer to access
-    // different parts of the buffer in parallel simultaneously. It is intended
-    // to be called without lock (only sc_bytebuf_commit_write() is intended to
-    // be called with lock held).
-
-    assert(len < buf->alloc_size - 1);
-    sc_bytebuf_write_step0(buf, from, len);
-}
-
-void
-sc_bytebuf_commit_write(struct sc_bytebuf *buf, size_t len) {
-    assert(len <= sc_bytebuf_can_write(buf));
-    sc_bytebuf_write_step1(buf, len);
-}
--- a/app/src/util/bytebuf.h
+++ b/app/src/util/bytebuf.h
@@ -1,114 +0,0 @@
-#ifndef SC_BYTEBUF_H
-#define SC_BYTEBUF_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct sc_bytebuf {
-    uint8_t *data;
-    // The actual capacity is (allocated - 1) so that head == tail is
-    // non-ambiguous
-    size_t alloc_size;
-    size_t head; // writter cursor
-    size_t tail; // reader cursor
-    // empty: tail == head
-    // full: ((tail + 1) % alloc_size) == head
-};
-
-bool
-sc_bytebuf_init(struct sc_bytebuf *buf, size_t alloc_size);
-
-/**
- * Copy from the bytebuf to a user-provided array
- *
- * The caller must check that len <= sc_bytebuf_read_available() (it is an
- * error to attempt to read more bytes than available).
- *
- * This function is guaranteed not to write to buf->head.
- */
-void
-sc_bytebuf_read(struct sc_bytebuf *buf, uint8_t *to, size_t len);
-
-/**
- * Drop len bytes from the buffer
- *
- * The caller must check that len <= sc_bytebuf_read_available() (it is an
- * error to attempt to skip more bytes than available).
- *
- * This function is guaranteed not to write to buf->head.
- *
- * It is equivalent to call sc_bytebuf_read() to some array and discard the
- * array (but this function is more efficient since there is no copy).
- */
-void
-sc_bytebuf_skip(struct sc_bytebuf *buf, size_t len);
-
-/**
- * Copy the user-provided array to the bytebuf
- *
- * The caller must check that len <= sc_bytebuf_write_available() (it is an
- * error to write more bytes than the remaining available space).
- *
- * This function is guaranteed not to write to buf->tail.
- */
-void
-sc_bytebuf_write(struct sc_bytebuf *buf, const uint8_t *from, size_t len);
-
-/**
- * Copy the user-provided array to the bytebuf, but do not advance the cursor
- *
- * The caller must check that len <= sc_bytebuf_write_available() (it is an
- * error to write more bytes than the remaining available space).
- *
- * After this function is called, the write must be committed with
- * sc_bytebuf_commit_write().
- *
- * The purpose of this mechanism is to acquire a lock only to commit the write,
- * but not to perform the actual copy.
- *
- * This function is guaranteed not to access buf->tail.
- */
-void
-sc_bytebuf_prepare_write(struct sc_bytebuf *buf, const uint8_t *from,
-                         size_t len);
-
-/**
- * Commit a prepared write
- */
-void
-sc_bytebuf_commit_write(struct sc_bytebuf *buf, size_t len);
-
-/**
- * Return the number of bytes which can be read
- *
- * It is an error to read more bytes than available.
- */
-static inline size_t
-sc_bytebuf_can_read(struct sc_bytebuf *buf) {
-    return (buf->alloc_size + buf->head - buf->tail) % buf->alloc_size;
-}
-
-/**
- * Return the number of bytes which can be written
- *
- * It is an error to write more bytes than available.
- */
-static inline size_t
-sc_bytebuf_can_write(struct sc_bytebuf *buf) {
-    return (buf->alloc_size + buf->tail - buf->head - 1) % buf->alloc_size;
-}
-
-/**
- * Return the actual capacity of the buffer (can_read() + can_write())
- */
-static inline size_t
-sc_bytebuf_capacity(struct sc_bytebuf *buf) {
-    return buf->alloc_size - 1;
-}
-
-void
-sc_bytebuf_destroy(struct sc_bytebuf *buf);
-
-#endif
--- a/app/tests/test_audiobuf.c
+++ b/app/tests/test_audiobuf.c
@@ -0,0 +1,128 @@
+#include "common.h"
+
+#include <assert.h>
+#include <string.h>
+
+#include "util/audiobuf.h"
+
+static void test_audiobuf_simple(void) {
+    struct sc_audiobuf buf;
+    uint32_t data[20];
+
+    bool ok = sc_audiobuf_init(&buf, 4, 20);
+    assert(ok);
+
+    uint32_t samples[] = {1, 2, 3, 4, 5};
+    uint32_t w = sc_audiobuf_write(&buf, samples, 5);
+    assert(w == 5);
+
+    uint32_t r = sc_audiobuf_read(&buf, data, 4);
+    assert(r == 4);
+    assert(!memcmp(data, samples, 16));
+
+    uint32_t samples2[] = {6, 7, 8};
+    w = sc_audiobuf_write(&buf, samples2, 3);
+    assert(w == 3);
+
+    uint32_t single = 9;
+    w = sc_audiobuf_write(&buf, &single, 1);
+    assert(w == 1);
+
+    r = sc_audiobuf_read(&buf, &data[4], 8);
+    assert(r == 5);
+
+    uint32_t expected[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
+    assert(!memcmp(data, expected, 36));
+
+    sc_audiobuf_destroy(&buf);
+}
+
+static void test_audiobuf_boundaries(void) {
+    struct sc_audiobuf buf;
+    uint32_t data[20];
+
+    bool ok = sc_audiobuf_init(&buf, 4, 20);
+    assert(ok);
+
+    uint32_t samples[] = {1, 2, 3, 4, 5, 6};
+    uint32_t w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 6);
+
+    w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 6);
+
+    w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 6);
+
+    uint32_t r = sc_audiobuf_read(&buf, data, 9);
+    assert(r == 9);
+
+    uint32_t expected[] = {1, 2, 3, 4, 5, 6, 1, 2, 3};
+    assert(!memcmp(data, expected, 36));
+
+    uint32_t samples2[] = {7, 8, 9, 10, 11};
+    w = sc_audiobuf_write(&buf, samples2, 5);
+    assert(w == 5);
+
+    uint32_t single = 12;
+    w = sc_audiobuf_write(&buf, &single, 1);
+    assert(w == 1);
+
+    w = sc_audiobuf_read(&buf, NULL, 3);
+    assert(w == 3);
+
+    assert(sc_audiobuf_can_read(&buf) == 12);
+
+    r = sc_audiobuf_read(&buf, data, 12);
+    assert(r == 12);
+
+    uint32_t expected2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+    assert(!memcmp(data, expected2, 48));
+
+    sc_audiobuf_destroy(&buf);
+}
+
+static void test_audiobuf_partial_read_write(void) {
+    struct sc_audiobuf buf;
+    uint32_t data[15];
+
+    bool ok = sc_audiobuf_init(&buf, 4, 10);
+    assert(ok);
+
+    uint32_t samples[] = {1, 2, 3, 4, 5, 6};
+    uint32_t w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 6);
+
+    w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 4);
+
+    w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 0);
+
+    uint32_t r = sc_audiobuf_read(&buf, data, 3);
+    assert(r == 3);
+
+    uint32_t expected[] = {1, 2, 3};
+    assert(!memcmp(data, expected, 12));
+
+    w = sc_audiobuf_write(&buf, samples, 6);
+    assert(w == 3);
+
+    r = sc_audiobuf_read(&buf, data, 15);
+    assert(r == 10);
+    uint32_t expected2[] = {4, 5, 6, 1, 2, 3, 4, 1, 2, 3};
+    assert(!memcmp(data, expected2, 12));
+
+    sc_audiobuf_destroy(&buf);
+}
+
+int main(int argc, char *argv[]) {
+    (void) argc;
+    (void) argv;
+
+    test_audiobuf_simple();
+    test_audiobuf_boundaries();
+    test_audiobuf_partial_read_write();
+
+    return 0;
+}
--- a/app/tests/test_bytebuf.c
+++ b/app/tests/test_bytebuf.c
@@ -1,126 +0,0 @@
-#include "common.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "util/bytebuf.h"
-
-static void test_bytebuf_simple(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[20];
-
-    bool ok = sc_bytebuf_init(&buf, 20);
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello", sizeof("hello") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 5);
-
-    sc_bytebuf_read(&buf, data, 4);
-    assert(!strncmp((char *) data, "hell", 4));
-
-    sc_bytebuf_write(&buf, (uint8_t *) " world", sizeof(" world") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 7);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
-    assert(sc_bytebuf_can_read(&buf) == 8);
-
-    sc_bytebuf_read(&buf, &data[4], 8);
-    assert(sc_bytebuf_can_read(&buf) == 0);
-
-    data[12] = '\0';
-    assert(!strcmp((char *) data, "hello world!"));
-    assert(sc_bytebuf_can_read(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-static void test_bytebuf_boundaries(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[20];
-
-    bool ok = sc_bytebuf_init(&buf, 20);
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 6);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 12);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 18);
-
-    sc_bytebuf_read(&buf, data, 9);
-    assert(!strncmp((char *) data, "hello hel", 9));
-    assert(sc_bytebuf_can_read(&buf) == 9);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "world", sizeof("world") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 14);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
-    assert(sc_bytebuf_can_read(&buf) == 15);
-
-    sc_bytebuf_skip(&buf, 3);
-    assert(sc_bytebuf_can_read(&buf) == 12);
-
-    sc_bytebuf_read(&buf, data, 12);
-    data[12] = '\0';
-    assert(!strcmp((char *) data, "hello world!"));
-    assert(sc_bytebuf_can_read(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-static void test_bytebuf_two_steps_write(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[20];
-
-    bool ok = sc_bytebuf_init(&buf, 20);
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 6);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 12);
-
-    sc_bytebuf_prepare_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 12); // write not committed yet
-
-    sc_bytebuf_read(&buf, data, 9);
-    assert(!strncmp((char *) data, "hello hel", 3));
-    assert(sc_bytebuf_can_read(&buf) == 3);
-
-    sc_bytebuf_commit_write(&buf, sizeof("hello ") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 9);
-
-    sc_bytebuf_prepare_write(&buf, (uint8_t *) "world", sizeof("world") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 9); // write not committed yet
-
-    sc_bytebuf_commit_write(&buf, sizeof("world") - 1);
-    assert(sc_bytebuf_can_read(&buf) == 14);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
-    assert(sc_bytebuf_can_read(&buf) == 15);
-
-    sc_bytebuf_skip(&buf, 3);
-    assert(sc_bytebuf_can_read(&buf) == 12);
-
-    sc_bytebuf_read(&buf, data, 12);
-    data[12] = '\0';
-    assert(!strcmp((char *) data, "hello world!"));
-    assert(sc_bytebuf_can_read(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
-    test_bytebuf_simple();
-    test_bytebuf_boundaries();
-    test_bytebuf_two_steps_write();
-
-    return 0;
-}
--- a/app/tests/test_orientation.c
+++ b/app/tests/test_orientation.c
@@ -0,0 +1,91 @@
+#include "common.h"
+
+#include <assert.h>
+
+#include "options.h"
+
+static void test_transforms(void) {
+    #define O(X) SC_ORIENTATION_ ## X
+    #define ASSERT_TRANSFORM(SRC, TR, RES) \
+        assert(sc_orientation_apply(O(SRC), O(TR)) == O(RES));
+
+    ASSERT_TRANSFORM(0, 0, 0);
+    ASSERT_TRANSFORM(0, 90, 90);
+    ASSERT_TRANSFORM(0, 180, 180);
+    ASSERT_TRANSFORM(0, 270, 270);
+    ASSERT_TRANSFORM(0, FLIP_0, FLIP_0);
+    ASSERT_TRANSFORM(0, FLIP_90, FLIP_90);
+    ASSERT_TRANSFORM(0, FLIP_180, FLIP_180);
+    ASSERT_TRANSFORM(0, FLIP_270, FLIP_270);
+
+    ASSERT_TRANSFORM(90, 0, 90);
+    ASSERT_TRANSFORM(90, 90, 180);
+    ASSERT_TRANSFORM(90, 180, 270);
+    ASSERT_TRANSFORM(90, 270, 0);
+    ASSERT_TRANSFORM(90, FLIP_0, FLIP_270);
+    ASSERT_TRANSFORM(90, FLIP_90, FLIP_0);
+    ASSERT_TRANSFORM(90, FLIP_180, FLIP_90);
+    ASSERT_TRANSFORM(90, FLIP_270, FLIP_180);
+
+    ASSERT_TRANSFORM(180, 0, 180);
+    ASSERT_TRANSFORM(180, 90, 270);
+    ASSERT_TRANSFORM(180, 180, 0);
+    ASSERT_TRANSFORM(180, 270, 90);
+    ASSERT_TRANSFORM(180, FLIP_0, FLIP_180);
+    ASSERT_TRANSFORM(180, FLIP_90, FLIP_270);
+    ASSERT_TRANSFORM(180, FLIP_180, FLIP_0);
+    ASSERT_TRANSFORM(180, FLIP_270, FLIP_90);
+
+    ASSERT_TRANSFORM(270, 0, 270);
+    ASSERT_TRANSFORM(270, 90, 0);
+    ASSERT_TRANSFORM(270, 180, 90);
+    ASSERT_TRANSFORM(270, 270, 180);
+    ASSERT_TRANSFORM(270, FLIP_0, FLIP_90);
+    ASSERT_TRANSFORM(270, FLIP_90, FLIP_180);
+    ASSERT_TRANSFORM(270, FLIP_180, FLIP_270);
+    ASSERT_TRANSFORM(270, FLIP_270, FLIP_0);
+
+    ASSERT_TRANSFORM(FLIP_0, 0, FLIP_0);
+    ASSERT_TRANSFORM(FLIP_0, 90, FLIP_90);
+    ASSERT_TRANSFORM(FLIP_0, 180, FLIP_180);
+    ASSERT_TRANSFORM(FLIP_0, 270, FLIP_270);
+    ASSERT_TRANSFORM(FLIP_0, FLIP_0, 0);
+    ASSERT_TRANSFORM(FLIP_0, FLIP_90, 90);
+    ASSERT_TRANSFORM(FLIP_0, FLIP_180, 180);
+    ASSERT_TRANSFORM(FLIP_0, FLIP_270, 270);
+
+    ASSERT_TRANSFORM(FLIP_90, 0, FLIP_90);
+    ASSERT_TRANSFORM(FLIP_90, 90, FLIP_180);
+    ASSERT_TRANSFORM(FLIP_90, 180, FLIP_270);
+    ASSERT_TRANSFORM(FLIP_90, 270, FLIP_0);
+    ASSERT_TRANSFORM(FLIP_90, FLIP_0, 270);
+    ASSERT_TRANSFORM(FLIP_90, FLIP_90, 0);
+    ASSERT_TRANSFORM(FLIP_90, FLIP_180, 90);
+    ASSERT_TRANSFORM(FLIP_90, FLIP_270, 180);
+
+    ASSERT_TRANSFORM(FLIP_180, 0, FLIP_180);
+    ASSERT_TRANSFORM(FLIP_180, 90, FLIP_270);
+    ASSERT_TRANSFORM(FLIP_180, 180, FLIP_0);
+    ASSERT_TRANSFORM(FLIP_180, 270, FLIP_90);
+    ASSERT_TRANSFORM(FLIP_180, FLIP_0, 180);
+    ASSERT_TRANSFORM(FLIP_180, FLIP_90, 270);
+    ASSERT_TRANSFORM(FLIP_180, FLIP_180, 0);
+    ASSERT_TRANSFORM(FLIP_180, FLIP_270, 90);
+
+    ASSERT_TRANSFORM(FLIP_270, 0, FLIP_270);
+    ASSERT_TRANSFORM(FLIP_270, 90, FLIP_0);
+    ASSERT_TRANSFORM(FLIP_270, 180, FLIP_90);
+    ASSERT_TRANSFORM(FLIP_270, 270, FLIP_180);
+    ASSERT_TRANSFORM(FLIP_270, FLIP_0, 90);
+    ASSERT_TRANSFORM(FLIP_270, FLIP_90, 180);
+    ASSERT_TRANSFORM(FLIP_270, FLIP_180, 270);
+    ASSERT_TRANSFORM(FLIP_270, FLIP_270, 0);
+}
+
+int main(int argc, char *argv[]) {
+    (void) argc;
+    (void) argv;
+
+    test_transforms();
+    return 0;
+}
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -6,7 +6,7 @@ c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
-pkgconfig = 'i686-w64-mingw32-pkg-config'
+pkg-config = 'i686-w64-mingw32-pkg-config'
 windres = 'i686-w64-mingw32-windres'

 [host_machine]
@@ -14,8 +14,3 @@ system = 'windows'
 cpu_family = 'x86'
 cpu = 'i686'
 endian = 'little'
-
-[properties]
-prebuilt_ffmpeg = 'ffmpeg-6.1-scrcpy-2/win32'
-prebuilt_sdl2 = 'SDL2-2.28.4/i686-w64-mingw32'
-prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-Win32'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -6,7 +6,7 @@ c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
-pkgconfig = 'x86_64-w64-mingw32-pkg-config'
+pkg-config = 'x86_64-w64-mingw32-pkg-config'
 windres = 'x86_64-w64-mingw32-windres'

 [host_machine]
@@ -14,8 +14,3 @@ system = 'windows'
 cpu_family = 'x86'
 cpu = 'x86_64'
 endian = 'little'
-
-[properties]
-prebuilt_ffmpeg = 'ffmpeg-6.1-scrcpy-2/win64'
-prebuilt_sdl2 = 'SDL2-2.28.4/x86_64-w64-mingw32'
-prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-x64'
--- a/doc/build.md
+++ b/doc/build.md
@@ -233,10 +233,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v2.2`][direct-scrcpy-server]  
-   <sub>SHA-256: `c85c4aa84305efb69115cd497a120ebdd10258993b4cf123a8245b3d99d49874`</sub>
+ - [`scrcpy-server-v2.3.1`][direct-scrcpy-server]  
+   <sub>SHA-256: `f6814822fc308a7a532f253485c9038183c6296a6c5df470a9e383b4f8e7605b`</sub>

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

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/doc/camera.md
+++ b/doc/camera.md
@@ -18,6 +18,17 @@ scrcpy --video-source=display --audio-source=mic    # force display AND micropho
 scrcpy --video-source=camera --audio-source=output  # force camera AND device audio output
 ```

+Audio can be disabled:
+
+```bash
+# audio not captured at all
+scrcpy --video-source=camera --no-audio
+scrcpy --video-source=camera --no-audio --record=file.mp4
+
+# audio captured and recorded, but not played
+scrcpy --video-source=camera --no-audio-playback --record=file.mp4
+```
+

 ## List

@@ -101,6 +112,16 @@ scrcpy --video-source=camera --camera-size=1920x1080 -m3000  # error
 ```


+## Rotation
+
+To rotate the captured video, use the [video orientation](video.md#orientation)
+option:
+
+```
+scrcpy --video-source=camera --camera-size=1920x1080 --orientation=90
+```
+
+
 ## Frame rate

 By default, camera is captured at Android's default frame rate (30 fps).
--- a/doc/control.md
+++ b/doc/control.md
@@ -85,7 +85,7 @@ way as <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>).
 To disable automatic clipboard synchronization, use
 `--no-clipboard-autosync`.

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

 To simulate "pinch-to-zoom": <kbd>Ctrl</kbd>+_click-and-move_.

@@ -93,8 +93,12 @@ More precisely, hold down <kbd>Ctrl</kbd> while pressing the left-click button.
 Until the left-click button is released, all mouse movements scale and rotate
 the content (if supported by the app) relative to the center of the screen.

+To simulate a tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.
+
 Technically, _scrcpy_ generates additional touch events from a "virtual finger"
-at a location inverted through the center of the screen.
+at a location inverted through the center of the screen. When pressing
+<kbd>Ctrl</kbd> the x and y coordinates are inverted. Using <kbd>Shift</kbd>
+only inverts x.


 ## Key repeat
--- a/doc/recording.md
+++ b/doc/recording.md
@@ -50,6 +50,12 @@ scrcpy --record=file --record-format=mkv
 ```


+## Rotation
+
+The video can be recorded rotated. See [video
+orientation](video.md#orientation).
+
+
 ## No playback

 To disable playback while recording:
--- a/doc/shortcuts.md
+++ b/doc/shortcuts.md
@@ -26,6 +26,8 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Switch fullscreen mode                      | <kbd>MOD</kbd>+<kbd>f</kbd>
 | Rotate display left                         | <kbd>MOD</kbd>+<kbd>←</kbd> _(left)_
 | Rotate display right                        | <kbd>MOD</kbd>+<kbd>→</kbd> _(right)_
+ | Flip display horizontally                   | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>←</kbd> _(left)_ \| <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>→</kbd> _(right)_
+ | Flip display vertically                     | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>↑</kbd> _(up)_ \| <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>↓</kbd> _(down)_
 | Resize window to 1:1 (pixel-perfect)        | <kbd>MOD</kbd>+<kbd>g</kbd>
 | Resize window to remove black borders       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-left-click¹_
 | Click on `HOME`                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Middle-click_
@@ -47,7 +49,8 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Synchronize clipboards and paste⁵           | <kbd>MOD</kbd>+<kbd>v</kbd>
 | Inject computer clipboard text              | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
 | Enable/disable FPS counter (on stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
- | Pinch-to-zoom                               | <kbd>Ctrl</kbd>+_click-and-move_
+ | Pinch-to-zoom/rotate                        | <kbd>Ctrl</kbd>+_click-and-move_
+ | Tilt (slide vertically with 2 fingers)      | <kbd>Shift</kbd>+_click-and-move_
 | Drag & drop APK file                        | Install APK from computer
 | Drag & drop non-APK file                    | [Push file to device](control.md#push-file-to-device)

--- a/doc/v4l2.md
+++ b/doc/v4l2.md
@@ -21,6 +21,13 @@ This will create a new video device in `/dev/videoN`, where `N` is an integer
 (more [options](https://github.com/umlaeute/v4l2loopback#options) are available
 to create several devices or devices with specific IDs).

+If you encounter problems detecting your device with Chrome/WebRTC, you can try
+`exclusive_caps` mode:
+
+```
+sudo modprobe v4l2loopback exclusive_caps=1
+```
+
 To list the enabled devices:

 ```bash
--- a/doc/video.md
+++ b/doc/video.md
@@ -97,39 +97,50 @@ scrcpy --video-codec=h264 --video-encoder='OMX.qcom.video.encoder.avc'
 ```


-## Rotation
+## Orientation

-The rotation may be applied at 3 different levels:
+The orientation may be applied at 3 different levels:
 - The [shortcut](shortcuts.md) <kbd>MOD</kbd>+<kbd>r</kbd> requests the
   device to switch between portrait and landscape (the current running app may
   refuse, if it does not support the requested orientation).
 - `--lock-video-orientation` changes the mirroring orientation (the orientation
   of the video sent from the device to the computer). This affects the
   recording.
- - `--rotation` rotates only the window content. This only affects the display,
-   not the recording. It may be changed dynamically at any time using the
-   [shortcuts](shortcuts.md) <kbd>MOD</kbd>+<kbd>←</kbd> and
-   <kbd>MOD</kbd>+<kbd>→</kbd>.
+ - `--orientation` is applied on the client side, and affects display and
+   recording. For the display, it can be changed dynamically using
+   [shortcuts](shortcuts.md).

-To lock the mirroring orientation:
+To lock the mirroring orientation (on the capture side):

 ```bash
-scrcpy --lock-video-orientation     # initial (current) orientation
-scrcpy --lock-video-orientation=0   # natural orientation
-scrcpy --lock-video-orientation=1   # 90° counterclockwise
-scrcpy --lock-video-orientation=2   # 180°
-scrcpy --lock-video-orientation=3   # 90° clockwise
+scrcpy --lock-video-orientation      # initial (current) orientation
+scrcpy --lock-video-orientation=0    # natural orientation
+scrcpy --lock-video-orientation=90   # 90° clockwise
+scrcpy --lock-video-orientation=180  # 180°
+scrcpy --lock-video-orientation=270  # 270° clockwise
 ```

-To set an initial window rotation:
+To orient the video (on the rendering side):

 ```bash
-scrcpy --rotation=0   # no rotation
-scrcpy --rotation=1   # 90 degrees counterclockwise
-scrcpy --rotation=2   # 180 degrees
-scrcpy --rotation=3   # 90 degrees clockwise
+scrcpy --orientation=0
+scrcpy --orientation=90       # 90° clockwise
+scrcpy --orientation=180      # 180°
+scrcpy --orientation=270      # 270° clockwise
+scrcpy --orientation=flip0    # hflip
+scrcpy --orientation=flip90   # hflip + 90° clockwise
+scrcpy --orientation=flip180  # vflip (hflip + 180°)
+scrcpy --orientation=flip270  # hflip + 270° clockwise
 ```

+The orientation can be set separately for display and record if necessary, via
+`--display-orientation` and `--record-orientation`.
+
+The rotation is applied to a recorded file by writing a display transformation
+to the MP4 or MKV target file. Flipping is not supported, so only the 4 first
+values are allowed when recording.
+
+
 ## Crop

 The device screen may be cropped to mirror only part of the screen.
--- a/doc/windows.md
+++ b/doc/windows.md
@@ -4,14 +4,14 @@

 Download the [latest release]:

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

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

 and extract it.

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

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

 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: 'v2.2',
+        version: '2.3.1',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/release.mk
+++ b/release.mk
@@ -69,58 +69,62 @@ prepare-deps:
 	@app/prebuilt-deps/prepare-libusb.sh

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

 build-win64: prepare-deps
-	[ -d "$(WIN64_BUILD_DIR)" ] || ( mkdir "$(WIN64_BUILD_DIR)" && \
-		meson setup "$(WIN64_BUILD_DIR)" \
-			--cross-file cross_win64.txt \
-			--buildtype release --strip -Db_lto=true \
-			-Dcompile_server=false \
-			-Dportable=true )
+	rm -rf "$(WIN64_BUILD_DIR)"
+	mkdir -p "$(WIN64_BUILD_DIR)/local"
+	cp -r app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-3/win64/. "$(WIN64_BUILD_DIR)/local/"
+	cp -r app/prebuilt-deps/data/SDL2-2.28.5/x86_64-w64-mingw32/. "$(WIN64_BUILD_DIR)/local/"
+	cp -r app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/. "$(WIN64_BUILD_DIR)/local/"
+	meson setup "$(WIN64_BUILD_DIR)" \
+		--pkg-config-path="$(WIN64_BUILD_DIR)/local/lib/pkgconfig" \
+		-Dc_args="-I$(PWD)/$(WIN64_BUILD_DIR)/local/include" \
+		-Dc_link_args="-L$(PWD)/$(WIN64_BUILD_DIR)/local/lib" \
+		--cross-file=cross_win64.txt \
+		--buildtype=release --strip -Db_lto=true \
+		-Dcompile_server=false \
+		-Dportable=true
 	ninja -C "$(WIN64_BUILD_DIR)"

 dist-win32: build-server build-win32
 	mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win32/bin/avutil-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win32/bin/avcodec-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win32/bin/avformat-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win32/bin/swresample-4.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.28.4/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/bin/msys-usb-1.0.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp "$(WIN32_BUILD_DIR)"/local/bin/*.dll "$(DIST)/$(WIN32_TARGET_DIR)/"

 dist-win64: build-server build-win64
 	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win64/bin/avutil-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win64/bin/avcodec-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win64/bin/avformat-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/ffmpeg-6.1-scrcpy-2/win64/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.28.4/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/bin/msys-usb-1.0.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp "$(WIN64_BUILD_DIR)"/local/bin/*.dll "$(DIST)/$(WIN64_TARGET_DIR)/"

 zip-win32: dist-win32
 	cd "$(DIST)"; \
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -7,8 +7,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 34
-        versionCode 200
-        versionName "v2.2"
+        versionCode 20301
+        versionName "2.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=v2.2
+SCRCPY_VERSION_NAME=2.3.1

 PLATFORM=${ANDROID_PLATFORM:-34}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-34.0.0}
--- a/server/src/main/java/com/genymobile/scrcpy/AsyncProcessor.java
+++ b/server/src/main/java/com/genymobile/scrcpy/AsyncProcessor.java
@@ -11,6 +11,8 @@ public interface AsyncProcessor {
    }

    void start(TerminationListener listener);
+
    void stop();
+
    void join() throws InterruptedException;
 }
--- a/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
@@ -153,13 +153,14 @@ public final class AudioCapture {
            previousRecorderTimestamp = timestamp.nanoTime;
        } else {
            if (nextPts == 0) {
-                Ln.w("Could not get any audio timestamp");
+                Ln.w("Could not get initial audio timestamp");
+                nextPts = System.nanoTime() / 1000;
            }
            // compute from previous timestamp and packet size
            pts = nextPts;
        }

-        long durationUs = r * 1000000 / (CHANNELS * BYTES_PER_SAMPLE * SAMPLE_RATE);
+        long durationUs = r * 1000000L / (CHANNELS * BYTES_PER_SAMPLE * SAMPLE_RATE);
        nextPts = pts + durationUs;

        if (previousPts != 0 && pts < previousPts + ONE_SAMPLE_US) {
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
@@ -289,18 +289,17 @@ public class CameraCapture extends SurfaceCapture {
        List<OutputConfiguration> outputs = Arrays.asList(outputConfig);

        int sessionType = highSpeed ? SessionConfiguration.SESSION_HIGH_SPEED : SessionConfiguration.SESSION_REGULAR;
-        SessionConfiguration sessionConfig = new SessionConfiguration(sessionType, outputs, cameraExecutor,
-                new CameraCaptureSession.StateCallback() {
-                    @Override
-                    public void onConfigured(CameraCaptureSession session) {
-                        future.complete(session);
-                    }
+        SessionConfiguration sessionConfig = new SessionConfiguration(sessionType, outputs, cameraExecutor, new CameraCaptureSession.StateCallback() {
+            @Override
+            public void onConfigured(CameraCaptureSession session) {
+                future.complete(session);
+            }

-                    @Override
-                    public void onConfigureFailed(CameraCaptureSession session) {
-                        future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
-                    }
-                });
+            @Override
+            public void onConfigureFailed(CameraCaptureSession session) {
+                future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
+            }
+        });

        camera.createCaptureSession(sessionConfig);

--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -14,8 +14,6 @@ import java.io.IOException;
 */
 public final class CleanUp {

-    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
-
    // A simple struct to be passed from the main process to the cleanup process
    public static class Config implements Parcelable {

@@ -135,13 +133,13 @@ public final class CleanUp {
        String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};

        ProcessBuilder builder = new ProcessBuilder(cmd);
-        builder.environment().put("CLASSPATH", SERVER_PATH);
+        builder.environment().put("CLASSPATH", Server.SERVER_PATH);
        builder.start();
    }

    public static void unlinkSelf() {
        try {
-            new File(SERVER_PATH).delete();
+            new File(Server.SERVER_PATH).delete();
        } catch (Exception e) {
            Ln.e("Could not unlink server", e);
        }
@@ -189,5 +187,7 @@ public final class CleanUp {
                Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
            }
        }
+
+        System.exit(0);
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -318,9 +318,8 @@ public class Controller implements AsyncProcessor {
            }
        }

-        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source,
-                        0);
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
+                DEFAULT_DEVICE_ID, 0, source, 0);
        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
    }

@@ -341,9 +340,8 @@ public class Controller implements AsyncProcessor {
        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);

-        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0,
-                        InputDevice.SOURCE_MOUSE, 0);
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
+                DEFAULT_DEVICE_ID, 0, InputDevice.SOURCE_MOUSE, 0);
        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
    }

--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -1,6 +1,7 @@
 package com.genymobile.scrcpy;

 import com.genymobile.scrcpy.wrappers.ClipboardManager;
+import com.genymobile.scrcpy.wrappers.DisplayControl;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
@@ -11,8 +12,8 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
-import android.view.IRotationWatcher;
 import android.view.IDisplayFoldListener;
+import android.view.IRotationWatcher;
 import android.view.InputDevice;
 import android.view.InputEvent;
 import android.view.KeyCharacterMap;
@@ -44,11 +45,11 @@ public final class Device {
        void onClipboardTextChanged(String text);
    }

-    private final Size deviceSize;
    private final Rect crop;
    private int maxSize;
    private final int lockVideoOrientation;

+    private Size deviceSize;
    private ScreenInfo screenInfo;
    private RotationListener rotationListener;
    private FoldListener foldListener;
@@ -115,8 +116,8 @@ public final class Device {
                            return;
                        }

-                        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), displayInfo.getSize(), options.getCrop(),
-                                options.getMaxSize(), options.getLockVideoOrientation());
+                        deviceSize = displayInfo.getSize();
+                        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
                        // notify
                        if (foldListener != null) {
                            foldListener.onFoldChanged(displayId, folded);
@@ -315,8 +316,12 @@ public final class Device {
     */
    public static boolean setScreenPowerMode(int mode) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // On Android 14, these internal methods have been moved to DisplayControl
+            boolean useDisplayControl =
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !SurfaceControl.hasPhysicalDisplayIdsMethod();
+
            // Change the power mode for all physical displays
-            long[] physicalDisplayIds = SurfaceControl.getPhysicalDisplayIds();
+            long[] physicalDisplayIds = useDisplayControl ? DisplayControl.getPhysicalDisplayIds() : SurfaceControl.getPhysicalDisplayIds();
            if (physicalDisplayIds == null) {
                Ln.e("Could not get physical display ids");
                return false;
@@ -324,7 +329,8 @@ public final class Device {

            boolean allOk = true;
            for (long physicalDisplayId : physicalDisplayIds) {
-                IBinder binder = SurfaceControl.getPhysicalDisplayToken(physicalDisplayId);
+                IBinder binder = useDisplayControl ? DisplayControl.getPhysicalDisplayToken(
+                        physicalDisplayId) : SurfaceControl.getPhysicalDisplayToken(physicalDisplayId);
                allOk &= SurfaceControl.setDisplayPowerMode(binder, mode);
            }
            return allOk;
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
@@ -51,6 +51,7 @@ public final class DeviceMessageSender {
            }
        }
    }
+
    public void start() {
        thread = new Thread(() -> {
            try {
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -3,12 +3,21 @@ package com.genymobile.scrcpy;
 import android.os.BatteryManager;
 import android.os.Build;

+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

 public final class Server {

+    public static final String SERVER_PATH;
+
+    static {
+        String[] classPaths = System.getProperty("java.class.path").split(File.pathSeparator);
+        // By convention, scrcpy is always executed with the absolute path of scrcpy-server.jar as the first item in the classpath
+        SERVER_PATH = classPaths[0];
+    }
+
    private static class Completion {
        private int running;
        private boolean fatalError;
--- a/server/src/main/java/com/genymobile/scrcpy/Settings.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Settings.java
@@ -75,7 +75,7 @@ public final class Settings {

        String oldValue = getValue(table, key);
        if (!value.equals(oldValue)) {
-             putValue(table, key, value);
+            putValue(table, key, value);
        }
        return oldValue;
    }
--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
@@ -49,6 +49,7 @@ public final class Workarounds {
    }

    public static void apply(boolean audio, boolean camera) {
+        boolean mustFillConfigurationController = false;
        boolean mustFillAppInfo = false;
        boolean mustFillAppContext = false;

@@ -85,11 +86,23 @@ public final class Workarounds {
            mustFillAppContext = true;
        }

+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            // On some Samsung devices, DisplayManagerGlobal.getDisplayInfoLocked() calls ActivityThread.currentActivityThread().getConfiguration(),
+            // which requires a non-null ConfigurationController.
+            // ConfigurationController was introduced in Android 12, so do not attempt to set it on lower versions.
+            // <https://github.com/Genymobile/scrcpy/issues/4467>
+            mustFillConfigurationController = true;
+        }
+
+        if (mustFillConfigurationController) {
+            // Must be call before fillAppContext() because it is necessary to get a valid system context
+            fillConfigurationController();
+        }
        if (mustFillAppInfo) {
-            Workarounds.fillAppInfo();
+            fillAppInfo();
        }
        if (mustFillAppContext) {
-            Workarounds.fillAppContext();
+            fillAppContext();
        }
    }

@@ -149,6 +162,22 @@ public final class Workarounds {
        }
    }

+    private static void fillConfigurationController() {
+        try {
+            Class<?> configurationControllerClass = Class.forName("android.app.ConfigurationController");
+            Class<?> activityThreadInternalClass = Class.forName("android.app.ActivityThreadInternal");
+            Constructor<?> configurationControllerConstructor = configurationControllerClass.getDeclaredConstructor(activityThreadInternalClass);
+            configurationControllerConstructor.setAccessible(true);
+            Object configurationController = configurationControllerConstructor.newInstance(ACTIVITY_THREAD);
+
+            Field configurationControllerField = ACTIVITY_THREAD_CLASS.getDeclaredField("mConfigurationController");
+            configurationControllerField.setAccessible(true);
+            configurationControllerField.set(ACTIVITY_THREAD, configurationController);
+        } catch (Throwable throwable) {
+            Ln.d("Could not fill configuration: " + throwable.getMessage());
+        }
+    }
+
    static Context getSystemContext() {
        try {
            Method getSystemContextMethod = ACTIVITY_THREAD_CLASS.getDeclaredMethod("getSystemContext");
@@ -256,16 +285,28 @@ public final class Workarounds {
                    Method getParcelMethod = attributionSourceState.getClass().getDeclaredMethod("getParcel");
                    Parcel attributionSourceParcel = (Parcel) getParcelMethod.invoke(attributionSourceState);

-                    // private native int native_setup(Object audiorecordThis,
-                    // Object /*AudioAttributes*/ attributes,
-                    // int[] sampleRate, int channelMask, int channelIndexMask, int audioFormat,
-                    // int buffSizeInBytes, int[] sessionId, @NonNull Parcel attributionSource,
-                    // long nativeRecordInJavaObj, int maxSharedAudioHistoryMs);
-                    Method nativeSetupMethod = AudioRecord.class.getDeclaredMethod("native_setup", Object.class, Object.class, int[].class, int.class,
-                            int.class, int.class, int.class, int[].class, Parcel.class, long.class, int.class);
-                    nativeSetupMethod.setAccessible(true);
-                    initResult = (int) nativeSetupMethod.invoke(audioRecord, new WeakReference<AudioRecord>(audioRecord), attributes, sampleRateArray,
-                            channelMask, channelIndexMask, audioRecord.getAudioFormat(), bufferSizeInBytes, session, attributionSourceParcel, 0L, 0);
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                        // private native int native_setup(Object audiorecordThis,
+                        // Object /*AudioAttributes*/ attributes,
+                        // int[] sampleRate, int channelMask, int channelIndexMask, int audioFormat,
+                        // int buffSizeInBytes, int[] sessionId, @NonNull Parcel attributionSource,
+                        // long nativeRecordInJavaObj, int maxSharedAudioHistoryMs);
+                        Method nativeSetupMethod = AudioRecord.class.getDeclaredMethod("native_setup", Object.class, Object.class, int[].class,
+                                int.class, int.class, int.class, int.class, int[].class, Parcel.class, long.class, int.class);
+                        nativeSetupMethod.setAccessible(true);
+                        initResult = (int) nativeSetupMethod.invoke(audioRecord, new WeakReference<AudioRecord>(audioRecord), attributes,
+                                sampleRateArray, channelMask, channelIndexMask, audioRecord.getAudioFormat(), bufferSizeInBytes, session,
+                                attributionSourceParcel, 0L, 0);
+                    } else {
+                        // Android 14 added a new int parameter "halInputFlags"
+                        // <https://github.com/aosp-mirror/platform_frameworks_base/commit/f6135d75db79b1d48fad3a3b3080d37be20a2313>
+                        Method nativeSetupMethod = AudioRecord.class.getDeclaredMethod("native_setup", Object.class, Object.class, int[].class,
+                                int.class, int.class, int.class, int.class, int[].class, Parcel.class, long.class, int.class, int.class);
+                        nativeSetupMethod.setAccessible(true);
+                        initResult = (int) nativeSetupMethod.invoke(audioRecord, new WeakReference<AudioRecord>(audioRecord), attributes,
+                                sampleRateArray, channelMask, channelIndexMask, audioRecord.getAudioFormat(), bufferSizeInBytes, session,
+                                attributionSourceParcel, 0L, 0, 0);
+                    }
                }
            }

--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -41,8 +41,14 @@ public final class ClipboardManager {
                            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class, int.class);
                            getMethodVersion = 2;
                        } catch (NoSuchMethodException e3) {
-                            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class, String.class);
-                            getMethodVersion = 3;
+                            try {
+                                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class, String.class);
+                                getMethodVersion = 3;
+                            } catch (NoSuchMethodException e4) {
+                                getPrimaryClipMethod = manager.getClass()
+                                        .getMethod("getPrimaryClip", String.class, String.class, int.class, int.class, boolean.class);
+                                getMethodVersion = 4;
+                            }
                        }
                    }
                }
@@ -87,8 +93,11 @@ public final class ClipboardManager {
                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID);
            case 2:
                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID, 0);
-            default:
+            case 3:
                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, FakeContext.ROOT_UID, null);
+            default:
+                // The last boolean parameter is "userOperate"
+                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID, 0, true);
        }
    }

@@ -138,8 +147,8 @@ public final class ClipboardManager {
        }
    }

-    private static void addPrimaryClipChangedListener(Method method, int methodVersion, IInterface manager,
-            IOnPrimaryClipChangedListener listener) throws InvocationTargetException, IllegalAccessException {
+    private static void addPrimaryClipChangedListener(Method method, int methodVersion, IInterface manager, IOnPrimaryClipChangedListener listener)
+            throws InvocationTargetException, IllegalAccessException {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
            method.invoke(manager, listener, FakeContext.PACKAGE_NAME);
            return;
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
@@ -0,0 +1,80 @@
+package com.genymobile.scrcpy.wrappers;
+
+import com.genymobile.scrcpy.Ln;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.IBinder;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+@SuppressLint({"PrivateApi", "SoonBlockedPrivateApi", "BlockedPrivateApi"})
+@TargetApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+public final class DisplayControl {
+
+    private static final Class<?> CLASS;
+
+    static {
+        Class<?> displayControlClass = null;
+        try {
+            Class<?> classLoaderFactoryClass = Class.forName("com.android.internal.os.ClassLoaderFactory");
+            Method createClassLoaderMethod = classLoaderFactoryClass.getDeclaredMethod("createClassLoader", String.class, String.class, String.class,
+                    ClassLoader.class, int.class, boolean.class, String.class);
+            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, "/system/framework/services.jar", null, null,
+                    ClassLoader.getSystemClassLoader(), 0, true, null);
+
+            displayControlClass = classLoader.loadClass("com.android.server.display.DisplayControl");
+
+            Method loadMethod = Runtime.class.getDeclaredMethod("loadLibrary0", Class.class, String.class);
+            loadMethod.setAccessible(true);
+            loadMethod.invoke(Runtime.getRuntime(), displayControlClass, "android_servers");
+        } catch (Throwable e) {
+            Ln.e("Could not initialize DisplayControl", e);
+            // Do not throw an exception here, the methods will fail when they are called
+        }
+        CLASS = displayControlClass;
+    }
+
+    private static Method getPhysicalDisplayTokenMethod;
+    private static Method getPhysicalDisplayIdsMethod;
+
+    private DisplayControl() {
+        // only static methods
+    }
+
+    private static Method getGetPhysicalDisplayTokenMethod() throws NoSuchMethodException {
+        if (getPhysicalDisplayTokenMethod == null) {
+            getPhysicalDisplayTokenMethod = CLASS.getMethod("getPhysicalDisplayToken", long.class);
+        }
+        return getPhysicalDisplayTokenMethod;
+    }
+
+    public static IBinder getPhysicalDisplayToken(long physicalDisplayId) {
+        try {
+            Method method = getGetPhysicalDisplayTokenMethod();
+            return (IBinder) method.invoke(null, physicalDisplayId);
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            Ln.e("Could not invoke method", e);
+            return null;
+        }
+    }
+
+    private static Method getGetPhysicalDisplayIdsMethod() throws NoSuchMethodException {
+        if (getPhysicalDisplayIdsMethod == null) {
+            getPhysicalDisplayIdsMethod = CLASS.getMethod("getPhysicalDisplayIds");
+        }
+        return getPhysicalDisplayIdsMethod;
+    }
+
+    public static long[] getPhysicalDisplayIds() {
+        try {
+            Method method = getGetPhysicalDisplayIdsMethod();
+            return (long[]) method.invoke(null);
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            Ln.e("Could not invoke method", e);
+            return null;
+        }
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
@@ -20,7 +20,7 @@ public final class PowerManager {
    private Method getIsScreenOnMethod() throws NoSuchMethodException {
        if (isScreenOnMethod == null) {
            @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
-                    String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
+            String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
            isScreenOnMethod = manager.getClass().getMethod(methodName);
        }
        return isScreenOnMethod;
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Method;
 public final class ServiceManager {

    private static final Method GET_SERVICE_METHOD;
+
    static {
        try {
            GET_SERVICE_METHOD = Class.forName("android.os.ServiceManager").getDeclaredMethod("getService", String.class);
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
@@ -139,6 +139,15 @@ public final class SurfaceControl {
        return getPhysicalDisplayIdsMethod;
    }

+    public static boolean hasPhysicalDisplayIdsMethod() {
+        try {
+            getGetPhysicalDisplayIdsMethod();
+            return true;
+        } catch (NoSuchMethodException e) {
+            return false;
+        }
+    }
+
    public static long[] getPhysicalDisplayIds() {
        try {
            Method method = getGetPhysicalDisplayIdsMethod();
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@@ -4,8 +4,8 @@ import com.genymobile.scrcpy.Ln;

 import android.annotation.TargetApi;
 import android.os.IInterface;
-import android.view.IRotationWatcher;
 import android.view.IDisplayFoldListener;
+import android.view.IRotationWatcher;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
Author	SHA1	Message	Date
Romain Vimont	1029835d75	audioplayer without locks	2024-01-01 19:22:55 +01:00
Romain Vimont	6a58891e13	Use current time as initial timestamp on error If the initial timestamp could not be retrieved, use the current time as returned by System.nanoTime(). In practice, it is the same time base as AudioRecord timestamps. Fixes #4536 <https://github.com/Genymobile/scrcpy/issues/4536>	2023-12-16 20:17:33 +01:00
Romain Vimont	ec41896c85	Fix integer overflow for audio packet duration The result is assigned to a long (64-bit signed integer), but the intermediate multiplication was stored in an int (32-bit signed integer). This value is only used as a fallback when no timestamp could be retrieved, that's why it did not cause too much harm so far. Fixes #4536 <https://github.com/Genymobile/scrcpy/issues/4536>	2023-12-16 20:16:31 +01:00
Romain Vimont	4cd61b5a90	Fix checkstyle violation Reported by checkstyle: > [ant:checkstyle] [INFO] > scrcpy/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java:48: > Line is longer than 150 characters (found 167). [LineLength]	2023-12-16 20:12:58 +01:00
Till Rathmann	d2ed4510a7	Simulate tilt multitouch event by pressing Shift PR #4529 <https://github.com/Genymobile/scrcpy/pull/4529> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-12-15 22:12:07 +01:00
Harsh Shandilya	604dfd7c6b	Fix incorrect compgen usage PR #4532 <https://github.com/Genymobile/scrcpy/pull/4532> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-12-14 17:08:19 +01:00
Harsh Shandilya	af69689ec1	Fix bash completion syntax PR #4532 <https://github.com/Genymobile/scrcpy/pull/4532> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-12-14 17:07:20 +01:00
Romain Vimont	cbce42336d	Fix manpage syntax The '-' character must be escaped. Fixes #4528 <https://github.com/Genymobile/scrcpy/issues/4528>	2023-12-13 13:42:57 +01:00
Romain Vimont	c9a4d2b38f	Use up-to-date values on display fold change When a display is folded or unfolded, the maxSize may have been updated since the option was passed, and deviceSize must be updated. Refs #4469 <https://github.com/Genymobile/scrcpy/pull/4469>	2023-12-04 08:50:12 +01:00
Romain Vimont	1beec99f82	Explicitly exit cleanup process This avoids an internal crash reported in `adb logcat`. Refs #4456 <https://github.com/Genymobile/scrcpy/pull/4456#issuecomment-1837427802>	2023-12-04 08:45:35 +01:00
Romain Vimont	5ce8672ebc	Add clipboard workaround for IQOO device Fixes #4492 <https://github.com/Genymobile/scrcpy/issues/4492>	2023-12-04 08:43:31 +01:00
Romain Vimont	3001f8a2d5	Adapt AudioRecord workaround to Android 14 Android 14 added a new int parameter "halInputFlags" to an internal method: <`f6135d75db`> Fixes #4492 <https://github.com/Genymobile/scrcpy/issues/4492>	2023-12-03 18:01:11 +01:00
Romain Vimont	c6ff78f414	Update links to v2.3.1	2023-12-02 12:39:05 +01:00
Romain Vimont	40f2560d98	Bump version to 2.3.1	2023-12-02 12:30:19 +01:00
Romain Vimont	26aa28c998	Merge branch 'master' into release	2023-12-02 12:29:31 +01:00
Romain Vimont	ef79fcbbd2	Fix AV1 demuxing For AV1, the config packet must not be merged with the next non-config packet. This fixes the following error when passing --video-codec=av1: > INFO: [FFmpeg] libdav1d 1.3.0 > ERROR: [FFmpeg] Unknown OBU type 0 of size 29393 > ERROR: [FFmpeg] Error parsing OBU data > ERROR: Decoder 'video': could not send video packet: -1094995529 PR #4487 <https://github.com/Genymobile/scrcpy/pull/4487>	2023-12-02 12:20:01 +01:00
Romain Vimont	9497f39fb4	Do not fail if SDL_INIT_VIDEO fails without video The SDL video subsystem may be initialized so that clipboard synchronization works even without video playback. But if the video subsystem initialization fails (e.g. because no video device is available), consider it as an error only if video playback is enabled. Refs `5e59ed3135` Fixes #4477 <https://github.com/Genymobile/scrcpy/issues/4477>	2023-11-29 12:16:05 +01:00
Romain Vimont	bf056b1fee	Do not initialize SDL video when not necessary The SDL video subsystem is required for video playback and clipboard synchronization. If neither is used, it is not necessary to initialize it. Refs `5e59ed3135` Refs `110b3a16f6` Refs #4418 <https://github.com/Genymobile/scrcpy/issues/4418> Refs #4477 <https://github.com/Genymobile/scrcpy/issues/4477>	2023-11-29 12:14:07 +01:00
Johannes Neyer	bd9292931e	Mention exclusive_caps mode in v4l2 documentation PR #4435 <https://github.com/Genymobile/scrcpy/pull/4435> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-11-28 08:32:28 +01:00
Romain Vimont	140a49b8be	Add workaround for Samsung devices issues On some Samsung devices, DisplayManagerGlobal.getDisplayInfoLocked() calls ActivityThread.currentActivityThread().getConfiguration(), which requires a non-null ConfigurationController. Fixes <https://github.com/Genymobile/scrcpy/issues/4467>	2023-11-27 09:29:06 +01:00
Romain Vimont	4135c411af	Fix compilation error Fix the following warning/error: ../app/src/cli.c:2158:17: warning: a label can only be part of a statement and a declaration is not a statement [-Wpedantic] With some compilers, this is an error rather than a pedantic warning. Refs <https://github.com/Genymobile/scrcpy/issues/2256#issuecomment-1467008307>	2023-11-25 23:56:46 +01:00
Romain Vimont	5e061636f6	Update links to v2.3	2023-11-25 22:15:07 +01:00
Romain Vimont	5f3fb843f5	Bump version to 2.3 The previous version bump to 2.2 was incorrect, it was updated by: ./bump_version v2.2 instead of: ./bump_version 2.2 Correctly bump to version 2.3. Refs #4433 <https://github.com/Genymobile/scrcpy/issues/4433#issuecomment-1816830875>	2023-11-25 21:40:27 +01:00
Romain Vimont	ce8126f322	Merge branch 'master' into release	2023-11-25 21:37:37 +01:00
Romain Vimont	d037b02cc2	Fix scrcpy-console.desktop The argument passed to scrcpy was not applied, the full command must be passed as a single argument. PR #4448 <https://github.com/Genymobile/scrcpy/pull/4448>	2023-11-25 21:35:04 +01:00
Kid	89761213c3	Do not quote $SHELL in .desktop files This does not work properly on some desktop environments (KDE), and $SHELL is unlikely to require quoting. Fixes #4367 <https://github.com/Genymobile/scrcpy/issues/4367> PR #4448 <https://github.com/Genymobile/scrcpy/pull/4448> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-11-25 21:28:43 +01:00
Kid	8db4e78b34	Fix Linux desktop files There were too many backslashes in the Exec line. Fixes #4367 <https://github.com/Genymobile/scrcpy/issues/4367> PR #4448 <https://github.com/Genymobile/scrcpy/pull/4448> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-11-25 21:28:43 +01:00
Romain Vimont	5d4b8a7e6d	Fix turn screen off on Android 14 On Android 14, the methods to access the display have been moved to DisplayControl, which is not in the core framework. Use a specific ClassLoader to access this class and its native dependencies. Fixes #3927 <https://github.com/Genymobile/scrcpy/issues/3927> Refs #3927 comment <https://github.com/Genymobile/scrcpy/issues/3927#issuecomment-1790031953> Refs #4446 comment <https://github.com/Genymobile/scrcpy/pull/4446#issuecomment-1824660915> PR #4456 <https://github.com/Genymobile/scrcpy/pull/4456> Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-11-25 21:25:26 +01:00
Romain Vimont	eed06b141a	Upgrade sdl (2.28.5) for Windows Include the latest version of SDL in Windows releases.	2023-11-25 21:06:45 +01:00
Romain Vimont	825d7f72c0	Extract $VERSION for dependency scripts This will allow to update the version only once in these files.	2023-11-25 21:06:45 +01:00
Romain Vimont	2370298b61	Download SDL prebuilt binaries from github The server is faster than libsdl.org.	2023-11-25 21:06:45 +01:00
Romain Vimont	67f356f881	Improve crossbuild Install all the prebuilt dependencies for Windows to a specific folder, and use meson command line options to specify their location. This removes crossbuild-specific code from the meson scripts and will simplify dependency upgrades. PR #4460 <https://github.com/Genymobile/scrcpy/pull/4460>	2023-11-25 21:06:37 +01:00
Romain Vimont	c573bd2a33	Fix java code style	2023-11-23 23:50:00 +01:00
sam80180	acb2988837	Do not hardcode server path on the device The path can be retrieved from the classpath. PR #4416 <https://github.com/Genymobile/scrcpy/pull/4416> Co-authored-by: Romain Vimont <rom@rom1v.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-11-23 23:39:40 +01:00
Romain Vimont	85a94dd4b5	Fix meson deprecated 'pkgconfig' to 'pkg-config' When running ./release.sh: > DEPRECATION: "pkgconfig" entry is deprecated and should be replaced by > "pkg-config"	2023-11-23 23:39:40 +01:00
Romain Vimont	94031dfe97	Update documentation about video orientation PR #4441 <https://github.com/Genymobile/scrcpy/pull/4441>	2023-11-23 23:34:46 +01:00
Romain Vimont	b43a9e8e7a	Add --orientation Add a shortcut to set both the display and record orientations. PR #4441 <https://github.com/Genymobile/scrcpy/pull/4441>	2023-11-23 23:34:46 +01:00
Romain Vimont	a9d6cb5837	Add --record-orientation Add an option to store the orientation to apply in a recorded file. Only rotations are supported (not flips). PR #4441 <https://github.com/Genymobile/scrcpy/pull/4441>	2023-11-23 23:34:46 +01:00
Romain Vimont	2f92686930	Pass --lock-video-orientation argument in degrees For consistency with the new --display-orientation option, express the --lock-video-orientation in degrees clockwise: * --lock-video-orientation=0 -> --lock-video-orientation=0 * --lock-video-orientation=3 -> --lock-video-orientation=90 * --lock-video-orientation=2 -> --lock-video-orientation=180 * --lock-video-orientation=1 -> --lock-video-orientation=270 PR #4441 <https://github.com/Genymobile/scrcpy/pull/4441>	2023-11-23 23:27:32 +01:00
Romain Vimont	bb88b60227	Add --display-orientation Deprecate the option --rotation and introduce a new option --display-orientation with the 8 possible orientations (0, 90, 180, 270, flip0, flip90, flip180 and flip270). New shortcuts MOD+Shift+(arrow) dynamically change the display (horizontal or vertical) flip. Fixes #1380 <https://github.com/Genymobile/scrcpy/issues/1380> Fixes #3819 <https://github.com/Genymobile/scrcpy/issues/3819> PR #4441 <https://github.com/Genymobile/scrcpy/pull/4441>	2023-11-23 23:27:28 +01:00
Romain Vimont	25e33566f5	Mention turning off audio in camera documentation	2023-11-21 08:46:38 +01:00