Replace SDL_strdup() by strdup()

The functions SDL_malloc(), SDL_free() and SDL_strdup() were used only because strdup() was not available everywhere. Now that it is available, use the native version of these functions.
Provide strdup() compat
2021-01-24 15:32:44 +01:00 · 2021-01-24 15:32:44 +01:00
36 changed files with 606 additions and 824 deletions
--- a/app/meson.build
+++ b/app/meson.build
@@ -23,8 +23,7 @@ src = [
    'src/video_buffer.c',
    'src/util/net.c',
    'src/util/process.c',
-    'src/util/str_util.c',
-    'src/util/thread.c',
+    'src/util/str_util.c'
 ]

 if host_machine.system() == 'windows'
@@ -99,6 +98,9 @@ foreach f : check_functions
  endif
 endforeach

+# expose the build type
+conf.set('NDEBUG', get_option('buildtype') != 'debug')
+
 # the version, updated on release
 conf.set_quoted('SCRCPY_VERSION', meson.project_version())

@@ -114,6 +116,16 @@ conf.set('PORTABLE', get_option('portable'))
 conf.set('DEFAULT_LOCAL_PORT_RANGE_FIRST', '27183')
 conf.set('DEFAULT_LOCAL_PORT_RANGE_LAST', '27199')

+# the default max video size for both dimensions, in pixels
+# overridden by option --max-size
+conf.set('DEFAULT_MAX_SIZE', '0')  # 0: unlimited
+
+# the default video orientation
+# natural device orientation is 0 and each increment adds 90 degrees
+# counterclockwise
+# overridden by option --lock-video-orientation
+conf.set('DEFAULT_LOCK_VIDEO_ORIENTATION', '-1')  # -1: unlocked
+
 # the default video bitrate, in bits/second
 # overridden by option --bit-rate
 conf.set('DEFAULT_BIT_RATE', '8000000')  # 8Mbps
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -10,9 +10,6 @@
 #include "util/log.h"
 #include "util/str_util.h"

