Detect codec/encoder mismatch

Fail with an explicit error when the requested encoder does not match
the requested codec.

Refs #5066 <https://github.com/Genymobile/scrcpy/issues/5066>

app/meson.build

@@ -5,7 +5,6 @@ src = [
     'src/adb/adb_parser.c',
     'src/adb/adb_tunnel.c',
     'src/audio_player.c',
-    'src/audio_regulator.c',
     'src/cli.c',
     'src/clock.c',
     'src/compat.c',
@@ -23,7 +22,6 @@ src = [
     'src/frame_buffer.c',
     'src/input_manager.c',
     'src/keyboard_sdk.c',
-    'src/mouse_capture.c',
     'src/mouse_sdk.c',
     'src/opengl.c',
     'src/options.c',

app/scrcpy.1

@@ -727,11 +727,7 @@ Pinch-to-zoom and rotate from the center of the screen
 
 .TP
 .B Shift+click-and-move
-Tilt vertically (slide with 2 fingers)
-
-.TP
-.B Ctrl+Shift+click-and-move
-Tilt horizontally (slide with 2 fingers)
+Tilt (slide vertically with two fingers)
 
 .TP
 .B Drag & drop APK file

app/src/audio_player.c

@@ -1,23 +1,138 @@
 #include "audio_player.h"
 
+#include <libavcodec/avcodec.h>
+#include <libavutil/opt.h>
+
 #include "util/log.h"
 
+//#define SC_AUDIO_PLAYER_DEBUG // uncomment to debug
+
+/**
+ * Real-time audio player with configurable latency
+ *
+ * As input, the player regularly receives AVFrames of decoded audio samples.
+ * As output, an SDL callback regularly requests audio samples to be played.
+ * In the middle, an audio buffer stores the samples produced but not consumed
+ * yet.
+ *
+ * The goal of the player is to feed the audio output with a latency as low as
+ * possible while avoiding buffer underrun (i.e. not being able to provide
+ * samples when requested).
+ *
+ * The player aims to feed the audio output with as little latency as possible
+ * while avoiding buffer underrun. To achieve this, it attempts to maintain the
+ * average buffering (the number of samples present in the buffer) around a
+ * target value. If this target buffering is too low, then buffer underrun will
+ * occur frequently. If it is too high, then latency will become unacceptable.
+ * This target value is configured using the scrcpy option --audio-buffer.
+ *
+ * The player cannot adjust the sample input rate (it receives samples produced
+ * in real-time) or the sample output rate (it must provide samples as
+ * requested by the audio output callback). Therefore, it may only apply
+ * compensation by resampling (converting _m_ input samples to _n_ output
+ * samples).
+ *
+ * The compensation itself is applied by libswresample (FFmpeg). It is
+ * configured using swr_set_compensation(). An important work for the player
+ * is to estimate the compensation value regularly and apply it.
+ *
+ * The estimated buffering level is the result of averaging the "natural"
+ * buffering (samples are produced and consumed by blocks, so it must be
+ * smoothed), and making instant adjustments resulting of its own actions
+ * (explicit compensation and silence insertion on underflow), which are not
+ * smoothed.
+ *
+ * Buffer underflow events can occur when packets arrive too late. In that case,
+ * the player inserts silence. Once the packets finally arrive (late), one
+ * strategy could be to drop the samples that were replaced by silence, in
+ * order to keep a minimal latency. However, dropping samples in case of buffer
+ * underflow is inadvisable, as it would temporarily increase the underflow
+ * even more and cause very noticeable audio glitches.
+ *
+ * Therefore, the player doesn't drop any sample on underflow. The compensation
+ * mechanism will absorb the delay introduced by the inserted silence.
+ */
+
 /** Downcast frame_sink to sc_audio_player */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_audio_player, frame_sink)
 
+#define SC_AV_SAMPLE_FMT AV_SAMPLE_FMT_FLT
 #define SC_SDL_SAMPLE_FMT AUDIO_F32
 
+#define TO_BYTES(SAMPLES) sc_audiobuf_to_bytes(&ap->buf, (SAMPLES))
+#define TO_SAMPLES(BYTES) sc_audiobuf_to_samples(&ap->buf, (BYTES))
+
 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_LockAudioDevice()
+
     assert(len_int > 0);
     size_t len = len_int;
+    uint32_t count = TO_SAMPLES(len);
 
-    assert(len % ap->audioreg.sample_size == 0);
-    uint32_t out_samples = len / ap->audioreg.sample_size;
+#ifdef SC_AUDIO_PLAYER_DEBUG
+    LOGD("[Audio] SDL callback requests %" PRIu32 " samples", count);
+#endif
 
-    sc_audio_regulator_pull(&ap->audioreg, stream, out_samples);
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (!played) {
+        uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
+        // Wait until the buffer is filled up to at least target_buffering
+        // before playing
+        if (buffered_samples < ap->target_buffering) {
+            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
+                 " samples", count);
+            // Delay playback starting to reach the target buffering. Fill the
+            // whole buffer with silence (len is small compared to the
+            // arbitrary margin value).
+            memset(stream, 0, len);
+            return;
+        }
+    }
+
+    uint32_t read = sc_audiobuf_read(&ap->buf, stream, count);
+
+    if (read < count) {
+        uint32_t silence = count - read;
+        // Insert silence. In theory, the inserted silent samples replace the
+        // missing real samples, which will arrive later, so they should be
+        // dropped to keep the latency minimal. However, this would cause very
+        // audible glitches, so let the clock compensation restore the target
+        // latency.
+        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
+             silence);
+        memset(stream + TO_BYTES(read), 0, TO_BYTES(silence));
+
+        bool received = atomic_load_explicit(&ap->received,
+                                             memory_order_relaxed);
+        if (received) {
+            // Inserting additional samples immediately increases buffering
+            atomic_fetch_add_explicit(&ap->underflow, silence,
+                                      memory_order_relaxed);
+        }
+    }
+
+    atomic_store_explicit(&ap->played, true, memory_order_relaxed);
+}
+
+static uint8_t *
+sc_audio_player_get_swr_buf(struct sc_audio_player *ap, uint32_t min_samples) {
+    size_t min_buf_size = TO_BYTES(min_samples);
+    if (min_buf_size > ap->swr_buf_alloc_size) {
+        size_t new_size = min_buf_size + 4096;
+        uint8_t *buf = realloc(ap->swr_buf, new_size);
+        if (!buf) {
+            LOG_OOM();
+            // Could not realloc to the requested size
+            return NULL;
+        }
+        ap->swr_buf = buf;
+        ap->swr_buf_alloc_size = new_size;
+    }
+
+    return ap->swr_buf;
 }
 
 static bool
