Fix build errors for macOS

PR #1960 <https://github.com/Genymobile/scrcpy/pull/1960> Signed-off-by: Romain Vimont <rom@rom1v.com>
2026-02-27 08:44:30 +01:00 · 2020-12-10 21:34:57 +01:00
102 changed files with 828 additions and 1355 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ build/
 .idea/
 .gradle/
 /x/
-local.properties
--- a/BUILD.md
+++ b/BUILD.md
@@ -254,10 +254,10 @@ You can then [run](README.md#run) _scrcpy_.

 ## Prebuilt server

- - [`scrcpy-server-v1.17`][direct-scrcpy-server]  
-   _(SHA-256: 11b5ad2d1bc9b9730fb7254a78efd71a8ff46b1938ff468e47a21b653a1b6725_
+ - [`scrcpy-server-v1.16`][direct-scrcpy-server]  
+   _(SHA-256: 94a79e05b4498d0460ab7bd9d12cbf05156e3a47bf0c5d1420cee1d4493b3832)_

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-server-v1.17
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.16/scrcpy-server-v1.16

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/FAQ.md
+++ b/FAQ.md
@@ -199,41 +199,3 @@ scrcpy -m 1920
 scrcpy -m 1024
 scrcpy -m 800
 ```
-
-You could also try another [encoder](README.md#encoder).
-
-
-## Command line on Windows
-
-Some Windows users are not familiar with the command line. Here is how to open a
-terminal and run `scrcpy` with arguments:
-
- 1. Press <kbd>Windows</kbd>+<kbd>r</kbd>, this opens a dialog box.
- 2. Type `cmd` and press <kbd>Enter</kbd>, this opens a terminal.
- 3. Go to your _scrcpy_ directory, by typing (adapt the path):
-
-    ```bat
-    cd C:\Users\user\Downloads\scrcpy-win64-xxx
-    ```
-
-    and press <kbd>Enter</kbd>
- 4. Type your command. For example:
-
-    ```bat
-    scrcpy --record file.mkv
-    ```
-
-If you plan to always use the same arguments, create a file `myscrcpy.bat`
-(enable [show file extensions] to avoid confusion) in the `scrcpy` directory,
-containing your command. For example:
-
-```bat
-scrcpy --prefer-text --turn-screen-off --stay-awake
-```
-
-Then just double-click on that file.
-
-You could also edit (a copy of) `scrcpy-console.bat` or `scrcpy-noconsole.vbs`
-to add some arguments.
-
-[show file extensions]: https://www.howtogeek.com/205086/beginner-how-to-make-windows-show-file-extensions/
--- a/2
+++ b/2
@@ -188,7 +188,7 @@
      identification within third-party archives.

   Copyright (C) 2018 Genymobile
-   Copyright (C) 2018-2021 Romain Vimont
+   Copyright (C) 2018-2020 Romain Vimont

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/Makefile.CrossWindows
+++ b/Makefile.CrossWindows
@@ -9,20 +9,21 @@
 # the server to the device.

 .PHONY: default clean \
-	test \
 	build-server \
 	prepare-deps-win32 prepare-deps-win64 \
-	build-win32 build-win64 \
+	build-win32 build-win32-noconsole \
+	build-win64 build-win64-noconsole \
 	dist-win32 dist-win64 \
 	zip-win32 zip-win64 \
-	release
+	sums release

 GRADLE ?= ./gradlew

-TEST_BUILD_DIR := build-test
 SERVER_BUILD_DIR := build-server
 WIN32_BUILD_DIR := build-win32
+WIN32_NOCONSOLE_BUILD_DIR := build-win32-noconsole
 WIN64_BUILD_DIR := build-win64
+WIN64_NOCONSOLE_BUILD_DIR := build-win64-noconsole

 DIST := dist
 WIN32_TARGET_DIR := scrcpy-win32
@@ -32,35 +33,19 @@ VERSION := $(shell git describe --tags --always)
 WIN32_TARGET := $(WIN32_TARGET_DIR)-$(VERSION).zip
 WIN64_TARGET := $(WIN64_TARGET_DIR)-$(VERSION).zip

-RELEASE_DIR := release-$(VERSION)
-
-release: clean test build-server zip-win32 zip-win64
-	mkdir -p "$(RELEASE_DIR)"
-	cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \
-		"$(RELEASE_DIR)/scrcpy-server-$(VERSION)"
-	cp "$(DIST)/$(WIN32_TARGET)" "$(RELEASE_DIR)"
-	cp "$(DIST)/$(WIN64_TARGET)" "$(RELEASE_DIR)"
-	cd "$(RELEASE_DIR)" && \
-		sha256sum "scrcpy-server-$(VERSION)" \
-			"scrcpy-win32-$(VERSION).zip" \
-			"scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt
-	@echo "Release generated in $(RELEASE_DIR)/"
+release: clean zip-win32 zip-win64 sums
+	@echo "Windows archives generated in $(DIST)/"

 clean:
 	$(GRADLE) clean
-	rm -rf "$(DIST)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \
-		"$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)"
-
-test:
-	[ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \
-		meson "$(TEST_BUILD_DIR)" -Db_sanitize=address )
-	ninja -C "$(TEST_BUILD_DIR)"
-	$(GRADLE) -p server check
+	rm -rf "$(SERVER_BUILD_DIR)" "$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)" \
+		   "$(WIN32_NOCONSOLE_BUILD_DIR)" "$(WIN64_NOCONSOLE_BUILD_DIR)" "$(DIST)"

 build-server:
 	[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \
-		meson "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )
-	ninja -C "$(SERVER_BUILD_DIR)"
+		meson "$(SERVER_BUILD_DIR)" \
+			--buildtype release -Dcompile_app=false )
+		ninja -C "$(SERVER_BUILD_DIR)"

 prepare-deps-win32:
 	-$(MAKE) -C prebuilt-deps prepare-win32
@@ -75,6 +60,17 @@ build-win32: prepare-deps-win32
 			-Dportable=true )
 	ninja -C "$(WIN32_BUILD_DIR)"

+build-win32-noconsole: prepare-deps-win32
+	[ -d "$(WIN32_NOCONSOLE_BUILD_DIR)" ] || ( mkdir "$(WIN32_NOCONSOLE_BUILD_DIR)" && \
+		meson "$(WIN32_NOCONSOLE_BUILD_DIR)" \
+			--cross-file cross_win32.txt \
+			--buildtype release --strip -Db_lto=true \
+			-Dcrossbuild_windows=true \
+			-Dcompile_server=false \
+			-Dwindows_noconsole=true \
+			-Dportable=true )
+	ninja -C "$(WIN32_NOCONSOLE_BUILD_DIR)"
+
 prepare-deps-win64:
 	-$(MAKE) -C prebuilt-deps prepare-win64

@@ -88,12 +84,22 @@ build-win64: prepare-deps-win64
 			-Dportable=true )
 	ninja -C "$(WIN64_BUILD_DIR)"

-dist-win32: build-server build-win32
+build-win64-noconsole: prepare-deps-win64
+	[ -d "$(WIN64_NOCONSOLE_BUILD_DIR)" ] || ( mkdir "$(WIN64_NOCONSOLE_BUILD_DIR)" && \
+		meson "$(WIN64_NOCONSOLE_BUILD_DIR)" \
+			--cross-file cross_win64.txt \
+			--buildtype release --strip -Db_lto=true \
+			-Dcrossbuild_windows=true \
+			-Dcompile_server=false \
+			-Dwindows_noconsole=true \
+			-Dportable=true )
+	ninja -C "$(WIN64_NOCONSOLE_BUILD_DIR)"
+
+dist-win32: build-server build-win32 build-win32-noconsole
 	mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)"
+	cp "$(WIN32_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/scrcpy-noconsole.exe"
 	cp prebuilt-deps/ffmpeg-4.3.1-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
@@ -102,14 +108,13 @@ dist-win32: build-server build-win32
 	cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/SDL2-2.0.14/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/SDL2-2.0.12/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"

-dist-win64: build-server build-win64
+dist-win64: build-server build-win64 build-win64-noconsole
 	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)"
+	cp "$(WIN64_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/scrcpy-noconsole.exe"
 	cp prebuilt-deps/ffmpeg-4.3.1-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/ffmpeg-4.3.1-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
@@ -118,7 +123,7 @@ dist-win64: build-server build-win64
 	cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/SDL2-2.0.14/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/SDL2-2.0.12/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"

 zip-win32: dist-win32
 	cd "$(DIST)/$(WIN32_TARGET_DIR)"; \
@@ -127,3 +132,7 @@ zip-win32: dist-win32
 zip-win64: dist-win64
 	cd "$(DIST)/$(WIN64_TARGET_DIR)"; \
 		zip -r "../$(WIN64_TARGET)" .
+
+sums:
+	cd "$(DIST)"; \
+		sha256sum *.zip > SHA256SUMS.txt
--- a/README.id.md
+++ b/README.id.md
@@ -675,7 +675,7 @@ Baca [halaman pengembang].
 ## Lisensi

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2021 Romain Vimont
+    Copyright (C) 2018-2020 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/README.ko.md
+++ b/README.ko.md
@@ -477,7 +477,7 @@ _²화면이 꺼진 상태에서 우클릭 시 다시 켜지며, 그 외의 상
 ## 라이선스

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2021 Romain Vimont
+    Copyright (C) 2018-2020 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# scrcpy (v1.17)
+# scrcpy (v1.16)

 [Read in another language](#translations)

@@ -77,10 +77,10 @@ hard).
 For Windows, for simplicity, a prebuilt archive with all the dependencies
 (including `adb`) is available:

- - [`scrcpy-win64-v1.17.zip`][direct-win64]  
-   _(SHA-256: 8b9e57993c707367ed10ebfe0e1ef563c7a29d9af4a355cd8b6a52a317c73eea)_
+ - [`scrcpy-win64-v1.16.zip`][direct-win64]  
+   _(SHA-256: 3f30dc5db1a2f95c2b40a0f5de91ec1642d9f53799250a8c529bc882bc0918f0)_

-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-win64-v1.17.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.16/scrcpy-win64-v1.16.zip

 It is also available in [Chocolatey]:

@@ -116,10 +116,6 @@ brew install scrcpy
 You need `adb`, accessible from your `PATH`. If you don't have it yet:

 ```bash
-# Homebrew >= 2.6.0
-brew install --cask android-platform-tools
-
-# Homebrew < 2.6.0
 brew cask install android-platform-tools
 ```

@@ -206,24 +202,6 @@ scrcpy --lock-video-orientation 3   # 90° clockwise

 This affects recording orientation.

-The [window may also be rotated](#rotation) independently.
-
-
-#### Encoder
-
-Some devices have more than one encoder, and some of them may cause issues or
-crash. It is possible to select a different encoder:
-
-```bash
-scrcpy --encoder OMX.qcom.video.encoder.avc
-```
-
-To list the available encoders, you could pass an invalid encoder name, the
-error will give the available encoders:
-
-```bash
-scrcpy --encoder _
-```

 ### Recording

@@ -257,13 +235,7 @@ _Scrcpy_ uses `adb` to communicate with the device, and `adb` can [connect] to a
 device over TCP/IP:

 1. Connect the device to the same Wi-Fi as your computer.
-2. Get your device IP address, in Settings → About phone → Status, or by
-   executing this command:
-
-    ```bash
-    adb shell ip route | awk '{print $9}'
-    ```
-
+2. Get your device IP address (in Settings → About phone → Status).
 3. Enable adb over TCP/IP on your device: `adb tcpip 5555`.
 4. Unplug your device.
 5. Connect to your device: `adb connect DEVICE_IP:5555` _(replace `DEVICE_IP`)_.
@@ -413,9 +385,9 @@ Note that _scrcpy_ manages 3 different rotations:
 - <kbd>MOD</kbd>+<kbd>r</kbd> requests the device to switch between portrait
   and landscape (the current running app may refuse, if it does support the
   requested orientation).
- - [`--lock-video-orientation`](#lock-video-orientation) changes the mirroring
-   orientation (the orientation of the video sent from the device to the
-   computer). This affects the recording.
+ - `--lock-video-orientation` changes the mirroring orientation (the orientation
+   of the video sent from the device to the computer). This affects the
+   recording.
 - `--rotation` (or <kbd>MOD</kbd>+<kbd>←</kbd>/<kbd>MOD</kbd>+<kbd>→</kbd>)
   rotates only the window content. This affects only the display, not the
   recording.
@@ -576,11 +548,6 @@ into the device clipboard. As a consequence, any Android application could read
 its content. You should avoid to paste sensitive content (like passwords) that
 way.

-Some devices do not behave as expected when setting the device clipboard
-programmatically. An option `--legacy-paste` is provided to change the behavior
-of <kbd>Ctrl</kbd>+<kbd>v</kbd> and <kbd>MOD</kbd>+<kbd>v</kbd> so that they
-also inject the computer clipboard text as a sequence of key events (the same
-way as <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>).

 #### Pinch-to-zoom

@@ -628,16 +595,6 @@ scrcpy --no-key-repeat
 ```


-#### Right-click and middle-click
-
-By default, right-click triggers BACK (or POWER on) and middle-click triggers
-HOME. To disable these shortcuts and forward the clicks to the device instead:
-
-```bash
-scrcpy --forward-all-clicks
-```
-
-
 ### File drop

 #### Install APK
@@ -772,7 +729,7 @@ Read the [developers page].
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2021 Romain Vimont
+    Copyright (C) 2018-2020 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/README.pt-br.md
+++ b/README.pt-br.md
@@ -508,7 +508,7 @@ Leia a  [developers page].
 ## Licença

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2021 Romain Vimont
+    Copyright (C) 2018-2020 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/README.zh-Hans.md
+++ b/README.zh-Hans.md
@@ -703,7 +703,7 @@ _³需要安卓版本 Android >= 7。_
 ## 许可协议

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2021 Romain Vimont
+    Copyright (C) 2018-2020 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/README.zh-Hant.md
+++ b/README.zh-Hant.md
@@ -682,7 +682,7 @@ _³只支援 Android 7+。_
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2021 Romain Vimont
+    Copyright (C) 2018-2020 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,8 +1,7 @@
 src = [
    'src/main.c',
-    'src/adb.c',
    'src/cli.c',
-    'src/compat.c',
+    'src/command.c',
    'src/control_msg.c',
    'src/controller.c',
    'src/decoder.c',
@@ -22,23 +21,9 @@ src = [
    'src/tiny_xpm.c',
    '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'
-    src += [ 'src/sys/win/process.c' ]
-else
-    src += [ 'src/sys/unix/process.c' ]
-endif
-
-check_functions = [
-    'strdup'
-]
-
-cc = meson.get_compiler('c')
-
 if not get_option('crossbuild_windows')

    # native build
@@ -52,6 +37,8 @@ if not get_option('crossbuild_windows')
 else

    # cross-compile mingw32 build (from Linux to Windows)
+    cc = meson.get_compiler('c')
+
    prebuilt_sdl2 = meson.get_cross_property('prebuilt_sdl2')
    sdl2_bin_dir = meson.current_source_dir() + '/../prebuilt-deps/' + prebuilt_sdl2 + '/bin'
    sdl2_lib_dir = meson.current_source_dir() + '/../prebuilt-deps/' + prebuilt_sdl2 + '/lib'
@@ -86,19 +73,17 @@ else

 endif

+cc = meson.get_compiler('c')
+
 if host_machine.system() == 'windows'
+    src += [ 'src/sys/win/command.c' ]
    dependencies += cc.find_library('ws2_32')
+else
+    src += [ 'src/sys/unix/command.c' ]
 endif

 conf = configuration_data()

-foreach f : check_functions
-  if cc.has_function(f)
-    define = 'HAVE_' + f.underscorify().to_upper()
-    conf.set(define, true)
-  endif
-endforeach
-
 # expose the build type
 conf.set('NDEBUG', get_option('buildtype') != 'debug')

@@ -134,6 +119,9 @@ conf.set('DEFAULT_BIT_RATE', '8000000')  # 8Mbps
 # enable High DPI support
 conf.set('HIDPI_SUPPORT', get_option('hidpi_support'))

+# disable console on Windows
+conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole'))
+
 # run a server debugger and wait for a client to be attached
 conf.set('SERVER_DEBUGGER', get_option('server_debugger'))

@@ -144,11 +132,18 @@ configure_file(configuration: conf, output: 'config.h')

 src_dir = include_directories('src')

+if get_option('windows_noconsole')
+    link_args = [ '-Wl,--subsystem,windows' ]
+else
+    link_args = []
+endif
+
 executable('scrcpy', src,
           dependencies: dependencies,
           include_directories: src_dir,
           install: true,
-           c_args: [])
+           c_args: [],
+           link_args: link_args)

 install_man('scrcpy.1')

--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -56,18 +56,10 @@ The list of possible display ids can be listed by "adb shell dumpsys display"

 Default is 0.

-.TP
-.BI "\-\-encoder " name
-Use a specific MediaCodec encoder (must be a H.264 encoder).
-
 .TP
 .B \-\-force\-adb\-forward
 Do not attempt to use "adb reverse" to connect to the device.

-.TP
-.B \-\-forward\-all\-clicks
-By default, right-click triggers BACK (or POWER on) and middle-click triggers HOME. This option disables these shortcuts and forward the clicks to the device instead.
-
 .TP
 .B \-f, \-\-fullscreen
 Start in fullscreen.
@@ -76,12 +68,6 @@ Start in fullscreen.
 .B \-h, \-\-help
 Print this help.

-.TP
-.B \-\-legacy\-paste
-Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+Shift+v).
-
-This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.
-
 .TP
 .BI "\-\-lock\-video\-orientation " value
 Lock video orientation to \fIvalue\fR. Possible values are -1 (unlocked), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees otation counterclockwise.
@@ -106,14 +92,14 @@ Disable device control (mirror the device in read\-only).
 .B \-N, \-\-no\-display
 Do not display device (only when screen recording is enabled).

-.TP
-.B \-\-no\-key\-repeat
-Do not forward repeated key events when a key is held down.
-
 .TP
 .B \-\-no\-mipmaps
 If the renderer is OpenGL 3.0+ or OpenGL ES 2.0+, then mipmaps are automatically generated to improve downscaling quality. This option disables the generation of mipmaps.

+.TP
+.B \-\-no\-key\-repeat
+Do not forward repeated key events when a key is held down.
+
 .TP
 .BI "\-p, \-\-port " port[:port]
 Set the TCP port (range) used by the client to listen.
--- a/app/src/adb.h
+++ b/app/src/adb.h
@@ -1,34 +0,0 @@
-#ifndef SC_ADB_H
-#define SC_ADB_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <inttypes.h>
-
-#include "util/process.h"
-
-process_t
-adb_execute(const char *serial, const char *const adb_cmd[], size_t len);
-
-process_t
-adb_forward(const char *serial, uint16_t local_port,
-            const char *device_socket_name);
-
-process_t
-adb_forward_remove(const char *serial, uint16_t local_port);
-
-process_t
-adb_reverse(const char *serial, const char *device_socket_name,
-            uint16_t local_port);
-
-process_t
-adb_reverse_remove(const char *serial, const char *device_socket_name);
-
-process_t
-adb_push(const char *serial, const char *local, const char *remote);
-
-process_t
-adb_install(const char *serial, const char *local);
-
-#endif
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <unistd.h>

+#include "config.h"
 #include "scrcpy.h"
 #include "util/log.h"
 #include "util/str_util.h"
@@ -52,30 +53,16 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "        Default is 0.\n"
        "\n"
-        "    --encoder name\n"
-        "        Use a specific MediaCodec encoder (must be a H.264 encoder).\n"
-        "\n"
        "    --force-adb-forward\n"
        "        Do not attempt to use \"adb reverse\" to connect to the\n"
        "        the device.\n"
        "\n"
-        "    --forward-all-clicks\n"
-        "        By default, right-click triggers BACK (or POWER on) and\n"
-        "        middle-click triggers HOME. This option disables these\n"
-        "        shortcuts and forward the clicks to the device instead.\n"
-        "\n"
        "    -f, --fullscreen\n"
        "        Start in fullscreen.\n"
        "\n"
        "    -h, --help\n"
        "        Print this help.\n"
        "\n"
-        "    --legacy-paste\n"
-        "        Inject computer clipboard text as a sequence of key events\n"
-        "        on Ctrl+v (like MOD+Shift+v).\n"
-        "        This is a workaround for some devices not behaving as\n"
-        "        expected when setting the device clipboard programmatically.\n"
-        "\n"
        "    --lock-video-orientation value\n"
        "        Lock video orientation to value.\n"
        "        Possible values are -1 (unlocked), 0, 1, 2 and 3.\n"
@@ -100,14 +87,14 @@ scrcpy_print_usage(const char *arg0) {
        "        Do not display device (only when screen recording is\n"
        "        enabled).\n"
        "\n"
-        "    --no-key-repeat\n"
-        "        Do not forward repeated key events when a key is held down.\n"
-        "\n"
        "    --no-mipmaps\n"
        "        If the renderer is OpenGL 3.0+ or OpenGL ES 2.0+, then\n"
        "        mipmaps are automatically generated to improve downscaling\n"
        "        quality. This option disables the generation of mipmaps.\n"
        "\n"
+        "    --no-key-repeat\n"
+        "        Do not forward repeated key events when a key is held down.\n"
+        "\n"
        "    -p, --port port[:port]\n"
        "        Set the TCP port (range) used by the client to listen.\n"
        "        Default is %d:%d.\n"
@@ -477,14 +464,14 @@ parse_port_range(const char *s, struct sc_port_range *port_range) {
 }

 static bool
-parse_display_id(const char *s, uint32_t *display_id) {
+parse_display_id(const char *s, uint16_t *display_id) {
    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 0x7FFFFFFF, "display id");
+    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "display id");
    if (!ok) {
        return false;
    }

-    *display_id = (uint32_t) value;
+    *display_id = (uint16_t) value;
    return true;
 }

@@ -664,9 +651,6 @@ guess_record_format(const char *filename) {
 #define OPT_DISABLE_SCREENSAVER    1020
 #define OPT_SHORTCUT_MOD           1021
 #define OPT_NO_KEY_REPEAT          1022
-#define OPT_FORWARD_ALL_CLICKS     1023
-#define OPT_LEGACY_PASTE           1024
-#define OPT_ENCODER_NAME           1025

 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -678,22 +662,18 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        {"disable-screensaver",    no_argument,       NULL,
                                                  OPT_DISABLE_SCREENSAVER},
        {"display",                required_argument, NULL, OPT_DISPLAY_ID},
-        {"encoder",                required_argument, NULL, OPT_ENCODER_NAME},
        {"force-adb-forward",      no_argument,       NULL,
                                                  OPT_FORCE_ADB_FORWARD},
-        {"forward-all-clicks",     no_argument,       NULL,
-                                                  OPT_FORWARD_ALL_CLICKS},
        {"fullscreen",             no_argument,       NULL, 'f'},
        {"help",                   no_argument,       NULL, 'h'},
-        {"legacy-paste",           no_argument,       NULL, OPT_LEGACY_PASTE},
        {"lock-video-orientation", required_argument, NULL,
                                                  OPT_LOCK_VIDEO_ORIENTATION},
        {"max-fps",                required_argument, NULL, OPT_MAX_FPS},
        {"max-size",               required_argument, NULL, 'm'},
        {"no-control",             no_argument,       NULL, 'n'},
        {"no-display",             no_argument,       NULL, 'N'},
-        {"no-key-repeat",          no_argument,       NULL, OPT_NO_KEY_REPEAT},
        {"no-mipmaps",             no_argument,       NULL, OPT_NO_MIPMAPS},
+        {"no-key-repeat",          no_argument,       NULL, OPT_NO_KEY_REPEAT},
        {"port",                   required_argument, NULL, 'p'},
        {"prefer-text",            no_argument,       NULL, OPT_PREFER_TEXT},
        {"push-target",            required_argument, NULL, OPT_PUSH_TARGET},
@@ -865,9 +845,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
            case OPT_CODEC_OPTIONS:
                opts->codec_options = optarg;
                break;
-            case OPT_ENCODER_NAME:
-                opts->encoder_name = optarg;
-                break;
            case OPT_FORCE_ADB_FORWARD:
                opts->force_adb_forward = true;
                break;
@@ -879,12 +856,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                    return false;
                }
                break;
-            case OPT_FORWARD_ALL_CLICKS:
-                opts->forward_all_clicks = true;
-                break;
-            case OPT_LEGACY_PASTE:
-                opts->legacy_paste = true;
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
--- a/app/src/cli.h
+++ b/app/src/cli.h
@@ -1,10 +1,9 @@
 #ifndef SCRCPY_CLI_H
 #define SCRCPY_CLI_H

-#include "common.h"
-
 #include <stdbool.h>

+#include "config.h"
 #include "scrcpy.h"

 struct scrcpy_cli_args {
--- a/app/src/command.c
+++ b/app/src/command.c
@@ -1,10 +1,12 @@
-#include "adb.h"
+#include "command.h"

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

+#include "config.h"
+#include "common.h"
 #include "util/log.h"
 #include "util/str_util.h"

@@ -68,7 +70,7 @@ show_adb_installation_msg() {
        {"pacman", "pacman -S android-tools"},
    };
    for (size_t i = 0; i < ARRAY_LEN(pkg_managers); ++i) {
-        if (search_executable(pkg_managers[i].binary)) {
+        if (cmd_search(pkg_managers[i].binary)) {
            LOGI("You may install 'adb' by \"%s\"", pkg_managers[i].command);
            return;
        }
@@ -116,7 +118,7 @@ adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {

    memcpy(&cmd[i], adb_cmd, len * sizeof(const char *));
    cmd[len + i] = NULL;
-    enum process_result r = process_execute(cmd, &process);
+    enum process_result r = cmd_execute(cmd, &process);
    if (r != PROCESS_SUCCESS) {
        show_adb_err_msg(r, cmd);
        return PROCESS_NONE;
@@ -173,7 +175,7 @@ adb_push(const char *serial, const char *local, const char *remote) {
    }
    remote = strquote(remote);
    if (!remote) {
-        free((void *) local);
+        SDL_free((void *) local);
        return PROCESS_NONE;
    }
 #endif
@@ -182,8 +184,8 @@ adb_push(const char *serial, const char *local, const char *remote) {
    process_t proc = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd));

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

    return proc;
@@ -204,8 +206,26 @@ adb_install(const char *serial, const char *local) {
    process_t proc = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd));

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

    return proc;
 }
+
+bool
+process_check_success(process_t proc, const char *name) {
+    if (proc == PROCESS_NONE) {
+        LOGE("Could not execute \"%s\"", name);
+        return false;
+    }
+    exit_code_t exit_code;
+    if (!cmd_simple_wait(proc, &exit_code)) {
+        if (exit_code != NO_EXIT_CODE) {
+            LOGE("\"%s\" returned with value %" PRIexitcode, name, exit_code);
+        } else {
+            LOGE("\"%s\" exited unexpectedly", name);
+        }
+        return false;
+    }
+    return true;
+}
--- a/app/src/util/process.h
+++ b/app/src/util/process.h
@@ -1,9 +1,8 @@
-#ifndef SC_PROCESS_H
-#define SC_PROCESS_H
-
-#include "common.h"
+#ifndef COMMAND_H
+#define COMMAND_H

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

 #ifdef _WIN32

@@ -13,7 +12,11 @@
 # define PATH_SEPARATOR '\\'
 # define PRIexitcode "lu"
 // <https://stackoverflow.com/a/44383330/1987178>
-# define PRIsizet "Iu"
+# ifdef _WIN64
+#   define PRIsizet PRIu64
+# else
+#   define PRIsizet PRIu32
+# endif
 # define PROCESS_NONE NULL
 # define NO_EXIT_CODE -1u // max value as unsigned
  typedef HANDLE process_t;
@@ -32,45 +35,58 @@

 #endif

+#include "config.h"
+
 enum process_result {
    PROCESS_SUCCESS,
    PROCESS_ERROR_GENERIC,
    PROCESS_ERROR_MISSING_BINARY,
 };

-// execute the command and write the result to the output parameter "process"
-enum process_result
-process_execute(const char *const argv[], process_t *process);
-
-// kill the process
+#ifndef __WINDOWS__
 bool
-process_terminate(process_t pid);
+cmd_search(const char *file);
+#endif

-// wait and close the process (like waitpid())
-// the "close" flag indicates if the process must be "closed" (reaped)
-// (passing false is equivalent to enable WNOWAIT in waitid())
-exit_code_t
-process_wait(process_t pid, bool close);
+enum process_result
+cmd_execute(const char *const argv[], process_t *process);

-// close the process
-//
-// Semantically, process_wait(close) = process_wait(noclose) + process_close
-void
-process_close(process_t pid);
+bool
+cmd_terminate(process_t pid);
+
+bool
+cmd_simple_wait(process_t pid, exit_code_t *exit_code);
+
+process_t
+adb_execute(const char *serial, const char *const adb_cmd[], size_t len);
+
+process_t
+adb_forward(const char *serial, uint16_t local_port,
+            const char *device_socket_name);
+
+process_t
+adb_forward_remove(const char *serial, uint16_t local_port);
+
+process_t
+adb_reverse(const char *serial, const char *device_socket_name,
+            uint16_t local_port);
+
+process_t
+adb_reverse_remove(const char *serial, const char *device_socket_name);
+
+process_t
+adb_push(const char *serial, const char *local, const char *remote);
+
+process_t
+adb_install(const char *serial, const char *local);

 // convenience function to wait for a successful process execution
 // automatically log process errors with the provided process name
 bool
-process_check_success(process_t proc, const char *name, bool close);
-
-#ifndef _WIN32
-// only used to find package manager, not implemented for Windows
-bool
-search_executable(const char *file);
-#endif
+process_check_success(process_t proc, const char *name);

 // return the absolute path of the executable (the scrcpy binary)
-// may be NULL on error; to be freed by free()
+// may be NULL on error; to be freed by SDL_free
 char *
 get_executable_path(void);

--- a/app/src/common.h
+++ b/app/src/common.h
@@ -1,11 +1,35 @@
 #ifndef COMMON_H
 #define COMMON_H

+#include <stdint.h>
+
 #include "config.h"
-#include "compat.h"

 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)
 #define MAX(X,Y) (X) > (Y) ? (X) : (Y)

+struct size {
+    uint16_t width;
+    uint16_t height;
+};
+
+struct point {
+    int32_t x;
+    int32_t y;
+};
+
+struct position {
+    // The video screen size may be different from the real device screen size,
+    // so store to which size the absolute position apply, to scale it
+    // accordingly.
+    struct size screen_size;
+    struct point point;
+};
+
+struct port_range {
+    uint16_t first;
+    uint16_t last;
+};
+
 #endif
--- a/app/src/compat.c
+++ b/app/src/compat.c
@@ -1,14 +0,0 @@
-#include "compat.h"
-
-#include "config.h"
-
-#ifndef HAVE_STRDUP
-char *strdup(const char *s) {
-    size_t size = strlen(s) + 1;
-    char *dup = malloc(size);
-    if (dup) {
-        memcpy(dup, s, size);
-    }
-    return dup;
-}
-#endif
--- a/app/src/compat.h
+++ b/app/src/compat.h
@@ -1,14 +1,6 @@
 #ifndef COMPAT_H
 #define COMPAT_H

-#define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 700
-#define _GNU_SOURCE
-#ifdef __APPLE__
-# define _DARWIN_C_SOURCE
-#endif
-
-#include <libavcodec/version.h>
 #include <libavformat/version.h>
 #include <SDL2/SDL_version.h>

@@ -56,8 +48,4 @@
 # define SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
 #endif

-#ifdef HAVE_STRDUP
-char *strdup(const char *s);
-#endif
-
 #endif
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -1,9 +1,9 @@
 #include "control_msg.h"

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

+#include "config.h"
 #include "util/buffer_util.h"
 #include "util/log.h"
 #include "util/str_util.h"
@@ -94,10 +94,10 @@ void
 control_msg_destroy(struct control_msg *msg) {
    switch (msg->type) {
        case CONTROL_MSG_TYPE_INJECT_TEXT:
-            free(msg->inject_text.text);
+            SDL_free(msg->inject_text.text);
            break;
        case CONTROL_MSG_TYPE_SET_CLIPBOARD:
-            free(msg->set_clipboard.text);
+            SDL_free(msg->set_clipboard.text);
            break;
        default:
            // do nothing
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -1,15 +1,14 @@
 #ifndef CONTROLMSG_H
 #define CONTROLMSG_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

+#include "config.h"
 #include "android/input.h"
 #include "android/keycodes.h"
-#include "coords.h"
+#include "common.h"

 #define CONTROL_MSG_MAX_SIZE (1 << 18) // 256k

@@ -50,7 +49,7 @@ struct control_msg {
            enum android_metastate metastate;
        } inject_keycode;
        struct {
-            char *text; // owned, to be freed by free()
+            char *text; // owned, to be freed by SDL_free()
        } inject_text;
        struct {
            enum android_motionevent_action action;
@@ -65,7 +64,7 @@ struct control_msg {
            int32_t vscroll;
        } inject_scroll_event;
        struct {
-            char *text; // owned, to be freed by free()
+            char *text; // owned, to be freed by SDL_free()
            bool paste;
        } set_clipboard;
        struct {
--- a/app/src/controller.c
+++ b/app/src/controller.c
@@ -2,27 +2,26 @@

 #include <assert.h>

+#include "config.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 +33,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 +47,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;
 }

@@ -62,12 +61,12 @@ static bool
 process_msg(struct controller *controller,
              const struct control_msg *msg) {
    static unsigned char serialized_msg[CONTROL_MSG_MAX_SIZE];
-    size_t length = control_msg_serialize(msg, serialized_msg);
+    int length = control_msg_serialize(msg, serialized_msg);
    if (!length) {
        return false;
    }
    int w = net_send_all(controller->control_socket, serialized_msg, length);
-    return (size_t) w == length;
+    return w == length;
 }

 static int
@@ -75,20 +74,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 +103,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 +121,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
@@ -1,23 +1,23 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H

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

+#include "config.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/coords.h
+++ b/app/src/coords.h
@@ -1,24 +0,0 @@
-#ifndef SC_COORDS
-#define SC_COORDS
-
-#include <stdint.h>
-
-struct size {
-    uint16_t width;
-    uint16_t height;
-};
-
-struct point {
-    int32_t x;
-    int32_t y;
-};
-
-struct position {
-    // The video screen size may be different from the real device screen size,
-    // so store to which size the absolute position apply, to scale it
-    // accordingly.
-    struct size screen_size;
-    struct point point;
-};
-
-#endif
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@@ -3,8 +3,12 @@
 #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 "config.h"
+#include "compat.h"
 #include "events.h"
 #include "recorder.h"
 #include "video_buffer.h"
--- a/app/src/decoder.h
+++ b/app/src/decoder.h
@@ -1,11 +1,11 @@
 #ifndef DECODER_H
 #define DECODER_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <libavformat/avformat.h>

+#include "config.h"
+
 struct video_buffer;

 struct decoder {
--- a/app/src/device.c
+++ b/app/src/device.c
@@ -1,5 +1,6 @@
 #include "device.h"

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

 bool
--- a/app/src/device.h
+++ b/app/src/device.h
@@ -1,11 +1,10 @@
 #ifndef DEVICE_H
 #define DEVICE_H

-#include "common.h"
-
 #include <stdbool.h>

-#include "coords.h"
+#include "config.h"
+#include "common.h"
 #include "util/net.h"

 #define DEVICE_NAME_FIELD_LENGTH 64
--- a/app/src/device_msg.c
+++ b/app/src/device_msg.c
@@ -1,8 +1,8 @@
 #include "device_msg.h"

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

+#include "config.h"
 #include "util/buffer_util.h"
 #include "util/log.h"

@@ -21,7 +21,7 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
            if (clipboard_len > len - 5) {
                return 0; // not available
            }
-            char *text = malloc(clipboard_len + 1);
+            char *text = SDL_malloc(clipboard_len + 1);
            if (!text) {
                LOGW("Could not allocate text for clipboard");
                return -1;
@@ -43,6 +43,6 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
 void
 device_msg_destroy(struct device_msg *msg) {
    if (msg->type == DEVICE_MSG_TYPE_CLIPBOARD) {
-        free(msg->clipboard.text);
+        SDL_free(msg->clipboard.text);
    }
 }
--- a/app/src/device_msg.h
+++ b/app/src/device_msg.h
@@ -1,12 +1,12 @@
 #ifndef DEVICEMSG_H
 #define DEVICEMSG_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <unistd.h>

+#include "config.h"
+
 #define DEVICE_MSG_MAX_SIZE (1 << 18) // 256k
 // type: 1 byte; length: 4 bytes
 #define DEVICE_MSG_TEXT_MAX_LENGTH (DEVICE_MSG_MAX_SIZE - 5)
@@ -19,7 +19,7 @@ struct device_msg {
    enum device_msg_type type;
    union {
        struct {
-            char *text; // owned, to be freed by free()
+            char *text; // owned, to be freed by SDL_free()
        } clipboard;
    };
 };
--- a/app/src/event_converter.c
+++ b/app/src/event_converter.c
@@ -1,5 +1,7 @@
 #include "event_converter.h"

+#include "config.h"
+
 #define MAP(FROM, TO) case FROM: *to = TO; return true
 #define FAIL default: return false

--- a/app/src/event_converter.h
+++ b/app/src/event_converter.h
@@ -1,11 +1,10 @@
 #ifndef CONVERT_H
 #define CONVERT_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <SDL2/SDL_events.h>

+#include "config.h"
 #include "control_msg.h"

 bool
--- a/app/src/file_handler.c
+++ b/app/src/file_handler.c
@@ -3,14 +3,16 @@
 #include <assert.h>
 #include <string.h>

-#include "adb.h"
+#include "config.h"
+#include "command.h"
+#include "util/lock.h"
 #include "util/log.h"

 #define DEFAULT_PUSH_TARGET "/sdcard/"

 static void
 file_handler_request_destroy(struct file_handler_request *req) {
-    free(req->file);
+    SDL_free(req->file);
 }

 bool
@@ -19,23 +21,21 @@ 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;
    }

    if (serial) {
-        file_handler->serial = strdup(serial);
+        file_handler->serial = SDL_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,9 +55,9 @@ 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);
-    free(file_handler->serial);
+    SDL_DestroyCond(file_handler->event_cond);
+    SDL_DestroyMutex(file_handler->mutex);
+    SDL_free(file_handler->serial);

    struct file_handler_request req;
    while (cbuf_take(&file_handler->queue, &req)) {
@@ -93,13 +93,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 +108,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,16 +133,16 @@ 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)) {
+            if (process_check_success(process, "adb install")) {
                LOGI("%s successfully installed", req.file);
            } else {
                LOGE("Failed to install %s", req.file);
            }
        } else {
-            if (process_check_success(process, "adb push", false)) {
+            if (process_check_success(process, "adb push")) {
                LOGI("%s successfully pushed to %s", req.file,
                                                     file_handler->push_target);
            } else {
@@ -151,14 +151,6 @@ run_file_handler(void *data) {
            }
        }

-        sc_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);
-
        file_handler_request_destroy(&req);
    }
    return 0;
@@ -168,9 +160,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 +172,20 @@ 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");
+        if (!cmd_terminate(file_handler->current_process)) {
+            LOGW("Could not terminate install process");
        }
+        cmd_simple_wait(file_handler->current_process, NULL);
+        file_handler->current_process = PROCESS_NONE;
    }
-    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
@@ -1,13 +1,13 @@
 #ifndef FILE_HANDLER_H
 #define FILE_HANDLER_H

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

-#include "adb.h"
+#include "config.h"
+#include "command.h"
 #include "util/cbuf.h"
-#include "util/thread.h"

 typedef enum {
    ACTION_INSTALL_APK,
@@ -24,9 +24,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;
@@ -49,7 +49,7 @@ file_handler_stop(struct file_handler *file_handler);
 void
 file_handler_join(struct file_handler *file_handler);

-// take ownership of file, and will free() it
+// take ownership of file, and will SDL_free() it
 bool
 file_handler_request(struct file_handler *file_handler,
                     file_handler_action_t action,
--- a/app/src/fps_counter.c
+++ b/app/src/fps_counter.c
@@ -3,24 +3,26 @@
 #include <assert.h>
 #include <SDL2/SDL_timer.h>

+#include "config.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 +31,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 +78,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 +91,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 +125,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 +135,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 +159,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 +172,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
@@ -1,20 +1,18 @@
 #ifndef FPSCOUNTER_H
 #define FPSCOUNTER_H

-#include "common.h"
-
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <SDL2/SDL_mutex.h>
+#include <SDL2/SDL_thread.h>

-#include "util/thread.h"
+#include "config.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
@@ -3,7 +3,9 @@
 #include <assert.h>
 #include <SDL2/SDL_keycode.h>

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

 static const int ACTION_DOWN = 1;
@@ -58,8 +60,6 @@ input_manager_init(struct input_manager *im,
    im->control = options->control;
    im->forward_key_repeat = options->forward_key_repeat;
    im->prefer_text = options->prefer_text;
-    im->forward_all_clicks = options->forward_all_clicks;
-    im->legacy_paste = options->legacy_paste;

    const struct sc_shortcut_mods *shortcut_mods = &options->shortcut_mods;
    assert(shortcut_mods->count);
@@ -189,20 +189,13 @@ set_device_clipboard(struct controller *controller, bool paste) {
        return;
    }

-    char *text_dup = strdup(text);
-    SDL_free(text);
-    if (!text_dup) {
-        LOGW("Could not strdup input text");
-        return;
-    }
-
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_SET_CLIPBOARD;
-    msg.set_clipboard.text = text_dup;
+    msg.set_clipboard.text = text;
    msg.set_clipboard.paste = paste;

    if (!controller_push_msg(controller, &msg)) {
-        free(text_dup);
+        SDL_free(text);
        LOGW("Could not request 'set device clipboard'");
    }
 }
@@ -248,18 +241,11 @@ clipboard_paste(struct controller *controller) {
        return;
    }

-    char *text_dup = strdup(text);
-    SDL_free(text);
-    if (!text_dup) {
-        LOGW("Could not strdup input text");
-        return;
-    }
-
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
-    msg.inject_text.text = text_dup;
+    msg.inject_text.text = text;
    if (!controller_push_msg(controller, &msg)) {
-        free(text_dup);
+        SDL_free(text);
        LOGW("Could not request 'paste clipboard'");
    }
 }
@@ -304,13 +290,13 @@ input_manager_process_text_input(struct input_manager *im,

    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
-    msg.inject_text.text = strdup(event->text);
+    msg.inject_text.text = SDL_strdup(event->text);
    if (!msg.inject_text.text) {
        LOGW("Could not strdup input text");
        return;
    }
    if (!controller_push_msg(im->controller, &msg)) {
-        free(msg.inject_text.text);
+        SDL_free(msg.inject_text.text);
        LOGW("Could not request 'inject text'");
    }
 }
@@ -454,7 +440,7 @@ input_manager_process_key(struct input_manager *im,
                return;
            case SDLK_v:
                if (control && !repeat && down) {
-                    if (shift || im->legacy_paste) {
+                    if (shift) {
                        // inject the text as input events
                        clipboard_paste(controller);
                    } else {
@@ -518,11 +504,6 @@ input_manager_process_key(struct input_manager *im,
    }

    if (ctrl && !shift && keycode == SDLK_v && down && !repeat) {
-        if (im->legacy_paste) {
-            // inject the text as input events
-            clipboard_paste(controller);
-            return;
-        }
        // Synchronize the computer clipboard to the device clipboard before
        // sending Ctrl+v, to allow seamless copy-paste.
        set_device_clipboard(controller, false);
@@ -648,7 +629,7 @@ input_manager_process_mouse_button(struct input_manager *im,
    }

    bool down = event->type == SDL_MOUSEBUTTONDOWN;
-    if (!im->forward_all_clicks && down) {
+    if (down) {
        if (control && event->button == SDL_BUTTON_RIGHT) {
            press_back_or_turn_screen_on(im->controller);
            return;
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@@ -1,12 +1,12 @@
 #ifndef INPUTMANAGER_H
 #define INPUTMANAGER_H

-#include "common.h"
-
 #include <stdbool.h>

 #include <SDL2/SDL.h>

+#include "config.h"
+#include "common.h"
 #include "controller.h"
 #include "fps_counter.h"
 #include "scrcpy.h"
@@ -25,8 +25,6 @@ struct input_manager {
    bool control;
    bool forward_key_repeat;
    bool prefer_text;
-    bool forward_all_clicks;
-    bool legacy_paste;

    struct {
        unsigned data[SC_MAX_SHORTCUT_MODS];
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -1,7 +1,5 @@
 #include "scrcpy.h"

-#include "common.h"
-
 #include <assert.h>
 #include <stdbool.h>
 #include <unistd.h>
@@ -9,7 +7,9 @@
 #define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem
 #include <SDL2/SDL.h>

+#include "config.h"
 #include "cli.h"
+#include "compat.h"
 #include "util/log.h"

 static void
@@ -98,5 +98,11 @@ main(int argc, char *argv[]) {

    avformat_network_deinit(); // ignore failure

+#if defined (__WINDOWS__) && ! defined (WINDOWS_NOCONSOLE)
+    if (res != 0) {
+        fprintf(stderr, "Press any key to continue...\n");
+        getchar();
+    }
+#endif
    return res;
 }
--- a/app/src/opengl.h
+++ b/app/src/opengl.h
@@ -1,11 +1,11 @@
 #ifndef SC_OPENGL_H
 #define SC_OPENGL_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <SDL2/SDL_opengl.h>

+#include "config.h"
+
 struct sc_opengl {
    const char *version;
    bool is_opengles;
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@@ -3,13 +3,14 @@
 #include <assert.h>
 #include <SDL2/SDL_clipboard.h>

+#include "config.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 +19,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 +102,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 +113,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
@@ -1,19 +1,19 @@
 #ifndef RECEIVER_H
 #define RECEIVER_H

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

+#include "config.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,9 @@
 #include <assert.h>
 #include <libavutil/time.h>

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

 static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us
@@ -26,7 +29,7 @@ find_muxer(const char *name) {

 static struct record_packet *
 record_packet_new(const AVPacket *packet) {
-    struct record_packet *rec = malloc(sizeof(*rec));
+    struct record_packet *rec = SDL_malloc(sizeof(*rec));
    if (!rec) {
        return NULL;
    }
@@ -36,7 +39,7 @@ record_packet_new(const AVPacket *packet) {
    av_init_packet(&rec->packet);

    if (av_packet_ref(&rec->packet, packet)) {
-        free(rec);
+        SDL_free(rec);
        return NULL;
    }
    return rec;
@@ -45,7 +48,7 @@ record_packet_new(const AVPacket *packet) {
 static void
 record_packet_delete(struct record_packet *rec) {
    av_packet_unref(&rec->packet);
-    free(rec);
+    SDL_free(rec);
 }

 static void
@@ -62,24 +65,24 @@ recorder_init(struct recorder *recorder,
              const char *filename,
              enum sc_record_format format,
              struct size declared_frame_size) {
-    recorder->filename = strdup(filename);
+    recorder->filename = SDL_strdup(filename);
    if (!recorder->filename) {
        LOGE("Could not strdup filename");
        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);
+        SDL_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);
-        free(recorder->filename);
+        SDL_DestroyMutex(recorder->mutex);
+        SDL_free(recorder->filename);
        return false;
    }

@@ -96,9 +99,9 @@ recorder_init(struct recorder *recorder,

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

 static const char *
@@ -257,17 +260,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 +290,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 +313,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 +332,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 +343,36 @@ 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);
        return false;
    }

    struct record_packet *rec = record_packet_new(packet);
    if (!rec) {
        LOGC("Could not allocate record packet");
-        sc_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
@@ -1,15 +1,15 @@
 #ifndef RECORDER_H
 #define RECORDER_H

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

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

 struct record_packet {
    AVPacket packet;
@@ -25,9 +25,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
@@ -13,6 +13,10 @@
 # include <windows.h>
 #endif

+#include "config.h"
+#include "command.h"
+#include "common.h"
+#include "compat.h"
 #include "controller.h"
 #include "decoder.h"
 #include "device.h"
@@ -26,10 +30,11 @@
 #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 server server = SERVER_INITIALIZER;
 static struct screen screen = SCREEN_INITIALIZER;
 static struct fps_counter fps_counter;
 static struct video_buffer video_buffer;
@@ -225,20 +230,13 @@ handle_event(SDL_Event *event, const struct scrcpy_options *options) {
            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;
        }
    }
@@ -292,7 +290,7 @@ av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
    if (priority == 0) {
        return;
    }
-    char *local_fmt = malloc(strlen(fmt) + 10);
+    char *local_fmt = SDL_malloc(strlen(fmt) + 10);
    if (!local_fmt) {
        LOGC("Could not allocate string");
        return;
@@ -301,26 +299,11 @@ av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
    strcpy(local_fmt, "[FFmpeg] ");
    strcpy(local_fmt + 9, fmt);
    SDL_LogMessageV(SDL_LOG_CATEGORY_VIDEO, priority, local_fmt, vl);
-    free(local_fmt);
+    SDL_free(local_fmt);
 }

 bool
 scrcpy(const struct scrcpy_options *options) {
-    if (!server_init(&server)) {
-        return false;
-    }
-
-    bool ret = false;
-
-    bool server_started = false;
-    bool fps_counter_initialized = false;
-    bool video_buffer_initialized = false;
-    bool file_handler_initialized = false;
-    bool recorder_initialized = false;
-    bool stream_started = false;
-    bool controller_initialized = false;
-    bool controller_started = false;
-
    bool record = !!options->record_filename;
    struct server_params params = {
        .log_level = options->log_level,
@@ -335,14 +318,21 @@ scrcpy(const struct scrcpy_options *options) {
        .show_touches = options->show_touches,
        .stay_awake = options->stay_awake,
        .codec_options = options->codec_options,
-        .encoder_name = options->encoder_name,
        .force_adb_forward = options->force_adb_forward,
    };
    if (!server_start(&server, options->serial, &params)) {
-        goto end;
+        return false;
    }

-    server_started = true;
+    bool ret = false;
+
+    bool fps_counter_initialized = false;
+    bool video_buffer_initialized = false;
+    bool file_handler_initialized = false;
+    bool recorder_initialized = false;
+    bool stream_started = false;
+    bool controller_initialized = false;
+    bool controller_started = false;

    if (!sdl_init_and_configure(options->display, options->render_driver,
                                options->disable_screensaver)) {
@@ -432,7 +422,7 @@ scrcpy(const struct scrcpy_options *options) {
                                   options->window_y, options->window_width,
                                   options->window_height,
                                   options->window_borderless,
-                                   options->rotation, options->mipmaps)) {
+                                   options->rotation, options-> mipmaps)) {
            goto end;
        }

@@ -474,10 +464,8 @@ end:
        fps_counter_interrupt(&fps_counter);
    }

-    if (server_started) {
-        // shutdown the sockets and kill the server
-        server_stop(&server);
-    }
+    // shutdown the sockets and kill the server
+    server_stop(&server);

    // now that the sockets are shutdown, the stream and controller are
    // interrupted, we can join them
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -1,12 +1,12 @@
 #ifndef SCRCPY_H
 #define SCRCPY_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

+#include "config.h"
+
 enum sc_log_level {
    SC_LOG_LEVEL_DEBUG,
    SC_LOG_LEVEL_INFO,
@@ -51,7 +51,6 @@ struct scrcpy_options {
    const char *push_target;
    const char *render_driver;
    const char *codec_options;
-    const char *encoder_name;
    enum sc_log_level log_level;
    enum sc_record_format record_format;
    struct sc_port_range port_range;
@@ -65,7 +64,7 @@ struct scrcpy_options {
    int16_t window_y; // SC_WINDOW_POSITION_UNDEFINED for "auto"
    uint16_t window_width;
    uint16_t window_height;
-    uint32_t display_id;
+    uint16_t display_id;
    bool show_touches;
    bool fullscreen;
    bool always_on_top;
@@ -80,8 +79,6 @@ struct scrcpy_options {
    bool force_adb_forward;
    bool disable_screensaver;
    bool forward_key_repeat;
-    bool forward_all_clicks;
-    bool legacy_paste;
 };

 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -92,7 +89,6 @@ struct scrcpy_options {
    .push_target = NULL, \
    .render_driver = NULL, \
    .codec_options = NULL, \
-    .encoder_name = NULL, \
    .log_level = SC_LOG_LEVEL_INFO, \
    .record_format = SC_RECORD_FORMAT_AUTO, \
    .port_range = { \
@@ -127,8 +123,6 @@ struct scrcpy_options {
    .force_adb_forward = false, \
    .disable_screensaver = false, \
    .forward_key_repeat = true, \
-    .forward_all_clicks = false, \
-    .legacy_paste = false, \
 }

 bool
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -4,10 +4,14 @@
 #include <string.h>
 #include <SDL2/SDL.h>

+#include "config.h"
+#include "common.h"
+#include "compat.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
@@ -453,13 +457,15 @@ update_texture(struct screen *screen, const AVFrame *frame) {

 bool
 screen_update_frame(struct screen *screen, struct video_buffer *vb) {
-    const AVFrame *frame = video_buffer_take_rendering_frame(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)) {
-        sc_mutex_unlock(&vb->mutex);
+        mutex_unlock(vb->mutex);
        return false;
    }
    update_texture(screen, frame);
+    mutex_unlock(vb->mutex);

    screen_render(screen, false);
    return true;
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -1,13 +1,12 @@
 #ifndef SCREEN_H
 #define SCREEN_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <SDL2/SDL.h>
 #include <libavformat/avformat.h>

-#include "coords.h"
+#include "config.h"
+#include "common.h"
 #include "opengl.h"

 struct video_buffer;
--- 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 "config.h"
+#include "command.h"
 #include "util/log.h"
 #include "util/net.h"
 #include "util/str_util.h"
@@ -31,7 +33,7 @@ get_server_path(void) {
 #ifdef __WINDOWS__
        char *server_path = utf8_from_wide_char(server_path_env);
 #else
-        char *server_path = strdup(server_path_env);
+        char *server_path = SDL_strdup(server_path_env);
 #endif
        if (!server_path) {
            LOGE("Could not allocate memory");
@@ -43,7 +45,7 @@ get_server_path(void) {

 #ifndef PORTABLE
    LOGD("Using server: " DEFAULT_SERVER_PATH);
-    char *server_path = strdup(DEFAULT_SERVER_PATH);
+    char *server_path = SDL_strdup(DEFAULT_SERVER_PATH);
    if (!server_path) {
        LOGE("Could not allocate memory");
        return NULL;
@@ -65,11 +67,11 @@ get_server_path(void) {

    // sizeof(SERVER_FILENAME) gives statically the size including the null byte
    size_t len = dirlen + 1 + sizeof(SERVER_FILENAME);
-    char *server_path = malloc(len);
+    char *server_path = SDL_malloc(len);
    if (!server_path) {
        LOGE("Could not alloc server path string, "
             "using " SERVER_FILENAME " from current directory");
-        free(executable_path);
+        SDL_free(executable_path);
        return SERVER_FILENAME;
    }

@@ -78,7 +80,7 @@ get_server_path(void) {
    memcpy(&server_path[dirlen + 1], SERVER_FILENAME, sizeof(SERVER_FILENAME));
    // the final null byte has been copied with SERVER_FILENAME

-    free(executable_path);
+    SDL_free(executable_path);

    LOGD("Using server (portable): %s", server_path);
    return server_path;
@@ -93,36 +95,36 @@ push_server(const char *serial) {
    }
    if (!is_regular_file(server_path)) {
        LOGE("'%s' does not exist or is not a regular file\n", server_path);
-        free(server_path);
+        SDL_free(server_path);
        return false;
    }
    process_t process = adb_push(serial, server_path, DEVICE_SERVER_PATH);
-    free(server_path);
-    return process_check_success(process, "adb push", true);
+    SDL_free(server_path);
+    return process_check_success(process, "adb push");
 }

 static bool
 enable_tunnel_reverse(const char *serial, uint16_t local_port) {
    process_t process = adb_reverse(serial, SOCKET_NAME, local_port);
-    return process_check_success(process, "adb reverse", true);
+    return process_check_success(process, "adb reverse");
 }

 static bool
 disable_tunnel_reverse(const char *serial) {
    process_t process = adb_reverse_remove(serial, SOCKET_NAME);
-    return process_check_success(process, "adb reverse --remove", true);
+    return process_check_success(process, "adb reverse --remove");
 }

 static bool
 enable_tunnel_forward(const char *serial, uint16_t local_port) {
    process_t process = adb_forward(serial, local_port, SOCKET_NAME);
-    return process_check_success(process, "adb forward", true);
+    return process_check_success(process, "adb forward");
 }

 static bool
 disable_tunnel_forward(const char *serial, uint16_t local_port) {
    process_t process = adb_forward_remove(serial, local_port);
-    return process_check_success(process, "adb forward --remove", true);
+    return process_check_success(process, "adb forward --remove");
 }

 static bool
@@ -199,7 +201,7 @@ enable_tunnel_forward_any_port(struct server *server,

        if (port < port_range.last) {
            LOGW("Could not forward port %" PRIu16", retrying on %" PRIu16,
-                 port, (uint16_t) (port + 1));
+                 port, port + 1);
            port++;
            continue;
        }
@@ -255,12 +257,12 @@ execute_server(struct server *server, const struct server_params *params) {
    char bit_rate_string[11];
    char max_fps_string[6];
    char lock_video_orientation_string[5];
-    char display_id_string[11];
+    char display_id_string[6];
    sprintf(max_size_string, "%"PRIu16, params->max_size);
    sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
    sprintf(max_fps_string, "%"PRIu16, params->max_fps);
    sprintf(lock_video_orientation_string, "%"PRIi8, params->lock_video_orientation);
-    sprintf(display_id_string, "%"PRIu32, params->display_id);
+    sprintf(display_id_string, "%"PRIu16, params->display_id);
    const char *const cmd[] = {
        "shell",
        "CLASSPATH=" DEVICE_SERVER_PATH,
@@ -292,7 +294,6 @@ execute_server(struct server *server, const struct server_params *params) {
        params->show_touches ? "true" : "false",
        params->stay_awake ? "true" : "false",
        params->codec_options ? params->codec_options : "-",
-        params->encoder_name ? params->encoder_name : "-",
    };
 #ifdef SERVER_DEBUGGER
    LOGI("Server debugger waiting for a client on device port "
@@ -351,50 +352,15 @@ close_socket(socket_t socket) {
    }
 }

-bool
+void
 server_init(struct server *server) {
-    server->serial = NULL;
-    server->process = PROCESS_NONE;
-    atomic_flag_clear_explicit(&server->server_socket_closed,
-                               memory_order_relaxed);
-
-    bool ok = sc_mutex_init(&server->mutex);
-    if (!ok) {
-        return false;
-    }
-
-    ok = sc_cond_init(&server->process_terminated_cond);
-    if (!ok) {
-        sc_mutex_destroy(&server->mutex);
-        return false;
-    }
-
-    server->process_terminated = false;
-
-    server->server_socket = INVALID_SOCKET;
-    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;
-    server->tunnel_forward = false;
-
-    return true;
+    *server = (struct server) SERVER_INITIALIZER;
 }

 static int
 run_wait_server(void *data) {
    struct server *server = data;
-    process_wait(server->process, false); // ignore exit code
-
-    sc_mutex_lock(&server->mutex);
-    server->process_terminated = true;
-    sc_cond_signal(&server->process_terminated_cond);
-    sc_mutex_unlock(&server->mutex);
-
+    cmd_simple_wait(server->process, NULL); // ignore exit code
    // no need for synchronization, server_socket is initialized before this
    // thread was created
    if (server->server_socket != INVALID_SOCKET
@@ -413,7 +379,7 @@ server_start(struct server *server, const char *serial,
    server->port_range = params->port_range;

    if (serial) {
-        server->serial = strdup(serial);
+        server->serial = SDL_strdup(serial);
        if (!server->serial) {
            return false;
        }
@@ -440,11 +406,11 @@ 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) {
-        process_terminate(server->process);
-        process_wait(server->process, true); // ignore exit code
+    server->wait_server_thread =
+        SDL_CreateThread(run_wait_server, "wait-server", server);
+    if (!server->wait_server_thread) {
+        cmd_terminate(server->process);
+        cmd_simple_wait(server->process, NULL); // ignore exit code
        goto error2;
    }

@@ -463,7 +429,7 @@ error2:
    }
    disable_tunnel(server);
 error1:
-    free(server->serial);
+    SDL_free(server->serial);
    return false;
 }

@@ -526,39 +492,17 @@ server_stop(struct server *server) {

    assert(server->process != PROCESS_NONE);

+    cmd_terminate(server->process);
+
    if (server->tunnel_enabled) {
        // ignore failure
        disable_tunnel(server);
    }

-    // Give some delay for the server to terminate properly
-    sc_mutex_lock(&server->mutex);
-    bool signaled = false;
-    if (!server->process_terminated) {
-#define WATCHDOG_DELAY_MS 1000
-        signaled = sc_cond_timedwait(&server->process_terminated_cond,
-                                     &server->mutex,
-                                     WATCHDOG_DELAY_MS);
-    }
-    sc_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) {
-        // 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);
-    process_close(server->process);
+    SDL_WaitThread(server->wait_server_thread, NULL);
 }

 void
 server_destroy(struct server *server) {
-    free(server->serial);
-    sc_cond_destroy(&server->process_terminated_cond);
-    sc_mutex_destroy(&server->mutex);
+    SDL_free(server->serial);
 }
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -1,28 +1,23 @@
 #ifndef SERVER_H
 #define SERVER_H

-#include "common.h"
-
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <SDL2/SDL_thread.h>

-#include "adb.h"
+#include "config.h"
+#include "command.h"
+#include "common.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;
-    bool process_terminated;
-
    socket_t server_socket; // only used if !tunnel_forward
    socket_t video_socket;
    socket_t control_socket;
@@ -32,25 +27,41 @@ struct server {
    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
 };

+#define SERVER_INITIALIZER { \
+    .serial = NULL, \
+    .process = PROCESS_NONE, \
+    .wait_server_thread = NULL, \
+    .server_socket_closed = ATOMIC_FLAG_INIT, \
+    .server_socket = INVALID_SOCKET, \
+    .video_socket = INVALID_SOCKET, \
+    .control_socket = INVALID_SOCKET, \
+    .port_range = { \
+        .first = 0, \
+        .last = 0, \
+    }, \
+    .local_port = 0, \
+    .tunnel_enabled = false, \
+    .tunnel_forward = false, \
+}
+
 struct server_params {
    enum sc_log_level log_level;
    const char *crop;
    const char *codec_options;
-    const char *encoder_name;
    struct sc_port_range port_range;
    uint16_t max_size;
    uint32_t bit_rate;
    uint16_t max_fps;
    int8_t lock_video_orientation;
    bool control;
-    uint32_t display_id;
+    uint16_t display_id;
    bool show_touches;
    bool stay_awake;
    bool force_adb_forward;
 };

 // init default values
-bool
+void
 server_init(struct server *server);

 // push, enable tunnel et start the server
--- a/app/src/stream.c
+++ b/app/src/stream.c
@@ -4,8 +4,12 @@
 #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 "config.h"
+#include "compat.h"
 #include "decoder.h"
 #include "events.h"
 #include "recorder.h"
@@ -277,8 +281,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 +298,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
@@ -1,21 +1,21 @@
 #ifndef STREAM_H
 #define STREAM_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <libavformat/avformat.h>
 #include <SDL2/SDL_atomic.h>
+#include <SDL2/SDL_thread.h>

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

 struct video_buffer;

 struct stream {
    socket_t socket;
-    sc_thread thread;
+    struct video_buffer *video_buffer;
+    SDL_Thread *thread;
    struct decoder *decoder;
    struct recorder *recorder;
    AVCodecContext *codec_ctx;
--- a/app/src/sys/unix/command.c
+++ b/app/src/sys/unix/command.c
@@ -1,4 +1,17 @@
-#include "util/process.h"
+// for portability
+#define _POSIX_SOURCE // for kill()
+#define _BSD_SOURCE // for readlink()
+
+// modern glibc will complain without this
+#define _DEFAULT_SOURCE
+
+#ifdef __APPLE__
+# define _DARWIN_C_SOURCE // for strdup(), strtok_r(), memset_pattern4()
+#endif
+
+#include "command.h"
+
+#include "config.h"

 #include <errno.h>
 #include <fcntl.h>
@@ -8,13 +21,14 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>

 #include "util/log.h"

 bool
-search_executable(const char *file) {
+cmd_search(const char *file) {
    char *path = getenv("PATH");
    if (!path)
        return false;
@@ -50,7 +64,7 @@ search_executable(const char *file) {
 }

 enum process_result
-process_execute(const char *const argv[], pid_t *pid) {
+cmd_execute(const char *const argv[], pid_t *pid) {
    int fd[2];

    if (pipe(fd) == -1) {
@@ -112,37 +126,29 @@ end:
 }

 bool
-process_terminate(pid_t pid) {
+cmd_terminate(pid_t pid) {
    if (pid <= 0) {
        LOGC("Requested to kill %d, this is an error. Please report the bug.\n",
             (int) pid);
        abort();
    }
-    return kill(pid, SIGKILL) != -1;
+    return kill(pid, SIGTERM) != -1;
 }

-exit_code_t
-process_wait(pid_t pid, bool close) {
+bool
+cmd_simple_wait(pid_t pid, int *exit_code) {
+    int status;
    int code;
-    int options = WEXITED;
-    if (!close) {
-        options |= WNOWAIT;
-    }
-
-    siginfo_t info;
-    int r = waitid(P_PID, pid, &info, options);
-    if (r == -1 || info.si_code != CLD_EXITED) {
+    if (waitpid(pid, &status, 0) == -1 || !WIFEXITED(status)) {
        // could not wait, or exited unexpectedly, probably by a signal
-        code = NO_EXIT_CODE;
+        code = -1;
    } else {
-        code = info.si_status;
+        code = WEXITSTATUS(status);
    }
-    return code;
-}
-
-void
-process_close(pid_t pid) {
-    process_wait(pid, true); // ignore exit code
+    if (exit_code) {
+        *exit_code = code;
+    }
+    return !code;
 }

 char *
@@ -156,7 +162,7 @@ get_executable_path(void) {
        return NULL;
    }
    buf[len] = '\0';
-    return strdup(buf);
+    return SDL_strdup(buf);
 #else
    // in practice, we only need this feature for portable builds, only used on
    // Windows, so we don't care implementing it for every platform
--- a/app/src/sys/win/command.c
+++ b/app/src/sys/win/command.c
@@ -1,8 +1,8 @@
-#include "util/process.h"
+#include "command.h"

-#include <assert.h>
 #include <sys/stat.h>

+#include "config.h"
 #include "util/log.h"
 #include "util/str_util.h"

@@ -21,7 +21,7 @@ build_cmd(char *cmd, size_t len, const char *const argv[]) {
 }

 enum process_result
-process_execute(const char *const argv[], HANDLE *handle) {
+cmd_execute(const char *const argv[], HANDLE *handle) {
    STARTUPINFOW si;
    PROCESS_INFORMATION pi;
    memset(&si, 0, sizeof(si));
@@ -39,9 +39,14 @@ process_execute(const char *const argv[], HANDLE *handle) {
        return PROCESS_ERROR_GENERIC;
    }

-    if (!CreateProcessW(NULL, wide, NULL, NULL, FALSE, 0, NULL, NULL, &si,
+#ifdef WINDOWS_NOCONSOLE
+    int flags = CREATE_NO_WINDOW;
+#else
+    int flags = 0;
+#endif
+    if (!CreateProcessW(NULL, wide, NULL, NULL, FALSE, flags, NULL, NULL, &si,
                        &pi)) {
-        free(wide);
+        SDL_free(wide);
        *handle = NULL;
        if (GetLastError() == ERROR_FILE_NOT_FOUND) {
            return PROCESS_ERROR_MISSING_BINARY;
@@ -49,35 +54,28 @@ process_execute(const char *const argv[], HANDLE *handle) {
        return PROCESS_ERROR_GENERIC;
    }

-    free(wide);
+    SDL_free(wide);
    *handle = pi.hProcess;
    return PROCESS_SUCCESS;
 }

 bool
-process_terminate(HANDLE handle) {
-    return TerminateProcess(handle, 1);
+cmd_terminate(HANDLE handle) {
+    return TerminateProcess(handle, 1) && CloseHandle(handle);
 }

-exit_code_t
-process_wait(HANDLE handle, bool close) {
+bool
+cmd_simple_wait(HANDLE handle, DWORD *exit_code) {
    DWORD code;
    if (WaitForSingleObject(handle, INFINITE) != WAIT_OBJECT_0
            || !GetExitCodeProcess(handle, &code)) {
        // could not wait or retrieve the exit code
-        code = NO_EXIT_CODE; // max value, it's unsigned
+        code = -1; // max value, it's unsigned
    }
-    if (close) {
-        CloseHandle(handle);
+    if (exit_code) {
+        *exit_code = code;
    }
-    return code;
-}
-
-void
-process_close(HANDLE handle) {
-    bool closed = CloseHandle(handle);
-    assert(closed);
-    (void) closed;
+    return !code;
 }

 char *
@@ -105,7 +103,7 @@ is_regular_file(const char *path) {

    struct _stat path_stat;
    int r = _wstat(wide_path, &path_stat);
-    free(wide_path);
+    SDL_free(wide_path);

    if (r) {
        perror("stat");
--- a/app/src/tiny_xpm.c
+++ b/app/src/tiny_xpm.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>

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

 struct index {
--- a/app/src/tiny_xpm.h
+++ b/app/src/tiny_xpm.h
@@ -1,10 +1,10 @@
 #ifndef TINYXPM_H
 #define TINYXPM_H

-#include "common.h"
-
 #include <SDL2/SDL.h>

+#include "config.h"
+
 SDL_Surface *
 read_xpm(char *xpm[]);

--- a/app/src/util/buffer_util.h
+++ b/app/src/util/buffer_util.h
@@ -1,11 +1,11 @@
 #ifndef BUFFER_UTIL_H
 #define BUFFER_UTIL_H

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

+#include "config.h"
+
 static inline void
 buffer_write16be(uint8_t *buf, uint16_t value) {
    buf[0] = value >> 8;
@@ -33,7 +33,7 @@ buffer_read16be(const uint8_t *buf) {

 static inline uint32_t
 buffer_read32be(const uint8_t *buf) {
-    return ((uint32_t) buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
+    return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
 }

 static inline uint64_t
--- a/app/src/util/cbuf.h
+++ b/app/src/util/cbuf.h
@@ -2,11 +2,11 @@
 #ifndef CBUF_H
 #define CBUF_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <unistd.h>

+#include "config.h"
+
 // To define a circular buffer type of 20 ints:
 //     struct cbuf_int CBUF(int, 20);
 //
--- a/app/src/util/lock.h
+++ b/app/src/util/lock.h
@@ -0,0 +1,74 @@
+#ifndef LOCK_H
+#define LOCK_H
+
+#include <stdint.h>
+#include <SDL2/SDL_mutex.h>
+
+#include "config.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/net.c
+++ b/app/src/util/net.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <SDL2/SDL_platform.h>

+#include "config.h"
 #include "log.h"

 #ifdef __WINDOWS__
--- a/app/src/util/net.h
+++ b/app/src/util/net.h
@@ -1,8 +1,6 @@
 #ifndef NET_H
 #define NET_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <stdint.h>
 #include <SDL2/SDL_platform.h>
@@ -19,6 +17,8 @@
  typedef int socket_t;
 #endif

+#include "config.h"
+
 bool
 net_init(void);

--- a/app/src/util/process.c
+++ b/app/src/util/process.c
@@ -1,21 +0,0 @@
-#include "process.h"
-
-#include "log.h"
-
-bool
-process_check_success(process_t proc, const char *name, bool close) {
-    if (proc == PROCESS_NONE) {
-        LOGE("Could not execute \"%s\"", name);
-        return false;
-    }
-    exit_code_t exit_code = process_wait(proc, close);
-    if (exit_code) {
-        if (exit_code != NO_EXIT_CODE) {
-            LOGE("\"%s\" returned with value %" PRIexitcode, name, exit_code);
-        } else {
-            LOGE("\"%s\" exited unexpectedly", name);
-        }
-        return false;
-    }
-    return true;
-}
--- a/app/src/util/queue.h
+++ b/app/src/util/queue.h
@@ -2,12 +2,12 @@
 #ifndef QUEUE_H
 #define QUEUE_H

-#include "common.h"
-
 #include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>

+#include "config.h"
+
 // To define a queue type of "struct foo":
 //    struct queue_foo QUEUE(struct foo);
 #define QUEUE(TYPE) { \
--- a/app/src/util/str_util.c
+++ b/app/src/util/str_util.c
@@ -10,6 +10,10 @@
 # include <tchar.h>
 #endif

+#include <SDL2/SDL_stdinc.h>
+
+#include "config.h"
+
 size_t
 xstrncpy(char *dest, const char *src, size_t n) {
    size_t i;
@@ -47,7 +51,7 @@ truncated:
 char *
 strquote(const char *src) {
    size_t len = strlen(src);
-    char *quoted = malloc(len + 3);
+    char *quoted = SDL_malloc(len + 3);
    if (!quoted) {
        return NULL;
    }
@@ -165,7 +169,7 @@ utf8_to_wide_char(const char *utf8) {
        return NULL;
    }

-    wchar_t *wide = malloc(len * sizeof(wchar_t));
+    wchar_t *wide = SDL_malloc(len * sizeof(wchar_t));
    if (!wide) {
        return NULL;
    }
@@ -181,7 +185,7 @@ utf8_from_wide_char(const wchar_t *ws) {
        return NULL;
    }

-    char *utf8 = malloc(len);
+    char *utf8 = SDL_malloc(len);
    if (!utf8) {
        return NULL;
    }
--- a/app/src/util/str_util.h
+++ b/app/src/util/str_util.h
@@ -1,11 +1,11 @@
 #ifndef STRUTIL_H
 #define STRUTIL_H

-#include "common.h"
-
 #include <stdbool.h>
 #include <stddef.h>

+#include "config.h"
+
 // like strncpy, except:
 //  - it copies at most n-1 chars
 //  - the dest string is nul-terminated
--- a/app/src/util/thread.c
+++ b/app/src/util/thread.c
@@ -1,159 +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
-    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,9 +1,12 @@
 #include "video_buffer.h"

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

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

 bool
@@ -11,31 +14,22 @@ video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
                  bool render_expired_frames) {
    vb->fps_counter = fps_counter;

-    vb->decoding_frame = av_frame_alloc();
-    if (!vb->decoding_frame) {
+    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->rendering_frame = av_frame_alloc();
-    if (!vb->rendering_frame) {
+    if (!(vb->mutex = SDL_CreateMutex())) {
        goto error_2;
    }

-    bool ok = sc_mutex_init(&vb->mutex);
-    if (!ok) {
-        goto error_3;
-    }
-
    vb->render_expired_frames = render_expired_frames;
    if (render_expired_frames) {
-        ok = sc_cond_init(&vb->pending_frame_consumed_cond);
-        if (!ok) {
-            sc_mutex_destroy(&vb->mutex);
+        if (!(vb->rendering_frame_consumed_cond = SDL_CreateCond())) {
+            SDL_DestroyMutex(vb->mutex);
            goto error_2;
        }
        // interrupted is not used if expired frames are not rendered
@@ -45,14 +39,12 @@ video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,

    // there is initially no rendering frame, so consider it has already been
    // consumed
-    vb->pending_frame_consumed = true;
+    vb->rendering_frame_consumed = true;

    return true;

-error_3:
-    av_frame_free(&vb->rendering_frame);
 error_2:
-    av_frame_free(&vb->pending_frame);
+    av_frame_free(&vb->rendering_frame);
 error_1:
    av_frame_free(&vb->decoding_frame);
 error_0:
@@ -62,78 +54,60 @@ error_0:
 void
 video_buffer_destroy(struct video_buffer *vb) {
    if (vb->render_expired_frames) {
-        sc_cond_destroy(&vb->pending_frame_consumed_cond);
+        SDL_DestroyCond(vb->rendering_frame_consumed_cond);
    }
-    sc_mutex_destroy(&vb->mutex);
+    SDL_DestroyMutex(vb->mutex);
    av_frame_free(&vb->rendering_frame);
-    av_frame_free(&vb->pending_frame);
    av_frame_free(&vb->decoding_frame);
 }

 static void
-video_buffer_swap_decoding_frame(struct video_buffer *vb) {
-    sc_mutex_assert(&vb->mutex);
+video_buffer_swap_frames(struct video_buffer *vb) {
    AVFrame *tmp = vb->decoding_frame;
-    vb->decoding_frame = vb->pending_frame;
-    vb->pending_frame = tmp;
-}
-
-static void
-video_buffer_swap_rendering_frame(struct video_buffer *vb) {
-    sc_mutex_assert(&vb->mutex);
-    AVFrame *tmp = vb->rendering_frame;
-    vb->rendering_frame = vb->pending_frame;
-    vb->pending_frame = tmp;
+    vb->decoding_frame = vb->rendering_frame;
+    vb->rendering_frame = tmp;
 }

 void
 video_buffer_offer_decoded_frame(struct video_buffer *vb,
                                 bool *previous_frame_skipped) {
-    sc_mutex_lock(&vb->mutex);
+    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->pending_frame_consumed) {
+    } else if (!vb->rendering_frame_consumed) {
        fps_counter_add_skipped_frame(vb->fps_counter);
    }

-    video_buffer_swap_decoding_frame(vb);
+    video_buffer_swap_frames(vb);

-    *previous_frame_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);
+    mutex_unlock(vb->mutex);
 }

 const AVFrame *
-video_buffer_take_rendering_frame(struct video_buffer *vb) {
-    sc_mutex_lock(&vb->mutex);
-    assert(!vb->pending_frame_consumed);
-    vb->pending_frame_consumed = true;
-
+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);
-
-    video_buffer_swap_rendering_frame(vb);
-
    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);
-
-    // rendering_frame is only written from this thread, no need to lock
    return vb->rendering_frame;
 }

 void
 video_buffer_interrupt(struct video_buffer *vb) {
    if (vb->render_expired_frames) {
-        sc_mutex_lock(&vb->mutex);
+        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
@@ -1,45 +1,23 @@
 #ifndef VIDEO_BUFFER_H
 #define VIDEO_BUFFER_H

-#include "common.h"
-
 #include <stdbool.h>
+#include <SDL2/SDL_mutex.h>

+#include "config.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 decoder (decoding_frame)
- *  - one frame is held by the renderer (rendering_frame)
- *  - one frame is shared between the decoder and the renderer (pending_frame)
- *
- * The decoder decodes a packet into the decoding_frame (it may takes time).
- *
- * Once the frame is decoded, it calls video_buffer_offer_decoded_frame(),
- * which swaps the decoding and pending frames.
- *
- * When the renderer is notified that a new frame is available, it calls
- * video_buffer_take_rendering_frame() to retrieve it, which swaps the pending
- * and rendering frames. The frame is valid until the next call, without
- * blocking the decoder.
- */
-
 struct video_buffer {
    AVFrame *decoding_frame;
-    AVFrame *pending_frame;
    AVFrame *rendering_frame;
-
-    sc_mutex mutex;
+    SDL_mutex *mutex;
    bool render_expired_frames;
    bool interrupted;
-
-    sc_cond pending_frame_consumed_cond;
-    bool pending_frame_consumed;
-
+    SDL_cond *rendering_frame_consumed_cond;
+    bool rendering_frame_consumed;
    struct fps_counter *fps_counter;
 };

@@ -51,15 +29,18 @@ 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_offer_decoded_frame(struct video_buffer *vb,
                                 bool *previous_frame_skipped);

 // mark the rendering frame as consumed and return it
-// the frame is valid until the next call to this function
+// 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_take_rendering_frame(struct video_buffer *vb);
+video_buffer_consume_rendered_frame(struct video_buffer *vb);

 // wake up and avoid any blocking call
 void
--- a/app/tests/test_buffer_util.c
+++ b/app/tests/test_buffer_util.c
@@ -1,5 +1,3 @@
-#include "common.h"
-
 #include <assert.h>

 #include "util/buffer_util.h"
--- a/app/tests/test_cbuf.c
+++ b/app/tests/test_cbuf.c
@@ -1,5 +1,3 @@
-#include "common.h"
-
 #include <assert.h>
 #include <string.h>

--- a/app/tests/test_cli.c
+++ b/app/tests/test_cli.c
@@ -1,9 +1,8 @@
-#include "common.h"
-
 #include <assert.h>
 #include <string.h>

 #include "cli.h"
+#include "common.h"
 #include "scrcpy.h"

 static void test_flag_version(void) {
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -1,5 +1,3 @@
-#include "common.h"
-
 #include <assert.h>
 #include <string.h>

@@ -17,7 +15,7 @@ static void test_serialize_inject_keycode(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 14);

    const unsigned char expected[] = {
@@ -39,7 +37,7 @@ static void test_serialize_inject_text(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 18);

    const unsigned char expected[] = {
@@ -59,7 +57,7 @@ static void test_serialize_inject_text_long(void) {
    msg.inject_text.text = text;

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);

    unsigned char expected[5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
@@ -95,7 +93,7 @@ static void test_serialize_inject_touch_event(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 28);

    const unsigned char expected[] = {
@@ -130,7 +128,7 @@ static void test_serialize_inject_scroll_event(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 21);

    const unsigned char expected[] = {
@@ -149,7 +147,7 @@ static void test_serialize_back_or_screen_on(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@@ -164,7 +162,7 @@ static void test_serialize_expand_notification_panel(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@@ -179,7 +177,7 @@ static void test_serialize_collapse_notification_panel(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@@ -194,7 +192,7 @@ static void test_serialize_get_clipboard(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@@ -213,7 +211,7 @@ static void test_serialize_set_clipboard(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 19);

    const unsigned char expected[] = {
@@ -234,7 +232,7 @@ static void test_serialize_set_screen_power_mode(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 2);

    const unsigned char expected[] = {
@@ -250,7 +248,7 @@ static void test_serialize_rotate_device(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
+    int size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
--- a/app/tests/test_device_msg_deserialize.c
+++ b/app/tests/test_device_msg_deserialize.c
@@ -1,5 +1,3 @@
-#include "common.h"
-
 #include <assert.h>
 #include <string.h>

--- a/app/tests/test_queue.c
+++ b/app/tests/test_queue.c
@@ -1,5 +1,3 @@
-#include "common.h"
-
 #include <assert.h>

 #include "util/queue.h"
--- a/app/tests/test_strutil.c
+++ b/app/tests/test_strutil.c
@@ -1,9 +1,8 @@
-#include "common.h"
-
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <SDL2/SDL.h>

 #include "util/str_util.h"

@@ -137,7 +136,7 @@ static void test_strquote(void) {
    // add '"' at the beginning and the end
    assert(!strcmp("\"abcde\"", out));

-    free(out);
+    SDL_free(out);
 }

 static void test_utf8_truncate(void) {
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
@@ -19,9 +19,6 @@ allprojects {
        google()
        jcenter()
    }
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:deprecation"
-    }
 }

 task clean(type: Delete) {
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -17,4 +17,4 @@ endian = 'little'
 [properties]
 prebuilt_ffmpeg_shared = 'ffmpeg-4.3.1-win32-shared'
 prebuilt_ffmpeg_dev = 'ffmpeg-4.3.1-win32-dev'
-prebuilt_sdl2 = 'SDL2-2.0.14/i686-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.0.12/i686-w64-mingw32'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -17,4 +17,4 @@ endian = 'little'
 [properties]
 prebuilt_ffmpeg_shared = 'ffmpeg-4.3.1-win64-shared'
 prebuilt_ffmpeg_dev = 'ffmpeg-4.3.1-win64-dev'
-prebuilt_sdl2 = 'SDL2-2.0.14/x86_64-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.0.12/x86_64-w64-mingw32'
--- a/data/scrcpy-console.bat
+++ b/data/scrcpy-console.bat
@@ -1,4 +0,0 @@
-@echo off
-scrcpy.exe %*
-:: if the exit code is >= 1, then pause
-if errorlevel 1 pause
--- a/data/scrcpy-noconsole.vbs
+++ b/data/scrcpy-noconsole.vbs
@@ -1 +0,0 @@
-CreateObject("Wscript.Shell").Run "cmd /c scrcpy.exe", 0, false
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '1.17',
+        version: '1.16',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,7 @@
 option('compile_app', type: 'boolean', value: true, description: 'Build the client')
 option('compile_server', type: 'boolean', value: true, description: 'Build the server')
 option('crossbuild_windows', type: 'boolean', value: false, description: 'Build for Windows from Linux')
+option('windows_noconsole', type: 'boolean', value: false, description: 'Disable console on Windows (pass -mwindows flag)')
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
 option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support')
--- a/prebuilt-deps/Makefile
+++ b/prebuilt-deps/Makefile
@@ -10,31 +10,31 @@ prepare-win32: prepare-sdl2 prepare-ffmpeg-shared-win32 prepare-ffmpeg-dev-win32
 prepare-win64: prepare-sdl2 prepare-ffmpeg-shared-win64 prepare-ffmpeg-dev-win64 prepare-adb

 prepare-ffmpeg-shared-win32:
-	@./prepare-dep https://github.com/Genymobile/scrcpy/releases/download/v1.16/ffmpeg-4.3.1-win32-shared.zip \
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.3.1-win32-shared.zip \
 		357af9901a456f4dcbacd107e83a934d344c9cb07ddad8aaf80612eeab7d26d2 \
 		ffmpeg-4.3.1-win32-shared

 prepare-ffmpeg-dev-win32:
-	@./prepare-dep https://github.com/Genymobile/scrcpy/releases/download/v1.16/ffmpeg-4.3.1-win32-dev.zip \
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.3.1-win32-dev.zip \
 		230efb08e9bcf225bd474da29676c70e591fc94d8790a740ca801408fddcb78b \
 		ffmpeg-4.3.1-win32-dev

 prepare-ffmpeg-shared-win64:
-	@./prepare-dep https://github.com/Genymobile/scrcpy/releases/download/v1.16/ffmpeg-4.3.1-win64-shared.zip \
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.3.1-win64-shared.zip \
 		dd29b7f92f48dead4dd940492c7509138c0f99db445076d0a597007298a79940 \
 		ffmpeg-4.3.1-win64-shared

 prepare-ffmpeg-dev-win64:
-	@./prepare-dep https://github.com/Genymobile/scrcpy/releases/download/v1.16/ffmpeg-4.3.1-win64-dev.zip \
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.3.1-win64-dev.zip \
 		2e8038242cf8e1bd095c2978f196ff0462b122cc6ef7e74626a6af15459d8b81 \
 		ffmpeg-4.3.1-win64-dev

 prepare-sdl2:
-	@./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.14-mingw.tar.gz \
-		405eaff3eb18f2e08fe669ef9e63bc9a8710b7d343756f238619761e9b60407d \
-		SDL2-2.0.14
+	@./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.12-mingw.tar.gz \
+		e614a60f797e35ef9f3f96aef3dc6a1d786de3cc7ca6216f97e435c0b6aafc46 \
+		SDL2-2.0.12

 prepare-adb:
-	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r30.0.5-windows.zip \
-		549ba2bdc31f335eb8a504f005f77606a479cc216d6b64a3e8b64c780003661f \
+	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r30.0.4-windows.zip \
+		413182fff6c5957911e231b9e97e6be4fc6a539035e3dfb580b5c54bd5950fee \
 		platform-tools
--- a/prebuilt-deps/prepare-dep
+++ b/prebuilt-deps/prepare-dep
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 url="$1"
 sum="$2"
--- a/release.sh
+++ b/release.sh
@@ -1,2 +1,44 @@
 #!/bin/bash
-make -f release.mk
+set -e
+
+# test locally
+TESTDIR=build_test
+rm -rf "$TESTDIR"
+# run client tests with ASAN enabled
+meson "$TESTDIR" -Db_sanitize=address
+ninja -C"$TESTDIR" test
+
+# test server
+GRADLE=${GRADLE:-./gradlew}
+$GRADLE -p server check
+
+BUILDDIR=build_release
+rm -rf "$BUILDDIR"
+meson "$BUILDDIR" --buildtype release --strip -Db_lto=true
+cd "$BUILDDIR"
+ninja
+cd -
+
+# build Windows releases
+make -f Makefile.CrossWindows
+
+# the generated server must be the same everywhere
+cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win32/scrcpy-server
+cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win64/scrcpy-server
+
+# get version name
+TAG=$(git describe --tags --always)
+
+# create release directory
+mkdir -p "release-$TAG"
+cp "$BUILDDIR/server/scrcpy-server" "release-$TAG/scrcpy-server-$TAG"
+cp "dist/scrcpy-win32-$TAG.zip" "release-$TAG/"
+cp "dist/scrcpy-win64-$TAG.zip" "release-$TAG/"
+
+# generate checksums
+cd "release-$TAG"
+sha256sum "scrcpy-server-$TAG" \
+          "scrcpy-win32-$TAG.zip" \
+          "scrcpy-win64-$TAG.zip" > SHA256SUMS.txt
+
+echo "Release generated in release-$TAG/"
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Run scrcpy generated in the specified BUILDDIR.
 #
 # This provides the same feature as "ninja run", except that it is possible to
--- a/scripts/run-scrcpy.sh
+++ b/scripts/run-scrcpy.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCRCPY_SERVER_PATH="$MESON_BUILD_ROOT/server/scrcpy-server" "$MESON_BUILD_ROOT/app/scrcpy"
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 30
+    compileSdkVersion 29
    defaultConfig {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 20
-        versionName "1.17"
+        targetSdkVersion 29
+        versionCode 19
+        versionName "1.16"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
@@ -20,7 +20,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.12'
 }

 apply from: "$project.rootDir/config/android-checkstyle.gradle"
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # This script generates the scrcpy binary "manually" (without gradle).
 #
@@ -12,10 +12,10 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=1.17
+SCRCPY_VERSION_NAME=1.16

-PLATFORM=${ANDROID_PLATFORM:-30}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-30.0.0}
+PLATFORM=${ANDROID_PLATFORM:-29}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-29.0.2}

 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
 CLASSES_DIR="$BUILD_DIR/classes"
--- a/server/scripts/build-wrapper.sh
+++ b/server/scripts/build-wrapper.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Wrapper script to invoke gradle from meson
 set -e

--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -78,9 +78,7 @@ public final class CleanUp {

        if (restoreNormalPowerMode) {
            Ln.i("Restoring normal power mode");
-            if (Device.isScreenOn()) {
-                Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
-            }
+            Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -54,7 +54,7 @@ public class Controller {

    public void control() throws IOException {
        // on start, power on the device
-        if (!Device.isScreenOn()) {
+        if (!device.isScreenOn()) {
            device.injectKeycode(KeyEvent.KEYCODE_POWER);

            // dirty hack
@@ -105,13 +105,13 @@ public class Controller {
                }
                break;
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
-                Device.expandNotificationPanel();
+                device.expandNotificationPanel();
                break;
            case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
-                Device.collapsePanels();
+                device.collapsePanels();
                break;
            case ControlMessage.TYPE_GET_CLIPBOARD:
-                String clipboardText = Device.getClipboardText();
+                String clipboardText = device.getClipboardText();
                if (clipboardText != null) {
                    sender.pushClipboardText(clipboardText);
                }
@@ -130,7 +130,7 @@ public class Controller {
                }
                break;
            case ControlMessage.TYPE_ROTATE_DEVICE:
-                Device.rotateDevice();
+                device.rotateDevice();
                break;
            default:
                // do nothing
@@ -205,13 +205,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;
-
        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEVICE_ID_VIRTUAL, 0, source,
-                        0);
+                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
+                        InputDevice.SOURCE_TOUCHSCREEN, 0);
        return device.injectEvent(event);
    }

@@ -252,7 +248,7 @@ public class Controller {
    }

    private boolean pressBackOrTurnScreenOn() {
-        int keycode = Device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
+        int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
        if (keepPowerModeOff && keycode == KeyEvent.KEYCODE_POWER) {
            schedulePowerModeOff();
        }
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -25,8 +25,6 @@ public final class Device {
    public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF;
    public static final int POWER_MODE_NORMAL = SurfaceControl.POWER_MODE_NORMAL;

-    private static final ServiceManager SERVICE_MANAGER = new ServiceManager();
-
    public interface RotationListener {
        void onRotationChanged(int rotation);
    }
@@ -35,6 +33,8 @@ public final class Device {
        void onClipboardTextChanged(String text);
    }

+    private final ServiceManager serviceManager = new ServiceManager();
+
    private ScreenInfo screenInfo;
    private RotationListener rotationListener;
    private ClipboardListener clipboardListener;
@@ -54,9 +54,9 @@ public final class Device {

    public Device(Options options) {
        displayId = options.getDisplayId();
-        DisplayInfo displayInfo = SERVICE_MANAGER.getDisplayManager().getDisplayInfo(displayId);
+        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo(displayId);
        if (displayInfo == null) {
-            int[] displayIds = SERVICE_MANAGER.getDisplayManager().getDisplayIds();
+            int[] displayIds = serviceManager.getDisplayManager().getDisplayIds();
            throw new InvalidDisplayIdException(displayId, displayIds);
        }

@@ -65,7 +65,7 @@ public final class Device {
        screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
        layerStack = displayInfo.getLayerStack();

-        SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
+        serviceManager.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
            @Override
            public void onRotationChanged(int rotation) {
                synchronized (Device.this) {
@@ -81,7 +81,7 @@ public final class Device {

        if (options.getControl()) {
            // If control is enabled, synchronize Android clipboard to the computer automatically
-            ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
+            ClipboardManager clipboardManager = serviceManager.getClipboardManager();
            if (clipboardManager != null) {
                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
                    @Override
@@ -166,7 +166,7 @@ public final class Device {
            return false;
        }

-        return SERVICE_MANAGER.getInputManager().injectInputEvent(inputEvent, mode);
+        return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
    }

    public boolean injectEvent(InputEvent event) {
@@ -184,8 +184,8 @@ public final class Device {
        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
    }

-    public static boolean isScreenOn() {
-        return SERVICE_MANAGER.getPowerManager().isScreenOn();
+    public boolean isScreenOn() {
+        return serviceManager.getPowerManager().isScreenOn();
    }

    public synchronized void setRotationListener(RotationListener rotationListener) {
@@ -196,16 +196,16 @@ public final class Device {
        this.clipboardListener = clipboardListener;
    }

-    public static void expandNotificationPanel() {
-        SERVICE_MANAGER.getStatusBarManager().expandNotificationsPanel();
+    public void expandNotificationPanel() {
+        serviceManager.getStatusBarManager().expandNotificationsPanel();
    }

-    public static void collapsePanels() {
-        SERVICE_MANAGER.getStatusBarManager().collapsePanels();
+    public void collapsePanels() {
+        serviceManager.getStatusBarManager().collapsePanels();
    }

-    public static String getClipboardText() {
-        ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
+    public String getClipboardText() {
+        ClipboardManager clipboardManager = serviceManager.getClipboardManager();
        if (clipboardManager == null) {
            return null;
        }
@@ -217,7 +217,7 @@ public final class Device {
    }

    public boolean setClipboardText(String text) {
-        ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
+        ClipboardManager clipboardManager = serviceManager.getClipboardManager();
        if (clipboardManager == null) {
            return false;
        }
@@ -252,8 +252,8 @@ public final class Device {
    /**
     * Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
     */
-    public static void rotateDevice() {
-        WindowManager wm = SERVICE_MANAGER.getWindowManager();
+    public void rotateDevice() {
+        WindowManager wm = serviceManager.getWindowManager();

        boolean accelerometerRotation = !wm.isRotationFrozen();

@@ -270,7 +270,7 @@ public final class Device {
        }
    }

-    public static ContentProvider createSettingsProvider() {
-        return SERVICE_MANAGER.getActivityManager().createSettingsProvider();
+    public ContentProvider createSettingsProvider() {
+        return serviceManager.getActivityManager().createSettingsProvider();
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/InvalidEncoderException.java
+++ b/server/src/main/java/com/genymobile/scrcpy/InvalidEncoderException.java
@@ -1,23 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.media.MediaCodecInfo;
-
-public class InvalidEncoderException extends RuntimeException {
-
-    private final String name;
-    private final MediaCodecInfo[] availableEncoders;
-
-    public InvalidEncoderException(String name, MediaCodecInfo[] availableEncoders) {
-        super("There is no encoder having name '" + name + '"');
-        this.name = name;
-        this.availableEncoders = availableEncoders;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public MediaCodecInfo[] getAvailableEncoders() {
-        return availableEncoders;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -16,7 +16,6 @@ public class Options {
    private boolean showTouches;
    private boolean stayAwake;
    private String codecOptions;
-    private String encoderName;

    public Ln.Level getLogLevel() {
        return logLevel;
@@ -121,12 +120,4 @@ public class Options {
    public void setCodecOptions(String codecOptions) {
        this.codecOptions = codecOptions;
    }
-
-    public String getEncoderName() {
-        return encoderName;
-    }
-
-    public void setEncoderName(String encoderName) {
-        this.encoderName = encoderName;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -5,7 +5,6 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import android.graphics.Rect;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
 import android.media.MediaFormat;
 import android.os.IBinder;
 import android.view.Surface;
@@ -13,8 +12,6 @@ import android.view.Surface;
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

@@ -29,19 +26,17 @@ public class ScreenEncoder implements Device.RotationListener {
    private final AtomicBoolean rotationChanged = new AtomicBoolean();
    private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);

-    private String encoderName;
    private List<CodecOption> codecOptions;
    private int bitRate;
    private int maxFps;
    private boolean sendFrameMeta;
    private long ptsOrigin;

-    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps, List<CodecOption> codecOptions, String encoderName) {
+    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps, List<CodecOption> codecOptions) {
        this.sendFrameMeta = sendFrameMeta;
        this.bitRate = bitRate;
        this.maxFps = maxFps;
        this.codecOptions = codecOptions;
-        this.encoderName = encoderName;
    }

    @Override
@@ -74,7 +69,7 @@ public class ScreenEncoder implements Device.RotationListener {
        boolean alive;
        try {
            do {
-                MediaCodec codec = createCodec(encoderName);
+                MediaCodec codec = createCodec();
                IBinder display = createDisplay();
                ScreenInfo screenInfo = device.getScreenInfo();
                Rect contentRect = screenInfo.getContentRect();
@@ -155,30 +150,8 @@ public class ScreenEncoder implements Device.RotationListener {
        IO.writeFully(fd, headerBuffer);
    }

-    private static MediaCodecInfo[] listEncoders() {
-        List<MediaCodecInfo> result = new ArrayList<>();
-        MediaCodecList list = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-        for (MediaCodecInfo codecInfo : list.getCodecInfos()) {
-            if (codecInfo.isEncoder() && Arrays.asList(codecInfo.getSupportedTypes()).contains(MediaFormat.MIMETYPE_VIDEO_AVC)) {
-                result.add(codecInfo);
-            }
-        }
-        return result.toArray(new MediaCodecInfo[result.size()]);
-    }
-
-    private static MediaCodec createCodec(String encoderName) throws IOException {
-        if (encoderName != null) {
-            Ln.d("Creating encoder by name: '" + encoderName + "'");
-            try {
-                return MediaCodec.createByCodecName(encoderName);
-            } catch (IllegalArgumentException e) {
-                MediaCodecInfo[] encoders = listEncoders();
-                throw new InvalidEncoderException(encoderName, encoders);
-            }
-        }
-        MediaCodec codec = MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_VIDEO_AVC);
-        Ln.d("Using encoder: '" + codec.getName() + "'");
-        return codec;
+    private static MediaCodec createCodec() throws IOException {
+        return MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_VIDEO_AVC);
    }

    private static void setCodecOption(MediaFormat format, CodecOption codecOption) {
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -4,7 +4,6 @@ import com.genymobile.scrcpy.wrappers.ContentProvider;

 import android.graphics.Rect;
 import android.media.MediaCodec;
-import android.media.MediaCodecInfo;
 import android.os.BatteryManager;
 import android.os.Build;

@@ -27,7 +26,7 @@ public final class Server {
        boolean mustDisableShowTouchesOnCleanUp = false;
        int restoreStayOn = -1;
        if (options.getShowTouches() || options.getStayAwake()) {
-            try (ContentProvider settings = Device.createSettingsProvider()) {
+            try (ContentProvider settings = device.createSettingsProvider()) {
                if (options.getShowTouches()) {
                    String oldValue = settings.getAndPutValue(ContentProvider.TABLE_SYSTEM, "show_touches", "1");
                    // If "show touches" was disabled, it must be disabled back on clean up
@@ -55,17 +54,14 @@ public final class Server {
        boolean tunnelForward = options.isTunnelForward();

        try (DesktopConnection connection = DesktopConnection.open(device, tunnelForward)) {
-            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps(), codecOptions,
-                    options.getEncoderName());
+            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps(), codecOptions);

-            Thread controllerThread = null;
-            Thread deviceMessageSenderThread = null;
            if (options.getControl()) {
                final Controller controller = new Controller(device, connection);

                // asynchronous
-                controllerThread = startController(controller);
-                deviceMessageSenderThread = startDeviceMessageSender(controller.getSender());
+                startController(controller);
+                startDeviceMessageSender(controller.getSender());

                device.setClipboardListener(new Device.ClipboardListener() {
                    @Override
@@ -81,19 +77,12 @@ public final class Server {
            } catch (IOException e) {
                // this is expected on close
                Ln.d("Screen streaming stopped");
-            } finally {
-                if (controllerThread != null) {
-                    controllerThread.interrupt();
-                }
-                if (deviceMessageSenderThread != null) {
-                    deviceMessageSenderThread.interrupt();
-                }
            }
        }
    }

-    private static Thread startController(final Controller controller) {
-        Thread thread = new Thread(new Runnable() {
+    private static void startController(final Controller controller) {
+        new Thread(new Runnable() {
            @Override
            public void run() {
                try {
@@ -103,13 +92,11 @@ public final class Server {
                    Ln.d("Controller stopped");
                }
            }
-        });
-        thread.start();
-        return thread;
+        }).start();
    }

-    private static Thread startDeviceMessageSender(final DeviceMessageSender sender) {
-        Thread thread = new Thread(new Runnable() {
+    private static void startDeviceMessageSender(final DeviceMessageSender sender) {
+        new Thread(new Runnable() {
            @Override
            public void run() {
                try {
@@ -119,9 +106,7 @@ public final class Server {
                    Ln.d("Device message sender stopped");
                }
            }
-        });
-        thread.start();
-        return thread;
+        }).start();
    }

    private static Options createOptions(String... args) {
@@ -135,7 +120,7 @@ public final class Server {
                    "The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
        }

-        final int expectedParameters = 15;
+        final int expectedParameters = 14;
        if (args.length != expectedParameters) {
            throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");
        }
@@ -182,9 +167,6 @@ public final class Server {
        String codecOptions = args[13];
        options.setCodecOptions(codecOptions);

-        String encoderName = "-".equals(args[14]) ? null : args[14];
-        options.setEncoderName(encoderName);
-
        return options;
    }

@@ -224,15 +206,6 @@ public final class Server {
                    Ln.e("    scrcpy --display " + id);
                }
            }
-        } else if (e instanceof InvalidEncoderException) {
-            InvalidEncoderException iee = (InvalidEncoderException) e;
-            MediaCodecInfo[] encoders = iee.getAvailableEncoders();
-            if (encoders != null && encoders.length > 0) {
-                Ln.e("Try to use one of the available encoders:");
-                for (MediaCodecInfo encoder : encoders) {
-                    Ln.e("    scrcpy --encoder-name '" + encoder.getName() + "'");
-                }
-            }
        }
    }

--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`CreateObject("Wscript.Shell").Run "cmd /c scrcpy.exe", 0, false`