-#define STR_IMPL_(x) #x
-#define STR(x) STR_IMPL_(x)
-
 void
 scrcpy_print_usage(const char *arg0) {
    fprintf(stderr,
@@ -26,7 +23,7 @@ scrcpy_print_usage(const char *arg0) {
        "    -b, --bit-rate value\n"
        "        Encode the video at the given bit-rate, expressed in bits/s.\n"
        "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
-        "        Default is " STR(DEFAULT_BIT_RATE) ".\n"
+        "        Default is %d.\n"
        "\n"
        "    --codec-options key[:type]=value[,...]\n"
        "        Set a list of comma-separated key:type=value options for the\n"
@@ -84,7 +81,7 @@ scrcpy_print_usage(const char *arg0) {
        "        Possible values are -1 (unlocked), 0, 1, 2 and 3.\n"
        "        Natural device orientation is 0, and each increment adds a\n"
        "        90 degrees rotation counterclockwise.\n"
-        "        Default is -1 (unlocked).\n"
+        "        Default is %d%s.\n"
        "\n"
        "    --max-fps value\n"
        "        Limit the frame rate of screen capture (officially supported\n"
@@ -94,7 +91,7 @@ scrcpy_print_usage(const char *arg0) {
        "        Limit both the width and height of the video to value. The\n"
        "        other dimension is computed so that the device aspect-ratio\n"
        "        is preserved.\n"
-        "        Default is 0 (unlimited).\n"
+        "        Default is %d%s.\n"
        "\n"
        "    -n, --no-control\n"
        "        Disable device control (mirror the device in read-only).\n"
@@ -113,8 +110,7 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "    -p, --port port[:port]\n"
        "        Set the TCP port (range) used by the client to listen.\n"
-        "        Default is " STR(DEFAULT_LOCAL_PORT_RANGE_FIRST) ":"
-                              STR(DEFAULT_LOCAL_PORT_RANGE_LAST) ".\n"
+        "        Default is %d:%d.\n"
        "\n"
        "    --prefer-text\n"
        "        Inject alpha characters and space as text events instead of\n"
@@ -301,7 +297,12 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "    Drag & drop APK file\n"
        "        Install APK from computer\n"
-        "\n", arg0);
+        "\n",
+        arg0,
+        DEFAULT_BIT_RATE,
+        DEFAULT_LOCK_VIDEO_ORIENTATION, DEFAULT_LOCK_VIDEO_ORIENTATION >= 0 ? "" : " (unlocked)",
+        DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
+        DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
 }

 static bool
--- a/app/src/compat.h
+++ b/app/src/compat.h
@@ -56,7 +56,7 @@
 # define SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
 #endif

-#ifndef HAVE_STRDUP
+#ifdef HAVE_STRDUP
 char *strdup(const char *s);
 #endif

--- a/app/src/controller.c
+++ b/app/src/controller.c
@@ -2,27 +2,25 @@

 #include <assert.h>

+#include "util/lock.h"
 #include "util/log.h"

 bool
 controller_init(struct controller *controller, socket_t control_socket) {
    cbuf_init(&controller->queue);

-    bool ok = receiver_init(&controller->receiver, control_socket);
-    if (!ok) {
+    if (!receiver_init(&controller->receiver, control_socket)) {
        return false;
    }

-    ok = sc_mutex_init(&controller->mutex);
-    if (!ok) {
+    if (!(controller->mutex = SDL_CreateMutex())) {
        receiver_destroy(&controller->receiver);
        return false;
    }

-    ok = sc_cond_init(&controller->msg_cond);
-    if (!ok) {
+    if (!(controller->msg_cond = SDL_CreateCond())) {
        receiver_destroy(&controller->receiver);
-        sc_mutex_destroy(&controller->mutex);
+        SDL_DestroyMutex(controller->mutex);
        return false;
    }

@@ -34,8 +32,8 @@ controller_init(struct controller *controller, socket_t control_socket) {

 void
 controller_destroy(struct controller *controller) {
-    sc_cond_destroy(&controller->msg_cond);
-    sc_mutex_destroy(&controller->mutex);
+    SDL_DestroyCond(controller->msg_cond);
+    SDL_DestroyMutex(controller->mutex);

    struct control_msg msg;
    while (cbuf_take(&controller->queue, &msg)) {
@@ -48,13 +46,13 @@ controller_destroy(struct controller *controller) {
 bool
 controller_push_msg(struct controller *controller,
                      const struct control_msg *msg) {
-    sc_mutex_lock(&controller->mutex);
+    mutex_lock(controller->mutex);
    bool was_empty = cbuf_is_empty(&controller->queue);
    bool res = cbuf_push(&controller->queue, *msg);
    if (was_empty) {
-        sc_cond_signal(&controller->msg_cond);
+        cond_signal(controller->msg_cond);
    }
-    sc_mutex_unlock(&controller->mutex);
+    mutex_unlock(controller->mutex);
    return res;
 }

@@ -75,20 +73,20 @@ run_controller(void *data) {
    struct controller *controller = data;

    for (;;) {
-        sc_mutex_lock(&controller->mutex);
+        mutex_lock(controller->mutex);
        while (!controller->stopped && cbuf_is_empty(&controller->queue)) {
-            sc_cond_wait(&controller->msg_cond, &controller->mutex);
+            cond_wait(controller->msg_cond, controller->mutex);
        }
        if (controller->stopped) {
            // stop immediately, do not process further msgs
-            sc_mutex_unlock(&controller->mutex);
+            mutex_unlock(controller->mutex);
            break;
        }
        struct control_msg msg;
        bool non_empty = cbuf_take(&controller->queue, &msg);
        assert(non_empty);
        (void) non_empty;
-        sc_mutex_unlock(&controller->mutex);
+        mutex_unlock(controller->mutex);

        bool ok = process_msg(controller, &msg);
        control_msg_destroy(&msg);
@@ -104,16 +102,16 @@ bool
 controller_start(struct controller *controller) {
    LOGD("Starting controller thread");

-    bool ok = sc_thread_create(&controller->thread, run_controller,
-                               "controller", controller);
-    if (!ok) {
+    controller->thread = SDL_CreateThread(run_controller, "controller",
+                                          controller);
+    if (!controller->thread) {
        LOGC("Could not start controller thread");
        return false;
    }

    if (!receiver_start(&controller->receiver)) {
        controller_stop(controller);
-        sc_thread_join(&controller->thread, NULL);
+        SDL_WaitThread(controller->thread, NULL);
        return false;
    }

@@ -122,14 +120,14 @@ controller_start(struct controller *controller) {

 void
 controller_stop(struct controller *controller) {
-    sc_mutex_lock(&controller->mutex);
+    mutex_lock(controller->mutex);
    controller->stopped = true;
-    sc_cond_signal(&controller->msg_cond);
-    sc_mutex_unlock(&controller->mutex);
+    cond_signal(controller->msg_cond);
+    mutex_unlock(controller->mutex);
 }

 void
 controller_join(struct controller *controller) {
-    sc_thread_join(&controller->thread, NULL);
+    SDL_WaitThread(controller->thread, NULL);
    receiver_join(&controller->receiver);
 }
--- a/app/src/controller.h
+++ b/app/src/controller.h
@@ -4,20 +4,21 @@
 #include "common.h"

 #include <stdbool.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

 #include "control_msg.h"
 #include "receiver.h"
 #include "util/cbuf.h"
 #include "util/net.h"
-#include "util/thread.h"

 struct control_msg_queue CBUF(struct control_msg, 64);

 struct controller {
    socket_t control_socket;
-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond msg_cond;
+    SDL_Thread *thread;
+    SDL_mutex *mutex;
+    SDL_cond *msg_cond;
    bool stopped;
    struct control_msg_queue queue;
    struct receiver receiver;
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@@ -3,6 +3,8 @@
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
 #include <SDL2/SDL_events.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>
 #include <unistd.h>

 #include "events.h"
@@ -11,6 +13,22 @@
 #include "util/buffer_util.h"
 #include "util/log.h"

+// set the decoded frame as ready for rendering, and notify
+static void
+push_frame(struct decoder *decoder) {
+    bool previous_frame_skipped;
+    video_buffer_offer_decoded_frame(decoder->video_buffer,
+                                     &previous_frame_skipped);
+    if (previous_frame_skipped) {
+        // the previous EVENT_NEW_FRAME will consume this frame
+        return;
+    }
+    static SDL_Event new_frame_event = {
+        .type = EVENT_NEW_FRAME,
+    };
+    SDL_PushEvent(&new_frame_event);
+}
+
 void
 decoder_init(struct decoder *decoder, struct video_buffer *vb) {
    decoder->video_buffer = vb;
@@ -50,10 +68,10 @@ decoder_push(struct decoder *decoder, const AVPacket *packet) {
        return false;
    }
    ret = avcodec_receive_frame(decoder->codec_ctx,
-                                decoder->video_buffer->producer_frame);
+                                decoder->video_buffer->decoding_frame);
    if (!ret) {
        // a frame was received
-        video_buffer_producer_offer_frame(decoder->video_buffer);
+        push_frame(decoder);
    } else if (ret != AVERROR(EAGAIN)) {
        LOGE("Could not receive video frame: %d", ret);
        return false;
--- a/app/src/decoder.h
+++ b/app/src/decoder.h
@@ -10,7 +10,6 @@ struct video_buffer;

 struct decoder {
    struct video_buffer *video_buffer;
-
    AVCodecContext *codec_ctx;
 };

--- a/app/src/events.h
+++ b/app/src/events.h
@@ -1,2 +1,3 @@
-#define EVENT_NEW_FRAME       SDL_USEREVENT
-#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 1)
+#define EVENT_NEW_SESSION SDL_USEREVENT
+#define EVENT_NEW_FRAME (SDL_USEREVENT + 1)
+#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 2)
--- a/app/src/file_handler.c
+++ b/app/src/file_handler.c
@@ -4,6 +4,7 @@
 #include <string.h>

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

 #define DEFAULT_PUSH_TARGET "/sdcard/"
@@ -19,14 +20,12 @@ file_handler_init(struct file_handler *file_handler, const char *serial,

    cbuf_init(&file_handler->queue);

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

-    ok = sc_cond_init(&file_handler->event_cond);
-    if (!ok) {
-        sc_mutex_destroy(&file_handler->mutex);
+    if (!(file_handler->event_cond = SDL_CreateCond())) {
+        SDL_DestroyMutex(file_handler->mutex);
        return false;
    }

@@ -34,8 +33,8 @@ file_handler_init(struct file_handler *file_handler, const char *serial,
        file_handler->serial = strdup(serial);
        if (!file_handler->serial) {
            LOGW("Could not strdup serial");
-            sc_cond_destroy(&file_handler->event_cond);
-            sc_mutex_destroy(&file_handler->mutex);
+            SDL_DestroyCond(file_handler->event_cond);
+            SDL_DestroyMutex(file_handler->mutex);
            return false;
        }
    } else {
@@ -55,8 +54,8 @@ file_handler_init(struct file_handler *file_handler, const char *serial,

 void
 file_handler_destroy(struct file_handler *file_handler) {
-    sc_cond_destroy(&file_handler->event_cond);
-    sc_mutex_destroy(&file_handler->mutex);
+    SDL_DestroyCond(file_handler->event_cond);
+    SDL_DestroyMutex(file_handler->mutex);
    free(file_handler->serial);

    struct file_handler_request req;
@@ -93,13 +92,13 @@ file_handler_request(struct file_handler *file_handler,
        .file = file,
    };

-    sc_mutex_lock(&file_handler->mutex);
+    mutex_lock(file_handler->mutex);
    bool was_empty = cbuf_is_empty(&file_handler->queue);
    bool res = cbuf_push(&file_handler->queue, req);
    if (was_empty) {
-        sc_cond_signal(&file_handler->event_cond);
+        cond_signal(file_handler->event_cond);
    }
-    sc_mutex_unlock(&file_handler->mutex);
+    mutex_unlock(file_handler->mutex);
    return res;
 }

@@ -108,14 +107,14 @@ run_file_handler(void *data) {
    struct file_handler *file_handler = data;

    for (;;) {
-        sc_mutex_lock(&file_handler->mutex);
+        mutex_lock(file_handler->mutex);
        file_handler->current_process = PROCESS_NONE;
        while (!file_handler->stopped && cbuf_is_empty(&file_handler->queue)) {
-            sc_cond_wait(&file_handler->event_cond, &file_handler->mutex);
+            cond_wait(file_handler->event_cond, file_handler->mutex);
        }
        if (file_handler->stopped) {
            // stop immediately, do not process further events
-            sc_mutex_unlock(&file_handler->mutex);
+            mutex_unlock(file_handler->mutex);
            break;
        }
        struct file_handler_request req;
@@ -133,7 +132,7 @@ run_file_handler(void *data) {
                                file_handler->push_target);
        }
        file_handler->current_process = process;
-        sc_mutex_unlock(&file_handler->mutex);
+        mutex_unlock(file_handler->mutex);

        if (req.action == ACTION_INSTALL_APK) {
            if (process_check_success(process, "adb install", false)) {
@@ -151,13 +150,13 @@ run_file_handler(void *data) {
            }
        }

-        sc_mutex_lock(&file_handler->mutex);
+        mutex_lock(file_handler->mutex);
        // Close the process (it is necessary already terminated)
        // Execute this call with mutex locked to avoid race conditions with
        // file_handler_stop()
        process_close(file_handler->current_process);
        file_handler->current_process = PROCESS_NONE;
-        sc_mutex_unlock(&file_handler->mutex);
+        mutex_unlock(file_handler->mutex);

        file_handler_request_destroy(&req);
    }
@@ -168,9 +167,9 @@ bool
 file_handler_start(struct file_handler *file_handler) {
    LOGD("Starting file_handler thread");

-    bool ok = sc_thread_create(&file_handler->thread, run_file_handler,
-                               "file_handler", file_handler);
-    if (!ok) {
+    file_handler->thread = SDL_CreateThread(run_file_handler, "file_handler",
+                                            file_handler);
+    if (!file_handler->thread) {
        LOGC("Could not start file_handler thread");
        return false;
    }
@@ -180,18 +179,18 @@ file_handler_start(struct file_handler *file_handler) {

 void
 file_handler_stop(struct file_handler *file_handler) {
-    sc_mutex_lock(&file_handler->mutex);
+    mutex_lock(file_handler->mutex);
    file_handler->stopped = true;
-    sc_cond_signal(&file_handler->event_cond);
+    cond_signal(file_handler->event_cond);
    if (file_handler->current_process != PROCESS_NONE) {
        if (!process_terminate(file_handler->current_process)) {
            LOGW("Could not terminate push/install process");
        }
    }
-    sc_mutex_unlock(&file_handler->mutex);
+    mutex_unlock(file_handler->mutex);
 }

 void
 file_handler_join(struct file_handler *file_handler) {
-    sc_thread_join(&file_handler->thread, NULL);
+    SDL_WaitThread(file_handler->thread, NULL);
 }
--- a/app/src/file_handler.h
+++ b/app/src/file_handler.h
@@ -4,10 +4,11 @@
 #include "common.h"

 #include <stdbool.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

 #include "adb.h"
 #include "util/cbuf.h"
-#include "util/thread.h"

 typedef enum {
    ACTION_INSTALL_APK,
@@ -24,9 +25,9 @@ struct file_handler_request_queue CBUF(struct file_handler_request, 16);
 struct file_handler {
    char *serial;
    const char *push_target;
-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond event_cond;
+    SDL_Thread *thread;
+    SDL_mutex *mutex;
+    SDL_cond *event_cond;
    bool stopped;
    bool initialized;
    process_t current_process;
--- a/app/src/fps_counter.c
+++ b/app/src/fps_counter.c
@@ -3,24 +3,25 @@
 #include <assert.h>
 #include <SDL2/SDL_timer.h>

+#include "util/lock.h"
 #include "util/log.h"

 #define FPS_COUNTER_INTERVAL_MS 1000

 bool
 fps_counter_init(struct fps_counter *counter) {
-    bool ok = sc_mutex_init(&counter->mutex);
-    if (!ok) {
+    counter->mutex = SDL_CreateMutex();
+    if (!counter->mutex) {
        return false;
    }

-    ok = sc_cond_init(&counter->state_cond);
-    if (!ok) {
-        sc_mutex_destroy(&counter->mutex);
+    counter->state_cond = SDL_CreateCond();
+    if (!counter->state_cond) {
+        SDL_DestroyMutex(counter->mutex);
        return false;
    }

-    counter->thread_started = false;
+    counter->thread = NULL;
    atomic_init(&counter->started, 0);
    // no need to initialize the other fields, they are unused until started

@@ -29,8 +30,8 @@ fps_counter_init(struct fps_counter *counter) {

 void
 fps_counter_destroy(struct fps_counter *counter) {
-    sc_cond_destroy(&counter->state_cond);
-    sc_mutex_destroy(&counter->mutex);
+    SDL_DestroyCond(counter->state_cond);
+    SDL_DestroyMutex(counter->mutex);
 }

 static inline bool
@@ -76,10 +77,10 @@ static int
 run_fps_counter(void *data) {
    struct fps_counter *counter = data;

-    sc_mutex_lock(&counter->mutex);
+    mutex_lock(counter->mutex);
    while (!counter->interrupted) {
        while (!counter->interrupted && !is_started(counter)) {
-            sc_cond_wait(&counter->state_cond, &counter->mutex);
+            cond_wait(counter->state_cond, counter->mutex);
        }
        while (!counter->interrupted && is_started(counter)) {
            uint32_t now = SDL_GetTicks();
@@ -89,35 +90,32 @@ run_fps_counter(void *data) {
            uint32_t remaining = counter->next_timestamp - now;

            // ignore the reason (timeout or signaled), we just loop anyway
-            sc_cond_timedwait(&counter->state_cond, &counter->mutex, remaining);
+            cond_wait_timeout(counter->state_cond, counter->mutex, remaining);
        }
    }
-    sc_mutex_unlock(&counter->mutex);
+    mutex_unlock(counter->mutex);
    return 0;
 }

 bool
 fps_counter_start(struct fps_counter *counter) {
-    sc_mutex_lock(&counter->mutex);
+    mutex_lock(counter->mutex);
    counter->next_timestamp = SDL_GetTicks() + FPS_COUNTER_INTERVAL_MS;
    counter->nr_rendered = 0;
    counter->nr_skipped = 0;
-    sc_mutex_unlock(&counter->mutex);
+    mutex_unlock(counter->mutex);

    set_started(counter, true);
-    sc_cond_signal(&counter->state_cond);
+    cond_signal(counter->state_cond);

-    // counter->thread_started and counter->thread are always accessed from the
-    // same thread, no need to lock
-    if (!counter->thread_started) {
-        bool ok = sc_thread_create(&counter->thread, run_fps_counter,
-                                   "fps counter", counter);
-        if (!ok) {
+    // counter->thread is always accessed from the same thread, no need to lock
+    if (!counter->thread) {
+        counter->thread =
+            SDL_CreateThread(run_fps_counter, "fps counter", counter);
+        if (!counter->thread) {
            LOGE("Could not start FPS counter thread");
            return false;
        }
-
-        counter->thread_started = true;
    }

    return true;
@@ -126,7 +124,7 @@ fps_counter_start(struct fps_counter *counter) {
 void
 fps_counter_stop(struct fps_counter *counter) {
    set_started(counter, false);
-    sc_cond_signal(&counter->state_cond);
+    cond_signal(counter->state_cond);
 }

 bool
@@ -136,21 +134,21 @@ fps_counter_is_started(struct fps_counter *counter) {

 void
 fps_counter_interrupt(struct fps_counter *counter) {
-    if (!counter->thread_started) {
+    if (!counter->thread) {
        return;
    }

-    sc_mutex_lock(&counter->mutex);
+    mutex_lock(counter->mutex);
    counter->interrupted = true;
-    sc_mutex_unlock(&counter->mutex);
+    mutex_unlock(counter->mutex);
    // wake up blocking wait
-    sc_cond_signal(&counter->state_cond);
+    cond_signal(counter->state_cond);
 }

 void
 fps_counter_join(struct fps_counter *counter) {
-    if (counter->thread_started) {
-        sc_thread_join(&counter->thread, NULL);
+    if (counter->thread) {
+        SDL_WaitThread(counter->thread, NULL);
    }
 }

@@ -160,11 +158,11 @@ fps_counter_add_rendered_frame(struct fps_counter *counter) {
        return;
    }

-    sc_mutex_lock(&counter->mutex);
+    mutex_lock(counter->mutex);
    uint32_t now = SDL_GetTicks();
    check_interval_expired(counter, now);
    ++counter->nr_rendered;
-    sc_mutex_unlock(&counter->mutex);
+    mutex_unlock(counter->mutex);
 }

 void
@@ -173,9 +171,9 @@ fps_counter_add_skipped_frame(struct fps_counter *counter) {
        return;
    }

-    sc_mutex_lock(&counter->mutex);
+    mutex_lock(counter->mutex);
    uint32_t now = SDL_GetTicks();
    check_interval_expired(counter, now);
    ++counter->nr_skipped;
-    sc_mutex_unlock(&counter->mutex);
+    mutex_unlock(counter->mutex);
 }
--- a/app/src/fps_counter.h
+++ b/app/src/fps_counter.h
@@ -6,15 +6,13 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
-
-#include "util/thread.h"
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

 struct fps_counter {
-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond state_cond;
-
-    bool thread_started;
+    SDL_Thread *thread;
+    SDL_mutex *mutex;
+    SDL_cond *state_cond;

    // atomic so that we can check without locking the mutex
    // if the FPS counter is disabled, we don't want to lock unnecessarily
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -4,6 +4,7 @@
 #include <SDL2/SDL_keycode.h>

 #include "event_converter.h"
+#include "util/lock.h"
 #include "util/log.h"

 static const int ACTION_DOWN = 1;
@@ -286,7 +287,7 @@ rotate_client_right(struct screen *screen) {
    screen_set_rotation(screen, new_rotation);
 }

-static void
+void
 input_manager_process_text_input(struct input_manager *im,
                                 const SDL_TextInputEvent *event) {
    if (is_shortcut_mod(im, SDL_GetModState())) {
@@ -366,7 +367,7 @@ convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
    return true;
 }

-static void
+void
 input_manager_process_key(struct input_manager *im,
                          const SDL_KeyboardEvent *event) {
    // control: indicates the state of the command-line option --no-control
@@ -480,7 +481,9 @@ input_manager_process_key(struct input_manager *im,
                return;
            case SDLK_i:
                if (!shift && !repeat && down) {
-                    switch_fps_counter_state(im->fps_counter);
+                    struct fps_counter *fps_counter =
+                        im->video_buffer->fps_counter;
+                    switch_fps_counter_state(fps_counter);
                }
                return;
            case SDLK_n:
@@ -549,7 +552,7 @@ convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
    return true;
 }

-static void
+void
 input_manager_process_mouse_motion(struct input_manager *im,
                                   const SDL_MouseMotionEvent *event) {
    if (!event->state) {
@@ -603,7 +606,7 @@ convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
    return true;
 }

-static void
+void
 input_manager_process_touch(struct input_manager *im,
                            const SDL_TouchFingerEvent *event) {
    struct control_msg msg;
@@ -635,7 +638,7 @@ convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
    return true;
 }

-static void
+void
 input_manager_process_mouse_button(struct input_manager *im,
                                   const SDL_MouseButtonEvent *event) {
    bool control = im->control;
@@ -734,7 +737,7 @@ convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
    return true;
 }

-static void
+void
 input_manager_process_mouse_wheel(struct input_manager *im,
                                  const SDL_MouseWheelEvent *event) {
    struct control_msg msg;
@@ -744,46 +747,3 @@ input_manager_process_mouse_wheel(struct input_manager *im,
        }
    }
 }
-
-bool
-input_manager_handle_event(struct input_manager *im, SDL_Event *event) {
-    switch (event->type) {
-        case SDL_TEXTINPUT:
-            if (!im->control) {
-                return true;
-            }
-            input_manager_process_text_input(im, &event->text);
-            return true;
-        case SDL_KEYDOWN:
-        case SDL_KEYUP:
-            // some key events do not interact with the device, so process the
-            // event even if control is disabled
-            input_manager_process_key(im, &event->key);
-            return true;
-        case SDL_MOUSEMOTION:
-            if (!im->control) {
-                break;
-            }
-            input_manager_process_mouse_motion(im, &event->motion);
-            return true;
-        case SDL_MOUSEWHEEL:
-            if (!im->control) {
-                break;
-            }
-            input_manager_process_mouse_wheel(im, &event->wheel);
-            return true;
-        case SDL_MOUSEBUTTONDOWN:
-        case SDL_MOUSEBUTTONUP:
-            // some mouse events do not interact with the device, so process
-            // the event even if control is disabled
-            input_manager_process_mouse_button(im, &event->button);
-            return true;
-        case SDL_FINGERMOTION:
-        case SDL_FINGERDOWN:
-        case SDL_FINGERUP:
-            input_manager_process_touch(im, &event->tfinger);
-            return true;
-    }
-
-    return false;
-}
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@@ -16,7 +16,6 @@
 struct input_manager {
    struct controller *controller;
    struct video_buffer *video_buffer;
-    struct fps_counter *fps_counter;
    struct screen *screen;

    // SDL reports repeated events as a boolean, but Android expects the actual
@@ -41,7 +40,28 @@ void
 input_manager_init(struct input_manager *im,
                   const struct scrcpy_options *options);

-bool
-input_manager_handle_event(struct input_manager *im, SDL_Event *event);
+void
+input_manager_process_text_input(struct input_manager *im,
+                                 const SDL_TextInputEvent *event);
+
+void
+input_manager_process_key(struct input_manager *im,
+                          const SDL_KeyboardEvent *event);
+
+void
+input_manager_process_mouse_motion(struct input_manager *im,
+                                   const SDL_MouseMotionEvent *event);
+
+void
+input_manager_process_touch(struct input_manager *im,
+                            const SDL_TouchFingerEvent *event);
+
+void
+input_manager_process_mouse_button(struct input_manager *im,
+                                   const SDL_MouseButtonEvent *event);
+
+void
+input_manager_process_mouse_wheel(struct input_manager *im,
+                                  const SDL_MouseWheelEvent *event);

 #endif
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@@ -4,12 +4,12 @@
 #include <SDL2/SDL_clipboard.h>

 #include "device_msg.h"
+#include "util/lock.h"
 #include "util/log.h"

 bool
 receiver_init(struct receiver *receiver, socket_t control_socket) {
-    bool ok = sc_mutex_init(&receiver->mutex);
-    if (!ok) {
+    if (!(receiver->mutex = SDL_CreateMutex())) {
        return false;
    }
    receiver->control_socket = control_socket;
@@ -18,7 +18,7 @@ receiver_init(struct receiver *receiver, socket_t control_socket) {

 void
 receiver_destroy(struct receiver *receiver) {
-    sc_mutex_destroy(&receiver->mutex);
+    SDL_DestroyMutex(receiver->mutex);
 }

 static void
@@ -101,9 +101,8 @@ bool
 receiver_start(struct receiver *receiver) {
    LOGD("Starting receiver thread");

-    bool ok = sc_thread_create(&receiver->thread, run_receiver, "receiver",
-                               receiver);
-    if (!ok) {
+    receiver->thread = SDL_CreateThread(run_receiver, "receiver", receiver);
+    if (!receiver->thread) {
        LOGC("Could not start receiver thread");
        return false;
    }
@@ -113,5 +112,5 @@ receiver_start(struct receiver *receiver) {

 void
 receiver_join(struct receiver *receiver) {
-    sc_thread_join(&receiver->thread, NULL);
+    SDL_WaitThread(receiver->thread, NULL);
 }
--- a/app/src/receiver.h
+++ b/app/src/receiver.h
@@ -4,16 +4,17 @@
 #include "common.h"

 #include <stdbool.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

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

 // receive events from the device
 // managed by the controller
 struct receiver {
    socket_t control_socket;
-    sc_thread thread;
-    sc_mutex mutex;
+    SDL_Thread *thread;
+    SDL_mutex *mutex;
 };

 bool
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <libavutil/time.h>

+#include "util/lock.h"
 #include "util/log.h"

 static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us
@@ -68,17 +69,17 @@ recorder_init(struct recorder *recorder,
        return false;
    }

-    bool ok = sc_mutex_init(&recorder->mutex);
-    if (!ok) {
+    recorder->mutex = SDL_CreateMutex();
+    if (!recorder->mutex) {
        LOGC("Could not create mutex");
        free(recorder->filename);
        return false;
    }

-    ok = sc_cond_init(&recorder->queue_cond);
-    if (!ok) {
+    recorder->queue_cond = SDL_CreateCond();
+    if (!recorder->queue_cond) {
        LOGC("Could not create cond");
-        sc_mutex_destroy(&recorder->mutex);
+        SDL_DestroyMutex(recorder->mutex);
        free(recorder->filename);
        return false;
    }
@@ -96,8 +97,8 @@ recorder_init(struct recorder *recorder,

 void
 recorder_destroy(struct recorder *recorder) {
-    sc_cond_destroy(&recorder->queue_cond);
-    sc_mutex_destroy(&recorder->mutex);
+    SDL_DestroyCond(recorder->queue_cond);
+    SDL_DestroyMutex(recorder->mutex);
    free(recorder->filename);
 }

@@ -257,17 +258,17 @@ run_recorder(void *data) {
    struct recorder *recorder = data;

    for (;;) {
-        sc_mutex_lock(&recorder->mutex);
+        mutex_lock(recorder->mutex);

        while (!recorder->stopped && queue_is_empty(&recorder->queue)) {
-            sc_cond_wait(&recorder->queue_cond, &recorder->mutex);
+            cond_wait(recorder->queue_cond, recorder->mutex);
        }

        // if stopped is set, continue to process the remaining events (to
        // finish the recording) before actually stopping

        if (recorder->stopped && queue_is_empty(&recorder->queue)) {
-            sc_mutex_unlock(&recorder->mutex);
+            mutex_unlock(recorder->mutex);
            struct record_packet *last = recorder->previous;
            if (last) {
                // assign an arbitrary duration to the last packet
@@ -287,7 +288,7 @@ run_recorder(void *data) {
        struct record_packet *rec;
        queue_take(&recorder->queue, next, &rec);

-        sc_mutex_unlock(&recorder->mutex);
+        mutex_unlock(recorder->mutex);

        // recorder->previous is only written from this thread, no need to lock
        struct record_packet *previous = recorder->previous;
@@ -310,11 +311,11 @@ run_recorder(void *data) {
        if (!ok) {
            LOGE("Could not record packet");

-            sc_mutex_lock(&recorder->mutex);
+            mutex_lock(recorder->mutex);
            recorder->failed = true;
            // discard pending packets
            recorder_queue_clear(&recorder->queue);
-            sc_mutex_unlock(&recorder->mutex);
+            mutex_unlock(recorder->mutex);
            break;
        }

@@ -329,9 +330,8 @@ bool
 recorder_start(struct recorder *recorder) {
    LOGD("Starting recorder thread");

-    bool ok = sc_thread_create(&recorder->thread, run_recorder, "recorder",
-                               recorder);
-    if (!ok) {
+    recorder->thread = SDL_CreateThread(run_recorder, "recorder", recorder);
+    if (!recorder->thread) {
        LOGC("Could not start recorder thread");
        return false;
    }
@@ -341,38 +341,38 @@ recorder_start(struct recorder *recorder) {

 void
 recorder_stop(struct recorder *recorder) {
-    sc_mutex_lock(&recorder->mutex);
+    mutex_lock(recorder->mutex);
    recorder->stopped = true;
-    sc_cond_signal(&recorder->queue_cond);
-    sc_mutex_unlock(&recorder->mutex);
+    cond_signal(recorder->queue_cond);
+    mutex_unlock(recorder->mutex);
 }

 void
 recorder_join(struct recorder *recorder) {
-    sc_thread_join(&recorder->thread, NULL);
+    SDL_WaitThread(recorder->thread, NULL);
 }

 bool
 recorder_push(struct recorder *recorder, const AVPacket *packet) {
-    sc_mutex_lock(&recorder->mutex);
+    mutex_lock(recorder->mutex);
    assert(!recorder->stopped);

    if (recorder->failed) {
        // reject any new packet (this will stop the stream)
-        sc_mutex_unlock(&recorder->mutex);
+        mutex_unlock(recorder->mutex);
        return false;
    }

    struct record_packet *rec = record_packet_new(packet);
    if (!rec) {
        LOGC("Could not allocate record packet");
-        sc_mutex_unlock(&recorder->mutex);
+        mutex_unlock(recorder->mutex);
        return false;
    }

    queue_push(&recorder->queue, next, rec);
-    sc_cond_signal(&recorder->queue_cond);
+    cond_signal(recorder->queue_cond);

-    sc_mutex_unlock(&recorder->mutex);
+    mutex_unlock(recorder->mutex);
    return true;
 }
--- a/app/src/recorder.h
+++ b/app/src/recorder.h
@@ -5,11 +5,12 @@

 #include <stdbool.h>
 #include <libavformat/avformat.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

 #include "coords.h"
 #include "scrcpy.h"
 #include "util/queue.h"
-#include "util/thread.h"

 struct record_packet {
    AVPacket packet;
@@ -25,9 +26,9 @@ struct recorder {
    struct size declared_frame_size;
    bool header_written;

-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond queue_cond;
+    SDL_Thread *thread;
+    SDL_mutex *mutex;
+    SDL_cond *queue_cond;
    bool stopped; // set on recorder_stop() by the stream reader
    bool failed; // set on packet write failure
    struct recorder_queue queue;
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -26,11 +26,12 @@
 #include "stream.h"
 #include "tiny_xpm.h"
 #include "video_buffer.h"
+#include "util/lock.h"
 #include "util/log.h"
 #include "util/net.h"

 static struct server server;
-static struct screen screen;
+static struct screen screen = SCREEN_INITIALIZER;
 static struct fps_counter fps_counter;
 static struct video_buffer video_buffer;
 static struct stream stream;
@@ -42,7 +43,6 @@ static struct file_handler file_handler;
 static struct input_manager input_manager = {
    .controller = &controller,
    .video_buffer = &video_buffer,
-    .fps_counter = &fps_counter,
    .screen = &screen,
    .repeat = 0,

@@ -174,37 +174,68 @@ handle_event(SDL_Event *event, const struct scrcpy_options *options) {
        case SDL_QUIT:
            LOGD("User requested to quit");
            return EVENT_RESULT_STOPPED_BY_USER;
+        case EVENT_NEW_FRAME:
+            if (!screen.has_frame) {
+                screen.has_frame = true;
+                // this is the very first frame, show the window
+                screen_show_window(&screen);
+            }
+            if (!screen_update_frame(&screen, &video_buffer)) {
+                return EVENT_RESULT_CONTINUE;
+            }
+            break;
+        case SDL_WINDOWEVENT:
+            screen_handle_window_event(&screen, &event->window);
+            break;
+        case SDL_TEXTINPUT:
+            if (!options->control) {
+                break;
+            }
+            input_manager_process_text_input(&input_manager, &event->text);
+            break;
+        case SDL_KEYDOWN:
+        case SDL_KEYUP:
+            // some key events do not interact with the device, so process the
+            // event even if control is disabled
+            input_manager_process_key(&input_manager, &event->key);
+            break;
+        case SDL_MOUSEMOTION:
+            if (!options->control) {
+                break;
+            }
+            input_manager_process_mouse_motion(&input_manager, &event->motion);
+            break;
+        case SDL_MOUSEWHEEL:
+            if (!options->control) {
+                break;
+            }
+            input_manager_process_mouse_wheel(&input_manager, &event->wheel);
+            break;
+        case SDL_MOUSEBUTTONDOWN:
+        case SDL_MOUSEBUTTONUP:
+            // some mouse events do not interact with the device, so process
+            // the event even if control is disabled
+            input_manager_process_mouse_button(&input_manager, &event->button);
+            break;
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
+            input_manager_process_touch(&input_manager, &event->tfinger);
+            break;
        case SDL_DROPFILE: {
            if (!options->control) {
                break;
            }
-            char *file = strdup(event->drop.file);
-            SDL_free(event->drop.file);
-            if (!file) {
-                LOGW("Could not strdup drop filename\n");
-                break;
-            }
-
            file_handler_action_t action;
-            if (is_apk(file)) {
+            if (is_apk(event->drop.file)) {
                action = ACTION_INSTALL_APK;
            } else {
                action = ACTION_PUSH_FILE;
            }
-            file_handler_request(&file_handler, action, file);
+            file_handler_request(&file_handler, action, event->drop.file);
            break;
        }
    }
-
-    bool consumed = screen_handle_event(&screen, event);
-    if (consumed) {
-        goto end;
-    }
-
-    consumed = input_manager_handle_event(&input_manager, event);
-    (void) consumed;
-
-end:
    return EVENT_RESULT_CONTINUE;
 }

@@ -333,7 +364,8 @@ scrcpy(const struct scrcpy_options *options) {
        }
        fps_counter_initialized = true;

-        if (!video_buffer_init(&video_buffer, options->render_expired_frames)) {
+        if (!video_buffer_init(&video_buffer, &fps_counter,
+                               options->render_expired_frames)) {
            goto end;
        }
        video_buffer_initialized = true;
@@ -366,6 +398,13 @@ scrcpy(const struct scrcpy_options *options) {

    stream_init(&stream, server.video_socket, dec, rec);

+    // now we consumed the header values, the socket receives the video stream
+    // start the stream
+    if (!stream_start(&stream)) {
+        goto end;
+    }
+    stream_started = true;
+
    if (options->display) {
        if (options->control) {
            if (!controller_init(&controller, server.control_socket)) {
@@ -382,21 +421,12 @@ scrcpy(const struct scrcpy_options *options) {
        const char *window_title =
            options->window_title ? options->window_title : device_name;

-        struct screen_params screen_params = {
-            .window_title = window_title,
-            .frame_size = frame_size,
-            .always_on_top = options->always_on_top,
-            .window_x = options->window_x,
-            .window_y = options->window_y,
-            .window_width = options->window_width,
-            .window_height = options->window_height,
-            .window_borderless = options->window_borderless,
-            .rotation = options->rotation,
-            .mipmaps = options->mipmaps,
-        };
-
-        if (!screen_init(&screen, &video_buffer, &fps_counter,
-                         &screen_params)) {
+        if (!screen_init_rendering(&screen, window_title, frame_size,
+                                   options->always_on_top, options->window_x,
+                                   options->window_y, options->window_width,
+                                   options->window_height,
+                                   options->window_borderless,
+                                   options->rotation, options->mipmaps)) {
            goto end;
        }

@@ -415,13 +445,6 @@ scrcpy(const struct scrcpy_options *options) {
        }
    }

-    // now we consumed the header values, the socket receives the video stream
-    // start the stream
-    if (!stream_start(&stream)) {
-        goto end;
-    }
-    stream_started = true;
-
    input_manager_init(&input_manager, options);

    ret = event_loop(options);
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -103,10 +103,10 @@ struct scrcpy_options {
        .data = {SC_MOD_LALT, SC_MOD_LSUPER}, \
        .count = 2, \
    }, \
-    .max_size = 0, \
+    .max_size = DEFAULT_MAX_SIZE, \
    .bit_rate = DEFAULT_BIT_RATE, \
    .max_fps = 0, \
-    .lock_video_orientation = -1, \
+    .lock_video_orientation = DEFAULT_LOCK_VIDEO_ORIENTATION, \
    .rotation = 0, \
    .window_x = SC_WINDOW_POSITION_UNDEFINED, \
    .window_y = SC_WINDOW_POSITION_UNDEFINED, \
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -4,11 +4,11 @@
 #include <string.h>
 #include <SDL2/SDL.h>

-#include "events.h"
 #include "icon.xpm"
 #include "scrcpy.h"
 #include "tiny_xpm.h"
 #include "video_buffer.h"
+#include "util/lock.h"
 #include "util/log.h"

 #define DISPLAY_MARGINS 96
@@ -191,25 +191,9 @@ screen_update_content_rect(struct screen *screen) {
    }
 }

-static void
-on_frame_available(struct video_buffer *vb, void *userdata) {
-    (void) vb;
-    (void) userdata;
-
-    static SDL_Event new_frame_event = {
-        .type = EVENT_NEW_FRAME,
-    };
-
-    // Post the event on the UI thread
-    SDL_PushEvent(&new_frame_event);
-}
-
-static void
-on_frame_skipped(struct video_buffer *vb, void *userdata) {
-    (void) vb;
-
-    struct screen *screen = userdata;
-    fps_counter_add_skipped_frame(screen->fps_counter);
+void
+screen_init(struct screen *screen) {
+    *screen = (struct screen) SCREEN_INITIALIZER;
 }

 static inline SDL_Texture *
@@ -240,40 +224,26 @@ create_texture(struct screen *screen) {
 }

 bool
-screen_init(struct screen *screen, struct video_buffer *vb,
-            struct fps_counter *fps_counter,
-            const struct screen_params *params) {
-    screen->vb = vb;
-    screen->fps_counter = fps_counter;
-
-    screen->resize_pending = false;
-    screen->has_frame = false;
-    screen->fullscreen = false;
-    screen->maximized = false;
-
-    static const struct video_buffer_callbacks cbs = {
-        .on_frame_available = on_frame_available,
-        .on_frame_skipped = on_frame_skipped,
-    };
-    video_buffer_set_consumer_callbacks(vb, &cbs, screen);
-
-    screen->frame_size = params->frame_size;
-    screen->rotation = params->rotation;
-    if (screen->rotation) {
-        LOGI("Initial display rotation set to %u", screen->rotation);
+screen_init_rendering(struct screen *screen, const char *window_title,
+                      struct size frame_size, bool always_on_top,
+                      int16_t window_x, int16_t window_y, uint16_t window_width,
+                      uint16_t window_height, bool window_borderless,
+                      uint8_t rotation, bool mipmaps) {
+    screen->frame_size = frame_size;
+    screen->rotation = rotation;
+    if (rotation) {
+        LOGI("Initial display rotation set to %u", rotation);
    }
-    struct size content_size =
-        get_rotated_size(screen->frame_size, screen->rotation);
+    struct size content_size = get_rotated_size(frame_size, screen->rotation);
    screen->content_size = content_size;

-    struct size window_size = get_initial_optimal_size(content_size,
-                                                       params->window_width,
-                                                       params->window_height);
+    struct size window_size =
+        get_initial_optimal_size(content_size, window_width, window_height);
    uint32_t window_flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE;
 #ifdef HIDPI_SUPPORT
    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
 #endif
-    if (params->always_on_top) {
+    if (always_on_top) {
 #ifdef SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP
        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
 #else
@@ -281,15 +251,15 @@ screen_init(struct screen *screen, struct video_buffer *vb,
             "(compile with SDL >= 2.0.5 to enable it)");
 #endif
    }
-    if (params->window_borderless) {
+    if (window_borderless) {
        window_flags |= SDL_WINDOW_BORDERLESS;
    }

-    int x = params->window_x != SC_WINDOW_POSITION_UNDEFINED
-          ? params->window_x : (int) SDL_WINDOWPOS_UNDEFINED;
-    int y = params->window_y != SC_WINDOW_POSITION_UNDEFINED
-          ? params->window_y : (int) SDL_WINDOWPOS_UNDEFINED;
-    screen->window = SDL_CreateWindow(params->window_title, x, y,
+    int x = window_x != SC_WINDOW_POSITION_UNDEFINED
+          ? window_x : (int) SDL_WINDOWPOS_UNDEFINED;
+    int y = window_y != SC_WINDOW_POSITION_UNDEFINED
+          ? window_y : (int) SDL_WINDOWPOS_UNDEFINED;
+    screen->window = SDL_CreateWindow(window_title, x, y,
                                      window_size.width, window_size.height,
                                      window_flags);
    if (!screen->window) {
@@ -301,7 +271,7 @@ screen_init(struct screen *screen, struct video_buffer *vb,
                                          SDL_RENDERER_ACCELERATED);
    if (!screen->renderer) {
        LOGC("Could not create renderer: %s", SDL_GetError());
-        SDL_DestroyWindow(screen->window);
+        screen_destroy(screen);
        return false;
    }

@@ -310,17 +280,15 @@ screen_init(struct screen *screen, struct video_buffer *vb,
    const char *renderer_name = r ? NULL : renderer_info.name;
    LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");

-    screen->mipmaps = false;
-
    // starts with "opengl"
-    bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
-    if (use_opengl) {
+    screen->use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
+    if (screen->use_opengl) {
        struct sc_opengl *gl = &screen->gl;
        sc_opengl_init(gl);

        LOGI("OpenGL version: %s", gl->version);

-        if (params->mipmaps) {
+        if (mipmaps) {
            bool supports_mipmaps =
                sc_opengl_version_at_least(gl, 3, 0, /* OpenGL 3.0+ */
                                               2, 0  /* OpenGL ES 2.0+ */);
@@ -334,7 +302,7 @@ screen_init(struct screen *screen, struct video_buffer *vb,
        } else {
            LOGI("Trilinear filtering disabled");
        }
-    } else if (params->mipmaps) {
+    } else {
        LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
    }

@@ -346,13 +314,12 @@ screen_init(struct screen *screen, struct video_buffer *vb,
        LOGW("Could not load icon");
    }

-    LOGI("Initial texture: %" PRIu16 "x%" PRIu16, params->frame_size.width,
-                                                  params->frame_size.height);
+    LOGI("Initial texture: %" PRIu16 "x%" PRIu16, frame_size.width,
+                                                  frame_size.height);
    screen->texture = create_texture(screen);
    if (!screen->texture) {
        LOGC("Could not create texture: %s", SDL_GetError());
-        SDL_DestroyRenderer(screen->renderer);
-        SDL_DestroyWindow(screen->window);
+        screen_destroy(screen);
        return false;
    }

@@ -373,9 +340,15 @@ screen_show_window(struct screen *screen) {

 void
 screen_destroy(struct screen *screen) {
-    SDL_DestroyTexture(screen->texture);
-    SDL_DestroyRenderer(screen->renderer);
-    SDL_DestroyWindow(screen->window);
+    if (screen->texture) {
+        SDL_DestroyTexture(screen->texture);
+    }
+    if (screen->renderer) {
+        SDL_DestroyRenderer(screen->renderer);
+    }
+    if (screen->window) {
+        SDL_DestroyWindow(screen->window);
+    }
 }

 static void
@@ -472,23 +445,24 @@ update_texture(struct screen *screen, const AVFrame *frame) {
            frame->data[2], frame->linesize[2]);

    if (screen->mipmaps) {
+        assert(screen->use_opengl);
        SDL_GL_BindTexture(screen->texture, NULL, NULL);
        screen->gl.GenerateMipmap(GL_TEXTURE_2D);
        SDL_GL_UnbindTexture(screen->texture);
    }
 }

-static bool
-screen_update_frame(struct screen *screen) {
-    const AVFrame *frame = video_buffer_consumer_take_frame(screen->vb);
-
-    fps_counter_add_rendered_frame(screen->fps_counter);
-
+bool
+screen_update_frame(struct screen *screen, struct video_buffer *vb) {
+    mutex_lock(vb->mutex);
+    const AVFrame *frame = video_buffer_consume_rendered_frame(vb);
    struct size new_frame_size = {frame->width, frame->height};
    if (!prepare_for_frame(screen, new_frame_size)) {
+        mutex_unlock(vb->mutex);
        return false;
    }
    update_texture(screen, frame);
+    mutex_unlock(vb->mutex);

    screen_render(screen, false);
    return true;
@@ -575,52 +549,31 @@ screen_resize_to_pixel_perfect(struct screen *screen) {
                                            content_size.height);
 }

-bool
-screen_handle_event(struct screen *screen, SDL_Event *event) {
-    switch (event->type) {
-        case EVENT_NEW_FRAME:
-            if (!screen->has_frame) {
-                screen->has_frame = true;
-                // this is the very first frame, show the window
-                screen_show_window(screen);
+void
+screen_handle_window_event(struct screen *screen,
+                           const SDL_WindowEvent *event) {
+    switch (event->event) {
+        case SDL_WINDOWEVENT_EXPOSED:
+            screen_render(screen, true);
+            break;
+        case SDL_WINDOWEVENT_SIZE_CHANGED:
+            screen_render(screen, true);
+            break;
+        case SDL_WINDOWEVENT_MAXIMIZED:
+            screen->maximized = true;
+            break;
+        case SDL_WINDOWEVENT_RESTORED:
+            if (screen->fullscreen) {
+                // On Windows, in maximized+fullscreen, disabling fullscreen
+                // mode unexpectedly triggers the "restored" then "maximized"
+                // events, leaving the window in a weird state (maximized
+                // according to the events, but not maximized visually).
+                break;
            }
-            bool ok = screen_update_frame(screen);
-            if (!ok) {
-                LOGW("Frame update failed\n");
-            }
-            return true;
-        case SDL_WINDOWEVENT:
-            if (!screen->has_frame) {
-                // Do nothing
-                return true;
-            }
-            switch (event->window.event) {
-                case SDL_WINDOWEVENT_EXPOSED:
-                    screen_render(screen, true);
-                    break;
-                case SDL_WINDOWEVENT_SIZE_CHANGED:
-                    screen_render(screen, true);
-                    break;
-                case SDL_WINDOWEVENT_MAXIMIZED:
-                    screen->maximized = true;
-                    break;
-                case SDL_WINDOWEVENT_RESTORED:
-                    if (screen->fullscreen) {
-                        // On Windows, in maximized+fullscreen, disabling
-                        // fullscreen mode unexpectedly triggers the "restored"
-                        // then "maximized" events, leaving the window in a
-                        // weird state (maximized according to the events, but
-                        // not maximized visually).
-                        break;
-                    }
-                    screen->maximized = false;
-                    apply_pending_resize(screen);
-                    break;
-            }
-            return true;
+            screen->maximized = false;
+            apply_pending_resize(screen);
+            break;
    }
-
-    return false;
 }

 struct point
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -13,12 +13,10 @@
 struct video_buffer;

 struct screen {
-    struct video_buffer *vb;
-    struct fps_counter *fps_counter;
-
    SDL_Window *window;
    SDL_Renderer *renderer;
    SDL_Texture *texture;
+    bool use_opengl;
    struct sc_opengl gl;
    struct size frame_size;
    struct size content_size; // rotated frame_size
@@ -35,30 +33,55 @@ struct screen {
    bool has_frame;
    bool fullscreen;
    bool maximized;
+    bool no_window;
    bool mipmaps;
 };

-struct screen_params {
-    const char *window_title;
-    struct size frame_size;
-    bool always_on_top;
+#define SCREEN_INITIALIZER { \
+    .window = NULL, \
+    .renderer = NULL, \
+    .texture = NULL, \
+    .use_opengl = false, \
+    .gl = {0}, \
+    .frame_size = { \
+        .width = 0, \
+        .height = 0, \
+    }, \
+    .content_size = { \
+        .width = 0, \
+        .height = 0, \
+    }, \
+    .resize_pending = false, \
+    .windowed_content_size = { \
+        .width = 0, \
+        .height = 0, \
+    }, \
+    .rotation = 0, \
+    .rect = { \
+        .x = 0, \
+        .y = 0, \
+        .w = 0, \
+        .h = 0, \
+    }, \
+    .has_frame = false, \
+    .fullscreen = false, \
+    .maximized = false, \
+    .no_window = false, \
+    .mipmaps = false, \
+}

-    int16_t window_x;
-    int16_t window_y;
-    uint16_t window_width;  // accepts SC_WINDOW_POSITION_UNDEFINED
-    uint16_t window_height; // accepts SC_WINDOW_POSITION_UNDEFINED
-
-    bool window_borderless;
-
-    uint8_t rotation;
-    bool mipmaps;
-};
+// initialize default values
+void
+screen_init(struct screen *screen);

 // initialize screen, create window, renderer and texture (window is hidden)
+// window_x and window_y accept SC_WINDOW_POSITION_UNDEFINED
 bool
-screen_init(struct screen *screen, struct video_buffer *vb,
-            struct fps_counter *fps_counter,
-            const struct screen_params *params);
+screen_init_rendering(struct screen *screen, const char *window_title,
+                      struct size frame_size, bool always_on_top,
+                      int16_t window_x, int16_t window_y, uint16_t window_width,
+                      uint16_t window_height, bool window_borderless,
+                      uint8_t rotation, bool mipmaps);

 // show the window
 void
@@ -68,6 +91,10 @@ screen_show_window(struct screen *screen);
 void
 screen_destroy(struct screen *screen);

+// resize if necessary and write the rendered frame into the texture
+bool
+screen_update_frame(struct screen *screen, struct video_buffer *vb);
+
 // render the texture to the renderer
 //
 // Set the update_content_rect flag if the window or content size may have
@@ -91,9 +118,9 @@ screen_resize_to_pixel_perfect(struct screen *screen);
 void
 screen_set_rotation(struct screen *screen, unsigned rotation);

-// react to SDL events
-bool
-screen_handle_event(struct screen *screen, SDL_Event *event);
+// react to window events
+void
+screen_handle_window_event(struct screen *screen, const SDL_WindowEvent *event);

 // convert point from window coordinates to frame coordinates
 // x and y are expressed in pixels
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -5,10 +5,12 @@
 #include <inttypes.h>
 #include <libgen.h>
 #include <stdio.h>
+#include <SDL2/SDL_thread.h>
 #include <SDL2/SDL_timer.h>
 #include <SDL2/SDL_platform.h>

 #include "adb.h"
+#include "util/lock.h"
 #include "util/log.h"
 #include "util/net.h"
 #include "util/str_util.h"
@@ -355,17 +357,18 @@ bool
 server_init(struct server *server) {
    server->serial = NULL;
    server->process = PROCESS_NONE;
+    server->wait_server_thread = NULL;
    atomic_flag_clear_explicit(&server->server_socket_closed,
                               memory_order_relaxed);

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

-    ok = sc_cond_init(&server->process_terminated_cond);
-    if (!ok) {
-        sc_mutex_destroy(&server->mutex);
+    server->process_terminated_cond = SDL_CreateCond();
+    if (!server->process_terminated_cond) {
+        SDL_DestroyMutex(server->mutex);
        return false;
    }

@@ -375,6 +378,8 @@ server_init(struct server *server) {
    server->video_socket = INVALID_SOCKET;
    server->control_socket = INVALID_SOCKET;

+    server->port_range.first = 0;
+    server->port_range.last = 0;
    server->local_port = 0;

    server->tunnel_enabled = false;
@@ -388,10 +393,10 @@ run_wait_server(void *data) {
    struct server *server = data;
    process_wait(server->process, false); // ignore exit code

-    sc_mutex_lock(&server->mutex);
+    mutex_lock(server->mutex);
    server->process_terminated = true;
-    sc_cond_signal(&server->process_terminated_cond);
-    sc_mutex_unlock(&server->mutex);
+    cond_signal(server->process_terminated_cond);
+    mutex_unlock(server->mutex);

    // no need for synchronization, server_socket is initialized before this
    // thread was created
@@ -408,6 +413,8 @@ run_wait_server(void *data) {
 bool
 server_start(struct server *server, const char *serial,
             const struct server_params *params) {
+    server->port_range = params->port_range;
+
    if (serial) {
        server->serial = strdup(serial);
        if (!server->serial) {
@@ -436,9 +443,9 @@ server_start(struct server *server, const char *serial,
    // things simple and multiplatform, just spawn a new thread waiting for the
    // server process and calling shutdown()/close() on the server socket if
    // necessary to wake up any accept() blocking call.
-    bool ok = sc_thread_create(&server->wait_server_thread, run_wait_server,
-                               "wait-server", server);
-    if (!ok) {
+    server->wait_server_thread =
+        SDL_CreateThread(run_wait_server, "wait-server", server);
+    if (!server->wait_server_thread) {
        process_terminate(server->process);
        process_wait(server->process, true); // ignore exit code
        goto error2;
@@ -528,33 +535,33 @@ server_stop(struct server *server) {
    }

    // Give some delay for the server to terminate properly
-    sc_mutex_lock(&server->mutex);
-    bool signaled = false;
+    mutex_lock(server->mutex);
+    int r = 0;
    if (!server->process_terminated) {
 #define WATCHDOG_DELAY_MS 1000
-        signaled = sc_cond_timedwait(&server->process_terminated_cond,
-                                     &server->mutex,
-                                     WATCHDOG_DELAY_MS);
+        r = cond_wait_timeout(server->process_terminated_cond,
+                              server->mutex,
+                              WATCHDOG_DELAY_MS);
    }
-    sc_mutex_unlock(&server->mutex);
+    mutex_unlock(server->mutex);

    // After this delay, kill the server if it's not dead already.
    // On some devices, closing the sockets is not sufficient to wake up the
    // blocking calls while the device is asleep.
-    if (!signaled) {
+    if (r == SDL_MUTEX_TIMEDOUT) {
        // The process is terminated, but not reaped (closed) yet, so its PID
        // is still valid.
        LOGW("Killing the server...");
        process_terminate(server->process);
    }

-    sc_thread_join(&server->wait_server_thread, NULL);
+    SDL_WaitThread(server->wait_server_thread, NULL);
    process_close(server->process);
 }

 void
 server_destroy(struct server *server) {
    free(server->serial);
-    sc_cond_destroy(&server->process_terminated_cond);
-    sc_mutex_destroy(&server->mutex);
+    SDL_DestroyCond(server->process_terminated_cond);
+    SDL_DestroyMutex(server->mutex);
 }
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -6,26 +6,27 @@
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <SDL2/SDL_thread.h>

 #include "adb.h"
 #include "scrcpy.h"
 #include "util/log.h"
 #include "util/net.h"
-#include "util/thread.h"

 struct server {
    char *serial;
    process_t process;
-    sc_thread wait_server_thread;
+    SDL_Thread *wait_server_thread;
    atomic_flag server_socket_closed;

-    sc_mutex mutex;
-    sc_cond process_terminated_cond;
+    SDL_mutex *mutex;
+    SDL_cond *process_terminated_cond;
    bool process_terminated;

    socket_t server_socket; // only used if !tunnel_forward
    socket_t video_socket;
    socket_t control_socket;
+    struct sc_port_range port_range;
    uint16_t local_port; // selected from port_range
    bool tunnel_enabled;
    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
--- a/app/src/stream.c
+++ b/app/src/stream.c
@@ -4,6 +4,8 @@
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
 #include <SDL2/SDL_events.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>
 #include <unistd.h>

 #include "decoder.h"
@@ -277,8 +279,8 @@ bool
 stream_start(struct stream *stream) {
    LOGD("Starting stream thread");

-    bool ok = sc_thread_create(&stream->thread, run_stream, "stream", stream);
-    if (!ok) {
+    stream->thread = SDL_CreateThread(run_stream, "stream", stream);
+    if (!stream->thread) {
        LOGC("Could not start stream thread");
        return false;
    }
@@ -294,5 +296,5 @@ stream_stop(struct stream *stream) {

 void
 stream_join(struct stream *stream) {
-    sc_thread_join(&stream->thread, NULL);
+    SDL_WaitThread(stream->thread, NULL);
 }
--- a/app/src/stream.h
+++ b/app/src/stream.h
@@ -7,15 +7,15 @@
 #include <stdint.h>
 #include <libavformat/avformat.h>
 #include <SDL2/SDL_atomic.h>
+#include <SDL2/SDL_thread.h>

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

 struct video_buffer;

 struct stream {
    socket_t socket;
-    sc_thread thread;
+    SDL_Thread *thread;
    struct decoder *decoder;
    struct recorder *recorder;
    AVCodecContext *codec_ctx;
--- a/app/src/util/lock.h
+++ b/app/src/util/lock.h
@@ -0,0 +1,75 @@
+#ifndef LOCK_H
+#define LOCK_H
+
+#include "common.h"
+
+#include <stdint.h>
+#include <SDL2/SDL_mutex.h>
+
+#include "log.h"
+
+static inline void
+mutex_lock(SDL_mutex *mutex) {
+    int r = SDL_LockMutex(mutex);
+#ifndef NDEBUG
+    if (r) {
+        LOGC("Could not lock mutex: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
+}
+
+static inline void
+mutex_unlock(SDL_mutex *mutex) {
+    int r = SDL_UnlockMutex(mutex);
+#ifndef NDEBUG
+    if (r) {
+        LOGC("Could not unlock mutex: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
+}
+
+static inline void
+cond_wait(SDL_cond *cond, SDL_mutex *mutex) {
+    int r = SDL_CondWait(cond, mutex);
+#ifndef NDEBUG
+    if (r) {
+        LOGC("Could not wait on condition: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
+}
+
+static inline int
+cond_wait_timeout(SDL_cond *cond, SDL_mutex *mutex, uint32_t ms) {
+    int r = SDL_CondWaitTimeout(cond, mutex, ms);
+#ifndef NDEBUG
+    if (r < 0) {
+        LOGC("Could not wait on condition with timeout: %s", SDL_GetError());
+        abort();
+    }
+#endif
+    return r;
+}
+
+static inline void
+cond_signal(SDL_cond *cond) {
+    int r = SDL_CondSignal(cond);
+#ifndef NDEBUG
+    if (r) {
+        LOGC("Could not signal a condition: %s", SDL_GetError());
+        abort();
+    }
+#else
+    (void) r;
+#endif
+}
+
+#endif
--- a/app/src/util/thread.c
+++ b/app/src/util/thread.c
@@ -1,160 +0,0 @@
-#include "thread.h"
-
-#include <assert.h>
-#include <SDL2/SDL_thread.h>
-
-#include "log.h"
-
-bool
-sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
-                 void *userdata) {
-    SDL_Thread *sdl_thread = SDL_CreateThread(fn, name, userdata);
-    if (!sdl_thread) {
-        return false;
-    }
-
-    thread->thread = sdl_thread;
-    return true;
-}
-
-void
-sc_thread_join(sc_thread *thread, int *status) {
-    SDL_WaitThread(thread->thread, status);
-}
-
-bool
-sc_mutex_init(sc_mutex *mutex) {
-    SDL_mutex *sdl_mutex = SDL_CreateMutex();
-    if (!sdl_mutex) {
-        return false;
-    }
-
-    mutex->mutex = sdl_mutex;
-#ifndef NDEBUG
-    mutex->locker = 0;
-#endif
-    return true;
-}
-
-void
-sc_mutex_destroy(sc_mutex *mutex) {
-    SDL_DestroyMutex(mutex->mutex);
-}
-
-void
-sc_mutex_lock(sc_mutex *mutex) {
-    // SDL mutexes are recursive, but we don't want to use recursive mutexes
-    assert(!sc_mutex_held(mutex));
-    int r = SDL_LockMutex(mutex->mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not lock mutex: %s", SDL_GetError());
-        abort();
-    }
-
-    mutex->locker = sc_thread_get_id();
-#else
-    (void) r;
-#endif
-}
-
-void
-sc_mutex_unlock(sc_mutex *mutex) {
-#ifndef NDEBUG
-    assert(sc_mutex_held(mutex));
-    mutex->locker = 0;
-#endif
-    int r = SDL_UnlockMutex(mutex->mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not lock mutex: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-sc_thread_id
-sc_thread_get_id(void) {
-    return SDL_ThreadID();
-}
-
-#ifndef NDEBUG
-bool
-sc_mutex_held(struct sc_mutex *mutex) {
-    return mutex->locker == sc_thread_get_id();
-}
-#endif
-
-bool
-sc_cond_init(sc_cond *cond) {
-    SDL_cond *sdl_cond = SDL_CreateCond();
-    if (!sdl_cond) {
-        return false;
-    }
-
-    cond->cond = sdl_cond;
-    return true;
-}
-
-void
-sc_cond_destroy(sc_cond *cond) {
-    SDL_DestroyCond(cond->cond);
-}
-
-void
-sc_cond_wait(sc_cond *cond, sc_mutex *mutex) {
-    int r = SDL_CondWait(cond->cond, mutex->mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not wait on condition: %s", SDL_GetError());
-        abort();
-    }
-
-    mutex->locker = sc_thread_get_id();
-#else
-    (void) r;
-#endif
-}
-
-bool
-sc_cond_timedwait(sc_cond *cond, sc_mutex *mutex, uint32_t ms) {
-    int r = SDL_CondWaitTimeout(cond->cond, mutex->mutex, ms);
-#ifndef NDEBUG
-    if (r < 0) {
-        LOGC("Could not wait on condition with timeout: %s", SDL_GetError());
-        abort();
-    }
-
-    mutex->locker = sc_thread_get_id();
-#endif
-    assert(r == 0 || r == SDL_MUTEX_TIMEDOUT);
-    return r == 0;
-}
-
-void
-sc_cond_signal(sc_cond *cond) {
-    int r = SDL_CondSignal(cond->cond);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not signal a condition: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-void
-sc_cond_broadcast(sc_cond *cond) {
-    int r = SDL_CondBroadcast(cond->cond);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not broadcast a condition: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
--- a/app/src/util/thread.h
+++ b/app/src/util/thread.h
@@ -1,81 +0,0 @@
-#ifndef SC_THREAD_H
-#define SC_THREAD_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/* Forward declarations */
-typedef struct SDL_Thread SDL_Thread;
-typedef struct SDL_mutex SDL_mutex;
-typedef struct SDL_cond SDL_cond;
-
-typedef int sc_thread_fn(void *);
-typedef unsigned int sc_thread_id;
-
-typedef struct sc_thread {
-    SDL_Thread *thread;
-} sc_thread;
-
-typedef struct sc_mutex {
-    SDL_mutex *mutex;
-#ifndef NDEBUG
-    sc_thread_id locker;
-#endif
-} sc_mutex;
-
-typedef struct sc_cond {
-    SDL_cond *cond;
-} sc_cond;
-
-bool
-sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
-                 void *userdata);
-
-void
-sc_thread_join(sc_thread *thread, int *status);
-
-bool
-sc_mutex_init(sc_mutex *mutex);
-
-void
-sc_mutex_destroy(sc_mutex *mutex);
-
-void
-sc_mutex_lock(sc_mutex *mutex);
-
-void
-sc_mutex_unlock(sc_mutex *mutex);
-
-sc_thread_id
-sc_thread_get_id(void);
-
-#ifndef NDEBUG
-bool
-sc_mutex_held(struct sc_mutex *mutex);
-# define sc_mutex_assert(mutex) assert(sc_mutex_held(mutex))
-#else
-# define sc_mutex_assert(mutex)
-#endif
-
-bool
-sc_cond_init(sc_cond *cond);
-
-void
-sc_cond_destroy(sc_cond *cond);
-
-void
-sc_cond_wait(sc_cond *cond, sc_mutex *mutex);
-
-// return true on signaled, false on timeout
-bool
-sc_cond_timedwait(sc_cond *cond, sc_mutex *mutex, uint32_t ms);
-
-void
-sc_cond_signal(sc_cond *cond);
-
-void
-sc_cond_broadcast(sc_cond *cond);
-
-#endif
--- a/app/src/video_buffer.c
+++ b/app/src/video_buffer.c
@@ -1,147 +1,112 @@
 #include "video_buffer.h"

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

+#include "util/lock.h"
 #include "util/log.h"

 bool
-video_buffer_init(struct video_buffer *vb, bool wait_consumer) {
-    vb->producer_frame = av_frame_alloc();
-    if (!vb->producer_frame) {
+video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
+                  bool render_expired_frames) {
+    vb->fps_counter = fps_counter;
+
+    if (!(vb->decoding_frame = av_frame_alloc())) {
        goto error_0;
    }

-    vb->pending_frame = av_frame_alloc();
-    if (!vb->pending_frame) {
+    if (!(vb->rendering_frame = av_frame_alloc())) {
        goto error_1;
    }

-    vb->consumer_frame = av_frame_alloc();
-    if (!vb->consumer_frame) {
+    if (!(vb->mutex = SDL_CreateMutex())) {
        goto error_2;
    }

-    bool ok = sc_mutex_init(&vb->mutex);
-    if (!ok) {
-        goto error_3;
-    }
-
-    vb->wait_consumer = wait_consumer;
-    if (wait_consumer) {
-        ok = sc_cond_init(&vb->pending_frame_consumed_cond);
-        if (!ok) {
-            sc_mutex_destroy(&vb->mutex);
+    vb->render_expired_frames = render_expired_frames;
+    if (render_expired_frames) {
+        if (!(vb->rendering_frame_consumed_cond = SDL_CreateCond())) {
+            SDL_DestroyMutex(vb->mutex);
            goto error_2;
        }
-        // interrupted is not used if wait_consumer is disabled since offering
-        // a frame will never block
+        // interrupted is not used if expired frames are not rendered
+        // since offering a frame will never block
        vb->interrupted = false;
    }

-    // there is initially no frame, so consider it has already been consumed
-    vb->pending_frame_consumed = true;
-
-    // The callbacks must be set by the consumer via
-    // video_buffer_set_consumer_callbacks()
-    vb->cbs = NULL;
+    // there is initially no rendering frame, so consider it has already been
+    // consumed
+    vb->rendering_frame_consumed = true;

    return true;

-error_3:
-    av_frame_free(&vb->consumer_frame);
 error_2:
-    av_frame_free(&vb->pending_frame);
+    av_frame_free(&vb->rendering_frame);
 error_1:
-    av_frame_free(&vb->producer_frame);
+    av_frame_free(&vb->decoding_frame);
 error_0:
    return false;
 }

 void
 video_buffer_destroy(struct video_buffer *vb) {
-    if (vb->wait_consumer) {
-        sc_cond_destroy(&vb->pending_frame_consumed_cond);
+    if (vb->render_expired_frames) {
+        SDL_DestroyCond(vb->rendering_frame_consumed_cond);
    }
-    sc_mutex_destroy(&vb->mutex);
-    av_frame_free(&vb->consumer_frame);
-    av_frame_free(&vb->pending_frame);
-    av_frame_free(&vb->producer_frame);
+    SDL_DestroyMutex(vb->mutex);
+    av_frame_free(&vb->rendering_frame);
+    av_frame_free(&vb->decoding_frame);
 }

-static inline void
-swap_frames(AVFrame **lhs, AVFrame **rhs) {
-    AVFrame *tmp = *lhs;
-    *lhs = *rhs;
-    *rhs = tmp;
+static void
+video_buffer_swap_frames(struct video_buffer *vb) {
+    AVFrame *tmp = vb->decoding_frame;
+    vb->decoding_frame = vb->rendering_frame;
+    vb->rendering_frame = tmp;
 }

 void
-video_buffer_set_consumer_callbacks(struct video_buffer *vb,
-                                    const struct video_buffer_callbacks *cbs,
-                                    void *cbs_userdata) {
-    assert(!vb->cbs); // must be set only once
-    assert(cbs);
-    assert(cbs->on_frame_available);
-    vb->cbs = cbs;
-    vb->cbs_userdata = cbs_userdata;
-}
-
-void
-video_buffer_producer_offer_frame(struct video_buffer *vb) {
-    assert(vb->cbs);
-
-    sc_mutex_lock(&vb->mutex);
-    if (vb->wait_consumer) {
+video_buffer_offer_decoded_frame(struct video_buffer *vb,
+                                 bool *previous_frame_skipped) {
+    mutex_lock(vb->mutex);
+    if (vb->render_expired_frames) {
        // wait for the current (expired) frame to be consumed
-        while (!vb->pending_frame_consumed && !vb->interrupted) {
-            sc_cond_wait(&vb->pending_frame_consumed_cond, &vb->mutex);
+        while (!vb->rendering_frame_consumed && !vb->interrupted) {
+            cond_wait(vb->rendering_frame_consumed_cond, vb->mutex);
        }
+    } else if (!vb->rendering_frame_consumed) {
+        fps_counter_add_skipped_frame(vb->fps_counter);
    }

-    av_frame_unref(vb->pending_frame);
-    swap_frames(&vb->producer_frame, &vb->pending_frame);
+    video_buffer_swap_frames(vb);

-    bool skipped = !vb->pending_frame_consumed;
-    vb->pending_frame_consumed = false;
+    *previous_frame_skipped = !vb->rendering_frame_consumed;
+    vb->rendering_frame_consumed = false;

-    sc_mutex_unlock(&vb->mutex);
-
-    if (skipped) {
-        if (vb->cbs->on_frame_skipped)
-            vb->cbs->on_frame_skipped(vb, vb->cbs_userdata);
-    } else {
-        vb->cbs->on_frame_available(vb, vb->cbs_userdata);
-    }
+    mutex_unlock(vb->mutex);
 }

 const AVFrame *
-video_buffer_consumer_take_frame(struct video_buffer *vb) {
-    sc_mutex_lock(&vb->mutex);
-    assert(!vb->pending_frame_consumed);
-    vb->pending_frame_consumed = true;
-
-    swap_frames(&vb->consumer_frame, &vb->pending_frame);
-    av_frame_unref(vb->pending_frame);
-
-    if (vb->wait_consumer) {
+video_buffer_consume_rendered_frame(struct video_buffer *vb) {
+    assert(!vb->rendering_frame_consumed);
+    vb->rendering_frame_consumed = true;
+    fps_counter_add_rendered_frame(vb->fps_counter);
+    if (vb->render_expired_frames) {
        // unblock video_buffer_offer_decoded_frame()
-        sc_cond_signal(&vb->pending_frame_consumed_cond);
+        cond_signal(vb->rendering_frame_consumed_cond);
    }
-    sc_mutex_unlock(&vb->mutex);
-
-    // consumer_frame is only written from this thread, no need to lock
-    return vb->consumer_frame;
+    return vb->rendering_frame;
 }

 void
 video_buffer_interrupt(struct video_buffer *vb) {
-    if (vb->wait_consumer) {
-        sc_mutex_lock(&vb->mutex);
+    if (vb->render_expired_frames) {
+        mutex_lock(vb->mutex);
        vb->interrupted = true;
-        sc_mutex_unlock(&vb->mutex);
+        mutex_unlock(vb->mutex);
        // wake up blocking wait
-        sc_cond_signal(&vb->pending_frame_consumed_cond);
+        cond_signal(vb->rendering_frame_consumed_cond);
    }
 }
--- a/app/src/video_buffer.h
+++ b/app/src/video_buffer.h
@@ -4,76 +4,44 @@
 #include "common.h"

 #include <stdbool.h>
+#include <SDL2/SDL_mutex.h>

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

 // forward declarations
 typedef struct AVFrame AVFrame;

-/**
- * There are 3 frames in memory:
- *  - one frame is held by the producer (producer_frame)
- *  - one frame is held by the consumer (consumer_frame)
- *  - one frame is shared between the producer and the consumer (pending_frame)
- *
- * The producer generates a frame into the producer_frame (it may takes time).
- *
- * Once the frame is produced, it calls video_buffer_producer_offer_frame(),
- * which swaps the producer and pending frames.
- *
- * When the consumer is notified that a new frame is available, it calls
- * video_buffer_consumer_take_frame() to retrieve it, which swaps the pending
- * and consumer frames. The frame is valid until the next call, without
- * blocking the producer.
- */
-
 struct video_buffer {
-    AVFrame *producer_frame;
-    AVFrame *pending_frame;
-    AVFrame *consumer_frame;
-
-    sc_mutex mutex;
-    bool wait_consumer; // never overwrite a pending frame if it is not consumed
+    AVFrame *decoding_frame;
+    AVFrame *rendering_frame;
+    SDL_mutex *mutex;
+    bool render_expired_frames;
    bool interrupted;
-
-    sc_cond pending_frame_consumed_cond;
-    bool pending_frame_consumed;
-
-    const struct video_buffer_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct video_buffer_callbacks {
-    // Called when a new frame can be consumed by
-    // video_buffer_consumer_take_frame(vb)
-    // This callback is mandatory (it must not be NULL).
-    void (*on_frame_available)(struct video_buffer *vb, void *userdata);
-
-    // Called when a pending frame has been overwritten by the producer
-    // This callback is optional (it may be NULL).
-    void (*on_frame_skipped)(struct video_buffer *vb, void *userdata);
+    SDL_cond *rendering_frame_consumed_cond;
+    bool rendering_frame_consumed;
+    struct fps_counter *fps_counter;
 };

 bool
-video_buffer_init(struct video_buffer *vb, bool wait_consumer);
+video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
+                  bool render_expired_frames);

 void
 video_buffer_destroy(struct video_buffer *vb);

+// set the decoded frame as ready for rendering
+// this function locks frames->mutex during its execution
+// the output flag is set to report whether the previous frame has been skipped
 void
-video_buffer_set_consumer_callbacks(struct video_buffer *vb,
-                                    const struct video_buffer_callbacks *cbs,
-                                    void *cbs_userdata);
+video_buffer_offer_decoded_frame(struct video_buffer *vb,
+                                 bool *previous_frame_skipped);

-// set the producer frame as ready for consuming
-void
-video_buffer_producer_offer_frame(struct video_buffer *vb);
-
-// mark the consumer frame as consumed and return it
-// the frame is valid until the next call to this function
+// mark the rendering frame as consumed and return it
+// MUST be called with frames->mutex locked!!!
+// the caller is expected to render the returned frame to some texture before
+// unlocking frames->mutex
 const AVFrame *
-video_buffer_consumer_take_frame(struct video_buffer *vb);
+video_buffer_consume_rendered_frame(struct video_buffer *vb);

 // wake up and avoid any blocking call
 void
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -2,11 +2,11 @@

 [binaries]
 name = 'mingw'
-c = 'i686-w64-mingw32-gcc'
-cpp = 'i686-w64-mingw32-g++'
-ar = 'i686-w64-mingw32-ar'
-strip = 'i686-w64-mingw32-strip'
-pkgconfig = 'i686-w64-mingw32-pkg-config'
+c = '/usr/bin/i686-w64-mingw32-gcc'
+cpp = '/usr/bin/i686-w64-mingw32-g++'
+ar = '/usr/bin/i686-w64-mingw32-ar'
+strip = '/usr/bin/i686-w64-mingw32-strip'
+pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'

 [host_machine]
 system = 'windows'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -2,11 +2,11 @@

 [binaries]
 name = 'mingw'
-c = 'x86_64-w64-mingw32-gcc'
-cpp = 'x86_64-w64-mingw32-g++'
-ar = 'x86_64-w64-mingw32-ar'
-strip = 'x86_64-w64-mingw32-strip'
-pkgconfig = 'x86_64-w64-mingw32-pkg-config'
+c = '/usr/bin/x86_64-w64-mingw32-gcc'
+cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ar = '/usr/bin/x86_64-w64-mingw32-ar'
+strip = '/usr/bin/x86_64-w64-mingw32-strip'
+pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'

 [host_machine]
 system = 'windows'
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,6 @@ project('scrcpy', 'c',
        default_options: [
            'c_std=c11',
            'warning_level=2',
-            'b_ndebug=if-release',
        ])

 if get_option('compile_app')
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;

 public class Controller {

-    private static final int DEFAULT_DEVICE_ID = 0;
+    private static final int DEVICE_ID_VIRTUAL = -1;

    private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();

@@ -45,7 +45,7 @@ public class Controller {

            MotionEvent.PointerCoords coords = new MotionEvent.PointerCoords();
            coords.orientation = 0;
-            coords.size = 0;
+            coords.size = 1;

            pointerProperties[i] = props;
            pointerCoords[i] = coords;
@@ -208,13 +208,9 @@ public class Controller {
        // Right-click and middle-click only work if the source is a mouse
        boolean nonPrimaryButtonPressed = (buttons & ~MotionEvent.BUTTON_PRIMARY) != 0;
        int source = nonPrimaryButtonPressed ? InputDevice.SOURCE_MOUSE : InputDevice.SOURCE_TOUCHSCREEN;
-        if (source != InputDevice.SOURCE_MOUSE) {
-            // Buttons must not be set for touch events
-            buttons = 0;
-        }

        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source,
+                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEVICE_ID_VIRTUAL, 0, source,
                        0);
        return device.injectEvent(event);
    }
@@ -237,7 +233,7 @@ public class Controller {
        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);

        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEFAULT_DEVICE_ID, 0,
+                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
                        InputDevice.SOURCE_TOUCHSCREEN, 0);
        return device.injectEvent(event);
    }
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -230,7 +230,7 @@ public final class Server {
            if (encoders != null && encoders.length > 0) {
                Ln.e("Try to use one of the available encoders:");
                for (MediaCodecInfo encoder : encoders) {
-                    Ln.e("    scrcpy --encoder '" + encoder.getName() + "'");
+                    Ln.e("    scrcpy --encoder-name '" + encoder.getName() + "'");
                }
            }
        }