@@ -25,21 +140,209 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
                                 const AVFrame *frame) {
     struct sc_audio_player *ap = DOWNCAST(sink);
 
-    return sc_audio_regulator_push(&ap->audioreg, frame);
+    SwrContext *swr_ctx = ap->swr_ctx;
+
+    int64_t swr_delay = swr_get_delay(swr_ctx, ap->sample_rate);
+    // No need to av_rescale_rnd(), input and output sample rates are the same.
+    // Add more space (256) for clock compensation.
+    int dst_nb_samples = swr_delay + frame->nb_samples + 256;
+
+    uint8_t *swr_buf = sc_audio_player_get_swr_buf(ap, dst_nb_samples);
+    if (!swr_buf) {
+        return false;
+    }
+
+    int ret = swr_convert(swr_ctx, &swr_buf, dst_nb_samples,
+                          (const uint8_t **) frame->data, frame->nb_samples);
+    if (ret < 0) {
+        LOGE("Resampling failed: %d", ret);
+        return false;
+    }
+
+    // swr_convert() returns the number of samples which would have been
+    // written if the buffer was big enough.
+    uint32_t samples = MIN(ret, dst_nb_samples);
+#ifdef SC_AUDIO_PLAYER_DEBUG
+    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
+#endif
+
+    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.
+        swr_buf += TO_BYTES(samples - cap);
+        samples = cap;
+    }
+
+    uint32_t skipped_samples = 0;
+
+    uint32_t written = sc_audiobuf_write(&ap->buf, swr_buf, samples);
+    if (written < samples) {
+        uint32_t remaining = samples - written;
+
+        // 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);
+
+        // 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
+            skipped_samples = sc_audiobuf_read(&ap->buf, NULL, remaining);
+            assert(skipped_samples == remaining);
+        }
+
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (written < samples) {
+            // Now there is enough space
+            uint32_t w = sc_audiobuf_write(&ap->buf,
+                                           swr_buf + TO_BYTES(written),
+                                           remaining);
+            assert(w == remaining);
+            (void) w;
+        }
+    }
+
+    uint32_t underflow = 0;
+    uint32_t max_buffered_samples;
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (played) {
+        underflow = atomic_exchange_explicit(&ap->underflow, 0,
+                                             memory_order_relaxed);
+
+        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.
+        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);
+            (void) r;
+            skipped_samples += skip_samples;
+        }
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (skip_samples) {
+            if (played) {
+                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
+                     " samples", skip_samples);
+#ifdef SC_AUDIO_PLAYER_DEBUG
+            } else {
+                LOGD("[Audio] Playback not started, skipping %" PRIu32
+                     " samples", skip_samples);
+#endif
+            }
+        }
+    }
+
+    atomic_store_explicit(&ap->received, true, memory_order_relaxed);
+    if (!played) {
+        // Nothing more to do
+        return true;
+    }
+
+    // Number of samples added (or removed, if negative) for compensation
+    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
+    // Inserting silence instantly increases buffering
+    int32_t inserted_silence = (int32_t) underflow;
+    // Dropping input samples instantly decreases buffering
+    int32_t dropped = (int32_t) skipped_samples;
+
+    // The compensation must apply instantly, it must not be smoothed
+    ap->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
+    if (ap->avg_buffering.avg < 0) {
+        // Since dropping samples instantly reduces buffering, the difference
+        // is applied immediately to the average value, assuming that the delay
+        // between the producer and the consumer will be caught up.
+        //
+        // However, when this assumption is not valid, the average buffering
+        // may decrease indefinitely. Prevent it to become negative to limit
+        // the consequences.
+        ap->avg_buffering.avg = 0;
+    }
+
+    // However, the buffering level must be smoothed
+    sc_average_push(&ap->avg_buffering, can_read);
+
+#ifdef SC_AUDIO_PLAYER_DEBUG
+    LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
+         can_read, sc_average_get(&ap->avg_buffering));
+#endif
+
+    ap->samples_since_resync += written;
+    if (ap->samples_since_resync >= ap->sample_rate) {
+        // Recompute compensation every second
+        ap->samples_since_resync = 0;
+
+        float avg = sc_average_get(&ap->avg_buffering);
+        int diff = ap->target_buffering - avg;
+
+        // Enable compensation when the difference exceeds +/- 4ms.
+        // Disable compensation when the difference is lower than +/- 1ms.
+        int threshold = ap->compensation != 0
+                      ? ap->sample_rate     / 1000  /* 1ms */
+                      : ap->sample_rate * 4 / 1000; /* 4ms */
+
+        if (abs(diff) < threshold) {
+            // Do not compensate for small values, the error is just noise
+            diff = 0;
+        } else if (diff < 0 && can_read < ap->target_buffering) {
+            // Do not accelerate if the instant buffering level is below the
+            // target, this would increase underflow
+            diff = 0;
+        }
+        // Compensate the diff over 4 seconds (but will be recomputed after 1
+        // second)
+        int distance = 4 * ap->sample_rate;
+        // Limit compensation rate to 2%
+        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, can_read, diff);
+
+        if (diff != ap->compensation) {
+            int ret = swr_set_compensation(swr_ctx, diff, distance);
+            if (ret < 0) {
+                LOGW("Resampling compensation failed: %d", ret);
+                // not fatal
+            } else {
+                ap->compensation = diff;
+            }
+        }
+    }
+
+    return true;
 }
 
 static bool
 sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
                                 const AVCodecContext *ctx) {
     struct sc_audio_player *ap = DOWNCAST(sink);
-
 #ifdef SCRCPY_LAVU_HAS_CHLAYOUT
-    assert(ctx->ch_layout.nb_channels > 0 && ctx->ch_layout.nb_channels < 256);
-    uint8_t nb_channels = ctx->ch_layout.nb_channels;
+    assert(ctx->ch_layout.nb_channels > 0);
+    unsigned nb_channels = ctx->ch_layout.nb_channels;
 #else
     int tmp = av_get_channel_layout_nb_channels(ctx->channel_layout);
-    assert(tmp > 0 && tmp < 256);
-    uint8_t nb_channels = tmp;
+    assert(tmp > 0);
+    unsigned nb_channels = tmp;
 #endif
 
     assert(ctx->sample_rate > 0);
@@ -47,19 +350,17 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     int out_bytes_per_sample = av_get_bytes_per_sample(SC_AV_SAMPLE_FMT);
     assert(out_bytes_per_sample > 0);
 
-    uint32_t target_buffering_samples =
-        ap->target_buffering_delay * ctx->sample_rate / SC_TICK_FREQ;
+    ap->sample_rate = ctx->sample_rate;
+    ap->nb_channels = nb_channels;
+    ap->out_bytes_per_sample = out_bytes_per_sample;
 
-    size_t sample_size = nb_channels * out_bytes_per_sample;
-    bool ok = sc_audio_regulator_init(&ap->audioreg, sample_size, ctx,
-                                      target_buffering_samples);
-    if (!ok) {
-        return false;
-    }
+    ap->target_buffering = ap->target_buffering_delay * ap->sample_rate
+                                                      / SC_TICK_FREQ;
 
-    uint64_t aout_samples = ap->output_buffer_duration * ctx->sample_rate
+    uint64_t aout_samples = ap->output_buffer_duration * ap->sample_rate
                                                        / SC_TICK_FREQ;
     assert(aout_samples <= 0xFFFF);
+    ap->output_buffer = (uint16_t) aout_samples;
 
     SDL_AudioSpec desired = {
         .freq = ctx->sample_rate,
@@ -74,10 +375,69 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     ap->device = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
     if (!ap->device) {
         LOGE("Could not open audio device: %s", SDL_GetError());
-        sc_audio_regulator_destroy(&ap->audioreg);
         return false;
     }
 
+    SwrContext *swr_ctx = swr_alloc();
+    if (!swr_ctx) {
+        LOG_OOM();
+        goto error_close_audio_device;
+    }
+    ap->swr_ctx = swr_ctx;
+
+#ifdef SCRCPY_LAVU_HAS_CHLAYOUT
+    av_opt_set_chlayout(swr_ctx, "in_chlayout", &ctx->ch_layout, 0);
+    av_opt_set_chlayout(swr_ctx, "out_chlayout", &ctx->ch_layout, 0);
+#else
+    av_opt_set_channel_layout(swr_ctx, "in_channel_layout",
+                              ctx->channel_layout, 0);
+    av_opt_set_channel_layout(swr_ctx, "out_channel_layout",
+                              ctx->channel_layout, 0);
+#endif
+
+    av_opt_set_int(swr_ctx, "in_sample_rate", ctx->sample_rate, 0);
+    av_opt_set_int(swr_ctx, "out_sample_rate", ctx->sample_rate, 0);
+
+    av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", ctx->sample_fmt, 0);
+    av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", SC_AV_SAMPLE_FMT, 0);
+
+    int ret = swr_init(swr_ctx);
+    if (ret) {
+        LOGE("Failed to initialize the resampling context");
+        goto error_free_swr_ctx;
+    }
+
+    // Use a ring-buffer of the target buffering size plus 1 second between the
+    // producer and the consumer. It's too big on purpose, to guarantee that
+    // the producer and the consumer will be able to access it in parallel
+    // without locking.
+    uint32_t audiobuf_samples = ap->target_buffering + ap->sample_rate;
+
+    size_t sample_size = ap->nb_channels * ap->out_bytes_per_sample;
+    bool ok = sc_audiobuf_init(&ap->buf, sample_size, audiobuf_samples);
+    if (!ok) {
+        goto error_free_swr_ctx;
+    }
+
+    size_t initial_swr_buf_size = TO_BYTES(4096);
+    ap->swr_buf = malloc(initial_swr_buf_size);
+    if (!ap->swr_buf) {
+        LOG_OOM();
+        goto error_destroy_audiobuf;
+    }
+    ap->swr_buf_alloc_size = initial_swr_buf_size;
+
+    // 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, 128);
+    ap->samples_since_resync = 0;
+
+    ap->received = false;
+    atomic_init(&ap->played, false);
+    atomic_init(&ap->received, false);
+    atomic_init(&ap->underflow, 0);
+    ap->compensation = 0;
+
     // The thread calling open() is the thread calling push(), which fills the
     // audio buffer consumed by the SDL audio thread.
     ok = sc_thread_set_priority(SC_THREAD_PRIORITY_TIME_CRITICAL);
@@ -89,6 +449,15 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     SDL_PauseAudioDevice(ap->device, 0);
 
     return true;
+
+error_destroy_audiobuf:
+    sc_audiobuf_destroy(&ap->buf);
+error_free_swr_ctx:
+    swr_free(&ap->swr_ctx);
+error_close_audio_device:
+    SDL_CloseAudioDevice(ap->device);
+
+    return false;
 }
 
 static void
@@ -99,7 +468,9 @@ sc_audio_player_frame_sink_close(struct sc_frame_sink *sink) {
     SDL_PauseAudioDevice(ap->device, 1);
     SDL_CloseAudioDevice(ap->device);
 
-    sc_audio_regulator_destroy(&ap->audioreg);
+    free(ap->swr_buf);
+    sc_audiobuf_destroy(&ap->buf);
+    swr_free(&ap->swr_ctx);
 }
 
 void

app/src/audio_player.h

@@ -5,27 +5,76 @@
 
 #include <stdatomic.h>
 #include <stdbool.h>
+#include <libavformat/avformat.h>
+#include <libswresample/swresample.h>
 #include <SDL2/SDL.h>
 
-#include "audio_regulator.h"
 #include "trait/frame_sink.h"
+#include "util/audiobuf.h"
+#include "util/average.h"
+#include "util/thread.h"
 #include "util/tick.h"
 
 struct sc_audio_player {
     struct sc_frame_sink frame_sink;
 
+    SDL_AudioDeviceID device;
+
     // The target buffering between the producer and the consumer. This value
     // is directly use for compensation.
     // Since audio capture and/or encoding on the device typically produce
     // blocks of 960 samples (20ms) or 1024 samples (~21.3ms), this target
     // value should be higher.
     sc_tick target_buffering_delay;
+    uint32_t target_buffering; // in samples
 
-    // SDL audio output buffer size
+    // SDL audio output buffer size.
     sc_tick output_buffer_duration;
+    uint16_t output_buffer;
 
-    SDL_AudioDeviceID device;
-    struct sc_audio_regulator audioreg;
+    // Audio buffer to communicate between the receiver and the SDL audio
+    // callback
+    struct sc_audiobuf buf;
+
+    // Resampler (only used from the receiver thread)
+    struct SwrContext *swr_ctx;
+
+    // The sample rate is the same for input and output
+    unsigned sample_rate;
+    // The number of channels is the same for input and output
+    unsigned nb_channels;
+    // The number of bytes per sample for a single channel
+    size_t out_bytes_per_sample;
+
+    // Target buffer for resampling (only used by the receiver thread)
+    uint8_t *swr_buf;
+    size_t swr_buf_alloc_size;
+
+    // Number of buffered samples (may be negative on underflow) (only used by
+    // the receiver thread)
+    struct sc_average avg_buffering;
+    // Count the number of samples to trigger a compensation update regularly
+    // (only used by the receiver thread)
+    uint32_t samples_since_resync;
+
+    // Number of silence samples inserted since the last received packet
+    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
+    atomic_bool received;
+
+    // Set to true the first time the SDL callback is called
+    atomic_bool played;
+
+    const struct sc_audio_player_callbacks *cbs;
+    void *cbs_userdata;
+};
+
+struct sc_audio_player_callbacks {
+    void (*on_ended)(struct sc_audio_player *ap, bool success, void *userdata);
 };
 
 void

app/src/audio_regulator.c

@@ -1,415 +0,0 @@
-#include "audio_regulator.h"
-
-#include <libavcodec/avcodec.h>
-#include <libavutil/opt.h>
-
-#include "util/log.h"
-
-//#define SC_AUDIO_REGULATOR_DEBUG // uncomment to debug
-
-/**
- * Real-time audio regulator with configurable latency
- *
- * As input, the regulator regularly receives AVFrames of decoded audio samples.
- * As output, the audio player regularly requests audio samples to be played.
- * In the middle, an audio buffer stores the samples produced but not consumed
- * yet.
- *
- * The goal of the regulator is to feed the audio player with a latency as low
- * as possible while avoiding buffer underrun (i.e. not being able to provide
- * samples when requested).
- *
- * To achieve this, it attempts to maintain the average buffering (the number
- * of samples present in the buffer) around a target value. If this target
- * buffering is too low, then buffer underrun will occur frequently. If it is
- * too high, then latency will become unacceptable. This target value is
- * configured using the scrcpy option --audio-buffer.
- *
- * The regulator cannot adjust the sample input rate (it receives samples
- * produced in real-time) or the sample output rate (it must provide samples as
- * requested by the audio player). Therefore, it may only apply compensation by
- * resampling (converting _m_ input samples to _n_ output samples).
- *
- * The compensation itself is applied by libswresample (FFmpeg). It is
- * configured using swr_set_compensation(). An important work for the regulator
- * is to estimate the compensation value regularly and apply it.
- *
- * The estimated buffering level is the result of averaging the "natural"
- * buffering (samples are produced and consumed by blocks, so it must be
- * smoothed), and making instant adjustments resulting of its own actions
- * (explicit compensation and silence insertion on underflow), which are not
- * smoothed.
- *
- * Buffer underflow events can occur when packets arrive too late. In that case,
- * the regulator inserts silence. Once the packets finally arrive (late), one
- * strategy could be to drop the samples that were replaced by silence, in
- * order to keep a minimal latency. However, dropping samples in case of buffer
- * underflow is inadvisable, as it would temporarily increase the underflow
- * even more and cause very noticeable audio glitches.
- *
- * Therefore, the regulator doesn't drop any sample on underflow. The
- * compensation mechanism will absorb the delay introduced by the inserted
- * silence.
- */
-
-#define TO_BYTES(SAMPLES) sc_audiobuf_to_bytes(&ar->buf, (SAMPLES))
-#define TO_SAMPLES(BYTES) sc_audiobuf_to_samples(&ar->buf, (BYTES))
-
-void
-sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
-                        uint32_t out_samples) {
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] Audio regulator pulls %" PRIu32 " samples", out_samples);
-#endif
-
-    // A lock is necessary in the rare case where the producer needs to drop
-    // samples already pushed (when the buffer is full)
-    sc_mutex_lock(&ar->mutex);
-
-    bool played = atomic_load_explicit(&ar->played, memory_order_relaxed);
-    if (!played) {
-        uint32_t buffered_samples = sc_audiobuf_can_read(&ar->buf);
-        // Wait until the buffer is filled up to at least target_buffering
-        // before playing
-        if (buffered_samples < ar->target_buffering) {
-            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
-                 " samples", out_samples);
-            // Delay playback starting to reach the target buffering. Fill the
-            // whole buffer with silence (len is small compared to the
-            // arbitrary margin value).
-            memset(out, 0, out_samples * ar->sample_size);
-            sc_mutex_unlock(&ar->mutex);
-            return;
-        }
-    }
-
-    uint32_t read = sc_audiobuf_read(&ar->buf, out, out_samples);
-
-    sc_mutex_unlock(&ar->mutex);
-
-    if (read < out_samples) {
-        uint32_t silence = out_samples - read;
-        // Insert silence. In theory, the inserted silent samples replace the
-        // missing real samples, which will arrive later, so they should be
-        // dropped to keep the latency minimal. However, this would cause very
-        // audible glitches, so let the clock compensation restore the target
-        // latency.
-        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
-             silence);
-        memset(out + TO_BYTES(read), 0, TO_BYTES(silence));
-
-        bool received = atomic_load_explicit(&ar->received,
-                                             memory_order_relaxed);
-        if (received) {
-            // Inserting additional samples immediately increases buffering
-            atomic_fetch_add_explicit(&ar->underflow, silence,
-                                      memory_order_relaxed);
-        }
-    }
-
-    atomic_store_explicit(&ar->played, true, memory_order_relaxed);
-}
-
-static uint8_t *
-sc_audio_regulator_get_swr_buf(struct sc_audio_regulator *ar,
-                               uint32_t min_samples) {
-    size_t min_buf_size = TO_BYTES(min_samples);
-    if (min_buf_size > ar->swr_buf_alloc_size) {
-        size_t new_size = min_buf_size + 4096;
-        uint8_t *buf = realloc(ar->swr_buf, new_size);
-        if (!buf) {
-            LOG_OOM();
-            // Could not realloc to the requested size
-            return NULL;
-        }
-        ar->swr_buf = buf;
-        ar->swr_buf_alloc_size = new_size;
-    }
-
-    return ar->swr_buf;
-}
-
-bool
-sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
-    SwrContext *swr_ctx = ar->swr_ctx;
-
-    int64_t swr_delay = swr_get_delay(swr_ctx, ar->sample_rate);
-    // No need to av_rescale_rnd(), input and output sample rates are the same.
-    // Add more space (256) for clock compensation.
-    int dst_nb_samples = swr_delay + frame->nb_samples + 256;
-
-    uint8_t *swr_buf = sc_audio_regulator_get_swr_buf(ar, dst_nb_samples);
-    if (!swr_buf) {
-        return false;
-    }
-
-    int ret = swr_convert(swr_ctx, &swr_buf, dst_nb_samples,
-                          (const uint8_t **) frame->data, frame->nb_samples);
-    if (ret < 0) {
-        LOGE("Resampling failed: %d", ret);
-        return false;
-    }
-
-    // swr_convert() returns the number of samples which would have been
-    // written if the buffer was big enough.
-    uint32_t samples = MIN(ret, dst_nb_samples);
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
-#endif
-
-    uint32_t cap = sc_audiobuf_capacity(&ar->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.
-        swr_buf += TO_BYTES(samples - cap);
-        samples = cap;
-    }
-
-    uint32_t skipped_samples = 0;
-
-    uint32_t written = sc_audiobuf_write(&ar->buf, swr_buf, samples);
-    if (written < samples) {
-        uint32_t remaining = samples - written;
-
-        // All samples that could be written without locking have been written,
-        // now we need to lock to drop/consume old samples
-        sc_mutex_lock(&ar->mutex);
-
-        // Retry with the lock
-        written += sc_audiobuf_write(&ar->buf,
-                                     swr_buf + TO_BYTES(written),
-                                     remaining);
-        if (written < samples) {
-            remaining = samples - written;
-            // Still insufficient, drop old samples to make space
-            skipped_samples = sc_audiobuf_read(&ar->buf, NULL, remaining);
-            assert(skipped_samples == remaining);
-        }
-
-        sc_mutex_unlock(&ar->mutex);
-
-        if (written < samples) {
-            // Now there is enough space
-            uint32_t w = sc_audiobuf_write(&ar->buf,
-                                           swr_buf + TO_BYTES(written),
-                                           remaining);
-            assert(w == remaining);
-            (void) w;
-        }
-    }
-
-    uint32_t underflow = 0;
-    uint32_t max_buffered_samples;
-    bool played = atomic_load_explicit(&ar->played, memory_order_relaxed);
-    if (played) {
-        underflow = atomic_exchange_explicit(&ar->underflow, 0,
-                                             memory_order_relaxed);
-
-        max_buffered_samples = ar->target_buffering * 11 / 10
-                             + 60 * ar->sample_rate / 1000 /* 60 ms */;
-    } else {
-        // Playback not started yet, do not accumulate more than
-        // max_initial_buffering samples, this would cause unnecessary delay
-        // (and glitches to compensate) on start.
-        max_buffered_samples = ar->target_buffering
-                             + 10 * ar->sample_rate / 1000 /* 10 ms */;
-    }
-
-    uint32_t can_read = sc_audiobuf_can_read(&ar->buf);
-    if (can_read > max_buffered_samples) {
-        uint32_t skip_samples = 0;
-
-        sc_mutex_lock(&ar->mutex);
-        can_read = sc_audiobuf_can_read(&ar->buf);
-        if (can_read > max_buffered_samples) {
-            skip_samples = can_read - max_buffered_samples;
-            uint32_t r = sc_audiobuf_read(&ar->buf, NULL, skip_samples);
-            assert(r == skip_samples);
-            (void) r;
-            skipped_samples += skip_samples;
-        }
-        sc_mutex_unlock(&ar->mutex);
-
-        if (skip_samples) {
-            if (played) {
-                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
-                     " samples", skip_samples);
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-            } else {
-                LOGD("[Audio] Playback not started, skipping %" PRIu32
-                     " samples", skip_samples);
-#endif
-            }
-        }
-    }
-
-    atomic_store_explicit(&ar->received, true, memory_order_relaxed);
-    if (!played) {
-        // Nothing more to do
-        return true;
-    }
-
-    // Number of samples added (or removed, if negative) for compensation
-    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
-    // Inserting silence instantly increases buffering
-    int32_t inserted_silence = (int32_t) underflow;
-    // Dropping input samples instantly decreases buffering
-    int32_t dropped = (int32_t) skipped_samples;
-
-    // The compensation must apply instantly, it must not be smoothed
-    ar->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
-    if (ar->avg_buffering.avg < 0) {
-        // Since dropping samples instantly reduces buffering, the difference
-        // is applied immediately to the average value, assuming that the delay
-        // between the producer and the consumer will be caught up.
-        //
-        // However, when this assumption is not valid, the average buffering
-        // may decrease indefinitely. Prevent it to become negative to limit
-        // the consequences.
-        ar->avg_buffering.avg = 0;
-    }
-
-    // However, the buffering level must be smoothed
-    sc_average_push(&ar->avg_buffering, can_read);
-
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
-         can_read, sc_average_get(&ar->avg_buffering));
-#endif
-
-    ar->samples_since_resync += written;
-    if (ar->samples_since_resync >= ar->sample_rate) {
-        // Recompute compensation every second
-        ar->samples_since_resync = 0;
-
-        float avg = sc_average_get(&ar->avg_buffering);
-        int diff = ar->target_buffering - avg;
-
-        // Enable compensation when the difference exceeds +/- 4ms.
-        // Disable compensation when the difference is lower than +/- 1ms.
-        int threshold = ar->compensation != 0
-                      ? ar->sample_rate     / 1000  /* 1ms */
-                      : ar->sample_rate * 4 / 1000; /* 4ms */
-
-        if (abs(diff) < threshold) {
-            // Do not compensate for small values, the error is just noise
-            diff = 0;
-        } else if (diff < 0 && can_read < ar->target_buffering) {
-            // Do not accelerate if the instant buffering level is below the
-            // target, this would increase underflow
-            diff = 0;
-        }
-        // Compensate the diff over 4 seconds (but will be recomputed after 1
-        // second)
-        int distance = 4 * ar->sample_rate;
-        // Limit compensation rate to 2%
-        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", ar->target_buffering, avg, can_read, diff);
-
-        if (diff != ar->compensation) {
-            int ret = swr_set_compensation(swr_ctx, diff, distance);
-            if (ret < 0) {
-                LOGW("Resampling compensation failed: %d", ret);
-                // not fatal
-            } else {
-                ar->compensation = diff;
-            }
-        }
-    }
-
-    return true;
-}
-
-bool
-sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
-                        const AVCodecContext *ctx, uint32_t target_buffering) {
-    SwrContext *swr_ctx = swr_alloc();
-    if (!swr_ctx) {
-        LOG_OOM();
-        return false;
-    }
-    ar->swr_ctx = swr_ctx;
-
-#ifdef SCRCPY_LAVU_HAS_CHLAYOUT
-    av_opt_set_chlayout(swr_ctx, "in_chlayout", &ctx->ch_layout, 0);
-    av_opt_set_chlayout(swr_ctx, "out_chlayout", &ctx->ch_layout, 0);
-#else
-    av_opt_set_channel_layout(swr_ctx, "in_channel_layout",
-                              ctx->channel_layout, 0);
-    av_opt_set_channel_layout(swr_ctx, "out_channel_layout",
-                              ctx->channel_layout, 0);
-#endif
-
-    av_opt_set_int(swr_ctx, "in_sample_rate", ctx->sample_rate, 0);
-    av_opt_set_int(swr_ctx, "out_sample_rate", ctx->sample_rate, 0);
-
-    av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", ctx->sample_fmt, 0);
-    av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", SC_AV_SAMPLE_FMT, 0);
-
-    int ret = swr_init(swr_ctx);
-    if (ret) {
-        LOGE("Failed to initialize the resampling context");
-        goto error_free_swr_ctx;
-    }
-
-    bool ok = sc_mutex_init(&ar->mutex);
-    if (!ok) {
-        goto error_free_swr_ctx;
-    }
-
-    ar->target_buffering = target_buffering;
-    ar->sample_size = sample_size;
-    ar->sample_rate = ctx->sample_rate;
-
-    // Use a ring-buffer of the target buffering size plus 1 second between the
-    // producer and the consumer. It's too big on purpose, to guarantee that
-    // the producer and the consumer will be able to access it in parallel
-    // without locking.
-    uint32_t audiobuf_samples = target_buffering + ar->sample_rate;
-
-    ok = sc_audiobuf_init(&ar->buf, sample_size, audiobuf_samples);
-    if (!ok) {
-        goto error_destroy_mutex;
-    }
-
-    size_t initial_swr_buf_size = TO_BYTES(4096);
-    ar->swr_buf = malloc(initial_swr_buf_size);
-    if (!ar->swr_buf) {
-        LOG_OOM();
-        goto error_destroy_audiobuf;
-    }
-    ar->swr_buf_alloc_size = initial_swr_buf_size;
-
-    // Samples are produced and consumed by blocks, so the buffering must be
-    // smoothed to get a relatively stable value.
-    sc_average_init(&ar->avg_buffering, 128);
-    ar->samples_since_resync = 0;
-
-    ar->received = false;
-    atomic_init(&ar->played, false);
-    atomic_init(&ar->received, false);
-    atomic_init(&ar->underflow, 0);
-    ar->compensation = 0;
-
-    return true;
-
-error_destroy_audiobuf:
-    sc_audiobuf_destroy(&ar->buf);
-error_destroy_mutex:
-    sc_mutex_destroy(&ar->mutex);
-error_free_swr_ctx:
-    swr_free(&ar->swr_ctx);
-
-    return false;
-}
-
-void
-sc_audio_regulator_destroy(struct sc_audio_regulator *ar) {
-    free(ar->swr_buf);
-    sc_audiobuf_destroy(&ar->buf);
-    sc_mutex_destroy(&ar->mutex);
-    swr_free(&ar->swr_ctx);
-}

app/src/audio_regulator.h

@@ -1,71 +0,0 @@
-#ifndef SC_AUDIO_REGULATOR_H
-#define SC_AUDIO_REGULATOR_H
-
-#include "common.h"
-
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <libavcodec/avcodec.h>
-#include <libswresample/swresample.h>
-#include "util/audiobuf.h"
-#include "util/average.h"
-#include "util/thread.h"
-
-#define SC_AV_SAMPLE_FMT AV_SAMPLE_FMT_FLT
-
-struct sc_audio_regulator {
-    sc_mutex mutex;
-
-    // Target buffering between the producer and the consumer (in samples)
-    uint32_t target_buffering;
-
-    // Audio buffer to communicate between the receiver and the player
-    struct sc_audiobuf buf;
-
-    // Resampler (only used from the receiver thread)
-    struct SwrContext *swr_ctx;
-
-    // The sample rate is the same for input and output
-    uint32_t sample_rate;
-    // The number of bytes per sample (for all channels)
-    size_t sample_size;
-
-    // Target buffer for resampling (only used by the receiver thread)
-    uint8_t *swr_buf;
-    size_t swr_buf_alloc_size;
-
-    // Number of buffered samples (may be negative on underflow) (only used by
-    // the receiver thread)
-    struct sc_average avg_buffering;
-    // Count the number of samples to trigger a compensation update regularly
-    // (only used by the receiver thread)
-    uint32_t samples_since_resync;
-
-    // Number of silence samples inserted since the last received packet
-    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
-    atomic_bool received;
-
-    // Set to true the first time samples are pulled by the player
-    atomic_bool played;
-};
-
-bool
-sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
-                        const AVCodecContext *ctx, uint32_t target_buffering);
-
-void
-sc_audio_regulator_destroy(struct sc_audio_regulator *ar);
-
-bool
-sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame);
-
-void
-sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
-                        uint32_t samples);
-
-#endif

app/src/cli.c

@@ -1072,11 +1072,7 @@ static const struct sc_shortcut shortcuts[] = {
     },
     {
         .shortcuts = { "Shift+click-and-move" },
-        .text = "Tilt vertically (slide with 2 fingers)",
-    },
-    {
-        .shortcuts = { "Ctrl+Shift+click-and-move" },
-        .text = "Tilt horizontally (slide with 2 fingers)",
+        .text = "Tilt (slide vertically with two fingers)",
     },
     {
         .shortcuts = { "Drag & drop APK file" },

app/src/input_manager.c

@@ -5,9 +5,53 @@
 
 #include "input_events.h"
 #include "screen.h"
-#include "shortcut_mod.h"
 #include "util/log.h"
 
+#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
+
+static inline uint16_t
+to_sdl_mod(uint8_t shortcut_mod) {
+    uint16_t sdl_mod = 0;
+    if (shortcut_mod & SC_SHORTCUT_MOD_LCTRL) {
+        sdl_mod |= KMOD_LCTRL;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RCTRL) {
+        sdl_mod |= KMOD_RCTRL;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_LALT) {
+        sdl_mod |= KMOD_LALT;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RALT) {
+        sdl_mod |= KMOD_RALT;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_LSUPER) {
+        sdl_mod |= KMOD_LGUI;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RSUPER) {
+        sdl_mod |= KMOD_RGUI;
+    }
+    return sdl_mod;
+}
+
+static bool
+is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
+    // keep only the relevant modifier keys
+    sdl_mod &= SC_SDL_SHORTCUT_MODS_MASK;
+
+    // at least one shortcut mod pressed?
+    return sdl_mod & im->sdl_shortcut_mods;
+}
+
+static bool
+is_shortcut_key(struct sc_input_manager *im, SDL_Keycode keycode) {
+    return (im->sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
+        || (im->sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
+        || (im->sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
+        || (im->sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
+        || (im->sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
+        || (im->sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
+}
+
 void
 sc_input_manager_init(struct sc_input_manager *im,
                       const struct sc_input_manager_params *params) {
@@ -29,7 +73,7 @@ sc_input_manager_init(struct sc_input_manager *im,
     im->legacy_paste = params->legacy_paste;
     im->clipboard_autosync = params->clipboard_autosync;
 
-    im->sdl_shortcut_mods = sc_shortcut_mods_to_sdl(params->shortcut_mods);
+    im->sdl_shortcut_mods = to_sdl_mod(params->shortcut_mods);
 
     im->vfinger_down = false;
     im->vfinger_invert_x = false;
@@ -302,8 +346,7 @@ sc_input_manager_process_text_input(struct sc_input_manager *im,
         return;
     }
 
-    if (sc_shortcut_mods_is_shortcut_mod(im->sdl_shortcut_mods,
-                                         SDL_GetModState())) {
+    if (is_shortcut_mod(im, SDL_GetModState())) {
         // A shortcut must never generate text events
         return;
     }
@@ -370,9 +413,8 @@ sc_input_manager_process_key(struct sc_input_manager *im,
     // press/release is a modifier key.
     // The second condition is necessary to ignore the release of the modifier
     // key (because in this case mod is 0).
-    uint16_t mods = im->sdl_shortcut_mods;
-    bool is_shortcut = sc_shortcut_mods_is_shortcut_mod(mods, mod)
-                    || sc_shortcut_mods_is_shortcut_key(mods, sdl_keycode);
+    bool is_shortcut = is_shortcut_mod(im, mod)
+                    || is_shortcut_key(im, sdl_keycode);
 
     if (down && !repeat) {
         if (sdl_keycode == im->last_keycode && mod == im->last_mod) {
@@ -494,7 +536,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                 return;
             case SDLK_f:
                 if (video && !shift && !repeat && down) {
-                    sc_screen_toggle_fullscreen(im->screen);
+                    sc_screen_switch_fullscreen(im->screen);
                 }
                 return;
             case SDLK_w:
@@ -794,7 +836,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
     }
 
     bool change_vfinger = event->button == SDL_BUTTON_LEFT &&
-            ((down && !im->vfinger_down && (ctrl_pressed || shift_pressed)) ||
+            ((down && !im->vfinger_down && (ctrl_pressed ^ shift_pressed)) ||
              (!down && im->vfinger_down));
     bool use_finger = im->vfinger_down || change_vfinger;
 
@@ -826,28 +868,16 @@ 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.
     //
-    // To simulate a vertical tilt gesture (a vertical slide with two fingers),
-    // Shift can be used instead of Ctrl. The "virtual finger" has a position
+    // 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.
-    //
-    // To simulate a horizontal tilt gesture (a horizontal slide with two
-    // fingers), Ctrl+Shift can be used. The "virtual finger" has a position
-    // inverted with respect to the horizontal axis of symmetry in the middle
-    // of the screen. It is expected to be less frequently used, that's why the
-    // one-mod shortcuts are assigned to rotation and vertical tilt.
     if (change_vfinger) {
         struct sc_point mouse =
             sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                                  event->y);
         if (down) {
-            // Ctrl  Shift     invert_x  invert_y
-            // ----  ----- ==> --------  --------
-            //   0     0           0         0      -
-            //   0     1           1         0      vertical tilt
-            //   1     0           1         1      rotate
-            //   1     1           0         1      horizontal tilt
-            im->vfinger_invert_x = ctrl_pressed ^ shift_pressed;
+            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,

app/src/keyboard_sdk.c

@@ -45,10 +45,6 @@ convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
         {SC_KEYCODE_RCTRL,     AKEYCODE_CTRL_RIGHT},
         {SC_KEYCODE_LSHIFT,    AKEYCODE_SHIFT_LEFT},
         {SC_KEYCODE_RSHIFT,    AKEYCODE_SHIFT_RIGHT},
-        {SC_KEYCODE_LALT,      AKEYCODE_ALT_LEFT},
-        {SC_KEYCODE_RALT,      AKEYCODE_ALT_RIGHT},
-        {SC_KEYCODE_LGUI,      AKEYCODE_META_LEFT},
-        {SC_KEYCODE_RGUI,      AKEYCODE_META_RIGHT},
     };
 
     // Numpad navigation keys.
@@ -170,7 +166,11 @@ convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
         return false;
     }
 
-    // Handle letters and space
+    if (mod & (SC_MOD_LALT | SC_MOD_RALT | SC_MOD_LGUI | SC_MOD_RGUI)) {
+        return false;
+    }
+
+    // if ALT and META are not pressed, also handle letters and space
     entry = SC_INTMAP_FIND_ENTRY(alphaspace_keys, from);
     if (entry) {
         *to = entry->value;

app/src/mouse_capture.c

@@ -1,123 +0,0 @@
-#include "mouse_capture.h"
-
-#include "shortcut_mod.h"
-#include "util/log.h"
-
-void
-sc_mouse_capture_init(struct sc_mouse_capture *mc, SDL_Window *window,
-                      uint8_t shortcut_mods) {
-    mc->window = window;
-    mc->sdl_mouse_capture_keys = sc_shortcut_mods_to_sdl(shortcut_mods);
-    mc->mouse_capture_key_pressed = SDLK_UNKNOWN;
-}
-
-static inline bool
-sc_mouse_capture_is_capture_key(struct sc_mouse_capture *mc, SDL_Keycode key) {
-    return sc_shortcut_mods_is_shortcut_key(mc->sdl_mouse_capture_keys, key);
-}
-
-bool
-sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
-                              const SDL_Event *event) {
-    switch (event->type) {
-        case SDL_WINDOWEVENT:
-            if (event->window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
-                sc_mouse_capture_set_active(mc, false);
-                return true;
-            }
-            break;
-        case SDL_KEYDOWN: {
-            SDL_Keycode key = event->key.keysym.sym;
-            if (sc_mouse_capture_is_capture_key(mc, key)) {
-                if (!mc->mouse_capture_key_pressed) {
-                    mc->mouse_capture_key_pressed = key;
-                } else {
-                    // Another mouse capture key has been pressed, cancel
-                    // mouse (un)capture
-                    mc->mouse_capture_key_pressed = 0;
-                }
-                // Mouse capture keys are never forwarded to the device
-                return true;
-            }
-            break;
-        }
-        case SDL_KEYUP: {
-            SDL_Keycode key = event->key.keysym.sym;
-            SDL_Keycode cap = mc->mouse_capture_key_pressed;
-            mc->mouse_capture_key_pressed = 0;
-            if (sc_mouse_capture_is_capture_key(mc, key)) {
-                if (key == cap) {
-                    // A mouse capture key has been pressed then released:
-                    // toggle the capture mouse mode
-                    sc_mouse_capture_toggle(mc);
-                }
-                // Mouse capture keys are never forwarded to the device
-                return true;
-            }
-            break;
-        }
-        case SDL_MOUSEWHEEL:
-        case SDL_MOUSEMOTION:
-        case SDL_MOUSEBUTTONDOWN:
-            if (!sc_mouse_capture_is_active(mc)) {
-                // The mouse will be captured on SDL_MOUSEBUTTONUP, so consume
-                // the event
-                return true;
-            }
-            break;
-        case SDL_MOUSEBUTTONUP:
-            if (!sc_mouse_capture_is_active(mc)) {
-                sc_mouse_capture_set_active(mc, true);
-                return true;
-            }
-            break;
-        case SDL_FINGERMOTION:
-        case SDL_FINGERDOWN:
-        case SDL_FINGERUP:
-            // Touch events are not compatible with relative mode
-            // (coordinates are not relative), so consume the event
-            return true;
-    }
-
-    return false;
-}
-
-void
-sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture) {
-#ifdef __APPLE__
-    // Workaround for SDL bug on macOS:
-    // <https://github.com/libsdl-org/SDL/issues/5340>
-    if (capture) {
-        int mouse_x, mouse_y;
-        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
-
-        int x, y, w, h;
-        SDL_GetWindowPosition(window, &x, &y);
-        SDL_GetWindowSize(window, &w, &h);
-
-        bool outside_window = mouse_x < x || mouse_x >= x + w
-                           || mouse_y < y || mouse_y >= y + h;
-        if (outside_window) {
-            SDL_WarpMouseInWindow(mc->window, w / 2, h / 2);
-        }
-    }
-#else
-    (void) mc;
-#endif
-    if (SDL_SetRelativeMouseMode(capture)) {
-        LOGE("Could not set relative mouse mode to %s: %s",
-             capture ? "true" : "false", SDL_GetError());
-    }
-}
-
-bool
-sc_mouse_capture_is_active(struct sc_mouse_capture *mc) {
-    (void) mc;
-    return SDL_GetRelativeMouseMode();
-}
-
-void
-sc_mouse_capture_toggle(struct sc_mouse_capture *mc) {
-    bool new_value = !sc_mouse_capture_is_active(mc);
-    sc_mouse_capture_set_active(mc, new_value);
-}

app/src/mouse_capture.h

@@ -1,38 +0,0 @@
-#ifndef SC_MOUSE_CAPTURE_H
-#define SC_MOUSE_CAPTURE_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include <SDL2/SDL.h>
-
-struct sc_mouse_capture {
-    SDL_Window *window;
-    uint16_t sdl_mouse_capture_keys;
-
-    // To enable/disable mouse capture, a mouse capture key (LALT, LGUI or
-    // RGUI) must be pressed. This variable tracks the pressed capture key.
-    SDL_Keycode mouse_capture_key_pressed;
-
-};
-
-void
-sc_mouse_capture_init(struct sc_mouse_capture *mc, SDL_Window *window,
-                      uint8_t shortcut_mods);
-
-void
-sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture);
-
-bool
-sc_mouse_capture_is_active(struct sc_mouse_capture *mc);
-
-void
-sc_mouse_capture_toggle(struct sc_mouse_capture *mc);
-
-// Return true if it consumed the event
-bool
-sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
-                              const SDL_Event *event);
-
-#endif

app/src/screen.c

@@ -162,6 +162,47 @@ sc_screen_is_relative_mode(struct sc_screen *screen) {
     return screen->im.mp && screen->im.mp->relative_mode;
 }
 
+static void
+sc_screen_set_mouse_capture(struct sc_screen *screen, bool capture) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(screen->window, &x, &y);
+        SDL_GetWindowSize(screen->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(screen->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) screen;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
+        LOGE("Could not set relative mouse mode to %s: %s",
+             capture ? "true" : "false", SDL_GetError());
+    }
+}
+
+static inline bool
+sc_screen_get_mouse_capture(struct sc_screen *screen) {
+    (void) screen;
+    return SDL_GetRelativeMouseMode();
+}
+
+static inline void
+sc_screen_toggle_mouse_capture(struct sc_screen *screen) {
+    (void) screen;
+    bool new_value = !sc_screen_get_mouse_capture(screen);
+    sc_screen_set_mouse_capture(screen, new_value);
+}
+
 static void
 sc_screen_update_content_rect(struct sc_screen *screen) {
     assert(screen->video);
@@ -330,6 +371,7 @@ sc_screen_init(struct sc_screen *screen,
     screen->fullscreen = false;
     screen->maximized = false;
     screen->minimized = false;
+    screen->mouse_capture_key_pressed = 0;
     screen->paused = false;
     screen->resume_frame = NULL;
     screen->orientation = SC_ORIENTATION_0;
@@ -444,9 +486,6 @@ sc_screen_init(struct sc_screen *screen,
 
     sc_input_manager_init(&screen->im, &im_params);
 
-    // Initialize even if not used for simplicity
-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
 #ifdef CONTINUOUS_RESIZING_WORKAROUND
     if (screen->video) {
         SDL_AddEventWatch(event_watcher, screen);
@@ -467,7 +506,7 @@ sc_screen_init(struct sc_screen *screen,
 
     if (!screen->video && sc_screen_is_relative_mode(screen)) {
         // Capture mouse immediately if video mirroring is disabled
-        sc_mouse_capture_set_active(&screen->mc, true);
+        sc_screen_set_mouse_capture(screen, true);
     }
 
     return true;
@@ -499,7 +538,7 @@ sc_screen_show_initial_window(struct sc_screen *screen) {
     SDL_SetWindowPosition(screen->window, x, y);
 
     if (screen->req.fullscreen) {
-        sc_screen_toggle_fullscreen(screen);
+        sc_screen_switch_fullscreen(screen);
     }
 
     if (screen->req.start_fps_counter) {
@@ -674,7 +713,7 @@ sc_screen_apply_frame(struct sc_screen *screen) {
 
         if (sc_screen_is_relative_mode(screen)) {
             // Capture mouse on start
-            sc_mouse_capture_set_active(&screen->mc, true);
+            sc_screen_set_mouse_capture(screen, true);
         }
     }
 
@@ -735,7 +774,7 @@ sc_screen_set_paused(struct sc_screen *screen, bool paused) {
 }
 
 void
-sc_screen_toggle_fullscreen(struct sc_screen *screen) {
+sc_screen_switch_fullscreen(struct sc_screen *screen) {
     assert(screen->video);
 
     uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
@@ -798,8 +837,15 @@ sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
                                             content_size.height);
 }
 
+static inline bool
+sc_screen_is_mouse_capture_key(SDL_Keycode key) {
+    return key == SDLK_LALT || key == SDLK_LGUI || key == SDLK_RGUI;
+}
+
 bool
 sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
+    bool relative_mode = sc_screen_is_relative_mode(screen);
+
     switch (event->type) {
         case SC_EVENT_SCREEN_INIT_SIZE: {
             // The initial size is passed via screen->frame_size
@@ -857,14 +903,69 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
                     apply_pending_resize(screen);
                     sc_screen_render(screen, true);
                     break;
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    if (relative_mode) {
+                        sc_screen_set_mouse_capture(screen, false);
+                    }
+                    break;
             }
             return true;
-    }
-
-    if (sc_screen_is_relative_mode(screen)
-            && sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
-        return true;
+        case SDL_KEYDOWN:
+            if (relative_mode) {
+                SDL_Keycode key = event->key.keysym.sym;
+                if (sc_screen_is_mouse_capture_key(key)) {
+                    if (!screen->mouse_capture_key_pressed) {
+                        screen->mouse_capture_key_pressed = key;
+                    } else {
+                        // Another mouse capture key has been pressed, cancel
+                        // mouse (un)capture
+                        screen->mouse_capture_key_pressed = 0;
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return true;
+                }
+            }
+            break;
+        case SDL_KEYUP:
+            if (relative_mode) {
+                SDL_Keycode key = event->key.keysym.sym;
+                SDL_Keycode cap = screen->mouse_capture_key_pressed;
+                screen->mouse_capture_key_pressed = 0;
+                if (sc_screen_is_mouse_capture_key(key)) {
+                    if (key == cap) {
+                        // A mouse capture key has been pressed then released:
+                        // toggle the capture mouse mode
+                        sc_screen_toggle_mouse_capture(screen);
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return true;
+                }
+            }
+            break;
+        case SDL_MOUSEWHEEL:
+        case SDL_MOUSEMOTION:
+        case SDL_MOUSEBUTTONDOWN:
+            if (relative_mode && !sc_screen_get_mouse_capture(screen)) {
+                // Do not forward to input manager, the mouse will be captured
+                // on SDL_MOUSEBUTTONUP
+                return true;
+            }
+            break;
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
+            if (relative_mode) {
+                // Touch events are not compatible with relative mode
+                // (coordinates are not relative)
+                return true;
+            }
+            break;
+        case SDL_MOUSEBUTTONUP:
+            if (relative_mode && !sc_screen_get_mouse_capture(screen)) {
+                sc_screen_set_mouse_capture(screen, true);
+                return true;
+            }
+            break;
     }
 
     sc_input_manager_handle_event(&screen->im, event);

app/src/screen.h

@@ -13,7 +13,6 @@
 #include "fps_counter.h"
 #include "frame_buffer.h"
 #include "input_manager.h"
-#include "mouse_capture.h"
 #include "opengl.h"
 #include "options.h"
 #include "trait/key_processor.h"
@@ -31,7 +30,6 @@ struct sc_screen {
 
     struct sc_display display;
     struct sc_input_manager im;
-    struct sc_mouse_capture mc; // only used in mouse relative mode
     struct sc_frame_buffer fb;
     struct sc_fps_counter fps_counter;
 
@@ -63,6 +61,10 @@ struct sc_screen {
     bool maximized;
     bool minimized;
 
+    // To enable/disable mouse capture, a mouse capture key (LALT, LGUI or
+    // RGUI) must be pressed. This variable tracks the pressed capture key.
+    SDL_Keycode mouse_capture_key_pressed;
+
     AVFrame *frame;
 
     bool paused;
@@ -124,9 +126,9 @@ sc_screen_destroy(struct sc_screen *screen);
 void
 sc_screen_hide_window(struct sc_screen *screen);
 
-// toggle the fullscreen mode
+// switch the fullscreen mode
 void
-sc_screen_toggle_fullscreen(struct sc_screen *screen);
+sc_screen_switch_fullscreen(struct sc_screen *screen);
 
 // resize window to optimal size (remove black borders)
 void

app/src/shortcut_mod.h

@@ -1,60 +0,0 @@
-#ifndef SC_SHORTCUT_MOD_H
-#define SC_SHORTCUT_MOD_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <SDL2/SDL_keycode.h>
-
-#include "options.h"
-
-#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
-
-// input: OR of enum sc_shortcut_mod
-// output: OR of SDL_Keymod
-static inline uint16_t
-sc_shortcut_mods_to_sdl(uint8_t shortcut_mods) {
-    uint16_t sdl_mod = 0;
-    if (shortcut_mods & SC_SHORTCUT_MOD_LCTRL) {
-        sdl_mod |= KMOD_LCTRL;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RCTRL) {
-        sdl_mod |= KMOD_RCTRL;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_LALT) {
-        sdl_mod |= KMOD_LALT;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RALT) {
-        sdl_mod |= KMOD_RALT;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_LSUPER) {
-        sdl_mod |= KMOD_LGUI;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RSUPER) {
-        sdl_mod |= KMOD_RGUI;
-    }
-    return sdl_mod;
-}
-
-static inline bool
-sc_shortcut_mods_is_shortcut_mod(uint16_t sdl_shortcut_mods, uint16_t sdl_mod) {
-    // sdl_shortcut_mods must be within the mask
-    assert(!(sdl_shortcut_mods & ~SC_SDL_SHORTCUT_MODS_MASK));
-
-    // at least one shortcut mod pressed?
-    return sdl_mod & sdl_shortcut_mods;
-}
-
-static inline bool
-sc_shortcut_mods_is_shortcut_key(uint16_t sdl_shortcut_mods,
-                                 SDL_Keycode keycode) {
-    return (sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
-        || (sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
-        || (sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
-        || (sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
-        || (sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
-        || (sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
-}
-
-#endif

app/src/usb/aoa_hid.h

@@ -1,8 +1,6 @@
 #ifndef SC_AOA_HID_H
 #define SC_AOA_HID_H
 
-#include "common.h"
-
 #include <stdint.h>
 #include <stdbool.h>
 

app/src/usb/scrcpy_otg.c

@@ -185,7 +185,6 @@ scrcpy_otg(struct scrcpy_options *options) {
         .window_width = options->window_width,
         .window_height = options->window_height,
         .window_borderless = options->window_borderless,
-        .shortcut_mods = options->shortcut_mods,
     };
 
     ok = sc_screen_otg_init(&s->screen_otg, &params);

app/src/usb/screen_otg.c

@@ -4,6 +4,47 @@
 #include "options.h"
 #include "util/log.h"
 
+static void
+sc_screen_otg_set_mouse_capture(struct sc_screen_otg *screen, bool capture) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(screen->window, &x, &y);
+        SDL_GetWindowSize(screen->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(screen->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) screen;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
+        LOGE("Could not set relative mouse mode to %s: %s",
+             capture ? "true" : "false", SDL_GetError());
+    }
+}
+
+static inline bool
+sc_screen_otg_get_mouse_capture(struct sc_screen_otg *screen) {
+    (void) screen;
+    return SDL_GetRelativeMouseMode();
+}
+
+static inline void
+sc_screen_otg_toggle_mouse_capture(struct sc_screen_otg *screen) {
+    (void) screen;
+    bool new_value = !sc_screen_otg_get_mouse_capture(screen);
+    sc_screen_otg_set_mouse_capture(screen, new_value);
+}
+
 static void
 sc_screen_otg_render(struct sc_screen_otg *screen) {
     SDL_RenderClear(screen->renderer);
@@ -20,6 +61,8 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
     screen->mouse = params->mouse;
     screen->gamepad = params->gamepad;
 
+    screen->mouse_capture_key_pressed = 0;
+
     const char *title = params->window_title;
     assert(title);
 
@@ -70,11 +113,9 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
         LOGW("Could not load icon");
     }
 
-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
     if (screen->mouse) {
         // Capture mouse on start
-        sc_mouse_capture_set_active(&screen->mc, true);
+        sc_screen_otg_set_mouse_capture(screen, true);
     }
 
     return true;
@@ -96,6 +137,11 @@ sc_screen_otg_destroy(struct sc_screen_otg *screen) {
     SDL_DestroyWindow(screen->window);
 }
 
+static inline bool
+sc_screen_otg_is_mouse_capture_key(SDL_Keycode key) {
+    return key == SDLK_LALT || key == SDLK_LGUI || key == SDLK_RGUI;
+}
+
 static void
 sc_screen_otg_process_key(struct sc_screen_otg *screen,
                              const SDL_KeyboardEvent *event) {
@@ -252,46 +298,80 @@ sc_screen_otg_process_gamepad_button(struct sc_screen_otg *screen,
 
 void
 sc_screen_otg_handle_event(struct sc_screen_otg *screen, SDL_Event *event) {
-    if (sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
-        return;
-    }
-
     switch (event->type) {
         case SDL_WINDOWEVENT:
             switch (event->window.event) {
                 case SDL_WINDOWEVENT_EXPOSED:
                     sc_screen_otg_render(screen);
                     break;
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    if (screen->mouse) {
+                        sc_screen_otg_set_mouse_capture(screen, false);
+                    }
+                    break;
             }
             return;
         case SDL_KEYDOWN:
+            if (screen->mouse) {
+                SDL_Keycode key = event->key.keysym.sym;
+                if (sc_screen_otg_is_mouse_capture_key(key)) {
+                    if (!screen->mouse_capture_key_pressed) {
+                        screen->mouse_capture_key_pressed = key;
+                    } else {
+                        // Another mouse capture key has been pressed, cancel
+                        // mouse (un)capture
+                        screen->mouse_capture_key_pressed = 0;
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return;
+                }
+            }
+
             if (screen->keyboard) {
                 sc_screen_otg_process_key(screen, &event->key);
             }
             break;
         case SDL_KEYUP:
+            if (screen->mouse) {
+                SDL_Keycode key = event->key.keysym.sym;
+                SDL_Keycode cap = screen->mouse_capture_key_pressed;
+                screen->mouse_capture_key_pressed = 0;
+                if (sc_screen_otg_is_mouse_capture_key(key)) {
+                    if (key == cap) {
+                        // A mouse capture key has been pressed then released:
+                        // toggle the capture mouse mode
+                        sc_screen_otg_toggle_mouse_capture(screen);
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return;
+                }
+            }
+
             if (screen->keyboard) {
                 sc_screen_otg_process_key(screen, &event->key);
             }
             break;
         case SDL_MOUSEMOTION:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                 sc_screen_otg_process_mouse_motion(screen, &event->motion);
             }
             break;
         case SDL_MOUSEBUTTONDOWN:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                 sc_screen_otg_process_mouse_button(screen, &event->button);
             }
             break;
         case SDL_MOUSEBUTTONUP:
             if (screen->mouse) {
-                sc_screen_otg_process_mouse_button(screen, &event->button);
+                if (sc_screen_otg_get_mouse_capture(screen)) {
+                    sc_screen_otg_process_mouse_button(screen, &event->button);
+                } else {
+                    sc_screen_otg_set_mouse_capture(screen, true);
+                }
             }
             break;
         case SDL_MOUSEWHEEL:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                 sc_screen_otg_process_mouse_wheel(screen, &event->wheel);
             }
             break;

app/src/usb/screen_otg.h

@@ -8,7 +8,6 @@
 
 #include "keyboard_aoa.h"
 #include "mouse_aoa.h"
-#include "mouse_capture.h"
 #include "gamepad_aoa.h"
 
 struct sc_screen_otg {
@@ -20,7 +19,8 @@ struct sc_screen_otg {
     SDL_Renderer *renderer;
     SDL_Texture *texture;
 
-    struct sc_mouse_capture mc;
+    // See equivalent mechanism in screen.h
+    SDL_Keycode mouse_capture_key_pressed;
 };
 
 struct sc_screen_otg_params {
@@ -35,7 +35,6 @@ struct sc_screen_otg_params {
     uint16_t window_width;
     uint16_t window_height;
     bool window_borderless;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
 };
 
 bool

doc/control.md

@@ -94,18 +94,14 @@ the content (if supported by the app) relative to the center of the screen.
 
 https://github.com/Genymobile/scrcpy/assets/543275/26c4a920-9805-43f1-8d4c-608752d04767
 
-To simulate a vertical tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.
+To simulate a tilt gesture: <kbd>Shift</kbd>+_click-and-move-up-or-down_.
 
 https://github.com/Genymobile/scrcpy/assets/543275/1e252341-4a90-4b29-9d11-9153b324669f
 
-Similarly, to simulate a horizontal tilt gesture:
-<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+_click-and-move-left-or-right_.
-
 Technically, _scrcpy_ generates additional touch events from a "virtual finger"
 at a location inverted through the center of the screen. When pressing
 <kbd>Ctrl</kbd> the _x_ and _y_ coordinates are inverted. Using <kbd>Shift</kbd>
-only inverts _x_, whereas using <kbd>Ctrl</kbd>+<kbd>Shift</kbd> only inverts
-_y_.
+only inverts _x_.
 
 This only works for the default mouse mode (`--mouse=sdk`).
 

doc/shortcuts.md

@@ -53,8 +53,7 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
  | Open keyboard settings (HID keyboard only)  | <kbd>MOD</kbd>+<kbd>k</kbd>
  | Enable/disable FPS counter (on stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
  | Pinch-to-zoom/rotate                        | <kbd>Ctrl</kbd>+_click-and-move_
- | Tilt vertically (slide with 2 fingers)      | <kbd>Shift</kbd>+_click-and-move_
- | Tilt horizontally (slide with 2 fingers)    | <kbd>Ctrl</kbd>+<kbd>Shift</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)
 

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

@@ -190,8 +190,7 @@ public final class Server {
                         options.getSendFrameMeta());
                 SurfaceCapture surfaceCapture;
                 if (options.getVideoSource() == VideoSource.DISPLAY) {
-                    surfaceCapture = new ScreenCapture(device, options.getDisplayId(), options.getMaxSize(), options.getCrop(),
-                            options.getLockVideoOrientation());
+                    surfaceCapture = new ScreenCapture(device);
                 } else {
                     surfaceCapture = new CameraCapture(options.getCameraId(), options.getCameraFacing(), options.getCameraSize(),
                             options.getMaxSize(), options.getCameraAspectRatio(), options.getCameraFps(), options.getCameraHighSpeed());

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

@@ -1,9 +1,9 @@
 package com.genymobile.scrcpy.audio;
 
 import com.genymobile.scrcpy.AsyncProcessor;
-import com.genymobile.scrcpy.device.Streamer;
 import com.genymobile.scrcpy.util.IO;
 import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Streamer;
 
 import android.media.MediaCodec;
 import android.os.Build;

server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java

@@ -1,7 +1,7 @@
 package com.genymobile.scrcpy.control;
 
-import com.genymobile.scrcpy.device.Position;
 import com.genymobile.scrcpy.util.Binary;
+import com.genymobile.scrcpy.device.Position;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;

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

@@ -3,9 +3,9 @@ package com.genymobile.scrcpy.control;
 import com.genymobile.scrcpy.AsyncProcessor;
 import com.genymobile.scrcpy.CleanUp;
 import com.genymobile.scrcpy.device.Device;
+import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.device.Point;
 import com.genymobile.scrcpy.device.Position;
-import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
@@ -243,7 +243,7 @@ public class Controller implements AsyncProcessor {
             return false;
         }
         for (KeyEvent event : events) {
-            if (!device.injectMainDisplayEvent(event, Device.INJECT_MODE_ASYNC)) {
+            if (!device.injectEvent(event, Device.INJECT_MODE_ASYNC)) {
                 return false;
             }
         }
@@ -324,7 +324,7 @@ public class Controller implements AsyncProcessor {
                     // First button pressed: ACTION_DOWN
                     MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!device.injectVirtualDisplayEvent(downEvent, Device.INJECT_MODE_ASYNC)) {
+                    if (!device.injectEvent(downEvent, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -335,7 +335,7 @@ public class Controller implements AsyncProcessor {
                 if (!InputManager.setActionButton(pressEvent, actionButton)) {
                     return false;
                 }
-                if (!device.injectVirtualDisplayEvent(pressEvent, Device.INJECT_MODE_ASYNC)) {
+                if (!device.injectEvent(pressEvent, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -349,7 +349,7 @@ public class Controller implements AsyncProcessor {
                 if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                     return false;
                 }
-                if (!device.injectVirtualDisplayEvent(releaseEvent, Device.INJECT_MODE_ASYNC)) {
+                if (!device.injectEvent(releaseEvent, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -357,7 +357,7 @@ public class Controller implements AsyncProcessor {
                     // Last button released: ACTION_UP
                     MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!device.injectVirtualDisplayEvent(upEvent, Device.INJECT_MODE_ASYNC)) {
+                    if (!device.injectEvent(upEvent, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -368,7 +368,7 @@ 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);
-        return device.injectVirtualDisplayEvent(event, Device.INJECT_MODE_ASYNC);
+        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 
     private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
@@ -390,7 +390,7 @@ public class Controller implements AsyncProcessor {
 
         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.injectVirtualDisplayEvent(event, Device.INJECT_MODE_ASYNC);
+        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.genymobile.scrcpy.device;
 
 import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.util.LogUtils;
 import com.genymobile.scrcpy.video.ScreenInfo;
 import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.DisplayControl;
@@ -15,6 +16,8 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
+import android.view.IDisplayFoldListener;
+import android.view.IRotationWatcher;
 import android.view.InputDevice;
 import android.view.InputEvent;
 import android.view.KeyCharacterMap;
@@ -34,10 +37,26 @@ public final class Device {
     public static final int LOCK_VIDEO_ORIENTATION_UNLOCKED = -1;
     public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;
 
+    public interface RotationListener {
+        void onRotationChanged(int rotation);
+    }
+
+    public interface FoldListener {
+        void onFoldChanged(int displayId, boolean folded);
+    }
+
     public interface ClipboardListener {
         void onClipboardTextChanged(String text);
     }
 
+    private final Rect crop;
+    private int maxSize;
+    private final int lockVideoOrientation;
+
+    private Size deviceSize;
+    private ScreenInfo screenInfo;
+    private RotationListener rotationListener;
+    private FoldListener foldListener;
     private ClipboardListener clipboardListener;
     private final AtomicBoolean isSettingClipboard = new AtomicBoolean();
 
@@ -46,15 +65,71 @@ public final class Device {
      */
     private final int displayId;
 
+    /**
+     * The surface flinger layer stack associated with this logical display
+     */
+    private final int layerStack;
+
     private final boolean supportsInputEvents;
 
-    // set by the ScreenCapture instance
-    private ScreenInfo screenInfo;
-    private int virtualDisplayId;
-
-    public Device(Options options) {
+    public Device(Options options) throws ConfigurationException {
         displayId = options.getDisplayId();
-        virtualDisplayId = displayId; // by default
+        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+        if (displayInfo == null) {
+            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
+            throw new ConfigurationException("Unknown display id: " + displayId);
+        }
+
+        int displayInfoFlags = displayInfo.getFlags();
+
+        deviceSize = displayInfo.getSize();
+        crop = options.getCrop();
+        maxSize = options.getMaxSize();
+        lockVideoOrientation = options.getLockVideoOrientation();
+
+        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
+        layerStack = displayInfo.getLayerStack();
+
+        ServiceManager.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
+            @Override
+            public void onRotationChanged(int rotation) {
+                synchronized (Device.this) {
+                    screenInfo = screenInfo.withDeviceRotation(rotation);
+
+                    // notify
+                    if (rotationListener != null) {
+                        rotationListener.onRotationChanged(rotation);
+                    }
+                }
+            }
+        }, displayId);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            ServiceManager.getWindowManager().registerDisplayFoldListener(new IDisplayFoldListener.Stub() {
+                @Override
+                public void onDisplayFoldChanged(int displayId, boolean folded) {
+                    if (Device.this.displayId != displayId) {
+                        // Ignore events related to other display ids
+                        return;
+                    }
+
+                    synchronized (Device.this) {
+                        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+                        if (displayInfo == null) {
+                            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
+                            return;
+                        }
+
+                        deviceSize = displayInfo.getSize();
+                        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
+                        // notify
+                        if (foldListener != null) {
+                            foldListener.onFoldChanged(displayId, folded);
+                        }
+                    }
+                }
+            });
+        }
 
         if (options.getControl() && options.getClipboardAutosync()) {
             // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
@@ -82,20 +157,38 @@ public final class Device {
             }
         }
 
+        if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
+            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
+        }
+
         // main display or any display on Android >= Q
-        supportsInputEvents = options.getDisplayId() == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
+        supportsInputEvents = displayId == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
         if (!supportsInputEvents) {
             Ln.w("Input events are not supported for secondary displays before Android 10");
         }
     }
 
+    public int getDisplayId() {
+        return displayId;
+    }
+
+    public synchronized void setMaxSize(int newMaxSize) {
+        maxSize = newMaxSize;
+        screenInfo = ScreenInfo.computeScreenInfo(screenInfo.getReverseVideoRotation(), deviceSize, crop, newMaxSize, lockVideoOrientation);
+    }
+
+    public synchronized ScreenInfo getScreenInfo() {
+        return screenInfo;
+    }
+
+    public int getLayerStack() {
+        return layerStack;
+    }
+
     public Point getPhysicalPoint(Position position) {
         // it hides the field on purpose, to read it with a lock
         @SuppressWarnings("checkstyle:HiddenField")
         ScreenInfo screenInfo = getScreenInfo(); // read with synchronization
-        if (screenInfo == null) {
-            return null;
-        }
 
         // ignore the locked video orientation, the events will apply in coordinates considered in the physical device orientation
         Size unlockedVideoSize = screenInfo.getUnlockedVideoSize();
@@ -129,22 +222,6 @@ public final class Device {
         return supportsInputEvents;
     }
 
-    private synchronized ScreenInfo getScreenInfo() {
-        return screenInfo;
-    }
-
-    public synchronized void setScreenInfo(ScreenInfo screenInfo) {
-        this.screenInfo = screenInfo;
-    }
-
-    private synchronized int getVirtualDisplayId() {
-        return virtualDisplayId;
-    }
-
-    public synchronized void setVirtualDisplayId(int virtualDisplayId) {
-        this.virtualDisplayId = virtualDisplayId;
-    }
-
     public static boolean injectEvent(InputEvent inputEvent, int displayId, int injectMode) {
         if (!supportsInputEvents(displayId)) {
             throw new AssertionError("Could not inject input event if !supportsInputEvents()");
@@ -157,14 +234,10 @@ public final class Device {
         return ServiceManager.getInputManager().injectInputEvent(inputEvent, injectMode);
     }
 
-    public boolean injectMainDisplayEvent(InputEvent event, int injectMode) {
+    public boolean injectEvent(InputEvent event, int injectMode) {
         return injectEvent(event, displayId, injectMode);
     }
 
-    public boolean injectVirtualDisplayEvent(InputEvent event, int injectMode) {
-        return injectEvent(event, virtualDisplayId, injectMode);
-    }
-
     public static boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState, int displayId, int injectMode) {
         long now = SystemClock.uptimeMillis();
         KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
@@ -189,6 +262,14 @@ public final class Device {
         return ServiceManager.getPowerManager().isScreenOn();
     }
 
+    public synchronized void setRotationListener(RotationListener rotationListener) {
+        this.rotationListener = rotationListener;
+    }
+
+    public synchronized void setFoldListener(FoldListener foldlistener) {
+        this.foldListener = foldlistener;
+    }
+
     public synchronized void setClipboardListener(ClipboardListener clipboardListener) {
         this.clipboardListener = clipboardListener;
     }

server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java

@@ -6,17 +6,15 @@ public final class DisplayInfo {
     private final int rotation;
     private final int layerStack;
     private final int flags;
-    private final int logicalDensityDpi;
 
     public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 0x00000001;
 
-    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags, int logicalDensityDpi) {
+    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags) {
         this.displayId = displayId;
         this.size = size;
         this.rotation = rotation;
         this.layerStack = layerStack;
         this.flags = flags;
-        this.logicalDensityDpi = logicalDensityDpi;
     }
 
     public int getDisplayId() {
@@ -38,9 +36,5 @@ public final class DisplayInfo {
     public int getFlags() {
         return flags;
     }
-
-    public int getLogicalDensityDpi() {
-        return logicalDensityDpi;
-    }
 }
 

server/src/main/java/com/genymobile/scrcpy/util/IO.java

@@ -2,7 +2,6 @@ package com.genymobile.scrcpy.util;
 
 import com.genymobile.scrcpy.BuildConfig;
 
-import android.os.Build;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
@@ -18,38 +17,23 @@ public final class IO {
         // not instantiable
     }
 
-    private static int write(FileDescriptor fd, ByteBuffer from) throws IOException {
-        while (true) {
-            try {
-                return Os.write(fd, from);
-            } catch (ErrnoException e) {
-                if (e.errno != OsConstants.EINTR) {
-                    throw new IOException(e);
-                }
-            }
-        }
-    }
-
     public static void writeFully(FileDescriptor fd, ByteBuffer from) throws IOException {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            while (from.hasRemaining()) {
-                write(fd, from);
-            }
-        } else {
-            // ByteBuffer position is not updated as expected by Os.write() on old Android versions, so
-            // handle the position and the remaining bytes manually.
-            // See <https://github.com/Genymobile/scrcpy/issues/291>.
-            int position = from.position();
-            int remaining = from.remaining();
-            while (remaining > 0) {
-                int w = write(fd, from);
+        // ByteBuffer position is not updated as expected by Os.write() on old Android versions, so
+        // count the remaining bytes manually.
+        // See <https://github.com/Genymobile/scrcpy/issues/291>.
+        int remaining = from.remaining();
+        while (remaining > 0) {
+            try {
+                int w = Os.write(fd, from);
                 if (BuildConfig.DEBUG && w < 0) {
                     // w should not be negative, since an exception is thrown on error
                     throw new AssertionError("Os.write() returned a negative value (" + w + ")");
                 }
                 remaining -= w;
-                position += w;
-                from.position(position);
+            } catch (ErrnoException e) {
+                if (e.errno != OsConstants.EINTR) {
+                    throw new IOException(e);
+                }
             }
         }
     }

server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java

@@ -31,7 +31,7 @@ public final class LogUtils {
         } else {
             for (CodecUtils.DeviceEncoder encoder : videoEncoders) {
                 builder.append("\n    --video-codec=").append(encoder.getCodec().getName());
-                builder.append(" --video-encoder=").append(encoder.getInfo().getName());
+                builder.append(" --video-encoder='").append(encoder.getInfo().getName()).append("'");
             }
         }
         return builder.toString();
@@ -45,7 +45,7 @@ public final class LogUtils {
         } else {
             for (CodecUtils.DeviceEncoder encoder : audioEncoders) {
                 builder.append("\n    --audio-codec=").append(encoder.getCodec().getName());
-                builder.append(" --audio-encoder=").append(encoder.getInfo().getName());
+                builder.append(" --audio-encoder='").append(encoder.getInfo().getName()).append("'");
             }
         }
         return builder.toString();

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

@@ -1,8 +1,8 @@
 package com.genymobile.scrcpy.video;
 
-import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.HandlerExecutor;
 import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
 import android.annotation.SuppressLint;

server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java

@@ -1,115 +1,42 @@
 package com.genymobile.scrcpy.video;
 
-import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
 
 import android.graphics.Rect;
-import android.hardware.display.DisplayManager;
 import android.hardware.display.VirtualDisplay;
 import android.os.Build;
 import android.os.IBinder;
-import android.view.IDisplayFoldListener;
-import android.view.IRotationWatcher;
 import android.view.Surface;
 
-public class ScreenCapture extends SurfaceCapture {
+public class ScreenCapture extends SurfaceCapture implements Device.RotationListener, Device.FoldListener {
 
     private final Device device;
-
-    private final int displayId;
-    private int maxSize;
-    private final Rect crop;
-    private final int lockVideoOrientation;
-    private int layerStack;
-    private int dpi;
-
-    private Size deviceSize;
-    private ScreenInfo screenInfo;
-
     private IBinder display;
     private VirtualDisplay virtualDisplay;
 
-    private IRotationWatcher rotationWatcher;
-    private IDisplayFoldListener displayFoldListener;
-
-    public ScreenCapture(Device device, int displayId, int maxSize, Rect crop, int lockVideoOrientation) {
+    public ScreenCapture(Device device) {
         this.device = device;
-        this.displayId = displayId;
-        this.maxSize = maxSize;
-        this.crop = crop;
-        this.lockVideoOrientation = lockVideoOrientation;
     }
 
     @Override
-    public void init() throws ConfigurationException {
-        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
-        if (displayInfo == null) {
-            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
-            throw new ConfigurationException("Unknown display id: " + displayId);
-        }
-
-        deviceSize = displayInfo.getSize();
-        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
-        device.setScreenInfo(screenInfo);
-        layerStack = displayInfo.getLayerStack();
-        dpi = displayInfo.getLogicalDensityDpi();
-
-        if (displayId == 0) {
-            rotationWatcher = new IRotationWatcher.Stub() {
-                @Override
-                public void onRotationChanged(int rotation) {
-                    synchronized (ScreenCapture.this) {
-                        screenInfo = screenInfo.withDeviceRotation(rotation);
-                        device.setScreenInfo(screenInfo);
-                    }
-                }
-            };
-            ServiceManager.getWindowManager().registerRotationWatcher(rotationWatcher, displayId);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            displayFoldListener = new IDisplayFoldListener.Stub() {
-                @Override
-                public void onDisplayFoldChanged(int displayId, boolean folded) {
-                    if (ScreenCapture.this.displayId != displayId) {
-                        // Ignore events related to other display ids
-                        return;
-                    }
-
-                    synchronized (ScreenCapture.this) {
-                        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
-                        if (displayInfo == null) {
-                            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
-                            return;
-                        }
-
-                        deviceSize = displayInfo.getSize();
-                        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
-                        device.setScreenInfo(screenInfo);
-                    }
-                }
-            };
-            ServiceManager.getWindowManager().registerDisplayFoldListener(displayFoldListener);
-        }
-
-        if ((displayInfo.getFlags() & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
-            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
-        }
+    public void init() {
+        device.setRotationListener(this);
+        device.setFoldListener(this);
     }
 
     @Override
     public void start(Surface surface) {
+        ScreenInfo screenInfo = device.getScreenInfo();
         Rect contentRect = screenInfo.getContentRect();
 
         // does not include the locked video orientation
         Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
         int videoRotation = screenInfo.getVideoRotation();
+        int layerStack = device.getLayerStack();
 
         if (display != null) {
             SurfaceControl.destroyDisplay(display);
@@ -122,12 +49,8 @@ public class ScreenCapture extends SurfaceCapture {
 
         try {
             Rect videoRect = screenInfo.getVideoSize().toRect();
-            int flags = DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC | DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY | (1
-                    << 6) /* DisplayManager.VIRTUAL_DISPLAY_FLAG_SUPPORT_TOUCH */ | 1 << 8 | 1 << 9 | 1 << 10 | 1 << 11 | 1 << 12 | 1 << 13 | 1 << 14;
-
             virtualDisplay = ServiceManager.getDisplayManager()
-                    .createVirtualDisplay("scrcpy", videoRect.width(), videoRect.height(), dpi, surface, flags);
-            device.setVirtualDisplayId(virtualDisplay.getDisplay().getDisplayId());
+                    .createVirtualDisplay("scrcpy", videoRect.width(), videoRect.height(), device.getDisplayId(), surface);
             Ln.d("Display: using DisplayManager API");
         } catch (Exception displayManagerException) {
             try {
@@ -144,12 +67,8 @@ public class ScreenCapture extends SurfaceCapture {
 
     @Override
     public void release() {
-        if (rotationWatcher != null) {
-            ServiceManager.getWindowManager().unregisterRotationWatcher(rotationWatcher);
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            ServiceManager.getWindowManager().unregisterDisplayFoldListener(displayFoldListener);
-        }
+        device.setRotationListener(null);
+        device.setFoldListener(null);
         if (display != null) {
             SurfaceControl.destroyDisplay(display);
             display = null;
@@ -161,18 +80,26 @@ public class ScreenCapture extends SurfaceCapture {
     }
 
     @Override
-    public synchronized Size getSize() {
-        return screenInfo.getVideoSize();
+    public Size getSize() {
+        return device.getScreenInfo().getVideoSize();
     }
 
     @Override
-    public synchronized boolean setMaxSize(int newMaxSize) {
-        maxSize = newMaxSize;
-        screenInfo = ScreenInfo.computeScreenInfo(screenInfo.getReverseVideoRotation(), deviceSize, crop, newMaxSize, lockVideoOrientation);
-        device.setScreenInfo(screenInfo);
+    public boolean setMaxSize(int maxSize) {
+        device.setMaxSize(maxSize);
         return true;
     }
 
+    @Override
+    public void onFoldChanged(int displayId, boolean folded) {
+        requestReset();
+    }
+
+    @Override
+    public void onRotationChanged(int rotation) {
+        requestReset();
+    }
+
     private static IBinder createDisplay() throws Exception {
         // Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
         // On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".

server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java

@@ -2,8 +2,8 @@ package com.genymobile.scrcpy.video;
 
 import com.genymobile.scrcpy.BuildConfig;
 import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 
 import android.graphics.Rect;
 

server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java

@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy.video;
 
-import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.Size;
 
 import android.view.Surface;
@@ -35,7 +34,7 @@ public abstract class SurfaceCapture {
     /**
      * Called once before the capture starts.
      */
-    public abstract void init() throws ConfigurationException, IOException;
+    public abstract void init() throws IOException;
 
     /**
      * Called after the capture ends (if and only if {@link #init()} has been called).

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java

@@ -1,18 +1,15 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.FakeContext;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.Command;
+import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.util.Ln;
+import com.genymobile.scrcpy.device.Size;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.hardware.display.VirtualDisplay;
 import android.view.Display;
 import android.view.Surface;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.regex.Matcher;
@@ -42,7 +39,7 @@ public final class DisplayManager {
     public static DisplayInfo parseDisplayInfo(String dumpsysDisplayOutput, int displayId) {
         Pattern regex = Pattern.compile(
                 "^    mOverrideDisplayInfo=DisplayInfo\\{\".*?, displayId " + displayId + ".*?(, FLAG_.*)?, real ([0-9]+) x ([0-9]+).*?, "
-                        + "rotation ([0-9]+).*?, density ([0-9]+).*?, layerStack ([0-9]+)",
+                        + "rotation ([0-9]+).*?, layerStack ([0-9]+)",
                 Pattern.MULTILINE);
         Matcher m = regex.matcher(dumpsysDisplayOutput);
         if (!m.find()) {
@@ -52,10 +49,9 @@ public final class DisplayManager {
         int width = Integer.parseInt(m.group(2));
         int height = Integer.parseInt(m.group(3));
         int rotation = Integer.parseInt(m.group(4));
-        int density = Integer.parseInt(m.group(5));
-        int layerStack = Integer.parseInt(m.group(6));
+        int layerStack = Integer.parseInt(m.group(5));
 
-        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags, density);
+        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
     }
 
     private static DisplayInfo getDisplayInfoFromDumpsysDisplay(int displayId) {
@@ -102,8 +98,7 @@ public final class DisplayManager {
             int rotation = cls.getDeclaredField("rotation").getInt(displayInfo);
             int layerStack = cls.getDeclaredField("layerStack").getInt(displayInfo);
             int flags = cls.getDeclaredField("flags").getInt(displayInfo);
-            int logicalDensityDpi = cls.getDeclaredField("logicalDensityDpi").getInt(displayInfo);
-            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags, logicalDensityDpi);
+            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
         } catch (ReflectiveOperationException e) {
             throw new AssertionError(e);
         }
@@ -120,17 +115,13 @@ public final class DisplayManager {
     private Method getCreateVirtualDisplayMethod() throws NoSuchMethodException {
         if (createVirtualDisplayMethod == null) {
             createVirtualDisplayMethod = android.hardware.display.DisplayManager.class
-                    .getMethod("createVirtualDisplay", String.class, int.class, int.class, int.class, Surface.class, int.class);
+                    .getMethod("createVirtualDisplay", String.class, int.class, int.class, int.class, Surface.class);
         }
         return createVirtualDisplayMethod;
     }
 
-    public VirtualDisplay createVirtualDisplay(String name, int width, int height, int dpi, Surface surface, int flags) throws Exception {
-        //Method method = getCreateVirtualDisplayMethod();
-        Constructor<android.hardware.display.DisplayManager> ctor = android.hardware.display.DisplayManager.class.getDeclaredConstructor(Context.class);
-        ctor.setAccessible(true);
-        android.hardware.display.DisplayManager dm = ctor.newInstance(FakeContext.get());
-        return dm.createVirtualDisplay(name, width, height, dpi, surface, flags);
-        //return (VirtualDisplay) method.invoke(null, name, width, height, dpi, surface, flags);
+    public VirtualDisplay createVirtualDisplay(String name, int width, int height, int displayIdToMirror, Surface surface) throws Exception {
+        Method method = getCreateVirtualDisplayMethod();
+        return (VirtualDisplay) method.invoke(null, name, width, height, displayIdToMirror, surface);
     }
 }

server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java

@@ -200,29 +200,13 @@ public final class WindowManager {
         }
     }
 
-    public void unregisterRotationWatcher(IRotationWatcher rotationWatcher) {
-        try {
-            manager.getClass().getMethod("removeRotationWatcher", IRotationWatcher.class).invoke(manager, rotationWatcher);
-        } catch (Exception e) {
-            Ln.e("Could not unregister rotation watcher", e);
-        }
-    }
-
     @TargetApi(29)
     public void registerDisplayFoldListener(IDisplayFoldListener foldListener) {
         try {
-            manager.getClass().getMethod("registerDisplayFoldListener", IDisplayFoldListener.class).invoke(manager, foldListener);
+            Class<?> cls = manager.getClass();
+            cls.getMethod("registerDisplayFoldListener", IDisplayFoldListener.class).invoke(manager, foldListener);
         } catch (Exception e) {
             Ln.e("Could not register display fold listener", e);
         }
     }
-
-    @TargetApi(29)
-    public void unregisterDisplayFoldListener(IDisplayFoldListener foldListener) {
-        try {
-            manager.getClass().getMethod("unregisterDisplayFoldListener", IDisplayFoldListener.class).invoke(manager, foldListener);
-        } catch (Exception e) {
-            Ln.e("Could not unregister display fold listener", e);
-        }
-    }
 }