Add Japanese translation for README.md

PR #2195 <https://github.com/Genymobile/scrcpy/pull/2195> Signed-off-by: Romain Vimont <rom@rom1v.com>
2021-03-16 22:01:29 +01:00
101 changed files with 1865 additions and 3273 deletions
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,43 +2,11 @@

 Here are the instructions to build _scrcpy_ (client and server).

+You may want to build only the client: the server binary, which will be pushed
+to the Android device, does not depend on your system and architecture. In that
+case, use the [prebuilt server] (so you will not need Java or the Android SDK).

-## Simple
-
-If you just want to install the latest release from `master`, follow this
-simplified process.
-
-First, you need to install the required packages:
-
-```bash
-# for Debian/Ubuntu
-sudo apt install ffmpeg libsdl2-2.0-0 adb wget \
-                 gcc git pkg-config meson ninja-build libsdl2-dev \
-                 libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev
-```
-
-Then clone the repo and execute the installation script
-([source](install_release.sh)):
-
-```bash
-git clone https://github.com/Genymobile/scrcpy
-cd scrcpy
-./install_release.sh
-```
-
-When a new release is out, update the repo and reinstall:
-
-```bash
-git pull
-./install_release.sh
-```
-
-To uninstall:
-
-```bash
-sudo ninja -Cbuild-auto uninstall
-```
-
+[prebuilt server]: #prebuilt-server

 ## Branches

@@ -91,8 +59,9 @@ Install the required packages from your package manager.
 sudo apt install ffmpeg libsdl2-2.0-0 adb

 # client build dependencies
-sudo apt install gcc git pkg-config meson ninja-build libsdl2-dev \
-                 libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev
+sudo apt install gcc git pkg-config meson ninja-build \
+                 libavcodec-dev libavformat-dev libavutil-dev \
+                 libsdl2-dev

 # server build dependencies
 sudo apt install openjdk-11-jdk
@@ -204,12 +173,12 @@ brew install pkg-config meson
 ```

 Additionally, if you want to build the server, install Java 8 from Caskroom, and
-make it available from the `PATH`:
+make it avaliable from the `PATH`:

 ```bash
 brew tap homebrew/cask-versions
-brew install adoptopenjdk/openjdk/adoptopenjdk11
-export JAVA_HOME="$(/usr/libexec/java_home --version 1.11)"
+brew cask install adoptopenjdk/openjdk/adoptopenjdk8
+export JAVA_HOME="$(/usr/libexec/java_home --version 1.8)"
 export PATH="$JAVA_HOME/bin:$PATH"
 ```

@@ -220,27 +189,8 @@ See [pierlon/scrcpy-docker](https://github.com/pierlon/scrcpy-docker).

 ## Common steps

-**As a non-root user**, clone the project:
-
-```bash
-git clone https://github.com/Genymobile/scrcpy
-cd scrcpy
-```
-
-
-### Build
-
-You may want to build only the client: the server binary, which will be pushed
-to the Android device, does not depend on your system and architecture. In that
-case, use the [prebuilt server] (so you will not need Java or the Android SDK).
-
-[prebuilt server]: #option-2-use-prebuilt-server
-
-
-#### Option 1: Build everything from sources
-
-Install the [Android SDK] (_Android Studio_), and set `ANDROID_SDK_ROOT` to its
-directory. For example:
+If you want to build the server, install the [Android SDK] (_Android Studio_),
+and set `ANDROID_SDK_ROOT` to its directory. For example:

 [Android SDK]: https://developer.android.com/studio/index.html

@@ -253,11 +203,20 @@ export ANDROID_SDK_ROOT=~/Library/Android/sdk
 set ANDROID_SDK_ROOT=%LOCALAPPDATA%\Android\sdk
 ```

+If you don't want to build the server, use the [prebuilt server].
+
+Clone the project:
+
+```bash
+git clone https://github.com/Genymobile/scrcpy
+cd scrcpy
+```
+
 Then, build:

 ```bash
 meson x --buildtype release --strip -Db_lto=true
-ninja -Cx  # DO NOT RUN AS ROOT
+ninja -Cx
 ```

 _Note: `ninja` [must][ninja-user] be run as a non-root user (only `ninja
@@ -266,27 +225,9 @@ install` must be run as root)._
 [ninja-user]: https://github.com/Genymobile/scrcpy/commit/4c49b27e9f6be02b8e63b508b60535426bd0291a


-#### Option 2: Use prebuilt server
+### Run

- - [`scrcpy-server-v1.17`][direct-scrcpy-server]  
-   _(SHA-256: 11b5ad2d1bc9b9730fb7254a78efd71a8ff46b1938ff468e47a21b653a1b6725)_
-
-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-server-v1.17
-
-Download the prebuilt server somewhere, and specify its path during the Meson
-configuration:
-
-```bash
-meson x --buildtype release --strip -Db_lto=true \
-    -Dprebuilt_server=/path/to/scrcpy-server
-ninja -Cx  # DO NOT RUN AS ROOT
-```
-
-The server only works with a matching client version (this server works with the
-`master` branch).
-
-
-### Run without installing:
+To run without installing:

 ```bash
 ./run x [options]
@@ -301,16 +242,32 @@ After a successful build, you can install _scrcpy_ on the system:
 sudo ninja -Cx install    # without sudo on Windows
 ```

-This installs three files:
+This installs two files:

 - `/usr/local/bin/scrcpy`
 - `/usr/local/share/scrcpy/scrcpy-server`
- - `/usr/local/share/man/man1/scrcpy.1`
+
+Just remove them to "uninstall" the application.

 You can then [run](README.md#run) _scrcpy_.

-### Uninstall
+
+## Prebuilt server
+
+ - [`scrcpy-server-v1.17`][direct-scrcpy-server]  
+   _(SHA-256: 11b5ad2d1bc9b9730fb7254a78efd71a8ff46b1938ff468e47a21b653a1b6725_
+
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-server-v1.17
+
+Download the prebuilt server somewhere, and specify its path during the Meson
+configuration:

 ```bash
-sudo ninja -Cx uninstall  # without sudo on Windows
+meson x --buildtype release --strip -Db_lto=true \
+    -Dprebuilt_server=/path/to/scrcpy-server
+ninja -Cx
+sudo ninja -Cx install
 ```
+
+The server only works with a matching client version (this server works with the
+`master` branch).
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -211,7 +211,7 @@ There are two [frames][video_buffer] simultaneously in memory:
 - the **rendering** frame, rendered in a texture from the main thread.

 When a new decoded frame is available, the decoder _swaps_ the decoding and
-rendering frame (with proper synchronization). Thus, it immediately starts
+rendering frame (with proper synchronization). Thus, it immediatly starts
 to decode a new frame while the main thread renders the last one.

 If a [recorder] is present (i.e. `--record` is enabled), then it muxes the raw
--- a/README.id.md
+++ b/README.id.md
@@ -69,7 +69,10 @@ Anda juga bisa [membangun aplikasi secara manual][BUILD] (jangan khawatir, tidak

 Untuk Windows, untuk kesederhanaan, arsip prebuilt dengan semua dependensi (termasuk `adb`) tersedia :

- - [README](README.md#windows)
+ - [`scrcpy-win64-v1.16.zip`][direct-win64]  
+   _(SHA-256: 3f30dc5db1a2f95c2b40a0f5de91ec1642d9f53799250a8c529bc882bc0918f0)_
+
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.16/scrcpy-win64-v1.16.zip

 Ini juga tersedia di [Chocolatey]:

--- a/README.jp.md
+++ b/README.jp.md
@@ -2,7 +2,12 @@ _Only the original [README](README.md) is guaranteed to be up-to-date._

 # scrcpy (v1.17)

-このアプリケーションはUSB(もしくは[TCP/IP経由][article-tcpip])で接続されたAndroidデバイスの表示と制御を提供します。このアプリケーションは _root_ でのアクセスを必要としません。このアプリケーションは _GNU/Linux_ 、 _Windows_ そして _macOS_ 上で動作します。
+[他の言語で読む](#translations)
+
+このアプリケーションはUSB(もしくは[TCP/IP経由][article-tcpip])で接続された
+Androidデバイスの表示と制御を提供します。このアプリケーションは  _root_ でのアクセス
+を必要としません。
+このアプリケーションは　_GNU/Linux_, _Windows_ そして _macOS_　上で動作します。

 ![screenshot](assets/screenshot-debian-600.jpg)

@@ -10,10 +15,10 @@ _Only the original [README](README.md) is guaranteed to be up-to-date._

 - **軽量** (ネイティブ、デバイス画面表示のみ)
 - **パフォーマンス**　(30~60fps)
- - **クオリティ**　(1920x1080以上)
+ - **クオリティ**　(1920x1018以上)
 - **低遅延**　([35~70ms][lowlatency])
 - **短い起動時間**　(初回画像を1秒以内に表示)
- - **非侵入型**　(デバイスに何もインストールされていない状態になる)
+ - **非侵入型**　(デバイスに何もインストールされない)

 [lowlatency]: https://github.com/Genymobile/scrcpy/pull/646

@@ -26,7 +31,8 @@ Androidデバイスで[adbデバッグが有効][enable-adb]であること。

 [enable-adb]: https://developer.android.com/studio/command-line/adb.html#Enabling

-一部のAndroidデバイスでは、キーボードとマウスを使用して制御する[追加オプション][control]を有効にする必要がある。
+一部ののAndroidデバイスでは、キーボードとマウスを使用して制御する[追加オプション][control]
+を有効にする必要がある。

 [control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323

@@ -71,7 +77,10 @@ Gentoo用[Ebuild]が利用可能: [`scrcpy`][ebuild-link]

 Windowsでは簡単に、（`adb`を含む）すべての依存関係を構築済みのアーカイブを利用可能です。

- - [README](README.md#windows)
+ - [`scrcpy-win64-v1.17.zip`][direct-win64]  
+   _(SHA-256: 8b9e57993c707367ed10ebfe0e1ef563c7a29d9af4a355cd8b6a52a317c73eea)_
+
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-win64-v1.17.zip

 [Chocolatey]でも利用可能です:

@@ -79,14 +88,14 @@ Windowsでは簡単に、（`adb`を含む）すべての依存関係を構築

 ```bash
 choco install scrcpy
-choco install adb    # まだ入手していない場合
+choco install adb    # if you don't have it yet
 ```

 [Scoop]でも利用可能です:

 ```bash
 scoop install scrcpy
-scoop install adb    # まだ入手していない場合
+scoop install adb    # if you don't have it yet
 ```

 [Scoop]: https://scoop.sh
@@ -136,16 +145,18 @@ scrcpy --help

 #### サイズ削減

-Androidデバイスを低解像度でミラーリングする場合、パフォーマンス向上に便利な場合があります。
+Androidデバイスを低解像度でミラーリングする場合、パフォーマンス向上に便利な
+場合があります。

-幅と高さをある値(例：1024)に制限するには:
+幅と高さをある値に制限するには(例：1024):

 ```bash
 scrcpy --max-size 1024
-scrcpy -m 1024  # 短縮版
+scrcpy -m 1024  # short version
 ```

-一方のサイズはデバイスのアスペクト比が維持されるように計算されます。この方法では、1920x1080のデバイスでは1024x576にミラーリングされます。
+一方のサイズはデバイスのアスペクト比が維持されるように計算されます。
+この方法では、1920x1080のデバイスでは1024x576にミラーリングされます。


 #### ビットレート変更
@@ -154,7 +165,7 @@ scrcpy -m 1024  # 短縮版

 ```bash
 scrcpy --bit-rate 2M
-scrcpy -b 2M  # 短縮版
+scrcpy -b 2M  # short version
 ```

 #### フレームレート制限
@@ -165,7 +176,8 @@ scrcpy -b 2M  # 短縮版
 scrcpy --max-fps 15
 ```

-この機能はAndroid 10からオフィシャルサポートとなっていますが、以前のバージョンでも動作する可能性があります。
+この機能はAndroid 10からオフィシャルサポートとなっていますが、以前のバージョンでも
+動作する可能性があります。

 #### トリミング

@@ -174,7 +186,7 @@ scrcpy --max-fps 15
 これは、例えばOculus Goの片方の目をミラーリングする場合に便利です。:

 ```bash
-scrcpy --crop 1224:1440:0:0   # オフセット位置(0,0)で1224x1440
+scrcpy --crop 1224:1440:0:0   # 1224x1440 at offset (0,0)
 ```

 もし`--max-size`も指定されている場合、トリミング後にサイズ変更が適用されます。
@@ -184,27 +196,30 @@ scrcpy --crop 1224:1440:0:0   # オフセット位置(0,0)で1224x1440
 ミラーリングの向きをロックするには:

 ```bash
-scrcpy --lock-video-orientation 0   # 自然な向き
-scrcpy --lock-video-orientation 1   # 90°反時計回り
+scrcpy --lock-video-orientation 0   # natural orientation
+scrcpy --lock-video-orientation 1   # 90° counterclockwise
 scrcpy --lock-video-orientation 2   # 180°
-scrcpy --lock-video-orientation 3   # 90°時計回り
+scrcpy --lock-video-orientation 3   # 90° clockwise
 ```

 この設定は録画の向きに影響します。

-[ウィンドウは独立して回転することもできます](#回転)。
+[ウィンドウは独立して回転することもできます](#rotation)。


 #### エンコーダ

-いくつかのデバイスでは一つ以上のエンコーダを持ちます。それらのいくつかは、問題やクラッシュを引き起こします。別のエンコーダを選択することが可能です:
+いくつかのデバイスでは一つ以上のエンコーダを持ちます。それらのいくつかは、
+問題やクラッシュを引き起こします。
+別のエンコーダを選択することが可能です:


 ```bash
 scrcpy --encoder OMX.qcom.video.encoder.avc
 ```

-利用可能なエンコーダをリストするために、無効なエンコーダ名を渡すことができます。エラー表示で利用可能なエンコーダを提供します。
+利用可能なエンコーダをリストするために、無効なエンコーダ名を渡すことができます。
+エラーでは利用可能なエンコーダを提供します。

 ```bash
 scrcpy --encoder _
@@ -227,9 +242,11 @@ scrcpy -Nr file.mkv
 # Ctrl+Cで録画を中断する
 ```

-"スキップされたフレーム"は(パフォーマンス上の理由で)リアルタイムで表示されなくても録画されます。
+"スキップされたフレーム"はリアルタイムで表示されなくても録画されます
+(パフォーマンス上の理由)。

-フレームはデバイス上で _タイムスタンプされる_ ため [パケット遅延のバリエーション] は録画されたファイルに影響を与えません。
+フレームはデバイス上で _タイムスタンプされる_ ため [パケット遅延のバリエーション] は
+録画されたファイルに影響を与えません。

 [パケット遅延のバリエーション]: https://en.wikipedia.org/wiki/Packet_delay_variation

@@ -238,10 +255,12 @@ scrcpy -Nr file.mkv

 #### ワイヤレス

-_Scrcpy_ はデバイスとの通信に`adb`を使用します。そして`adb`はTCP/IPを介しデバイスに[接続]することができます:
+_Scrcpy_ はデバイスとの通信に`adb`を使用します。そして`adb`はTCP/IPを介し
+デバイスに[接続]することができます:

 1. あなたのコンピュータと同じWi-Fiに接続します。
-2. あなたのIPアドレスを取得します。設定 → 端末情報 → ステータス情報、もしくは、このコマンドを実行します:
+2. あなたのIPアドレスを取得します。設定 → 端末情報 → ステータス情報、
+   もしくは、このコマンドを実行します:

    ```bash
    adb shell ip route | awk '{print $9}'
@@ -253,11 +272,11 @@ _Scrcpy_ はデバイスとの通信に`adb`を使用します。そして`adb`
 `adb connect DEVICE_IP:5555` _(`DEVICE_IP`は置き換える)_
 6. 通常通り`scrcpy`を実行します。

-この方法はビットレートと解像度を減らすのにおそらく有用です:
+この方法はビットレートと定義を減らすのにおそらく有用です:

 ```bash
 scrcpy --bit-rate 2M --max-size 800
-scrcpy -b2M -m800  # 短縮版
+scrcpy -b2M -m800  # short version
 ```

 [接続]: https://developer.android.com/studio/command-line/adb.html#wireless
@@ -265,18 +284,19 @@ scrcpy -b2M -m800  # 短縮版

 #### マルチデバイス

-もし`adb devices`でいくつかのデバイスがリストされる場合、 _シリアルナンバー_ を指定する必要があります:
+もし`adb devices`でいくつかのデバイスがリストされる場合、 _シリアルナンバー_ を
+指定する必要があります:

 ```bash
 scrcpy --serial 0123456789abcdef
-scrcpy -s 0123456789abcdef  # 短縮版
+scrcpy -s 0123456789abcdef  # short version
 ```

 デバイスがTCP/IPを介して接続されている場合:

 ```bash
 scrcpy --serial 192.168.0.1:5555
-scrcpy -s 192.168.0.1:5555  # 短縮版
+scrcpy -s 192.168.0.1:5555  # short version
 ```

 複数のデバイスに対して、複数の _scrcpy_ インスタンスを開始することができます。
@@ -293,12 +313,13 @@ autoadb scrcpy -s '{}'

 #### SSHトンネル

-リモートデバイスに接続するため、ローカル`adb`クライアントからリモート`adb`サーバーへ接続することが可能です(同じバージョンの _adb_ プロトコルを使用している場合):
+リモートデバイスに接続するため、ローカル`adb`クライアントからリモート`adb`サーバーへ
+接続することが可能です(同じバージョンの _adb_ プロトコルを使用している場合):

 ```bash
-adb kill-server    # 5037ポートのローカルadbサーバーを終了する
+adb kill-server    # kill the local adb server on 5037
 ssh -CN -L5037:localhost:5037 -R27183:localhost:27183 your_remote_computer
-# オープンしたままにする
+# keep this open
 ```

 他の端末から:
@@ -307,12 +328,13 @@ ssh -CN -L5037:localhost:5037 -R27183:localhost:27183 your_remote_computer
 scrcpy
 ```

-リモートポート転送の有効化を回避するためには、代わりに転送接続を強制することができます(`-R`の代わりに`-L`を使用することに注意):
+リモートポート転送の有効化を回避するためには、代わりに転送接続を
+強制することができます(`-R`の代わりに`-L`を使用することに注意):

 ```bash
-adb kill-server    # 5037ポートのローカルadbサーバーを終了する
+adb kill-server    # kill the local adb server on 5037
 ssh -CN -L5037:localhost:5037 -L27183:localhost:27183 your_remote_computer
-# オープンしたままにする
+# keep this open
 ```

 他の端末から:
@@ -368,7 +390,7 @@ scrcpy --always-on-top

 ```bash
 scrcpy --fullscreen
-scrcpy -f  # 短縮版
+scrcpy -f  # short version
 ```

 フルスクリーンは、次のコマンドで動的に切り替えることができます <kbd>MOD</kbd>+<kbd>f</kbd>
@@ -388,18 +410,24 @@ scrcpy --rotation 1
 - `2`: 180°
 - `3`: 90° 時計回り

-回転は次のコマンドで動的に変更することができます。 <kbd>MOD</kbd>+<kbd>←</kbd>_(左)_ 、 <kbd>MOD</kbd>+<kbd>→</kbd>_(右)_
+回転は次のコマンドで動的に変更することができます。 <kbd>MOD</kbd>+<kbd>←</kbd>
+_(左)_ 、 <kbd>MOD</kbd>+<kbd>→</kbd> _(右)_

 _scrcpy_ は3つの回転を管理することに注意:
- - <kbd>MOD</kbd>+<kbd>r</kbd>はデバイスに縦向きと横向きの切り替えを要求する(現在実行中のアプリで要求している向きをサポートしていない場合、拒否することがある)
- - [`--lock-video-orientation`](#ビデオの向きをロックする)は、ミラーリングする向きを変更する(デバイスからPCへ送信される向き)。録画に影響します。
- - `--rotation` (もしくは<kbd>MOD</kbd>+<kbd>←</kbd>/<kbd>MOD</kbd>+<kbd>→</kbd>)は、ウィンドウのコンテンツのみを回転します。これは表示にのみに影響し、録画には影響しません。
+ - <kbd>MOD</kbd>+<kbd>r</kbd>はデバイスに縦向きと横向きの切り替えを要求する
+   (現在実行中のアプリで要求している向きをサポートしている場合、拒否する場合がある)
+ - [`--lock-video-orientation`](#lock-video-orientation)は、ミラーリングする向きを
+    変更する(デバイスからPCへ送信される向き)。録画に影響します。
+ - `--rotation` (もしくは<kbd>MOD</kbd>+<kbd>←</kbd>/<kbd>MOD</kbd>+<kbd>→</kbd>)
+    は、ウィンドウのコンテンツのみを回転します。これは表示にのみに影響し、録画
+    には影響しません。

 ### 他のミラーリングオプション

 #### Read-only　リードオンリー

-制御を無効にするには(デバイスと対話する全てのもの:入力キー、マウスイベント、ファイルのドラッグ&ドロップ):
+制御を無効にするには(デバイスと対話する全てのもの:入力キー、マウスイベント、ファイル
+のドラッグ&ドロップ):

 ```bash
 scrcpy --no-control
@@ -420,7 +448,8 @@ scrcpy --display 1
 adb shell dumpsys display   # search "mDisplayId=" in the output
 ```

-セカンダリディスプレイは、デバイスが少なくともAndroid 10の場合にコントロール可能です。(それ以外ではリードオンリーでミラーリングされます)
+セカンダリディスプレイは、デバイスが少なくともAndroid 10の場合にコントロール可能です。
+(それ以外ではリードオンリーでミラーリングされます)


 #### 起動状態にする
@@ -432,11 +461,12 @@ scrcpy --stay-awake
 scrcpy -w
 ```

-scrcpyが閉じられた時、初期状態に復元されます。
+初期状態はscrcpyが閉じられた時に保存されます。

 #### 画面OFF

-コマンドラインオプションを使用することで、ミラーリングの開始時にデバイスの画面をOFFにすることができます:
+コマンドラインオプションを使用することで、ミラーリングの開始時にデバイスの画面を
+OFFにすることができます:

 ```bash
 scrcpy --turn-screen-off
@@ -447,7 +477,11 @@ scrcpy -S

 元に戻すには、<kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>を押します。

-Androidでは、`POWER`ボタンはいつでも画面を表示します。便宜上、`POWER`がscrcpyを介して(右クリックもしくは<kbd>MOD</kbd>+<kbd>p</kbd>を介して)送信される場合、(ベストエフォートベースで)少し遅れて、強制的に画面を非表示にします。ただし、物理的な`POWER`ボタンを押した場合は、画面は表示されます。
+Androidでは、`POWER`ボタンはいつでも画面を表示します。
+便宜上、`POWER`がscrcpyを介して(右クリックもしくは<kbd>MOD</kbd>+<kbd>p</kbd>を
+介して)送信される場合、(ベストエフォートベースで)少し遅れて、強制的に画面を
+非表示にします。
+物理的な`POWER`ボタンを押しても画面は表示されます。

 このオプションはデバイスがスリープしないようにすることにも役立ちます:

@@ -459,7 +493,8 @@ scrcpy -Sw

 #### 期限切れフレームをレンダリングする

-初期状態では、待ち時間を最小限にするために、_scrcpy_ は最後にデコードされたフレームをレンダリングし、前のフレームを削除します。
+初期状態では、待ち時間を最小限にするために、_scrcpy_ は最後にデコードされたフレーム
+を使用可能にレンダリングし、前のフレームを削除します。

 全フレームのレンダリングを強制するには(待ち時間が長くなる可能性があります):

@@ -473,7 +508,8 @@ scrcpy --render-expired-frames

 Androidはこの機能を _開発者オプション_ で提供します。

-_Scrcpy_　は開始時にこの機能を有効にし、終了時に初期値を復元するオプションを提供します:
+_Scrcpy_　は開始時にこの機能を有効にし、終了時に初期値を復元するオプションを
+提供します:

 ```bash
 scrcpy --show-touches
@@ -485,7 +521,8 @@ scrcpy -t

 #### スクリーンセーバー無効

-初期状態では、scrcpyはコンピュータ上でスクリーンセーバーが実行される事を妨げません。
+初期状態では、scrcpyはコンピュータ上でスクリーンセーバーが実行される事を
+妨げません。

 これを無効にするには:

@@ -500,39 +537,60 @@ scrcpy --disable-screensaver

 <kbd>MOD</kbd>+<kbd>r</kbd>を押すことで、縦向きと横向きを切り替えます。

-フォアグラウンドのアプリケーションが要求された向きをサポートしている場合のみ回転することに注意してください。
+フォアグラウンドのアプリケーションが要求された向きをサポートしている場合のみ
+回転することに注意してください。

 #### コピー-ペースト

-Androidのクリップボードが変更される度に、コンピュータのクリップボードに自動的に同期されます。
+Androidのクリップボードが変更される度に、コンピュータのクリップボードに
+自動的に同期されます。

 <kbd>Ctrl</kbd>のショートカットは全てデバイスに転送されます。特に:
 - <kbd>Ctrl</kbd>+<kbd>c</kbd> 通常はコピーします
 - <kbd>Ctrl</kbd>+<kbd>x</kbd> 通常はカットします
- - <kbd>Ctrl</kbd>+<kbd>v</kbd> 通常はペーストします(コンピュータとデバイスのクリップボードが同期された後)
+ - <kbd>Ctrl</kbd>+<kbd>v</kbd> 通常はペーストします(コンピュータとデバイスの
+  クリップボードが同期された後)

 通常は期待通りに動作します。

-しかしながら、実際の動作はアクティブなアプリケーションに依存します。例えば、_Termux_ は代わりに<kbd>Ctrl</kbd>+<kbd>c</kbd>でSIGINTを送信します、そして、_K-9 Mail_ は新しいメッセージを作成します。
+しかしながら、実際の動作はアクティブなアプリケーションに依存します。例えば、
+_Termux_ は代わりに<kbd>Ctrl</kbd>+<kbd>c</kbd>でSIGINTを送信します、そして、
+_K-9 Mail_ は新しいメッセージを作成します。

-このようなケースでコピー、カットそしてペーストをするには(Android 7以上でのサポートのみですが):
+このようなケースでコピー、カットそしてペーストをするには(Android 7以上での
+サポートのみですが):
 - <kbd>MOD</kbd>+<kbd>c</kbd> `COPY`を挿入
 - <kbd>MOD</kbd>+<kbd>x</kbd> `CUT`を挿入
- - <kbd>MOD</kbd>+<kbd>v</kbd> `PASTE`を挿入(コンピュータとデバイスのクリップボードが同期された後)
+ - <kbd>MOD</kbd>+<kbd>v</kbd> `PASTE`を挿入(コンピュータとデバイスの
+  クリップボードが同期された後)

-加えて、<kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>はコンピュータのクリップボードテキストにキーイベントのシーケンスとして挿入することを許可します。これはコンポーネントがテキストのペーストを許可しない場合(例えば _Termux_)に有用ですが、非ASCIIコンテンツを壊す可能性があります。
+加えて、<kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>はコンピュータの
+クリップボードテキストにキーイベントのシーケンスとして挿入することを許可します。
+これはコンポーネントがテキストのペーストを許可しない場合(例えば _Termux_)に
+有用ですが、非ASCIIコンテンツを壊す可能性があります。

-**警告:** デバイスにコンピュータのクリップボードを(<kbd>Ctrl</kbd>+<kbd>v</kbd>または<kbd>MOD</kbd>+<kbd>v</kbd>を介して)ペーストすることは、デバイスのクリップボードにコンテンツをコピーします。結果としてどのAndoridアプリケーションもそのコンテンツを読み取ることができます。機密性の高いコンテンツ(例えばパスワードなど)をこの方法でペーストすることは避けてください。
+**警告:** デバイスにコンピュータのクリップボードを(<kbd>Ctrl</kbd>+<kbd>v</kbd>
+または<kbd>MOD</kbd>+<kbd>v</kbd>を介して)ペーストすることは、デバイスの
+クリップボードにコンテンツをコピーします。結果としてどのAndoridアプリケーションも
+そのコンテンツを読み取ることができます。機密性の高いコンテンツ(例えばパスワードなど)
+をこの方法でペーストすることは避けてください。

-プログラムでデバイスのクリップボードを設定した場合、一部のデバイスは期待どおりに動作しません。`--legacy-paste`オプションは、コンピュータのクリップボードテキストをキーイベントのシーケンスとして挿入するため(<kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>と同じ方法)、<kbd>Ctrl</kbd>+<kbd>v</kbd>と<kbd>MOD</kbd>+<kbd>v</kbd>の動作の変更を提供します。
+プログラムでデバイスのクリップボードを設定した場合、一部のデバイスは期待どおりに
+動作しません。`--legacy-paste`オプションは、コンピュータのクリップボードテキストを
+キーイベントのシーケンスとして挿入するため(<kbd>MOD</kbd>+<kbd>Shift</kbd>
+<kbd>v</kbd>と同じ方法)、<kbd>Ctrl</kbd>+<kbd>v</kbd>と
+<kbd>MOD</kbd>+<kbd>v</kbd>の動作の変更を提供します。

 #### ピンチしてズームする

-"ピンチしてズームする"をシミュレートするには: <kbd>Ctrl</kbd>+_クリック&移動_
+"ピンチしてズームする"をシミュレートするには: <kbd>Ctrl</kbd>+_click-and-move_

-より正確にするには、左クリックボタンを押している間、<kbd>Ctrl</kbd>を押したままにします。左クリックボタンを離すまで、全てのマウスの動きは、(アプリでサポートされている場合)画面の中心を基準として、コンテンツを拡大縮小および回転します。
+より正確にするには、左クリックボタンを押している間、<kbd>Ctrl</kbd>を
+押したままにします。左クリックボタンを離すまで、全てのマウスの動きは、(アプリでサポート
+されている場合)画面の中心を基準として、コンテンツを拡大縮小および回転します。

-具体的には、scrcpyは画面の中央を反転した位置にある"バーチャルフィンガー"から追加のタッチイベントを生成します。
+具体的には、scrcpyは画面の中央を反転した位置にある"バーチャルフィンガー"から
+追加のタッチイベントを生成します。


 #### テキストインジェクション環境設定
@@ -541,9 +599,11 @@ Androidのクリップボードが変更される度に、コンピュータの
 - _key events_　はキーを押したときと離したことを通知します。
 - _text events_　はテキストが入力されたことを通知します。

-初期状態で、文字はキーイベントで挿入されるため、キーボードはゲームで期待通りに動作します(通常はWASDキー)。
+初期状態で、文字はキーイベントで挿入されるため、キーボードはゲームで期待通りに
+動作します(通常はWASDキー)。

-しかし、これは[問題を引き起こす][prefertext]かもしれません。もしこのような問題が発生した場合は、この方法で回避できます:
+しかし、これは[問題を引き起こす][prefertext]かもしれません。もしこのような問題が
+発生した場合は、この方法で回避できます:

 ```bash
 scrcpy --prefer-text
@@ -557,7 +617,9 @@ scrcpy --prefer-text

 #### キーの繰り返し

-初期状態では、キーの押しっぱなしは繰り返しのキーイベントを生成します。これらのイベントが使われない場合でも、この方法は一部のゲームでパフォーマンスの問題を引き起す可能性があります。
+初期状態では、キーの押しっぱなしは繰り返しのキーイベントを生成します。
+これらのイベントが使われない場合でも、この方法は一部のゲームでパフォーマンスの
+問題を引き起す可能性があります。

 繰り返しのキーイベントの転送を回避するためには:

@@ -568,7 +630,9 @@ scrcpy --no-key-repeat

 #### 右クリックと真ん中クリック

-初期状態では、右クリックはバックの動作(もしくはパワーオン)を起こし、真ん中クリックではホーム画面へ戻ります。このショートカットを無効にし、代わりにデバイスへクリックを転送するには:
+初期状態では、右クリックはバックの動作(もしくはパワーオン)を起こし、真ん中クリック
+ではホーム画面へ戻ります。このショートカットを無効にし、代わりにデバイスへクリックを
+転送するには:

 ```bash
 scrcpy --forward-all-clicks
@@ -579,14 +643,16 @@ scrcpy --forward-all-clicks

 #### APKのインストール

-APKをインストールするには、(`.apk`で終わる)APKファイルを _scrcpy_ の画面にドラッグ&ドロップします。
+APKをインストールするには、(`.apk`で終わる)APKファイルを _scrcpy_ の画面に
+ドラッグ&ドロップします。

 見た目のフィードバックはありません。コンソールにログが出力されます。


 #### デバイスにファイルを送る

-デバイスの`/sdcard/`ディレクトリにファイルを送るには、(APKではない)ファイルを _scrcpy_ の画面にドラッグ&ドロップします。
+デバイスの`/sdcard/`ディレクトリにファイルを送るには、(APKではない)ファイルを
+_scrcpy_ の画面にドラッグ&ドロップします。

 見た目のフィードバックはありません。コンソールにログが出力されます。

@@ -609,15 +675,17 @@ scrcpy --push-target /sdcard/foo/bar/

 ## ショートカット

-次のリストでは、<kbd>MOD</kbd>でショートカット変更します。初期状態では、(left)<kbd>Alt</kbd>または(left)<kbd>Super</kbd>です。
+次のリストでは、<kbd>MOD</kbd>でショートカット変更します。初期状態では、
+(left)<kbd>Alt</kbd>または(left)<kbd>Super</kbd>です。

-これは`--shortcut-mod`で変更することができます。可能なキーは`lctrl`、`rctrl`、`lalt`、 `ralt`、 `lsuper`そして`rsuper`です。例えば:
+これは`--shortcut-mod`で変更することができます。可能なキーは
+`lctrl`、`rctrl`、`lalt`、 `ralt`、 `lsuper`そして`rsuper`です。例えば:

 ```bash
-# RCtrlをショートカットとして使用します
+# use RCtrl for shortcuts
 scrcpy --shortcut-mod=rctrl

-# ショートカットにLCtrl+LAltまたはLSuperのいずれかを使用します
+# use either LCtrl+LAlt or LSuper for shortcuts
 scrcpy --shortcut-mod=lctrl+lalt,lsuper
 ```

@@ -647,7 +715,7 @@ _<kbd>[Super]</kbd>は通常<kbd>Windows</kbd>もしくは<kbd>Cmd</kbd>キー
 | 通知パネルを折りたたむ                        | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
 | クリップボードへのコピー³                     | <kbd>MOD</kbd>+<kbd>c</kbd>
 | クリップボードへのカット³                     | <kbd>MOD</kbd>+<kbd>x</kbd>
- | クリップボードの同期とペースト³                | <kbd>MOD</kbd>+<kbd>v</kbd>
+ | クリップボードとペーストの同期³                | <kbd>MOD</kbd>+<kbd>v</kbd>
 | コンピュータのクリップボードテキストの挿入      | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
 | FPSカウンタ有効/無効(標準入出力上)             | <kbd>MOD</kbd>+<kbd>i</kbd>
 | ピンチしてズームする                          | <kbd>Ctrl</kbd>+_クリック&移動_
@@ -656,7 +724,8 @@ _¹黒い境界線を削除するため、境界線上でダブルクリック_
 _²もしスクリーンがオフの場合、右クリックでスクリーンをオンする。それ以外の場合はBackを押します._  
 _³Android 7以上のみ._

-全ての<kbd>Ctrl</kbd>+_キー_ ショートカットはデバイスに転送されます、そのためアクティブなアプリケーションによって処理されます。
+全ての<kbd>Ctrl</kbd>+_キー_ ショートカットはデバイスに転送されます、
+そのためアクティブなアプリケーションによって処理されます。


 ## カスタムパス
@@ -665,7 +734,8 @@ _³Android 7以上のみ._

    ADB=/path/to/adb scrcpy

-`scrcpy-server`ファイルのパスを上書きするには、`SCRCPY_SERVER_PATH`でそのパスを構成します。
+`scrcpy-server`ファイルのパスを上書きするには、`SCRCPY_SERVER_PATH`で
+そのパスを構成します。

 [useful]: https://github.com/Genymobile/scrcpy/issues/278#issuecomment-429330345

@@ -687,7 +757,7 @@ _³Android 7以上のみ._
 [BUILD]: BUILD.md


-## よくある質問
+## 共通の問題

 [FAQ](FAQ.md)を参照してください。

--- a/README.ko.md
+++ b/README.ko.md
@@ -68,7 +68,9 @@ Gentoo에서 ,[Ebuild] 가 가능합니다 : [`scrcpy/`][ebuild-link].

 윈도우 상에서, 간단하게 설치하기 위해 종속성이 있는 사전 구축된 아카이브가 제공됩니다 (`adb` 포함) :
 해당 파일은 Readme원본 링크를 통해서 다운로드가 가능합니다.
- - [README](README.md#windows)
+ - [`scrcpy-win`][direct-win]
+
+[direct-win]: https://github.com/Genymobile/scrcpy/blob/master/README.md#windows


 [어플을 직접 설치][BUILD] 할 수도 있습니다.
--- a/README.md
+++ b/README.md
@@ -38,18 +38,6 @@ control it using keyboard and mouse.

 <a href="https://repology.org/project/scrcpy/versions"><img src="https://repology.org/badge/vertical-allrepos/scrcpy.svg" alt="Packaging status" align="right"></a>

-### Summary
-
- - Linux: `apt install scrcpy`
- - Windows: [download][direct-win64]
- - macOS: `brew install scrcpy`
-
-Build from sources: [BUILD] ([simplified process][BUILD_simple])
-
-[BUILD]: BUILD.md
-[BUILD_simple]: BUILD.md#simple
-
-
 ### Linux

 On Debian (_testing_ and _sid_ for now) and Ubuntu (20.04):
@@ -79,8 +67,9 @@ For Gentoo, an [Ebuild] is available: [`scrcpy/`][ebuild-link].
 [Ebuild]: https://wiki.gentoo.org/wiki/Ebuild
 [ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy

-You could also [build the app manually][BUILD] ([simplified
-process][BUILD_simple]).
+You could also [build the app manually][BUILD] (don't worry, it's not that
+hard).
+


 ### Windows
@@ -127,18 +116,13 @@ brew install scrcpy
 You need `adb`, accessible from your `PATH`. If you don't have it yet:

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

-It's also available in [MacPorts], which sets up adb for you:
-
-```bash
-sudo port install scrcpy
-```
-
-[MacPorts]: https://www.macports.org/
-
-
 You can also [build the app manually][BUILD].


@@ -214,11 +198,10 @@ If `--max-size` is also specified, resizing is applied after cropping.
 To lock the orientation of the mirroring:

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

 This affects recording orientation.
@@ -242,9 +225,7 @@ error will give the available encoders:
 scrcpy --encoder _
 ```

-### Capture
-
-#### Recording
+### Recording

 It is possible to record the screen while mirroring:

@@ -268,59 +249,6 @@ variation] does not impact the recorded file.
 [packet delay variation]: https://en.wikipedia.org/wiki/Packet_delay_variation


-#### v4l2loopback
-
-On Linux, it is possible to send the video stream to a v4l2 loopback device, so
-that the Android device can be opened like a webcam by any v4l2-capable tool.
-
-The module `v4l2loopback` must be installed:
-
-```bash
-sudo apt install v4l2loopback-dkms
-```
-
-To create a v4l2 device:
-
-```bash
-sudo modprobe v4l2loopback
-```
-
-This will create a new video device in `/dev/videoN`, where `N` is an integer
-(more [options](https://github.com/umlaeute/v4l2loopback#options) are available
-to create several devices or devices with specific IDs).
-
-To list the enabled devices:
-
-```bash
-# requires v4l-utils package
-v4l2-ctl --list-devices
-
-# simple but might be sufficient
-ls /dev/video*
-```
-
-To start scrcpy using a v4l2 sink:
-
-```bash
-scrcpy --v4l2-sink=/dev/videoN
-scrcpy --v4l2-sink=/dev/videoN --no-display  # disable mirroring window
-scrcpy --v4l2-sink=/dev/videoN -N            # short version
-```
-
-(replace `N` by the device ID, check with `ls /dev/video*`)
-
-Once enabled, you can open your video stream with a v4l2-capable tool:
-
-```bash
-ffplay -i /dev/videoN
-vlc v4l2:///dev/videoN   # VLC might add some buffering delay
-```
-
-For example, you could capture the video within [OBS].
-
-[OBS]: https://obsproject.com/fr
-
-
 ### Connection

 #### Wireless
@@ -483,7 +411,7 @@ _(left)_ and <kbd>MOD</kbd>+<kbd>→</kbd> _(right)_.

 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 not support the
+   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
@@ -563,6 +491,18 @@ scrcpy -Sw
 ```


+#### Render expired frames
+
+By default, to minimize latency, _scrcpy_ always renders the last decoded frame
+available, and drops any previous one.
+
+To force the rendering of all frames (at a cost of a possible increased
+latency), use:
+
+```bash
+scrcpy --render-expired-frames
+```
+
 #### Show touches

 For presentations, it may be useful to show physical touches (on the physical
@@ -710,15 +650,15 @@ There is no visual feedback, a log is printed to the console.

 #### Push file to device

-To push a file to `/sdcard/Download/` on the device, drag & drop a (non-APK)
-file to the _scrcpy_ window.
+To push a file to `/sdcard/` on the device, drag & drop a (non-APK) file to the
+_scrcpy_ window.

 There is no visual feedback, a log is printed to the console.

 The target directory can be changed on start:

 ```bash
-scrcpy --push-target=/sdcard/Movies/
+scrcpy --push-target /sdcard/foo/bar/
 ```


@@ -758,10 +698,10 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Rotate display left                         | <kbd>MOD</kbd>+<kbd>←</kbd> _(left)_
 | Rotate display right                        | <kbd>MOD</kbd>+<kbd>→</kbd> _(right)_
 | Resize window to 1:1 (pixel-perfect)        | <kbd>MOD</kbd>+<kbd>g</kbd>
- | Resize window to remove black borders       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-left-click¹_
+ | Resize window to remove black borders       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-click¹_
 | Click on `HOME`                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Middle-click_
 | Click on `BACK`                             | <kbd>MOD</kbd>+<kbd>b</kbd> \| _Right-click²_
- | Click on `APP_SWITCH`                       | <kbd>MOD</kbd>+<kbd>s</kbd> \| _4th-click³_
+ | Click on `APP_SWITCH`                       | <kbd>MOD</kbd>+<kbd>s</kbd>
 | Click on `MENU` (unlock screen)             | <kbd>MOD</kbd>+<kbd>m</kbd>
 | Click on `VOLUME_UP`                        | <kbd>MOD</kbd>+<kbd>↑</kbd> _(up)_
 | Click on `VOLUME_DOWN`                      | <kbd>MOD</kbd>+<kbd>↓</kbd> _(down)_
@@ -770,27 +710,18 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Turn device screen off (keep mirroring)     | <kbd>MOD</kbd>+<kbd>o</kbd>
 | Turn device screen on                       | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>
 | Rotate device screen                        | <kbd>MOD</kbd>+<kbd>r</kbd>
- | Expand notification panel                   | <kbd>MOD</kbd>+<kbd>n</kbd> \| _5th-click³_
- | Expand settings panel                       |  <kbd>MOD</kbd>+<kbd>n</kbd>+<kbd>n</kbd> \| _Double-5th-click³_
- | Collapse panels                             | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
- | Copy to clipboard⁴                          | <kbd>MOD</kbd>+<kbd>c</kbd>
- | Cut to clipboard⁴                           | <kbd>MOD</kbd>+<kbd>x</kbd>
- | Synchronize clipboards and paste⁴           | <kbd>MOD</kbd>+<kbd>v</kbd>
+ | Expand notification panel                   | <kbd>MOD</kbd>+<kbd>n</kbd>
+ | Collapse notification panel                 | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
+ | Copy to clipboard³                          | <kbd>MOD</kbd>+<kbd>c</kbd>
+ | Cut to clipboard³                           | <kbd>MOD</kbd>+<kbd>x</kbd>
+ | Synchronize clipboards and paste³           | <kbd>MOD</kbd>+<kbd>v</kbd>
 | Inject computer clipboard text              | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
 | Enable/disable FPS counter (on stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
 | Pinch-to-zoom                               | <kbd>Ctrl</kbd>+_click-and-move_

 _¹Double-click on black borders to remove them._  
 _²Right-click turns the screen on if it was off, presses BACK otherwise._  
-_³4th and 5th mouse buttons, if your mouse has them._  
-_⁴Only on Android >= 7._
-
-Shortcuts with repeated keys are executted by releasing and pressing the key a
-second time. For example, to execute "Expand settings panel":
-
- 1. Press and keep pressing <kbd>MOD</kbd>.
- 2. Then double-press <kbd>n</kbd>.
- 3. Finally, release <kbd>MOD</kbd>.
+_³Only on Android >= 7._

 All <kbd>Ctrl</kbd>+_key_ shortcuts are forwarded to the device, so they are
 handled by the active application.
@@ -823,6 +754,8 @@ A colleague challenged me to find a name as unpronounceable as [gnirehtet].

 See [BUILD].

+[BUILD]: BUILD.md
+

 ## Common issues

@@ -866,7 +799,7 @@ Read the [developers page].
 This README is available in other languages:

 - [Indonesian (Indonesia, `id`) - v1.16](README.id.md)
- [日本語 (Japanese, `jp`) - v1.17](README.jp.md)
+- [日本語 (Japanese, `jp`) - v1.17)(README.jp.md)
 - [한국어 (Korean, `ko`) - v1.11](README.ko.md)
 - [português brasileiro (Brazilian Portuguese, `pt-BR`) - v1.17](README.pt-br.md)
 - [简体中文 (Simplified Chinese, `zh-Hans`) - v1.17](README.zh-Hans.md)
--- a/README.pt-br.md
+++ b/README.pt-br.md
@@ -77,7 +77,10 @@ difícil).
 Para Windows, por simplicidade, um arquivo pré-compilado com todas as dependências
 (incluindo `adb`) está disponível:

- - [README](README.md#windows)
+ - [`scrcpy-win64-v1.17.zip`][direct-win64]  
+   _(SHA-256: 8b9e57993c707367ed10ebfe0e1ef563c7a29d9af4a355cd8b6a52a317c73eea)_
+
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-win64-v1.17.zip

 Também está disponível em [Chocolatey]:

--- a/README.zh-Hans.md
+++ b/README.zh-Hans.md
@@ -78,7 +78,10 @@ apt install scrcpy

 在 Windows 上，简便起见，我们提供包含了所有依赖 (包括 `adb`) 的预编译包。

- - [README](README.md#windows)
+ - [`scrcpy-win64-v1.17.zip`][direct-win64]
+   _(SHA-256: 8b9e57993c707367ed10ebfe0e1ef563c7a29d9af4a355cd8b6a52a317c73eea)_
+
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-win64-v1.17.zip

 也可以使用 [Chocolatey]：

--- a/README.zh-Hant.md
+++ b/README.zh-Hant.md
@@ -80,7 +80,10 @@ apt install scrcpy

 為了保持簡單，Windows 用戶可以下載一個包含所有必需軟體 (包含 `adb`) 的壓縮包:

- - [README](README.md#windows)
+- [`scrcpy-win64-v1.15.zip`][direct-win64]  
+   _(SHA-256: dd514bb591e63ef4cd52a53c30f1153a28f59722d64690eb07bd017849edcba2)_
+
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.15/scrcpy-win64-v1.15.zip

 [Chocolatey] 上也可以下載:

--- a/app/meson.build
+++ b/app/meson.build
@@ -1,11 +1,11 @@
 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',
+    'src/device.c',
    'src/device_msg.c',
    'src/event_converter.c',
    'src/file_handler.c',
@@ -21,28 +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
-
-v4l2_support = host_machine.system() == 'linux'
-if v4l2_support
-    src += [ 'src/v4l2_sink.c' ]
-endif
-
-check_functions = [
-    'strdup'
-]
-
-cc = meson.get_compiler('c')
-
 if not get_option('crossbuild_windows')

    # native build
@@ -53,13 +34,11 @@ if not get_option('crossbuild_windows')
        dependency('sdl2'),
    ]

-    if v4l2_support
-        dependencies += dependency('libavdevice')
-    endif
-
 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'
@@ -94,18 +73,19 @@ 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')

 # the version, updated on release
 conf.set_quoted('SCRCPY_VERSION', meson.project_version())
@@ -122,19 +102,29 @@ conf.set('PORTABLE', get_option('portable'))
 conf.set('DEFAULT_LOCAL_PORT_RANGE_FIRST', '27183')
 conf.set('DEFAULT_LOCAL_PORT_RANGE_LAST', '27199')

+# the default max video size for both dimensions, in pixels
+# overridden by option --max-size
+conf.set('DEFAULT_MAX_SIZE', '0')  # 0: unlimited
+
+# the default video orientation
+# natural device orientation is 0 and each increment adds 90 degrees
+# counterclockwise
+# overridden by option --lock-video-orientation
+conf.set('DEFAULT_LOCK_VIDEO_ORIENTATION', '-1')  # -1: unlocked
+
 # the default video bitrate, in bits/second
 # overridden by option --bit-rate
 conf.set('DEFAULT_BIT_RATE', '8000000')  # 8Mbps

+# enable High DPI support
+conf.set('HIDPI_SUPPORT', get_option('hidpi_support'))
+
 # run a server debugger and wait for a client to be attached
 conf.set('SERVER_DEBUGGER', get_option('server_debugger'))

 # select the debugger method ('old' for Android < 9, 'new' for Android >= 9)
 conf.set('SERVER_DEBUGGER_METHOD_NEW', get_option('server_debugger_method') == 'new')

-# enable V4L2 support (linux only)
-conf.set('HAVE_V4L2', v4l2_support)
-
 configure_file(configuration: conf, output: 'config.h')

 src_dir = include_directories('src')
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -83,12 +83,10 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S
 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 "unlocked", "initial" (locked to the initial orientation), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees otation counterclockwise.
+.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.

-Default is "unlocked".
-
-Passing the option without argument is equivalent to passing "initial".
+Default is -1 (unlocked).

 .TP
 .BI "\-\-max\-fps " value
@@ -133,7 +131,7 @@ but breaks the expected behavior of alpha keys in games (typically WASD).
 .BI "\-\-push\-target " path
 Set the target directory for pushing files to the device by drag & drop. It is passed as\-is to "adb push".

-Default is "/sdcard/Download/".
+Default is "/sdcard/".

 .TP
 .BI "\-r, \-\-record " file
@@ -157,6 +155,10 @@ Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "me
 .UR https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER
 .UE

+.TP
+.B \-\-render\-expired\-frames
+By default, to minimize latency, scrcpy always renders the last available decoded frame, and drops any previous ones. This flag forces to render all frames, at a cost of a possible increased latency.
+
 .TP
 .BI "\-\-rotation " value
 Set the initial display rotation. Possibles values are 0, 1, 2 and 3. Each increment adds a 90 degrees rotation counterclockwise.
@@ -186,10 +188,8 @@ Enable "show touches" on start, restore the initial value on exit.
 It only shows physical touches (not clicks from scrcpy).

 .TP
-.BI "\-\-v4l2-sink " /dev/videoN
-Output to v4l2loopback device.
-
-It requires to lock the video orientation (see --lock-video-orientation).
+.B \-v, \-\-version
+Print the version of scrcpy.

 .TP
 .BI "\-V, \-\-verbosity " value
@@ -197,10 +197,6 @@ Set the log level ("debug", "info", "warn" or "error").

 Default is "info" for release builds, "debug" for debug builds.

-.TP
-.B \-v, \-\-version
-Print the version of scrcpy.
-
 .TP
 .B \-w, \-\-stay-awake
 Keep the device on while scrcpy is running, when the device is plugged in.
--- 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/android/input.h
+++ b/app/src/android/input.h
@@ -21,7 +21,7 @@
 #define _ANDROID_INPUT_H

 /**
- * Meta key / modifier state.
+ * Meta key / modifer state.
 */
 enum android_metastate {
    /** No meta keys are pressed. */
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -6,13 +6,11 @@
 #include <stdio.h>
 #include <unistd.h>

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

-#define STR_IMPL_(x) #x
-#define STR(x) STR_IMPL_(x)
-
 void
 scrcpy_print_usage(const char *arg0) {
    fprintf(stderr,
@@ -26,7 +24,7 @@ scrcpy_print_usage(const char *arg0) {
        "    -b, --bit-rate value\n"
        "        Encode the video at the given bit-rate, expressed in bits/s.\n"
        "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
-        "        Default is " STR(DEFAULT_BIT_RATE) ".\n"
+        "        Default is %d.\n"
        "\n"
        "    --codec-options key[:type]=value[,...]\n"
        "        Set a list of comma-separated key:type=value options for the\n"
@@ -79,15 +77,12 @@ scrcpy_print_usage(const char *arg0) {
        "        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 value\n"
        "        Lock video orientation to value.\n"
-        "        Possible values are \"unlocked\", \"initial\" (locked to the\n"
-        "        initial orientation), 0, 1, 2 and 3.\n"
+        "        Possible values are -1 (unlocked), 0, 1, 2 and 3.\n"
        "        Natural device orientation is 0, and each increment adds a\n"
        "        90 degrees rotation counterclockwise.\n"
-        "        Default is \"unlocked\".\n"
-        "        Passing the option without argument is equivalent to passing\n"
-        "        \"initial\".\n"
+        "        Default is %d%s.\n"
        "\n"
        "    --max-fps value\n"
        "        Limit the frame rate of screen capture (officially supported\n"
@@ -97,7 +92,7 @@ scrcpy_print_usage(const char *arg0) {
        "        Limit both the width and height of the video to value. The\n"
        "        other dimension is computed so that the device aspect-ratio\n"
        "        is preserved.\n"
-        "        Default is 0 (unlimited).\n"
+        "        Default is %d%s.\n"
        "\n"
        "    -n, --no-control\n"
        "        Disable device control (mirror the device in read-only).\n"
@@ -116,8 +111,7 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "    -p, --port port[:port]\n"
        "        Set the TCP port (range) used by the client to listen.\n"
-        "        Default is " STR(DEFAULT_LOCAL_PORT_RANGE_FIRST) ":"
-                              STR(DEFAULT_LOCAL_PORT_RANGE_LAST) ".\n"
+        "        Default is %d:%d.\n"
        "\n"
        "    --prefer-text\n"
        "        Inject alpha characters and space as text events instead of\n"
@@ -129,7 +123,7 @@ scrcpy_print_usage(const char *arg0) {
        "    --push-target path\n"
        "        Set the target directory for pushing files to the device by\n"
        "        drag & drop. It is passed as-is to \"adb push\".\n"
-        "        Default is \"/sdcard/Download/\".\n"
+        "        Default is \"/sdcard/\".\n"
        "\n"
        "    -r, --record file.mp4\n"
        "        Record screen to file.\n"
@@ -146,6 +140,12 @@ scrcpy_print_usage(const char *arg0) {
        "        \"opengles2\", \"opengles\", \"metal\" and \"software\".\n"
        "        <https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER>\n"
        "\n"
+        "    --render-expired-frames\n"
+        "        By default, to minimize latency, scrcpy always renders the\n"
+        "        last available decoded frame, and drops any previous ones.\n"
+        "        This flag forces to render all frames, at a cost of a\n"
+        "        possible increased latency.\n"
+        "\n"
        "    --rotation value\n"
        "        Set the initial display rotation.\n"
        "        Possibles values are 0, 1, 2 and 3. Each increment adds a 90\n"
@@ -176,13 +176,9 @@ scrcpy_print_usage(const char *arg0) {
        "        on exit.\n"
        "        It only shows physical touches (not clicks from scrcpy).\n"
        "\n"
-#ifdef HAVE_V4L2
-        "    --v4l2-sink /dev/videoN\n"
-        "        Output to v4l2loopback device.\n"
-        "        It requires to lock the video orientation (see\n"
-        "        --lock-video-orientation).\n"
+        "    -v, --version\n"
+        "        Print the version of scrcpy.\n"
        "\n"
-#endif
        "    -V, --verbosity value\n"
        "        Set the log level (debug, info, warn or error).\n"
 #ifndef NDEBUG
@@ -190,9 +186,6 @@ scrcpy_print_usage(const char *arg0) {
 #else
        "        Default is info.\n"
 #endif
-        "\n"
-        "    -v, --version\n"
-        "        Print the version of scrcpy.\n"
        "\n"
        "    -w, --stay-awake\n"
        "        Keep the device on while scrcpy is running, when the device\n"
@@ -217,7 +210,7 @@ scrcpy_print_usage(const char *arg0) {
        "        Default is 0 (automatic).\n"
        "\n"
        "    --window-height value\n"
-        "        Set the initial window height.\n"
+        "        Set the initial window width.\n"
        "        Default is 0 (automatic).\n"
        "\n"
        "Shortcuts:\n"
@@ -305,7 +298,12 @@ scrcpy_print_usage(const char *arg0) {
        "\n"
        "    Drag & drop APK file\n"
        "        Install APK from computer\n"
-        "\n", arg0);
+        "\n",
+        arg0,
+        DEFAULT_BIT_RATE,
+        DEFAULT_LOCK_VIDEO_ORIENTATION, DEFAULT_LOCK_VIDEO_ORIENTATION >= 0 ? "" : " (unlocked)",
+        DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
+        DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
 }

 static bool
@@ -393,27 +391,15 @@ parse_max_fps(const char *s, uint16_t *max_fps) {
 }

 static bool
-parse_lock_video_orientation(const char *s,
-                             enum sc_lock_video_orientation *lock_mode) {
-    if (!s || !strcmp(s, "initial")) {
-        // Without argument, lock the initial orientation
-        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_INITIAL;
-        return true;
-    }
-
-    if (!strcmp(s, "unlocked")) {
-        *lock_mode = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED;
-        return true;
-    }
-
+parse_lock_video_orientation(const char *s, int8_t *lock_video_orientation) {
    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 3,
+    bool ok = parse_integer_arg(s, &value, false, -1, 3,
                                "lock video orientation");
    if (!ok) {
        return false;
    }

-    *lock_mode = (enum sc_lock_video_orientation) value;
+    *lock_video_orientation = (int8_t) value;
    return true;
 }

@@ -492,14 +478,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;
 }

@@ -682,8 +668,6 @@ guess_record_format(const char *filename) {
 #define OPT_FORWARD_ALL_CLICKS     1023
 #define OPT_LEGACY_PASTE           1024
 #define OPT_ENCODER_NAME           1025
-#define OPT_POWER_OFF_ON_CLOSE     1026
-#define OPT_V4L2_SINK              1027

 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -703,7 +687,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        {"fullscreen",             no_argument,       NULL, 'f'},
        {"help",                   no_argument,       NULL, 'h'},
        {"legacy-paste",           no_argument,       NULL, OPT_LEGACY_PASTE},
-        {"lock-video-orientation", optional_argument, NULL,
+        {"lock-video-orientation", required_argument, NULL,
                                                  OPT_LOCK_VIDEO_ORIENTATION},
        {"max-fps",                required_argument, NULL, OPT_MAX_FPS},
        {"max-size",               required_argument, NULL, 'm'},
@@ -725,9 +709,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        {"show-touches",           no_argument,       NULL, 't'},
        {"stay-awake",             no_argument,       NULL, 'w'},
        {"turn-screen-off",        no_argument,       NULL, 'S'},
-#ifdef HAVE_V4L2
-        {"v4l2-sink",              required_argument, NULL, OPT_V4L2_SINK},
-#endif
        {"verbosity",              required_argument, NULL, 'V'},
        {"version",                no_argument,       NULL, 'v'},
        {"window-title",           required_argument, NULL, OPT_WINDOW_TITLE},
@@ -737,8 +718,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        {"window-height",          required_argument, NULL, OPT_WINDOW_HEIGHT},
        {"window-borderless",      no_argument,       NULL,
                                                  OPT_WINDOW_BORDERLESS},
-        {"power-off-on-close",     no_argument,       NULL,
-                                                  OPT_POWER_OFF_ON_CLOSE},
        {NULL,                     0,                 NULL, 0  },
    };

@@ -791,8 +770,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                }
                break;
            case OPT_LOCK_VIDEO_ORIENTATION:
-                if (!parse_lock_video_orientation(optarg,
-                        &opts->lock_video_orientation)) {
+                if (!parse_lock_video_orientation(optarg, &opts->lock_video_orientation)) {
                    return false;
                }
                break;
@@ -837,8 +815,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                opts->stay_awake = true;
                break;
            case OPT_RENDER_EXPIRED_FRAMES:
-                LOGW("Option --render-expired-frames has been removed. This "
-                     "flag has been ignored.");
+                opts->render_expired_frames = true;
                break;
            case OPT_WINDOW_TITLE:
                opts->window_title = optarg;
@@ -909,39 +886,16 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
            case OPT_LEGACY_PASTE:
                opts->legacy_paste = true;
                break;
-            case OPT_POWER_OFF_ON_CLOSE:
-                opts->power_off_on_close = true;
-                break;
-#ifdef HAVE_V4L2
-            case OPT_V4L2_SINK:
-                opts->v4l2_device = optarg;
-                break;
-#endif
            default:
                // getopt prints the error message on stderr
                return false;
        }
    }

-#ifdef HAVE_V4L2
-    if (!opts->display && !opts->record_filename && !opts->v4l2_device) {
-        LOGE("-N/--no-display requires either screen recording (-r/--record)"
-             " or sink to v4l2loopback device (--v4l2-sink)");
-        return false;
-    }
-
-    if (opts->v4l2_device && opts->lock_video_orientation
-                             == SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
-        LOGI("Video orientation is locked for v4l2 sink. "
-             "See --lock-video-orientation.");
-        opts->lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_INITIAL;
-    }
-#else
    if (!opts->display && !opts->record_filename) {
        LOGE("-N/--no-display requires screen recording (-r/--record)");
        return false;
    }
-#endif

    int index = optind;
    if (index < argc) {
--- 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;
        }
@@ -81,20 +83,14 @@ show_adb_installation_msg() {

 static void
 show_adb_err_msg(enum process_result err, const char *const argv[]) {
-#define MAX_COMMAND_STRING_LEN 1024
-    char *buf = malloc(MAX_COMMAND_STRING_LEN);
-    if (!buf) {
-        LOGE("Failed to execute (could not allocate error message)");
-        return;
-    }
-
+    char buf[512];
    switch (err) {
        case PROCESS_ERROR_GENERIC:
-            argv_to_string(argv, buf, MAX_COMMAND_STRING_LEN);
+            argv_to_string(argv, buf, sizeof(buf));
            LOGE("Failed to execute: %s", buf);
            break;
        case PROCESS_ERROR_MISSING_BINARY:
-            argv_to_string(argv, buf, MAX_COMMAND_STRING_LEN);
+            argv_to_string(argv, buf, sizeof(buf));
            LOGE("Command not found: %s", buf);
            LOGE("(make 'adb' accessible from your PATH or define its full"
                 "path in the ADB environment variable)");
@@ -104,38 +100,29 @@ show_adb_err_msg(enum process_result err, const char *const argv[]) {
            // do nothing
            break;
    }
-
-    free(buf);
 }

 process_t
 adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
+    const char *cmd[len + 4];
    int i;
    process_t process;
-
-    const char **argv = malloc((len + 4) * sizeof(*argv));
-    if (!argv) {
-        return PROCESS_NONE;
-    }
-
-    argv[0] = get_adb_command();
+    cmd[0] = get_adb_command();
    if (serial) {
-        argv[1] = "-s";
-        argv[2] = serial;
+        cmd[1] = "-s";
+        cmd[2] = serial;
        i = 3;
    } else {
        i = 1;
    }

-    memcpy(&argv[i], adb_cmd, len * sizeof(const char *));
-    argv[len + i] = NULL;
-    enum process_result r = process_execute(argv, &process);
+    memcpy(&cmd[i], adb_cmd, len * sizeof(const char *));
+    cmd[len + i] = NULL;
+    enum process_result r = cmd_execute(cmd, &process);
    if (r != PROCESS_SUCCESS) {
-        show_adb_err_msg(r, argv);
-        process = PROCESS_NONE;
+        show_adb_err_msg(r, cmd);
+        return PROCESS_NONE;
    }
-
-    free(argv);
    return process;
 }

@@ -188,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
@@ -197,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;
@@ -219,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

@@ -32,45 +31,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,14 +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)

-#define container_of(ptr, type, member) \
-    ((type *) (((char *) (ptr)) - offsetof(type, member)))
+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,16 +1,19 @@
 #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 <libavformat/version.h>
 #include <SDL2/SDL_version.h>

+// In ffmpeg/doc/APIchanges:
+// 2016-04-11 - 6f69f7a / 9200514 - lavf 57.33.100 / 57.5.0 - avformat.h
+//   Add AVStream.codecpar, deprecate AVStream.codec.
+#if    (LIBAVFORMAT_VERSION_MICRO >= 100 /* FFmpeg */ && \
+        LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)) \
+    || (LIBAVFORMAT_VERSION_MICRO < 100 && /* Libav */ \
+        LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 5, 0))
+# define SCRCPY_LAVF_HAS_NEW_CODEC_PARAMS_API
+#endif
+
 // In ffmpeg/doc/APIchanges:
 // 2018-02-06 - 0694d87024 - lavf 58.9.100 - avformat.h
 //   Deprecate use of av_register_input_format(), av_register_output_format(),
@@ -22,16 +25,13 @@
 # define SCRCPY_LAVF_REQUIRES_REGISTER_ALL
 #endif

-
 // In ffmpeg/doc/APIchanges:
-// 2018-01-28 - ea3672b7d6 - lavf 58.7.100 - avformat.h
-//   Deprecate AVFormatContext filename field which had limited length, use the
-//   new dynamically allocated url field instead.
-//
-// 2018-01-28 - ea3672b7d6 - lavf 58.7.100 - avformat.h
-//   Add url field to AVFormatContext and add ff_format_set_url helper function.
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 7, 100)
-# define SCRCPY_LAVF_HAS_AVFORMATCONTEXT_URL
+// 2016-04-21 - 7fc329e - lavc 57.37.100 - avcodec.h
+//   Add a new audio/video encoding and decoding API with decoupled input
+//   and output -- avcodec_send_packet(), avcodec_receive_frame(),
+//   avcodec_send_frame() and avcodec_receive_packet().
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 37, 100)
+# define SCRCPY_LAVF_HAS_NEW_ENCODING_DECODING_API
 #endif

 #if SDL_VERSION_ATLEAST(2, 0, 5)
@@ -48,8 +48,4 @@
 # define SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
 #endif

-#ifndef 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"
@@ -67,9 +67,6 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
            buffer_write32be(&buf[17],
                             (uint32_t) msg->inject_scroll_event.vscroll);
            return 21;
-        case CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
-            buf[1] = msg->inject_keycode.action;
-            return 2;
        case CONTROL_MSG_TYPE_SET_CLIPBOARD: {
            buf[1] = !!msg->set_clipboard.paste;
            size_t len = write_string(msg->set_clipboard.text,
@@ -80,9 +77,9 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
        case CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
            buf[1] = msg->set_screen_power_mode.mode;
            return 2;
+        case CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
        case CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
-        case CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
-        case CONTROL_MSG_TYPE_COLLAPSE_PANELS:
+        case CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
        case CONTROL_MSG_TYPE_ROTATE_DEVICE:
            // no additional data
@@ -97,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

@@ -27,8 +26,7 @@ enum control_msg_type {
    CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
    CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
    CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
-    CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
-    CONTROL_MSG_TYPE_COLLAPSE_PANELS,
+    CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL,
    CONTROL_MSG_TYPE_GET_CLIPBOARD,
    CONTROL_MSG_TYPE_SET_CLIPBOARD,
    CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
@@ -51,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;
@@ -66,11 +64,7 @@ struct control_msg {
            int32_t vscroll;
        } inject_scroll_event;
        struct {
-            enum android_keyevent_action action; // action for the BACK key
-            // screen may only be turned on on ACTION_DOWN
-        } back_or_screen_on;
-        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
@@ -1,43 +1,42 @@
 #include "decoder.h"

 #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"
-#include "trait/frame_sink.h"
+#include "util/buffer_util.h"
 #include "util/log.h"

-/** Downcast packet_sink to decoder */
-#define DOWNCAST(SINK) container_of(SINK, struct decoder, packet_sink)
-
+// set the decoded frame as ready for rendering, and notify
 static void
-decoder_close_first_sinks(struct decoder *decoder, unsigned count) {
-    while (count) {
-        struct sc_frame_sink *sink = decoder->sinks[--count];
-        sink->ops->close(sink);
+push_frame(struct decoder *decoder) {
+    bool previous_frame_skipped;
+    video_buffer_offer_decoded_frame(decoder->video_buffer,
+                                     &previous_frame_skipped);
+    if (previous_frame_skipped) {
+        // the previous EVENT_NEW_FRAME will consume this frame
+        return;
    }
+    static SDL_Event new_frame_event = {
+        .type = EVENT_NEW_FRAME,
+    };
+    SDL_PushEvent(&new_frame_event);
 }

-static inline void
-decoder_close_sinks(struct decoder *decoder) {
-    decoder_close_first_sinks(decoder, decoder->sink_count);
+void
+decoder_init(struct decoder *decoder, struct video_buffer *vb) {
+    decoder->video_buffer = vb;
 }

-static bool
-decoder_open_sinks(struct decoder *decoder) {
-    for (unsigned i = 0; i < decoder->sink_count; ++i) {
-        struct sc_frame_sink *sink = decoder->sinks[i];
-        if (!sink->ops->open(sink)) {
-            LOGE("Could not open frame sink %d", i);
-            decoder_close_first_sinks(decoder, i);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static bool
+bool
 decoder_open(struct decoder *decoder, const AVCodec *codec) {
    decoder->codec_ctx = avcodec_alloc_context3(codec);
    if (!decoder->codec_ctx) {
@@ -51,110 +50,52 @@ decoder_open(struct decoder *decoder, const AVCodec *codec) {
        return false;
    }

-    decoder->frame = av_frame_alloc();
-    if (!decoder->frame) {
-        LOGE("Could not create decoder frame");
-        avcodec_close(decoder->codec_ctx);
-        avcodec_free_context(&decoder->codec_ctx);
-        return false;
-    }
-
-    if (!decoder_open_sinks(decoder)) {
-        LOGE("Could not open decoder sinks");
-        av_frame_free(&decoder->frame);
-        avcodec_close(decoder->codec_ctx);
-        avcodec_free_context(&decoder->codec_ctx);
-        return false;
-    }
-
    return true;
 }

-static void
+void
 decoder_close(struct decoder *decoder) {
-    decoder_close_sinks(decoder);
-    av_frame_free(&decoder->frame);
    avcodec_close(decoder->codec_ctx);
    avcodec_free_context(&decoder->codec_ctx);
 }

-static bool
-push_frame_to_sinks(struct decoder *decoder, const AVFrame *frame) {
-    for (unsigned i = 0; i < decoder->sink_count; ++i) {
-        struct sc_frame_sink *sink = decoder->sinks[i];
-        if (!sink->ops->push(sink, frame)) {
-            LOGE("Could not send frame to sink %d", i);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static bool
+bool
 decoder_push(struct decoder *decoder, const AVPacket *packet) {
-    bool is_config = packet->pts == AV_NOPTS_VALUE;
-    if (is_config) {
-        // nothing to do
-        return true;
-    }
-
-    int ret = avcodec_send_packet(decoder->codec_ctx, packet);
-    if (ret < 0 && ret != AVERROR(EAGAIN)) {
+// the new decoding/encoding API has been introduced by:
+// <http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=7fc329e2dd6226dfecaa4a1d7adf353bf2773726>
+#ifdef SCRCPY_LAVF_HAS_NEW_ENCODING_DECODING_API
+    int ret;
+    if ((ret = avcodec_send_packet(decoder->codec_ctx, packet)) < 0) {
        LOGE("Could not send video packet: %d", ret);
        return false;
    }
-    ret = avcodec_receive_frame(decoder->codec_ctx, decoder->frame);
+    ret = avcodec_receive_frame(decoder->codec_ctx,
+                                decoder->video_buffer->decoding_frame);
    if (!ret) {
        // a frame was received
-        bool ok = push_frame_to_sinks(decoder, decoder->frame);
-        // A frame lost should not make the whole pipeline fail. The error, if
-        // any, is already logged.
-        (void) ok;
-
-        av_frame_unref(decoder->frame);
+        push_frame(decoder);
    } else if (ret != AVERROR(EAGAIN)) {
        LOGE("Could not receive video frame: %d", ret);
        return false;
    }
+#else
+    int got_picture;
+    int len = avcodec_decode_video2(decoder->codec_ctx,
+                                    decoder->video_buffer->decoding_frame,
+                                    &got_picture,
+                                    packet);
+    if (len < 0) {
+        LOGE("Could not decode video packet: %d", len);
+        return false;
+    }
+    if (got_picture) {
+        push_frame(decoder);
+    }
+#endif
    return true;
 }

-static bool
-decoder_packet_sink_open(struct sc_packet_sink *sink, const AVCodec *codec) {
-    struct decoder *decoder = DOWNCAST(sink);
-    return decoder_open(decoder, codec);
-}
-
-static void
-decoder_packet_sink_close(struct sc_packet_sink *sink) {
-    struct decoder *decoder = DOWNCAST(sink);
-    decoder_close(decoder);
-}
-
-static bool
-decoder_packet_sink_push(struct sc_packet_sink *sink, const AVPacket *packet) {
-    struct decoder *decoder = DOWNCAST(sink);
-    return decoder_push(decoder, packet);
-}
-
 void
-decoder_init(struct decoder *decoder) {
-    decoder->sink_count = 0;
-
-    static const struct sc_packet_sink_ops ops = {
-        .open = decoder_packet_sink_open,
-        .close = decoder_packet_sink_close,
-        .push = decoder_packet_sink_push,
-    };
-
-    decoder->packet_sink.ops = &ops;
-}
-
-void
-decoder_add_sink(struct decoder *decoder, struct sc_frame_sink *sink) {
-    assert(decoder->sink_count < DECODER_MAX_SINKS);
-    assert(sink);
-    assert(sink->ops);
-    decoder->sinks[decoder->sink_count++] = sink;
+decoder_interrupt(struct decoder *decoder) {
+    video_buffer_interrupt(decoder->video_buffer);
 }
--- a/app/src/decoder.h
+++ b/app/src/decoder.h
@@ -1,29 +1,31 @@
 #ifndef DECODER_H
 #define DECODER_H

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

-#define DECODER_MAX_SINKS 2
+#include "config.h"
+
+struct video_buffer;

 struct decoder {
-    struct sc_packet_sink packet_sink; // packet sink trait
-
-    struct sc_frame_sink *sinks[DECODER_MAX_SINKS];
-    unsigned sink_count;
-
+    struct video_buffer *video_buffer;
    AVCodecContext *codec_ctx;
-    AVFrame *frame;
 };

 void
-decoder_init(struct decoder *decoder);
+decoder_init(struct decoder *decoder, struct video_buffer *vb);
+
+bool
+decoder_open(struct decoder *decoder, const AVCodec *codec);

 void
-decoder_add_sink(struct decoder *decoder, struct sc_frame_sink *sink);
+decoder_close(struct decoder *decoder);
+
+bool
+decoder_push(struct decoder *decoder, const AVPacket *packet);
+
+void
+decoder_interrupt(struct decoder *decoder);

 #endif
--- a/app/src/device.c
+++ b/app/src/device.c
@@ -0,0 +1,24 @@
+#include "device.h"
+
+#include "config.h"
+#include "util/log.h"
+
+bool
+device_read_info(socket_t device_socket, char *device_name, struct size *size) {
+    unsigned char buf[DEVICE_NAME_FIELD_LENGTH + 4];
+    int r = net_recv_all(device_socket, buf, sizeof(buf));
+    if (r < DEVICE_NAME_FIELD_LENGTH + 4) {
+        LOGE("Could not retrieve device information");
+        return false;
+    }
+    // in case the client sends garbage
+    buf[DEVICE_NAME_FIELD_LENGTH - 1] = '\0';
+    // strcpy is safe here, since name contains at least
+    // DEVICE_NAME_FIELD_LENGTH bytes and strlen(buf) < DEVICE_NAME_FIELD_LENGTH
+    strcpy(device_name, (char *) buf);
+    size->width = (buf[DEVICE_NAME_FIELD_LENGTH] << 8)
+            | buf[DEVICE_NAME_FIELD_LENGTH + 1];
+    size->height = (buf[DEVICE_NAME_FIELD_LENGTH + 2] << 8)
+            | buf[DEVICE_NAME_FIELD_LENGTH + 3];
+    return true;
+}
--- a/app/src/device.h
+++ b/app/src/device.h
@@ -0,0 +1,16 @@
+#ifndef DEVICE_H
+#define DEVICE_H
+
+#include <stdbool.h>
+
+#include "config.h"
+#include "common.h"
+#include "util/net.h"
+
+#define DEVICE_NAME_FIELD_LENGTH 64
+
+// name must be at least DEVICE_NAME_FIELD_LENGTH bytes
+bool
+device_read_info(socket_t device_socket, char *device_name, struct size *size);
+
+#endif
--- 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

@@ -14,7 +16,7 @@ convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to) {

 static enum android_metastate
 autocomplete_metastate(enum android_metastate metastate) {
-    // fill dependent flags
+    // fill dependant flags
    if (metastate & (AMETA_SHIFT_LEFT_ON | AMETA_SHIFT_RIGHT_ON)) {
        metastate |= AMETA_SHIFT_ON;
    }
--- 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/events.h
+++ b/app/src/events.h
@@ -1,2 +1,3 @@
-#define EVENT_NEW_FRAME       SDL_USEREVENT
-#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 1)
+#define EVENT_NEW_SESSION SDL_USEREVENT
+#define EVENT_NEW_FRAME (SDL_USEREVENT + 1)
+#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 2)
--- a/app/src/file_handler.c
+++ b/app/src/file_handler.c
@@ -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/Download/"
+#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,25 +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) {
-        // interrupted must be set by the thread calling join(), so no need to
-        // lock for the assertion
-        assert(counter->interrupted);
-
-        sc_thread_join(&counter->thread, NULL);
+    if (counter->thread) {
+        SDL_WaitThread(counter->thread, NULL);
    }
 }

@@ -164,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
@@ -177,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;
@@ -52,13 +54,9 @@ is_shortcut_mod(struct input_manager *im, uint16_t sdl_mod) {
 }

 void
-input_manager_init(struct input_manager *im, struct controller *controller,
-                   struct screen *screen,
-                   const struct scrcpy_options *options) {
-    im->controller = controller;
-    im->screen = screen;
-    im->repeat = 0;
-
+input_manager_init(struct input_manager *im,
+                   const struct scrcpy_options *options)
+{
    im->control = options->control;
    im->forward_key_repeat = options->forward_key_repeat;
    im->prefer_text = options->prefer_text;
@@ -76,10 +74,6 @@ input_manager_init(struct input_manager *im, struct controller *controller,
    im->sdl_shortcut_mods.count = shortcut_mods->count;

    im->vfinger_down = false;
-
-    im->last_keycode = SDLK_UNKNOWN;
-    im->last_mod = 0;
-    im->key_repeat = 0;
 }

 static void
@@ -154,25 +148,13 @@ action_cut(struct controller *controller, int actions) {
 }

 // turn the screen on if it was off, press BACK otherwise
-// If the screen is off, it is turned on only on ACTION_DOWN
 static void
-press_back_or_turn_screen_on(struct controller *controller, int actions) {
+press_back_or_turn_screen_on(struct controller *controller) {
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;

-    if (actions & ACTION_DOWN) {
-        msg.back_or_screen_on.action = AKEY_EVENT_ACTION_DOWN;
-        if (!controller_push_msg(controller, &msg)) {
-            LOGW("Could not request 'press back or turn screen on'");
-            return;
-        }
-    }
-
-    if (actions & ACTION_UP) {
-        msg.back_or_screen_on.action = AKEY_EVENT_ACTION_UP;
-        if (!controller_push_msg(controller, &msg)) {
-            LOGW("Could not request 'press back or turn screen on'");
-        }
+    if (!controller_push_msg(controller, &msg)) {
+        LOGW("Could not request 'press back or turn screen on'");
    }
 }

@@ -187,19 +169,9 @@ expand_notification_panel(struct controller *controller) {
 }

 static void
-expand_settings_panel(struct controller *controller) {
+collapse_notification_panel(struct controller *controller) {
    struct control_msg msg;
-    msg.type = CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL;
-
-    if (!controller_push_msg(controller, &msg)) {
-        LOGW("Could not request 'expand settings panel'");
-    }
-}
-
-static void
-collapse_panels(struct controller *controller) {
-    struct control_msg msg;
-    msg.type = CONTROL_MSG_TYPE_COLLAPSE_PANELS;
+    msg.type = CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL;

    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request 'collapse notification panel'");
@@ -219,20 +191,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'");
    }
 }
@@ -278,18 +243,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'");
    }
 }
@@ -316,7 +274,7 @@ rotate_client_right(struct screen *screen) {
    screen_set_rotation(screen, new_rotation);
 }

-static void
+void
 input_manager_process_text_input(struct input_manager *im,
                                 const SDL_TextInputEvent *event) {
    if (is_shortcut_mod(im, SDL_GetModState())) {
@@ -334,13 +292,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'");
    }
 }
@@ -396,33 +354,22 @@ convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
    return true;
 }

-static void
+void
 input_manager_process_key(struct input_manager *im,
                          const SDL_KeyboardEvent *event) {
    // control: indicates the state of the command-line option --no-control
    bool control = im->control;

+    bool smod = is_shortcut_mod(im, event->keysym.mod);
+
    struct controller *controller = im->controller;

    SDL_Keycode keycode = event->keysym.sym;
-    uint16_t mod = event->keysym.mod;
    bool down = event->type == SDL_KEYDOWN;
    bool ctrl = event->keysym.mod & KMOD_CTRL;
    bool shift = event->keysym.mod & KMOD_SHIFT;
    bool repeat = event->repeat;

-    bool smod = is_shortcut_mod(im, mod);
-
-    if (down && !repeat) {
-        if (keycode == im->last_keycode && mod == im->last_mod) {
-            ++im->key_repeat;
-        } else {
-            im->key_repeat = 0;
-            im->last_keycode = keycode;
-            im->last_mod = mod;
-        }
-    }
-
    // The shortcut modifier is pressed
    if (smod) {
        int action = down ? ACTION_DOWN : ACTION_UP;
@@ -521,17 +468,17 @@ input_manager_process_key(struct input_manager *im,
                return;
            case SDLK_i:
                if (!shift && !repeat && down) {
-                    switch_fps_counter_state(&im->screen->fps_counter);
+                    struct fps_counter *fps_counter =
+                        im->video_buffer->fps_counter;
+                    switch_fps_counter_state(fps_counter);
                }
                return;
            case SDLK_n:
                if (control && !repeat && down) {
                    if (shift) {
-                        collapse_panels(controller);
-                    } else if (im->key_repeat == 0) {
-                        expand_notification_panel(controller);
+                        collapse_notification_panel(controller);
                    } else {
-                        expand_settings_panel(controller);
+                        expand_notification_panel(controller);
                    }
                }
                return;
@@ -592,7 +539,7 @@ convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
    return true;
 }

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

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

-static void
+void
 input_manager_process_mouse_button(struct input_manager *im,
                                   const SDL_MouseButtonEvent *event) {
    bool control = im->control;
@@ -689,27 +636,13 @@ input_manager_process_mouse_button(struct input_manager *im,
    }

    bool down = event->type == SDL_MOUSEBUTTONDOWN;
-    if (!im->forward_all_clicks) {
-        int action = down ? ACTION_DOWN : ACTION_UP;
-
-        if (control && event->button == SDL_BUTTON_X1) {
-            action_app_switch(im->controller, action);
-            return;
-        }
-        if (control && event->button == SDL_BUTTON_X2 && down) {
-            if (event->clicks < 2) {
-                expand_notification_panel(im->controller);
-            } else {
-                expand_settings_panel(im->controller);
-            }
-            return;
-        }
+    if (!im->forward_all_clicks && down) {
        if (control && event->button == SDL_BUTTON_RIGHT) {
-            press_back_or_turn_screen_on(im->controller, action);
+            press_back_or_turn_screen_on(im->controller);
            return;
        }
        if (control && event->button == SDL_BUTTON_MIDDLE) {
-            action_home(im->controller, action);
+            action_home(im->controller, ACTION_DOWN | ACTION_UP);
            return;
        }

@@ -722,9 +655,7 @@ input_manager_process_mouse_button(struct input_manager *im,
            bool outside = x < r->x || x >= r->x + r->w
                        || y < r->y || y >= r->y + r->h;
            if (outside) {
-                if (down) {
-                    screen_resize_to_fit(im->screen);
-                }
+                screen_resize_to_fit(im->screen);
                return;
            }
        }
@@ -793,7 +724,7 @@ convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
    return true;
 }

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

 struct input_manager {
    struct controller *controller;
+    struct video_buffer *video_buffer;
    struct screen *screen;

    // SDL reports repeated events as a boolean, but Android expects the actual
@@ -32,20 +34,34 @@ struct input_manager {
    } sdl_shortcut_mods;

    bool vfinger_down;
-
-    // Tracks the number of identical consecutive shortcut key down events.
-    // Not to be confused with event->repeat, which counts the number of
-    // system-generated repeated key presses.
-    unsigned key_repeat;
-    SDL_Keycode last_keycode;
-    uint16_t last_mod;
 };

 void
-input_manager_init(struct input_manager *im, struct controller *controller,
-                   struct screen *screen, const struct scrcpy_options *options);
+input_manager_init(struct input_manager *im,
+                   const struct scrcpy_options *options);

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

 #endif
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -1,18 +1,15 @@
 #include "scrcpy.h"

-#include "common.h"
-
 #include <assert.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <libavformat/avformat.h>
-#ifdef HAVE_V4L2
-# include <libavdevice/avdevice.h>
-#endif
 #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
@@ -31,11 +28,6 @@ print_version(void) {
    fprintf(stderr, " - libavutil %d.%d.%d\n", LIBAVUTIL_VERSION_MAJOR,
                                               LIBAVUTIL_VERSION_MINOR,
                                               LIBAVUTIL_VERSION_MICRO);
-#ifdef HAVE_V4L2
-    fprintf(stderr, " - libavdevice %d.%d.%d\n", LIBAVDEVICE_VERSION_MAJOR,
-                                                 LIBAVDEVICE_VERSION_MINOR,
-                                                 LIBAVDEVICE_VERSION_MICRO);
-#endif
 }

 static SDL_LogPriority
@@ -98,12 +90,6 @@ main(int argc, char *argv[]) {
    av_register_all();
 #endif

-#ifdef HAVE_V4L2
-    if (args.opts.v4l2_device) {
-        avdevice_register_all();
-    }
-#endif
-
    if (avformat_network_init()) {
        return 1;
    }
--- 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,11 +3,10 @@
 #include <assert.h>
 #include <libavutil/time.h>

+#include "config.h"
+#include "compat.h"
+#include "util/lock.h"
 #include "util/log.h"
-#include "util/str_util.h"
-
-/** Downcast packet_sink to recorder */
-#define DOWNCAST(SINK) container_of(SINK, struct recorder, packet_sink)

 static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us

@@ -23,27 +22,24 @@ find_muxer(const char *name) {
 #else
        oformat = av_oformat_next(oformat);
 #endif
-        // until null or containing the requested name
-    } while (oformat && !strlist_contains(oformat->name, ',', name));
+        // until null or with name "mp4"
+    } while (oformat && strcmp(oformat->name, name));
    return oformat;
 }

 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;
    }

-    rec->packet = av_packet_alloc();
-    if (!rec->packet) {
-        free(rec);
-        return NULL;
-    }
+    // av_packet_ref() does not initialize all fields in old FFmpeg versions
+    // See <https://github.com/Genymobile/scrcpy/issues/707>
+    av_init_packet(&rec->packet);

-    if (av_packet_ref(rec->packet, packet)) {
-        av_packet_free(&rec->packet);
-        free(rec);
+    if (av_packet_ref(&rec->packet, packet)) {
+        SDL_free(rec);
        return NULL;
    }
    return rec;
@@ -51,9 +47,8 @@ record_packet_new(const AVPacket *packet) {

 static void
 record_packet_delete(struct record_packet *rec) {
-    av_packet_unref(rec->packet);
-    av_packet_free(&rec->packet);
-    free(rec);
+    av_packet_unref(&rec->packet);
+    SDL_free(rec);
 }

 static void
@@ -65,6 +60,50 @@ recorder_queue_clear(struct recorder_queue *queue) {
    }
 }

+bool
+recorder_init(struct recorder *recorder,
+              const char *filename,
+              enum sc_record_format format,
+              struct size declared_frame_size) {
+    recorder->filename = SDL_strdup(filename);
+    if (!recorder->filename) {
+        LOGE("Could not strdup filename");
+        return false;
+    }
+
+    recorder->mutex = SDL_CreateMutex();
+    if (!recorder->mutex) {
+        LOGC("Could not create mutex");
+        SDL_free(recorder->filename);
+        return false;
+    }
+
+    recorder->queue_cond = SDL_CreateCond();
+    if (!recorder->queue_cond) {
+        LOGC("Could not create cond");
+        SDL_DestroyMutex(recorder->mutex);
+        SDL_free(recorder->filename);
+        return false;
+    }
+
+    queue_init(&recorder->queue);
+    recorder->stopped = false;
+    recorder->failed = false;
+    recorder->format = format;
+    recorder->declared_frame_size = declared_frame_size;
+    recorder->header_written = false;
+    recorder->previous = NULL;
+
+    return true;
+}
+
+void
+recorder_destroy(struct recorder *recorder) {
+    SDL_DestroyCond(recorder->queue_cond);
+    SDL_DestroyMutex(recorder->mutex);
+    SDL_free(recorder->filename);
+}
+
 static const char *
 recorder_get_format_name(enum sc_record_format format) {
    switch (format) {
@@ -74,6 +113,88 @@ recorder_get_format_name(enum sc_record_format format) {
    }
 }

+bool
+recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
+    const char *format_name = recorder_get_format_name(recorder->format);
+    assert(format_name);
+    const AVOutputFormat *format = find_muxer(format_name);
+    if (!format) {
+        LOGE("Could not find muxer");
+        return false;
+    }
+
+    recorder->ctx = avformat_alloc_context();
+    if (!recorder->ctx) {
+        LOGE("Could not allocate output context");
+        return false;
+    }
+
+    // contrary to the deprecated API (av_oformat_next()), av_muxer_iterate()
+    // returns (on purpose) a pointer-to-const, but AVFormatContext.oformat
+    // still expects a pointer-to-non-const (it has not be updated accordingly)
+    // <https://github.com/FFmpeg/FFmpeg/commit/0694d8702421e7aff1340038559c438b61bb30dd>
+    recorder->ctx->oformat = (AVOutputFormat *) format;
+
+    av_dict_set(&recorder->ctx->metadata, "comment",
+                "Recorded by scrcpy " SCRCPY_VERSION, 0);
+
+    AVStream *ostream = avformat_new_stream(recorder->ctx, input_codec);
+    if (!ostream) {
+        avformat_free_context(recorder->ctx);
+        return false;
+    }
+
+#ifdef SCRCPY_LAVF_HAS_NEW_CODEC_PARAMS_API
+    ostream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+    ostream->codecpar->codec_id = input_codec->id;
+    ostream->codecpar->format = AV_PIX_FMT_YUV420P;
+    ostream->codecpar->width = recorder->declared_frame_size.width;
+    ostream->codecpar->height = recorder->declared_frame_size.height;
+#else
+    ostream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+    ostream->codec->codec_id = input_codec->id;
+    ostream->codec->pix_fmt = AV_PIX_FMT_YUV420P;
+    ostream->codec->width = recorder->declared_frame_size.width;
+    ostream->codec->height = recorder->declared_frame_size.height;
+#endif
+
+    int ret = avio_open(&recorder->ctx->pb, recorder->filename,
+                        AVIO_FLAG_WRITE);
+    if (ret < 0) {
+        LOGE("Failed to open output file: %s", recorder->filename);
+        // ostream will be cleaned up during context cleaning
+        avformat_free_context(recorder->ctx);
+        return false;
+    }
+
+    LOGI("Recording started to %s file: %s", format_name, recorder->filename);
+
+    return true;
+}
+
+void
+recorder_close(struct recorder *recorder) {
+    if (recorder->header_written) {
+        int ret = av_write_trailer(recorder->ctx);
+        if (ret < 0) {
+            LOGE("Failed to write trailer to %s", recorder->filename);
+            recorder->failed = true;
+        }
+    } else {
+        // the recorded file is empty
+        recorder->failed = true;
+    }
+    avio_close(recorder->ctx->pb);
+    avformat_free_context(recorder->ctx);
+
+    if (recorder->failed) {
+        LOGE("Recording failed to %s", recorder->filename);
+    } else {
+        const char *format_name = recorder_get_format_name(recorder->format);
+        LOGI("Recording complete to %s file: %s", format_name, recorder->filename);
+    }
+}
+
 static bool
 recorder_write_header(struct recorder *recorder, const AVPacket *packet) {
    AVStream *ostream = recorder->ctx->streams[0];
@@ -87,8 +208,13 @@ recorder_write_header(struct recorder *recorder, const AVPacket *packet) {
    // copy the first packet to the extra data
    memcpy(extradata, packet->data, packet->size);

+#ifdef SCRCPY_LAVF_HAS_NEW_CODEC_PARAMS_API
    ostream->codecpar->extradata = extradata;
    ostream->codecpar->extradata_size = packet->size;
+#else
+    ostream->codec->extradata = extradata;
+    ostream->codec->extradata_size = packet->size;
+#endif

    int ret = avformat_write_header(recorder->ctx, NULL);
    if (ret < 0) {
@@ -105,7 +231,7 @@ recorder_rescale_packet(struct recorder *recorder, AVPacket *packet) {
    av_packet_rescale_ts(packet, SCRCPY_TIME_BASE, ostream->time_base);
 }

-static bool
+bool
 recorder_write(struct recorder *recorder, AVPacket *packet) {
    if (!recorder->header_written) {
        if (packet->pts != AV_NOPTS_VALUE) {
@@ -134,22 +260,22 @@ 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
-                last->packet->duration = 100000;
-                bool ok = recorder_write(recorder, last->packet);
+                last->packet.duration = 100000;
+                bool ok = recorder_write(recorder, &last->packet);
                if (!ok) {
                    // failing to write the last frame is not very serious, no
                    // future frame may depend on it, so the resulting file
@@ -164,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;
@@ -176,45 +302,25 @@ run_recorder(void *data) {
        }

        // config packets have no PTS, we must ignore them
-        if (rec->packet->pts != AV_NOPTS_VALUE
-            && previous->packet->pts != AV_NOPTS_VALUE) {
+        if (rec->packet.pts != AV_NOPTS_VALUE
+            && previous->packet.pts != AV_NOPTS_VALUE) {
            // we now know the duration of the previous packet
-            previous->packet->duration =
-                rec->packet->pts - previous->packet->pts;
+            previous->packet.duration = rec->packet.pts - previous->packet.pts;
        }

-        bool ok = recorder_write(recorder, previous->packet);
+        bool ok = recorder_write(recorder, &previous->packet);
        record_packet_delete(previous);
        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;
        }
-    }

-    if (!recorder->failed) {
-        if (recorder->header_written) {
-            int ret = av_write_trailer(recorder->ctx);
-            if (ret < 0) {
-                LOGE("Failed to write trailer to %s", recorder->filename);
-                recorder->failed = true;
-            }
-        } else {
-            // the recorded file is empty
-            recorder->failed = true;
-        }
-    }
-
-    if (recorder->failed) {
-        LOGE("Recording failed to %s", recorder->filename);
-    } else {
-        const char *format_name = recorder_get_format_name(recorder->format);
-        LOGI("Recording complete to %s file: %s", format_name, recorder->filename);
    }

    LOGD("Recorder thread ended");
@@ -222,176 +328,53 @@ run_recorder(void *data) {
    return 0;
 }

-static bool
-recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
-    bool ok = sc_mutex_init(&recorder->mutex);
-    if (!ok) {
-        LOGC("Could not create mutex");
+bool
+recorder_start(struct recorder *recorder) {
+    LOGD("Starting recorder thread");
+
+    recorder->thread = SDL_CreateThread(run_recorder, "recorder", recorder);
+    if (!recorder->thread) {
+        LOGC("Could not start recorder thread");
        return false;
    }

-    ok = sc_cond_init(&recorder->queue_cond);
-    if (!ok) {
-        LOGC("Could not create cond");
-        goto error_mutex_destroy;
-    }
-
-    queue_init(&recorder->queue);
-    recorder->stopped = false;
-    recorder->failed = false;
-    recorder->header_written = false;
-    recorder->previous = NULL;
-
-    const char *format_name = recorder_get_format_name(recorder->format);
-    assert(format_name);
-    const AVOutputFormat *format = find_muxer(format_name);
-    if (!format) {
-        LOGE("Could not find muxer");
-        goto error_cond_destroy;
-    }
-
-    recorder->ctx = avformat_alloc_context();
-    if (!recorder->ctx) {
-        LOGE("Could not allocate output context");
-        goto error_cond_destroy;
-    }
-
-    // contrary to the deprecated API (av_oformat_next()), av_muxer_iterate()
-    // returns (on purpose) a pointer-to-const, but AVFormatContext.oformat
-    // still expects a pointer-to-non-const (it has not be updated accordingly)
-    // <https://github.com/FFmpeg/FFmpeg/commit/0694d8702421e7aff1340038559c438b61bb30dd>
-    recorder->ctx->oformat = (AVOutputFormat *) format;
-
-    av_dict_set(&recorder->ctx->metadata, "comment",
-                "Recorded by scrcpy " SCRCPY_VERSION, 0);
-
-    AVStream *ostream = avformat_new_stream(recorder->ctx, input_codec);
-    if (!ostream) {
-        goto error_avformat_free_context;
-    }
-
-    ostream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
-    ostream->codecpar->codec_id = input_codec->id;
-    ostream->codecpar->format = AV_PIX_FMT_YUV420P;
-    ostream->codecpar->width = recorder->declared_frame_size.width;
-    ostream->codecpar->height = recorder->declared_frame_size.height;
-
-    int ret = avio_open(&recorder->ctx->pb, recorder->filename,
-                        AVIO_FLAG_WRITE);
-    if (ret < 0) {
-        LOGE("Failed to open output file: %s", recorder->filename);
-        // ostream will be cleaned up during context cleaning
-        goto error_avformat_free_context;
-    }
-
-    LOGD("Starting recorder thread");
-    ok = sc_thread_create(&recorder->thread, run_recorder, "recorder",
-                               recorder);
-    if (!ok) {
-        LOGC("Could not start recorder thread");
-        goto error_avio_close;
-    }
-
-    LOGI("Recording started to %s file: %s", format_name, recorder->filename);
-
    return true;
-
-error_avio_close:
-    avio_close(recorder->ctx->pb);
-error_avformat_free_context:
-    avformat_free_context(recorder->ctx);
-error_cond_destroy:
-    sc_cond_destroy(&recorder->queue_cond);
-error_mutex_destroy:
-    sc_mutex_destroy(&recorder->mutex);
-
-    return false;
 }

-static void
-recorder_close(struct recorder *recorder) {
-    sc_mutex_lock(&recorder->mutex);
+void
+recorder_stop(struct recorder *recorder) {
+    mutex_lock(recorder->mutex);
    recorder->stopped = true;
-    sc_cond_signal(&recorder->queue_cond);
-    sc_mutex_unlock(&recorder->mutex);
-
-    sc_thread_join(&recorder->thread, NULL);
-
-    avio_close(recorder->ctx->pb);
-    avformat_free_context(recorder->ctx);
-    sc_cond_destroy(&recorder->queue_cond);
-    sc_mutex_destroy(&recorder->mutex);
+    cond_signal(recorder->queue_cond);
+    mutex_unlock(recorder->mutex);
 }

-static bool
+void
+recorder_join(struct recorder *recorder) {
+    SDL_WaitThread(recorder->thread, NULL);
+}
+
+bool
 recorder_push(struct recorder *recorder, const AVPacket *packet) {
-    sc_mutex_lock(&recorder->mutex);
+    mutex_lock(recorder->mutex);
    assert(!recorder->stopped);

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

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

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

-    sc_mutex_unlock(&recorder->mutex);
+    mutex_unlock(recorder->mutex);
    return true;
 }
-
-static bool
-recorder_packet_sink_open(struct sc_packet_sink *sink, const AVCodec *codec) {
-    struct recorder *recorder = DOWNCAST(sink);
-    return recorder_open(recorder, codec);
-}
-
-static void
-recorder_packet_sink_close(struct sc_packet_sink *sink) {
-    struct recorder *recorder = DOWNCAST(sink);
-    recorder_close(recorder);
-}
-
-static bool
-recorder_packet_sink_push(struct sc_packet_sink *sink, const AVPacket *packet) {
-    struct recorder *recorder = DOWNCAST(sink);
-    return recorder_push(recorder, packet);
-}
-
-bool
-recorder_init(struct recorder *recorder,
-              const char *filename,
-              enum sc_record_format format,
-              struct size declared_frame_size) {
-    recorder->filename = strdup(filename);
-    if (!recorder->filename) {
-        LOGE("Could not strdup filename");
-        return false;
-    }
-
-    recorder->format = format;
-    recorder->declared_frame_size = declared_frame_size;
-
-    static const struct sc_packet_sink_ops ops = {
-        .open = recorder_packet_sink_open,
-        .close = recorder_packet_sink_close,
-        .push = recorder_packet_sink_push,
-    };
-
-    recorder->packet_sink.ops = &ops;
-
-    return true;
-}
-
-void
-recorder_destroy(struct recorder *recorder) {
-    free(recorder->filename);
-}
--- a/app/src/recorder.h
+++ b/app/src/recorder.h
@@ -1,37 +1,34 @@
 #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 "trait/packet_sink.h"
 #include "util/queue.h"
-#include "util/thread.h"

 struct record_packet {
-    AVPacket *packet;
+    AVPacket packet;
    struct record_packet *next;
 };

 struct recorder_queue QUEUE(struct record_packet);

 struct recorder {
-    struct sc_packet_sink packet_sink; // packet sink trait
-
    char *filename;
    enum sc_record_format format;
    AVFormatContext *ctx;
    struct size declared_frame_size;
    bool header_written;

-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond queue_cond;
-    bool stopped; // set on recorder_close()
+    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;

@@ -49,4 +46,22 @@ recorder_init(struct recorder *recorder, const char *filename,
 void
 recorder_destroy(struct recorder *recorder);

+bool
+recorder_open(struct recorder *recorder, const AVCodec *input_codec);
+
+void
+recorder_close(struct recorder *recorder);
+
+bool
+recorder_start(struct recorder *recorder);
+
+void
+recorder_stop(struct recorder *recorder);
+
+void
+recorder_join(struct recorder *recorder);
+
+bool
+recorder_push(struct recorder *recorder, const AVPacket *packet);
+
 #endif
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -13,34 +13,49 @@
 # 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"
 #include "events.h"
 #include "file_handler.h"
+#include "fps_counter.h"
 #include "input_manager.h"
 #include "recorder.h"
 #include "screen.h"
 #include "server.h"
 #include "stream.h"
 #include "tiny_xpm.h"
+#include "video_buffer.h"
+#include "util/lock.h"
 #include "util/log.h"
 #include "util/net.h"
-#ifdef HAVE_V4L2
-# include "v4l2_sink.h"
-#endif

-struct scrcpy {
-    struct server server;
-    struct screen screen;
-    struct stream stream;
-    struct decoder decoder;
-    struct recorder recorder;
-#ifdef HAVE_V4L2
-    struct sc_v4l2_sink v4l2_sink;
-#endif
-    struct controller controller;
-    struct file_handler file_handler;
-    struct input_manager input_manager;
+static struct server server;
+static struct screen screen = SCREEN_INITIALIZER;
+static struct fps_counter fps_counter;
+static struct video_buffer video_buffer;
+static struct stream stream;
+static struct decoder decoder;
+static struct recorder recorder;
+static struct controller controller;
+static struct file_handler file_handler;
+
+static struct input_manager input_manager = {
+    .controller = &controller,
+    .video_buffer = &video_buffer,
+    .screen = &screen,
+    .repeat = 0,
+
+    // initialized later
+    .prefer_text = false,
+    .sdl_shortcut_mods = {
+        .data = {0},
+        .count = 0,
+    },
 };

 #ifdef _WIN32
@@ -118,6 +133,30 @@ sdl_init_and_configure(bool display, const char *render_driver,
    return true;
 }

+
+#if defined(__APPLE__) || defined(__WINDOWS__)
+# define CONTINUOUS_RESIZING_WORKAROUND
+#endif
+
+#ifdef CONTINUOUS_RESIZING_WORKAROUND
+// On Windows and MacOS, resizing blocks the event loop, so resizing events are
+// not triggered. As a workaround, handle them in an event handler.
+//
+// <https://bugzilla.libsdl.org/show_bug.cgi?id=2077>
+// <https://stackoverflow.com/a/40693139/1987178>
+static int
+event_watcher(void *data, SDL_Event *event) {
+    (void) data;
+    if (event->type == SDL_WINDOWEVENT
+            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
+        // In practice, it seems to always be called from the same thread in
+        // that specific case. Anyway, it's just a workaround.
+        screen_render(&screen, true);
+    }
+    return 0;
+}
+#endif
+
 static bool
 is_apk(const char *file) {
    const char *ext = strrchr(file, '.');
@@ -131,8 +170,7 @@ enum event_result {
 };

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

 static bool
-event_loop(struct scrcpy *s, const struct scrcpy_options *options) {
+event_loop(const struct scrcpy_options *options) {
+#ifdef CONTINUOUS_RESIZING_WORKAROUND
+    if (options->display) {
+        SDL_AddEventWatch(event_watcher, NULL);
+    }
+#endif
    SDL_Event event;
    while (SDL_WaitEvent(&event)) {
-        enum event_result result = handle_event(s, options, &event);
+        enum event_result result = handle_event(&event, options);
        switch (result) {
            case EVENT_RESULT_STOPPED_BY_USER:
                return true;
@@ -216,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;
@@ -225,44 +299,28 @@ 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);
-}
-
-static void
-stream_on_eos(struct stream *stream, void *userdata) {
-    (void) stream;
-    (void) userdata;
-
-    SDL_Event stop_event;
-    stop_event.type = EVENT_STREAM_STOPPED;
-    SDL_PushEvent(&stop_event);
+    SDL_free(local_fmt);
 }

 bool
 scrcpy(const struct scrcpy_options *options) {
-    static struct scrcpy scrcpy;
-    struct scrcpy *s = &scrcpy;
-
-    if (!server_init(&s->server)) {
+    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;
-#ifdef HAVE_V4L2
-    bool v4l2_sink_initialized = false;
-#endif
    bool stream_started = false;
    bool controller_initialized = false;
    bool controller_started = false;
-    bool screen_initialized = false;

    bool record = !!options->record_filename;
    struct server_params params = {
-        .serial = options->serial,
        .log_level = options->log_level,
        .crop = options->crop,
        .port_range = options->port_range,
@@ -277,9 +335,8 @@ scrcpy(const struct scrcpy_options *options) {
        .codec_options = options->codec_options,
        .encoder_name = options->encoder_name,
        .force_adb_forward = options->force_adb_forward,
-        .power_off_on_close = options->power_off_on_close,
    };
-    if (!server_start(&s->server, &params)) {
+    if (!server_start(&server, options->serial, &params)) {
        goto end;
    }

@@ -290,66 +347,76 @@ scrcpy(const struct scrcpy_options *options) {
        goto end;
    }

-    char device_name[DEVICE_NAME_FIELD_LENGTH];
-    struct size frame_size;
-
-    if (!server_connect_to(&s->server, device_name, &frame_size)) {
+    if (!server_connect_to(&server)) {
        goto end;
    }

-    if (options->display && options->control) {
-        if (!file_handler_init(&s->file_handler, s->server.serial,
-                               options->push_target)) {
-            goto end;
-        }
-        file_handler_initialized = true;
+    char device_name[DEVICE_NAME_FIELD_LENGTH];
+    struct size frame_size;
+
+    // screenrecord does not send frames when the screen content does not
+    // change therefore, we transmit the screen size before the video stream,
+    // to be able to init the window immediately
+    if (!device_read_info(server.video_socket, device_name, &frame_size)) {
+        goto end;
    }

    struct decoder *dec = NULL;
-    bool needs_decoder = options->display;
-#ifdef HAVE_V4L2
-    needs_decoder |= !!options->v4l2_device;
-#endif
-    if (needs_decoder) {
-        decoder_init(&s->decoder);
-        dec = &s->decoder;
+    if (options->display) {
+        if (!fps_counter_init(&fps_counter)) {
+            goto end;
+        }
+        fps_counter_initialized = true;
+
+        if (!video_buffer_init(&video_buffer, &fps_counter,
+                               options->render_expired_frames)) {
+            goto end;
+        }
+        video_buffer_initialized = true;
+
+        if (options->control) {
+            if (!file_handler_init(&file_handler, server.serial,
+                                   options->push_target)) {
+                goto end;
+            }
+            file_handler_initialized = true;
+        }
+
+        decoder_init(&decoder, &video_buffer);
+        dec = &decoder;
    }

    struct recorder *rec = NULL;
    if (record) {
-        if (!recorder_init(&s->recorder,
+        if (!recorder_init(&recorder,
                           options->record_filename,
                           options->record_format,
                           frame_size)) {
            goto end;
        }
-        rec = &s->recorder;
+        rec = &recorder;
        recorder_initialized = true;
    }

    av_log_set_callback(av_log_callback);

-    const struct stream_callbacks stream_cbs = {
-        .on_eos = stream_on_eos,
-    };
-    stream_init(&s->stream, s->server.video_socket, &stream_cbs, NULL);
+    stream_init(&stream, server.video_socket, dec, rec);

-    if (dec) {
-        stream_add_sink(&s->stream, &dec->packet_sink);
-    }
-
-    if (rec) {
-        stream_add_sink(&s->stream, &rec->packet_sink);
+    // now we consumed the header values, the socket receives the video stream
+    // start the stream
+    if (!stream_start(&stream)) {
+        goto end;
    }
+    stream_started = true;

    if (options->display) {
        if (options->control) {
-            if (!controller_init(&s->controller, s->server.control_socket)) {
+            if (!controller_init(&controller, server.control_socket)) {
                goto end;
            }
            controller_initialized = true;

-            if (!controller_start(&s->controller)) {
+            if (!controller_start(&controller)) {
                goto end;
            }
            controller_started = true;
@@ -358,120 +425,89 @@ scrcpy(const struct scrcpy_options *options) {
        const char *window_title =
            options->window_title ? options->window_title : device_name;

-        struct screen_params screen_params = {
-            .window_title = window_title,
-            .frame_size = frame_size,
-            .always_on_top = options->always_on_top,
-            .window_x = options->window_x,
-            .window_y = options->window_y,
-            .window_width = options->window_width,
-            .window_height = options->window_height,
-            .window_borderless = options->window_borderless,
-            .rotation = options->rotation,
-            .mipmaps = options->mipmaps,
-            .fullscreen = options->fullscreen,
-        };
-
-        if (!screen_init(&s->screen, &screen_params)) {
+        if (!screen_init_rendering(&screen, window_title, frame_size,
+                                   options->always_on_top, options->window_x,
+                                   options->window_y, options->window_width,
+                                   options->window_height,
+                                   options->window_borderless,
+                                   options->rotation, options->mipmaps)) {
            goto end;
        }
-        screen_initialized = true;
-
-        decoder_add_sink(&s->decoder, &s->screen.frame_sink);

        if (options->turn_screen_off) {
            struct control_msg msg;
            msg.type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
            msg.set_screen_power_mode.mode = SCREEN_POWER_MODE_OFF;

-            if (!controller_push_msg(&s->controller, &msg)) {
+            if (!controller_push_msg(&controller, &msg)) {
                LOGW("Could not request 'set screen power mode'");
            }
        }
-    }

-#ifdef HAVE_V4L2
-    if (options->v4l2_device) {
-        if (!sc_v4l2_sink_init(&s->v4l2_sink, options->v4l2_device, frame_size)) {
-            goto end;
+        if (options->fullscreen) {
+            screen_switch_fullscreen(&screen);
        }
-
-        decoder_add_sink(&s->decoder, &s->v4l2_sink.frame_sink);
-
-        v4l2_sink_initialized = true;
    }
-#endif

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

-    input_manager_init(&s->input_manager, &s->controller, &s->screen, options);
-
-    ret = event_loop(s, options);
+    ret = event_loop(options);
    LOGD("quit...");

-    // Close the window immediately on closing, because screen_destroy() may
-    // only be called once the stream thread is joined (it may take time)
-    screen_hide_window(&s->screen);
+    screen_destroy(&screen);

 end:
-    // The stream is not stopped explicitly, because it will stop by itself on
-    // end-of-stream
+    // stop stream and controller so that they don't continue once their socket
+    // is shutdown
+    if (stream_started) {
+        stream_stop(&stream);
+    }
    if (controller_started) {
-        controller_stop(&s->controller);
+        controller_stop(&controller);
    }
    if (file_handler_initialized) {
-        file_handler_stop(&s->file_handler);
+        file_handler_stop(&file_handler);
    }
-    if (screen_initialized) {
-        screen_interrupt(&s->screen);
+    if (fps_counter_initialized) {
+        fps_counter_interrupt(&fps_counter);
    }

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

    // now that the sockets are shutdown, the stream and controller are
    // interrupted, we can join them
    if (stream_started) {
-        stream_join(&s->stream);
+        stream_join(&stream);
    }
-
-#ifdef HAVE_V4L2
-    if (v4l2_sink_initialized) {
-        sc_v4l2_sink_destroy(&s->v4l2_sink);
-    }
-#endif
-
-    // Destroy the screen only after the stream is guaranteed to be finished,
-    // because otherwise the screen could receive new frames after destruction
-    if (screen_initialized) {
-        screen_join(&s->screen);
-        screen_destroy(&s->screen);
-    }
-
    if (controller_started) {
-        controller_join(&s->controller);
+        controller_join(&controller);
    }
    if (controller_initialized) {
-        controller_destroy(&s->controller);
+        controller_destroy(&controller);
    }

    if (recorder_initialized) {
-        recorder_destroy(&s->recorder);
+        recorder_destroy(&recorder);
    }

    if (file_handler_initialized) {
-        file_handler_join(&s->file_handler);
-        file_handler_destroy(&s->file_handler);
+        file_handler_join(&file_handler);
+        file_handler_destroy(&file_handler);
    }

-    server_destroy(&s->server);
+    if (video_buffer_initialized) {
+        video_buffer_destroy(&video_buffer);
+    }
+
+    if (fps_counter_initialized) {
+        fps_counter_join(&fps_counter);
+        fps_counter_destroy(&fps_counter);
+    }
+
+    server_destroy(&server);

    return ret;
 }
--- 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,
@@ -20,16 +20,6 @@ enum sc_record_format {
    SC_RECORD_FORMAT_MKV,
 };

-enum sc_lock_video_orientation {
-    SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
-    // lock the current orientation when scrcpy starts
-    SC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,
-    SC_LOCK_VIDEO_ORIENTATION_0 = 0,
-    SC_LOCK_VIDEO_ORIENTATION_1,
-    SC_LOCK_VIDEO_ORIENTATION_2,
-    SC_LOCK_VIDEO_ORIENTATION_3,
-};
-
 #define SC_MAX_SHORTCUT_MODS 8

 enum sc_shortcut_mod {
@@ -62,7 +52,6 @@ struct scrcpy_options {
    const char *render_driver;
    const char *codec_options;
    const char *encoder_name;
-    const char *v4l2_device;
    enum sc_log_level log_level;
    enum sc_record_format record_format;
    struct sc_port_range port_range;
@@ -70,19 +59,20 @@ struct scrcpy_options {
    uint16_t max_size;
    uint32_t bit_rate;
    uint16_t max_fps;
-    enum sc_lock_video_orientation lock_video_orientation;
+    int8_t lock_video_orientation;
    uint8_t rotation;
    int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
    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;
    bool control;
    bool display;
    bool turn_screen_off;
+    bool render_expired_frames;
    bool prefer_text;
    bool window_borderless;
    bool mipmaps;
@@ -92,7 +82,6 @@ struct scrcpy_options {
    bool forward_key_repeat;
    bool forward_all_clicks;
    bool legacy_paste;
-    bool power_off_on_close;
 };

 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -104,7 +93,6 @@ struct scrcpy_options {
    .render_driver = NULL, \
    .codec_options = NULL, \
    .encoder_name = NULL, \
-    .v4l2_device = NULL, \
    .log_level = SC_LOG_LEVEL_INFO, \
    .record_format = SC_RECORD_FORMAT_AUTO, \
    .port_range = { \
@@ -115,10 +103,10 @@ struct scrcpy_options {
        .data = {SC_MOD_LALT, SC_MOD_LSUPER}, \
        .count = 2, \
    }, \
-    .max_size = 0, \
+    .max_size = DEFAULT_MAX_SIZE, \
    .bit_rate = DEFAULT_BIT_RATE, \
    .max_fps = 0, \
-    .lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED, \
+    .lock_video_orientation = DEFAULT_LOCK_VIDEO_ORIENTATION, \
    .rotation = 0, \
    .window_x = SC_WINDOW_POSITION_UNDEFINED, \
    .window_y = SC_WINDOW_POSITION_UNDEFINED, \
@@ -131,6 +119,7 @@ struct scrcpy_options {
    .control = true, \
    .display = true, \
    .turn_screen_off = false, \
+    .render_expired_frames = false, \
    .prefer_text = false, \
    .window_borderless = false, \
    .mipmaps = true, \
@@ -140,7 +129,6 @@ struct scrcpy_options {
    .forward_key_repeat = true, \
    .forward_all_clicks = false, \
    .legacy_paste = false, \
-    .power_off_on_close = false, \
 }

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

-#include "events.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

-#define DOWNCAST(SINK) container_of(SINK, struct screen, frame_sink)
-
 static inline struct size
 get_rotated_size(struct size size, int rotation) {
    struct size rotated_size;
@@ -41,18 +42,6 @@ get_window_size(const struct screen *screen) {
    return size;
 }

-static struct point
-get_window_position(const struct screen *screen) {
-    int x;
-    int y;
-    SDL_GetWindowPosition(screen->window, &x, &y);
-
-    struct point point;
-    point.x = x;
-    point.y = y;
-    return point;
-}
-
 // set the window size to be applied when fullscreen is disabled
 static void
 set_window_size(struct screen *screen, struct size new_size) {
@@ -134,6 +123,13 @@ get_optimal_size(struct size current_size, struct size content_size) {
    return window_size;
 }

+// same as get_optimal_size(), but read the current size from the window
+static inline struct size
+get_optimal_window_size(const struct screen *screen, struct size content_size) {
+    struct size window_size = get_window_size(screen);
+    return get_optimal_size(window_size, content_size);
+}
+
 // initially, there is no current size, so use the frame size as current size
 // req_width and req_height, if not 0, are the sizes requested by the user
 static inline struct size
@@ -198,6 +194,11 @@ screen_update_content_rect(struct screen *screen) {
    }
 }

+void
+screen_init(struct screen *screen) {
+    *screen = (struct screen) SCREEN_INITIALIZER;
+}
+
 static inline SDL_Texture *
 create_texture(struct screen *screen) {
    SDL_Renderer *renderer = screen->renderer;
@@ -225,112 +226,27 @@ create_texture(struct screen *screen) {
    return texture;
 }

-#if defined(__APPLE__) || defined(__WINDOWS__)
-# define CONTINUOUS_RESIZING_WORKAROUND
-#endif
-
-#ifdef CONTINUOUS_RESIZING_WORKAROUND
-// On Windows and MacOS, resizing blocks the event loop, so resizing events are
-// not triggered. As a workaround, handle them in an event handler.
-//
-// <https://bugzilla.libsdl.org/show_bug.cgi?id=2077>
-// <https://stackoverflow.com/a/40693139/1987178>
-static int
-event_watcher(void *data, SDL_Event *event) {
-    struct screen *screen = data;
-    if (event->type == SDL_WINDOWEVENT
-            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
-        // In practice, it seems to always be called from the same thread in
-        // that specific case. Anyway, it's just a workaround.
-        screen_render(screen, true);
-    }
-    return 0;
-}
-#endif
-
-static bool
-screen_frame_sink_open(struct sc_frame_sink *sink) {
-    struct screen *screen = DOWNCAST(sink);
-    (void) screen;
-#ifndef NDEBUG
-    screen->open = true;
-#endif
-
-    // nothing to do, the screen is already open on the main thread
-    return true;
-}
-
-static void
-screen_frame_sink_close(struct sc_frame_sink *sink) {
-    struct screen *screen = DOWNCAST(sink);
-    (void) screen;
-#ifndef NDEBUG
-    screen->open = false;
-#endif
-
-    // nothing to do, the screen lifecycle is not managed by the frame producer
-}
-
-static bool
-screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
-    struct screen *screen = DOWNCAST(sink);
-
-    bool previous_frame_skipped;
-    bool ok = video_buffer_push(&screen->vb, frame, &previous_frame_skipped);
-    if (!ok) {
-        return false;
-    }
-
-    if (previous_frame_skipped) {
-        fps_counter_add_skipped_frame(&screen->fps_counter);
-        // The EVENT_NEW_FRAME triggered for the previous frame will consume
-        // this new frame instead
-    } else {
-        static SDL_Event new_frame_event = {
-            .type = EVENT_NEW_FRAME,
-        };
-
-        // Post the event on the UI thread
-        SDL_PushEvent(&new_frame_event);
-    }
-
-    return true;
-}
-
 bool
-screen_init(struct screen *screen, const struct screen_params *params) {
-    screen->resize_pending = false;
-    screen->has_frame = false;
-    screen->fullscreen = false;
-    screen->maximized = false;
-
-    bool ok = video_buffer_init(&screen->vb);
-    if (!ok) {
-        LOGE("Could not initialize video buffer");
-        return false;
+screen_init_rendering(struct screen *screen, const char *window_title,
+                      struct size frame_size, bool always_on_top,
+                      int16_t window_x, int16_t window_y, uint16_t window_width,
+                      uint16_t window_height, bool window_borderless,
+                      uint8_t rotation, bool mipmaps) {
+    screen->frame_size = frame_size;
+    screen->rotation = rotation;
+    if (rotation) {
+        LOGI("Initial display rotation set to %u", rotation);
    }
-
-    if (!fps_counter_init(&screen->fps_counter)) {
-        LOGE("Could not initialize FPS counter");
-        goto error_destroy_video_buffer;
-    }
-
-    screen->frame_size = params->frame_size;
-    screen->rotation = params->rotation;
-    if (screen->rotation) {
-        LOGI("Initial display rotation set to %u", screen->rotation);
-    }
-    struct size content_size =
-        get_rotated_size(screen->frame_size, screen->rotation);
+    struct size content_size = get_rotated_size(frame_size, screen->rotation);
    screen->content_size = content_size;

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

-    int x = params->window_x != SC_WINDOW_POSITION_UNDEFINED
-          ? params->window_x : (int) SDL_WINDOWPOS_UNDEFINED;
-    int y = params->window_y != SC_WINDOW_POSITION_UNDEFINED
-          ? params->window_y : (int) SDL_WINDOWPOS_UNDEFINED;
-    screen->window = SDL_CreateWindow(params->window_title, x, y,
+    int x = window_x != SC_WINDOW_POSITION_UNDEFINED
+          ? window_x : (int) SDL_WINDOWPOS_UNDEFINED;
+    int y = window_y != SC_WINDOW_POSITION_UNDEFINED
+          ? window_y : (int) SDL_WINDOWPOS_UNDEFINED;
+    screen->window = SDL_CreateWindow(window_title, x, y,
                                      window_size.width, window_size.height,
                                      window_flags);
    if (!screen->window) {
        LOGC("Could not create window: %s", SDL_GetError());
-        goto error_destroy_fps_counter;
+        return false;
    }

    screen->renderer = SDL_CreateRenderer(screen->window, -1,
                                          SDL_RENDERER_ACCELERATED);
    if (!screen->renderer) {
        LOGC("Could not create renderer: %s", SDL_GetError());
-        goto error_destroy_window;
+        screen_destroy(screen);
+        return false;
    }

    SDL_RendererInfo renderer_info;
@@ -366,17 +283,15 @@ screen_init(struct screen *screen, const struct screen_params *params) {
    const char *renderer_name = r ? NULL : renderer_info.name;
    LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");

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

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

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

@@ -402,18 +317,13 @@ screen_init(struct screen *screen, const struct screen_params *params) {
        LOGW("Could not load icon");
    }

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

    // Reset the window size to trigger a SIZE_CHANGED event, to workaround
@@ -423,73 +333,25 @@ screen_init(struct screen *screen, const struct screen_params *params) {

    screen_update_content_rect(screen);

-    if (params->fullscreen) {
-        screen_switch_fullscreen(screen);
-    }
-
-#ifdef CONTINUOUS_RESIZING_WORKAROUND
-    SDL_AddEventWatch(event_watcher, screen);
-#endif
-
-    static const struct sc_frame_sink_ops ops = {
-        .open = screen_frame_sink_open,
-        .close = screen_frame_sink_close,
-        .push = screen_frame_sink_push,
-    };
-
-    screen->frame_sink.ops = &ops;
-
-#ifndef NDEBUG
-    screen->open = false;
-#endif
-
    return true;
-
-error_destroy_texture:
-    SDL_DestroyTexture(screen->texture);
-error_destroy_renderer:
-    SDL_DestroyRenderer(screen->renderer);
-error_destroy_window:
-    SDL_DestroyWindow(screen->window);
-error_destroy_fps_counter:
-    fps_counter_destroy(&screen->fps_counter);
-error_destroy_video_buffer:
-    video_buffer_destroy(&screen->vb);
-
-    return false;
 }

-static void
+void
 screen_show_window(struct screen *screen) {
    SDL_ShowWindow(screen->window);
 }

-void
-screen_hide_window(struct screen *screen) {
-    SDL_HideWindow(screen->window);
-}
-
-void
-screen_interrupt(struct screen *screen) {
-    fps_counter_interrupt(&screen->fps_counter);
-}
-
-void
-screen_join(struct screen *screen) {
-    fps_counter_join(&screen->fps_counter);
-}
-
 void
 screen_destroy(struct screen *screen) {
-#ifndef NDEBUG
-    assert(!screen->open);
-#endif
-    av_frame_free(&screen->frame);
-    SDL_DestroyTexture(screen->texture);
-    SDL_DestroyRenderer(screen->renderer);
-    SDL_DestroyWindow(screen->window);
-    fps_counter_destroy(&screen->fps_counter);
-    video_buffer_destroy(&screen->vb);
+    if (screen->texture) {
+        SDL_DestroyTexture(screen->texture);
+    }
+    if (screen->renderer) {
+        SDL_DestroyRenderer(screen->renderer);
+    }
+    if (screen->window) {
+        SDL_DestroyWindow(screen->window);
+    }
 }

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

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

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

    screen_render(screen, false);
    return true;
@@ -667,20 +528,9 @@ screen_resize_to_fit(struct screen *screen) {
        return;
    }

-    struct point point = get_window_position(screen);
-    struct size window_size = get_window_size(screen);
-
    struct size optimal_size =
-        get_optimal_size(window_size, screen->content_size);
-
-    // Center the window related to the device screen
-    assert(optimal_size.width <= window_size.width);
-    assert(optimal_size.height <= window_size.height);
-    uint32_t new_x = point.x + (window_size.width - optimal_size.width) / 2;
-    uint32_t new_y = point.y + (window_size.height - optimal_size.height) / 2;
-
+        get_optimal_window_size(screen, screen->content_size);
    SDL_SetWindowSize(screen->window, optimal_size.width, optimal_size.height);
-    SDL_SetWindowPosition(screen->window, new_x, new_y);
    LOGD("Resized to optimal size: %ux%u", optimal_size.width,
                                           optimal_size.height);
 }
@@ -702,53 +552,31 @@ screen_resize_to_pixel_perfect(struct screen *screen) {
                                            content_size.height);
 }

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

 struct point
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -1,30 +1,21 @@
 #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"
-#include "trait/frame_sink.h"
-#include "video_buffer.h"
+
+struct video_buffer;

 struct screen {
-    struct sc_frame_sink frame_sink; // frame sink trait
-
-#ifndef NDEBUG
-    bool open; // track the open/close state to assert correct behavior
-#endif
-
-    struct video_buffer vb;
-    struct fps_counter fps_counter;
-
    SDL_Window *window;
    SDL_Renderer *renderer;
    SDL_Texture *texture;
+    bool use_opengl;
    struct sc_opengl gl;
    struct size frame_size;
    struct size content_size; // rotated frame_size
@@ -41,52 +32,67 @@ struct screen {
    bool has_frame;
    bool fullscreen;
    bool maximized;
+    bool no_window;
    bool mipmaps;
-
-    AVFrame *frame;
 };

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

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

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

-// request to interrupt any inner thread
-// must be called before screen_join()
+// show the window
 void
-screen_interrupt(struct screen *screen);
-
-// join any inner thread
-void
-screen_join(struct screen *screen);
+screen_show_window(struct screen *screen);

 // destroy window, renderer and texture (if any)
 void
 screen_destroy(struct screen *screen);

-// hide the window
-//
-// It is used to hide the window immediately on closing without waiting for
-// screen_destroy()
-void
-screen_hide_window(struct screen *screen);
+// resize if necessary and write the rendered frame into the texture
+bool
+screen_update_frame(struct screen *screen, struct video_buffer *vb);

 // render the texture to the renderer
 //
@@ -111,9 +117,9 @@ screen_resize_to_pixel_perfect(struct screen *screen);
 void
 screen_set_rotation(struct screen *screen, unsigned rotation);

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

 // convert point from window coordinates to frame coordinates
 // x and y are expressed in pixels
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -5,10 +5,13 @@
 #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/lock.h"
 #include "util/log.h"
 #include "util/net.h"
 #include "util/str_util.h"
@@ -31,7 +34,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 +46,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;
@@ -58,19 +61,19 @@ get_server_path(void) {
        LOGE("Could not get executable path, "
             "using " SERVER_FILENAME " from current directory");
        // not found, use current directory
-        return strdup(SERVER_FILENAME);
+        return SERVER_FILENAME;
    }
    char *dir = dirname(executable_path);
    size_t dirlen = strlen(dir);

    // 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);
-        return strdup(SERVER_FILENAME);
+        SDL_free(executable_path);
+        return SERVER_FILENAME;
    }

    memcpy(server_path, dir, dirlen);
@@ -78,7 +81,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 +96,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
@@ -255,12 +258,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,
@@ -293,7 +296,6 @@ execute_server(struct server *server, const struct server_params *params) {
        params->stay_awake ? "true" : "false",
        params->codec_options ? params->codec_options : "-",
        params->encoder_name ? params->encoder_name : "-",
-        params->power_off_on_close ? "true" : "false",
    };
 #ifdef SERVER_DEBUGGER
    LOGI("Server debugger waiting for a client on device port "
@@ -306,7 +308,7 @@ execute_server(struct server *server, const struct server_params *params) {
    //     Port: 5005
    // Then click on "Debug"
 #endif
-    return adb_execute(server->serial, cmd, ARRAY_LEN(cmd));
+    return adb_execute(server->serial, cmd, sizeof(cmd) / sizeof(cmd[0]));
 }

 static socket_t
@@ -356,17 +358,18 @@ bool
 server_init(struct server *server) {
    server->serial = NULL;
    server->process = PROCESS_NONE;
+    server->wait_server_thread = NULL;
    atomic_flag_clear_explicit(&server->server_socket_closed,
                               memory_order_relaxed);

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

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

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

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

    server->tunnel_enabled = false;
@@ -387,12 +392,12 @@ server_init(struct server *server) {
 static int
 run_wait_server(void *data) {
    struct server *server = data;
-    process_wait(server->process, false); // ignore exit code
+    cmd_simple_wait(server->process, NULL); // ignore exit code

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

    // no need for synchronization, server_socket is initialized before this
    // thread was created
@@ -407,28 +412,30 @@ run_wait_server(void *data) {
 }

 bool
-server_start(struct server *server, const struct server_params *params) {
-    if (params->serial) {
-        server->serial = strdup(params->serial);
+server_start(struct server *server, const char *serial,
+             const struct server_params *params) {
+    server->port_range = params->port_range;
+
+    if (serial) {
+        server->serial = SDL_strdup(serial);
        if (!server->serial) {
            return false;
        }
    }

-    if (!push_server(params->serial)) {
-        /* server->serial will be freed on server_destroy() */
-        return false;
+    if (!push_server(serial)) {
+        goto error1;
    }

    if (!enable_tunnel_any_port(server, params->port_range,
                                params->force_adb_forward)) {
-        return false;
+        goto error1;
    }

    // server will connect to our server socket
    server->process = execute_server(server, params);
    if (server->process == PROCESS_NONE) {
-        goto error;
+        goto error2;
    }

    // If the server process dies before connecting to the server socket, then
@@ -437,19 +444,19 @@ server_start(struct server *server, const struct server_params *params) {
    // 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
-        goto error;
+    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;
    }

    server->tunnel_enabled = true;

    return true;

-error:
+error2:
    if (!server->tunnel_forward) {
        bool was_closed =
            atomic_flag_test_and_set(&server->server_socket_closed);
@@ -459,32 +466,13 @@ error:
        close_socket(server->server_socket);
    }
    disable_tunnel(server);
-
+error1:
+    SDL_free(server->serial);
    return false;
 }

-static bool
-device_read_info(socket_t device_socket, char *device_name, struct size *size) {
-    unsigned char buf[DEVICE_NAME_FIELD_LENGTH + 4];
-    int r = net_recv_all(device_socket, buf, sizeof(buf));
-    if (r < DEVICE_NAME_FIELD_LENGTH + 4) {
-        LOGE("Could not retrieve device information");
-        return false;
-    }
-    // in case the client sends garbage
-    buf[DEVICE_NAME_FIELD_LENGTH - 1] = '\0';
-    // strcpy is safe here, since name contains at least
-    // DEVICE_NAME_FIELD_LENGTH bytes and strlen(buf) < DEVICE_NAME_FIELD_LENGTH
-    strcpy(device_name, (char *) buf);
-    size->width = (buf[DEVICE_NAME_FIELD_LENGTH] << 8)
-            | buf[DEVICE_NAME_FIELD_LENGTH + 1];
-    size->height = (buf[DEVICE_NAME_FIELD_LENGTH + 2] << 8)
-            | buf[DEVICE_NAME_FIELD_LENGTH + 3];
-    return true;
-}
-
 bool
-server_connect_to(struct server *server, char *device_name, struct size *size) {
+server_connect_to(struct server *server) {
    if (!server->tunnel_forward) {
        server->video_socket = net_accept(server->server_socket);
        if (server->video_socket == INVALID_SOCKET) {
@@ -524,8 +512,7 @@ server_connect_to(struct server *server, char *device_name, struct size *size) {
    disable_tunnel(server); // ignore failure
    server->tunnel_enabled = false;

-    // The sockets will be closed on stop if device_read_info() fails
-    return device_read_info(server->video_socket, device_name, size);
+    return true;
 }

 void
@@ -549,33 +536,33 @@ server_stop(struct server *server) {
    }

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

    // After this delay, kill the server if it's not dead already.
    // On some devices, closing the sockets is not sufficient to wake up the
    // blocking calls while the device is asleep.
-    if (!signaled) {
-        // The process is terminated, but not reaped (closed) yet, so its PID
-        // is still valid.
+    if (r == SDL_MUTEX_TIMEDOUT) {
+        // FIXME There is a race condition here: there is a small chance that
+        // the process is already terminated, and the PID assigned to a new
+        // process.
        LOGW("Killing the server...");
-        process_terminate(server->process);
+        cmd_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);
+    SDL_DestroyCond(server->process_terminated_cond);
+    SDL_DestroyMutex(server->mutex);
 }
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -1,39 +1,38 @@
 #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 "coords.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;
+    SDL_mutex *mutex;
+    SDL_cond *process_terminated_cond;
    bool process_terminated;

    socket_t server_socket; // only used if !tunnel_forward
    socket_t video_socket;
    socket_t control_socket;
+    struct sc_port_range port_range;
    uint16_t local_port; // selected from port_range
    bool tunnel_enabled;
    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
 };

 struct server_params {
-    const char *serial;
    enum sc_log_level log_level;
    const char *crop;
    const char *codec_options;
@@ -44,11 +43,10 @@ struct server_params {
    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;
-    bool power_off_on_close;
 };

 // init default values
@@ -57,13 +55,12 @@ server_init(struct server *server);

 // push, enable tunnel et start the server
 bool
-server_start(struct server *server, const struct server_params *params);
+server_start(struct server *server, const char *serial,
+             const struct server_params *params);

-#define DEVICE_NAME_FIELD_LENGTH 64
 // block until the communication with the server is established
-// device_name must point to a buffer of at least DEVICE_NAME_FIELD_LENGTH bytes
 bool
-server_connect_to(struct server *server, char *device_name, struct size *size);
+server_connect_to(struct server *server);

 // disconnect and kill the server process
 void
--- a/app/src/stream.c
+++ b/app/src/stream.c
@@ -3,8 +3,13 @@
 #include <assert.h>
 #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"
@@ -57,12 +62,33 @@ stream_recv_packet(struct stream *stream, AVPacket *packet) {
    return true;
 }

+static void
+notify_stopped(void) {
+    SDL_Event stop_event;
+    stop_event.type = EVENT_STREAM_STOPPED;
+    SDL_PushEvent(&stop_event);
+}
+
 static bool
-push_packet_to_sinks(struct stream *stream, const AVPacket *packet) {
-    for (unsigned i = 0; i < stream->sink_count; ++i) {
-        struct sc_packet_sink *sink = stream->sinks[i];
-        if (!sink->ops->push(sink, packet)) {
-            LOGE("Could not send config packet to sink %d", i);
+process_config_packet(struct stream *stream, AVPacket *packet) {
+    if (stream->recorder && !recorder_push(stream->recorder, packet)) {
+        LOGE("Could not send config packet to recorder");
+        return false;
+    }
+    return true;
+}
+
+static bool
+process_frame(struct stream *stream, AVPacket *packet) {
+    if (stream->decoder && !decoder_push(stream->decoder, packet)) {
+        return false;
+    }
+
+    if (stream->recorder) {
+        packet->dts = packet->pts;
+
+        if (!recorder_push(stream->recorder, packet)) {
+            LOGE("Could not send packet to recorder");
            return false;
        }
    }
@@ -89,11 +115,9 @@ stream_parse(struct stream *stream, AVPacket *packet) {
        packet->flags |= AV_PKT_FLAG_KEY;
    }

-    packet->dts = packet->pts;
-
-    bool ok = push_packet_to_sinks(stream, packet);
+    bool ok = process_frame(stream, packet);
    if (!ok) {
-        LOGE("Could not process packet");
+        LOGE("Could not process frame");
        return false;
    }

@@ -104,44 +128,39 @@ static bool
 stream_push_packet(struct stream *stream, AVPacket *packet) {
    bool is_config = packet->pts == AV_NOPTS_VALUE;

-    // A config packet must not be decoded immediately (it contains no
+    // A config packet must not be decoded immetiately (it contains no
    // frame); instead, it must be concatenated with the future data packet.
-    if (stream->pending || is_config) {
+    if (stream->has_pending || is_config) {
        size_t offset;
-        if (stream->pending) {
-            offset = stream->pending->size;
-            if (av_grow_packet(stream->pending, packet->size)) {
+        if (stream->has_pending) {
+            offset = stream->pending.size;
+            if (av_grow_packet(&stream->pending, packet->size)) {
                LOGE("Could not grow packet");
                return false;
            }
        } else {
            offset = 0;
-            stream->pending = av_packet_alloc();
-            if (!stream->pending) {
-                LOGE("Could not allocate packet");
-                return false;
-            }
-            if (av_new_packet(stream->pending, packet->size)) {
+            if (av_new_packet(&stream->pending, packet->size)) {
                LOGE("Could not create packet");
-                av_packet_free(&stream->pending);
                return false;
            }
+            stream->has_pending = true;
        }

-        memcpy(stream->pending->data + offset, packet->data, packet->size);
+        memcpy(stream->pending.data + offset, packet->data, packet->size);

        if (!is_config) {
            // prepare the concat packet to send to the decoder
-            stream->pending->pts = packet->pts;
-            stream->pending->dts = packet->dts;
-            stream->pending->flags = packet->flags;
-            packet = stream->pending;
+            stream->pending.pts = packet->pts;
+            stream->pending.dts = packet->dts;
+            stream->pending.flags = packet->flags;
+            packet = &stream->pending;
        }
    }

    if (is_config) {
        // config packet
-        bool ok = push_packet_to_sinks(stream, packet);
+        bool ok = process_config_packet(stream, packet);
        if (!ok) {
            return false;
        }
@@ -149,10 +168,10 @@ stream_push_packet(struct stream *stream, AVPacket *packet) {
        // data packet
        bool ok = stream_parse(stream, packet);

-        if (stream->pending) {
+        if (stream->has_pending) {
            // the pending packet must be discarded (consumed or error)
-            av_packet_unref(stream->pending);
-            av_packet_free(&stream->pending);
+            stream->has_pending = false;
+            av_packet_unref(&stream->pending);
        }

        if (!ok) {
@@ -162,33 +181,6 @@ stream_push_packet(struct stream *stream, AVPacket *packet) {
    return true;
 }

-static void
-stream_close_first_sinks(struct stream *stream, unsigned count) {
-    while (count) {
-        struct sc_packet_sink *sink = stream->sinks[--count];
-        sink->ops->close(sink);
-    }
-}
-
-static inline void
-stream_close_sinks(struct stream *stream) {
-    stream_close_first_sinks(stream, stream->sink_count);
-}
-
-static bool
-stream_open_sinks(struct stream *stream, const AVCodec *codec) {
-    for (unsigned i = 0; i < stream->sink_count; ++i) {
-        struct sc_packet_sink *sink = stream->sinks[i];
-        if (!sink->ops->open(sink, codec)) {
-            LOGE("Could not open packet sink %d", i);
-            stream_close_first_sinks(stream, i);
-            return false;
-        }
-    }
-
-    return true;
-}
-
 static int
 run_stream(void *data) {
    struct stream *stream = data;
@@ -205,36 +197,43 @@ run_stream(void *data) {
        goto end;
    }

-    if (!stream_open_sinks(stream, codec)) {
-        LOGE("Could not open stream sinks");
+    if (stream->decoder && !decoder_open(stream->decoder, codec)) {
+        LOGE("Could not open decoder");
        goto finally_free_codec_ctx;
    }

+    if (stream->recorder) {
+        if (!recorder_open(stream->recorder, codec)) {
+            LOGE("Could not open recorder");
+            goto finally_close_decoder;
+        }
+
+        if (!recorder_start(stream->recorder)) {
+            LOGE("Could not start recorder");
+            goto finally_close_recorder;
+        }
+    }
+
    stream->parser = av_parser_init(AV_CODEC_ID_H264);
    if (!stream->parser) {
        LOGE("Could not initialize parser");
-        goto finally_close_sinks;
+        goto finally_stop_and_join_recorder;
    }

    // We must only pass complete frames to av_parser_parse2()!
    // It's more complicated, but this allows to reduce the latency by 1 frame!
    stream->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;

-    AVPacket *packet = av_packet_alloc();
-    if (!packet) {
-        LOGE("Could not allocate packet");
-        goto finally_close_parser;
-    }
-
    for (;;) {
-        bool ok = stream_recv_packet(stream, packet);
+        AVPacket packet;
+        bool ok = stream_recv_packet(stream, &packet);
        if (!ok) {
            // end of stream
            break;
        }

-        ok = stream_push_packet(stream, packet);
-        av_packet_unref(packet);
+        ok = stream_push_packet(stream, &packet);
+        av_packet_unref(&packet);
        if (!ok) {
            // cannot process packet (error already logged)
            break;
@@ -243,51 +242,47 @@ run_stream(void *data) {

    LOGD("End of frames");

-    if (stream->pending) {
-        av_packet_unref(stream->pending);
-        av_packet_free(&stream->pending);
+    if (stream->has_pending) {
+        av_packet_unref(&stream->pending);
    }

-    av_packet_free(&packet);
-finally_close_parser:
    av_parser_close(stream->parser);
-finally_close_sinks:
-    stream_close_sinks(stream);
+finally_stop_and_join_recorder:
+    if (stream->recorder) {
+        recorder_stop(stream->recorder);
+        LOGI("Finishing recording...");
+        recorder_join(stream->recorder);
+    }
+finally_close_recorder:
+    if (stream->recorder) {
+        recorder_close(stream->recorder);
+    }
+finally_close_decoder:
+    if (stream->decoder) {
+        decoder_close(stream->decoder);
+    }
 finally_free_codec_ctx:
    avcodec_free_context(&stream->codec_ctx);
 end:
-    stream->cbs->on_eos(stream, stream->cbs_userdata);
-
+    notify_stopped();
    return 0;
 }

 void
 stream_init(struct stream *stream, socket_t socket,
-            const struct stream_callbacks *cbs, void *cbs_userdata) {
+            struct decoder *decoder, struct recorder *recorder) {
    stream->socket = socket;
-    stream->pending = NULL;
-    stream->sink_count = 0;
-
-    assert(cbs && cbs->on_eos);
-
-    stream->cbs = cbs;
-    stream->cbs_userdata = cbs_userdata;
-}
-
-void
-stream_add_sink(struct stream *stream, struct sc_packet_sink *sink) {
-    assert(stream->sink_count < STREAM_MAX_SINKS);
-    assert(sink);
-    assert(sink->ops);
-    stream->sinks[stream->sink_count++] = sink;
+    stream->decoder = decoder,
+    stream->recorder = recorder;
+    stream->has_pending = false;
 }

 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;
    }
@@ -295,6 +290,13 @@ stream_start(struct stream *stream) {
 }

 void
-stream_join(struct stream *stream) {
-    sc_thread_join(&stream->thread, NULL);
+stream_stop(struct stream *stream) {
+    if (stream->decoder) {
+        decoder_interrupt(stream->decoder);
+    }
+}
+
+void
+stream_join(struct stream *stream) {
+    SDL_WaitThread(stream->thread, NULL);
 }
--- a/app/src/stream.h
+++ b/app/src/stream.h
@@ -1,49 +1,40 @@
 #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 "trait/packet_sink.h"
+#include "config.h"
 #include "util/net.h"
-#include "util/thread.h"

-#define STREAM_MAX_SINKS 2
+struct video_buffer;

 struct stream {
    socket_t socket;
-    sc_thread thread;
-
-    struct sc_packet_sink *sinks[STREAM_MAX_SINKS];
-    unsigned sink_count;
-
+    SDL_Thread *thread;
+    struct decoder *decoder;
+    struct recorder *recorder;
    AVCodecContext *codec_ctx;
    AVCodecParserContext *parser;
    // successive packets may need to be concatenated, until a non-config
    // packet is available
-    AVPacket *pending;
-
-    const struct stream_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct stream_callbacks {
-    void (*on_eos)(struct stream *stream, void *userdata);
+    bool has_pending;
+    AVPacket pending;
 };

 void
 stream_init(struct stream *stream, socket_t socket,
-            const struct stream_callbacks *cbs, void *cbs_userdata);
-
-void
-stream_add_sink(struct stream *stream, struct sc_packet_sink *sink);
+            struct decoder *decoder, struct recorder *recorder);

 bool
 stream_start(struct stream *stream);

+void
+stream_stop(struct stream *stream);
+
 void
 stream_join(struct stream *stream);

--- a/app/src/sys/unix/command.c
+++ b/app/src/sys/unix/command.c
@@ -1,4 +1,17 @@
-#include "util/process.h"
+// for portability (kill, readlink, strdup, strtok_r)
+#define _POSIX_C_SOURCE 200809L
+#define _BSD_SOURCE
+
+// 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>
@@ -14,7 +27,7 @@
 #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 +63,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 +125,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 +161,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,14 +1,12 @@
-#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"

-#define CMD_MAX_LEN 8192
-
-static bool
+static int
 build_cmd(char *cmd, size_t len, const char *const argv[]) {
    // Windows command-line parsing is WTF:
    // <http://daviddeley.com/autohotkey/parameters/parameters.htm#WINPASS>
@@ -17,26 +15,25 @@ build_cmd(char *cmd, size_t len, const char *const argv[]) {
    size_t ret = xstrjoin(cmd, argv, ' ', len);
    if (ret >= len) {
        LOGE("Command too long (%" PRIsizet " chars)", len - 1);
-        return false;
+        return -1;
    }
-    return true;
+    return 0;
 }

 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));
    si.cb = sizeof(si);

-    char *cmd = malloc(CMD_MAX_LEN);
-    if (!cmd || !build_cmd(cmd, CMD_MAX_LEN, argv)) {
+    char cmd[256];
+    if (build_cmd(cmd, sizeof(cmd), argv)) {
        *handle = NULL;
        return PROCESS_ERROR_GENERIC;
    }

    wchar_t *wide = utf8_to_wide_char(cmd);
-    free(cmd);
    if (!wide) {
        LOGC("Could not allocate wide char string");
        return PROCESS_ERROR_GENERIC;
@@ -44,7 +41,7 @@ process_execute(const char *const argv[], HANDLE *handle) {

    if (!CreateProcessW(NULL, wide, NULL, NULL, FALSE, 0, NULL, NULL, &si,
                        &pi)) {
-        free(wide);
+        SDL_free(wide);
        *handle = NULL;
        if (GetLastError() == ERROR_FILE_NOT_FOUND) {
            return PROCESS_ERROR_MISSING_BINARY;
@@ -52,35 +49,29 @@ 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) {
+cmd_terminate(HANDLE handle) {
    return TerminateProcess(handle, 1);
 }

-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;
+    CloseHandle(handle);
+    return !code;
 }

 char *
@@ -108,7 +99,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/trait/frame_sink.h
+++ b/app/src/trait/frame_sink.h
@@ -1,26 +0,0 @@
-#ifndef SC_FRAME_SINK
-#define SC_FRAME_SINK
-
-#include "common.h"
-
-#include <assert.h>
-#include <stdbool.h>
-
-typedef struct AVFrame AVFrame;
-
-/**
- * Frame sink trait.
- *
- * Component able to receive AVFrames should implement this trait.
- */
-struct sc_frame_sink {
-    const struct sc_frame_sink_ops *ops;
-};
-
-struct sc_frame_sink_ops {
-    bool (*open)(struct sc_frame_sink *sink);
-    void (*close)(struct sc_frame_sink *sink);
-    bool (*push)(struct sc_frame_sink *sink, const AVFrame *frame);
-};
-
-#endif
--- a/app/src/trait/packet_sink.h
+++ b/app/src/trait/packet_sink.h
@@ -1,27 +0,0 @@
-#ifndef SC_PACKET_SINK
-#define SC_PACKET_SINK
-
-#include "common.h"
-
-#include <assert.h>
-#include <stdbool.h>
-
-typedef struct AVCodec AVCodec;
-typedef struct AVPacket AVPacket;
-
-/**
- * Packet sink trait.
- *
- * Component able to receive AVPackets should implement this trait.
- */
-struct sc_packet_sink {
-    const struct sc_packet_sink_ops *ops;
-};
-
-struct sc_packet_sink_ops {
-    bool (*open)(struct sc_packet_sink *sink, const AVCodec *codec);
-    void (*close)(struct sc_packet_sink *sink);
-    bool (*push)(struct sc_packet_sink *sink, const AVPacket *packet);
-};
-
-#endif
--- 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;
    }
@@ -140,24 +144,6 @@ parse_integer_with_suffix(const char *s, long *out) {
    return true;
 }

-bool
-strlist_contains(const char *list, char sep, const char *s) {
-    char *p;
-    do {
-        p = strchr(list, sep);
-
-        size_t token_len = p ? (size_t) (p - list) : strlen(list);
-        if (!strncmp(list, s, token_len)) {
-            return true;
-        }
-
-        if (p) {
-            list = p + 1;
-        }
-    } while (p);
-    return false;
-}
-
 size_t
 utf8_truncation_index(const char *utf8, size_t max_len) {
    size_t len = strlen(utf8);
@@ -183,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;
    }
@@ -199,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
@@ -16,7 +16,7 @@ size_t
 xstrncpy(char *dest, const char *src, size_t n);

 // join tokens by sep into dst
-// returns the number of chars actually written (max n-1) if no truncation
+// returns the number of chars actually written (max n-1) if no trucation
 // occurred, or n if truncated
 size_t
 xstrjoin(char *dst, const char *const tokens[], char sep, size_t n);
@@ -43,11 +43,6 @@ parse_integers(const char *s, const char sep, size_t max_items, long *out);
 bool
 parse_integer_with_suffix(const char *s, long *out);

-// search s in the list separated by sep
-// for example, strlist_contains("a,bc,def", ',', "bc") returns true
-bool
-strlist_contains(const char *list, char sep, const char *s);
-
 // return the index to truncate a UTF-8 string at a valid position
 size_t
 utf8_truncation_index(const char *utf8, size_t max_len);
--- a/app/src/util/thread.c
+++ b/app/src/util/thread.c
@@ -1,160 +0,0 @@
-#include "thread.h"
-
-#include <assert.h>
-#include <SDL2/SDL_thread.h>
-
-#include "log.h"
-
-bool
-sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
-                 void *userdata) {
-    SDL_Thread *sdl_thread = SDL_CreateThread(fn, name, userdata);
-    if (!sdl_thread) {
-        return false;
-    }
-
-    thread->thread = sdl_thread;
-    return true;
-}
-
-void
-sc_thread_join(sc_thread *thread, int *status) {
-    SDL_WaitThread(thread->thread, status);
-}
-
-bool
-sc_mutex_init(sc_mutex *mutex) {
-    SDL_mutex *sdl_mutex = SDL_CreateMutex();
-    if (!sdl_mutex) {
-        return false;
-    }
-
-    mutex->mutex = sdl_mutex;
-#ifndef NDEBUG
-    mutex->locker = 0;
-#endif
-    return true;
-}
-
-void
-sc_mutex_destroy(sc_mutex *mutex) {
-    SDL_DestroyMutex(mutex->mutex);
-}
-
-void
-sc_mutex_lock(sc_mutex *mutex) {
-    // SDL mutexes are recursive, but we don't want to use recursive mutexes
-    assert(!sc_mutex_held(mutex));
-    int r = SDL_LockMutex(mutex->mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not lock mutex: %s", SDL_GetError());
-        abort();
-    }
-
-    mutex->locker = sc_thread_get_id();
-#else
-    (void) r;
-#endif
-}
-
-void
-sc_mutex_unlock(sc_mutex *mutex) {
-#ifndef NDEBUG
-    assert(sc_mutex_held(mutex));
-    mutex->locker = 0;
-#endif
-    int r = SDL_UnlockMutex(mutex->mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not lock mutex: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-sc_thread_id
-sc_thread_get_id(void) {
-    return SDL_ThreadID();
-}
-
-#ifndef NDEBUG
-bool
-sc_mutex_held(struct sc_mutex *mutex) {
-    return mutex->locker == sc_thread_get_id();
-}
-#endif
-
-bool
-sc_cond_init(sc_cond *cond) {
-    SDL_cond *sdl_cond = SDL_CreateCond();
-    if (!sdl_cond) {
-        return false;
-    }
-
-    cond->cond = sdl_cond;
-    return true;
-}
-
-void
-sc_cond_destroy(sc_cond *cond) {
-    SDL_DestroyCond(cond->cond);
-}
-
-void
-sc_cond_wait(sc_cond *cond, sc_mutex *mutex) {
-    int r = SDL_CondWait(cond->cond, mutex->mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not wait on condition: %s", SDL_GetError());
-        abort();
-    }
-
-    mutex->locker = sc_thread_get_id();
-#else
-    (void) r;
-#endif
-}
-
-bool
-sc_cond_timedwait(sc_cond *cond, sc_mutex *mutex, uint32_t ms) {
-    int r = SDL_CondWaitTimeout(cond->cond, mutex->mutex, ms);
-#ifndef NDEBUG
-    if (r < 0) {
-        LOGC("Could not wait on condition with timeout: %s", SDL_GetError());
-        abort();
-    }
-
-    mutex->locker = sc_thread_get_id();
-#endif
-    assert(r == 0 || r == SDL_MUTEX_TIMEDOUT);
-    return r == 0;
-}
-
-void
-sc_cond_signal(sc_cond *cond) {
-    int r = SDL_CondSignal(cond->cond);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not signal a condition: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-void
-sc_cond_broadcast(sc_cond *cond) {
-    int r = SDL_CondBroadcast(cond->cond);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not broadcast a condition: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
--- a/app/src/util/thread.h
+++ b/app/src/util/thread.h
@@ -1,81 +0,0 @@
-#ifndef SC_THREAD_H
-#define SC_THREAD_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/* Forward declarations */
-typedef struct SDL_Thread SDL_Thread;
-typedef struct SDL_mutex SDL_mutex;
-typedef struct SDL_cond SDL_cond;
-
-typedef int sc_thread_fn(void *);
-typedef unsigned int sc_thread_id;
-
-typedef struct sc_thread {
-    SDL_Thread *thread;
-} sc_thread;
-
-typedef struct sc_mutex {
-    SDL_mutex *mutex;
-#ifndef NDEBUG
-    sc_thread_id locker;
-#endif
-} sc_mutex;
-
-typedef struct sc_cond {
-    SDL_cond *cond;
-} sc_cond;
-
-bool
-sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
-                 void *userdata);
-
-void
-sc_thread_join(sc_thread *thread, int *status);
-
-bool
-sc_mutex_init(sc_mutex *mutex);
-
-void
-sc_mutex_destroy(sc_mutex *mutex);
-
-void
-sc_mutex_lock(sc_mutex *mutex);
-
-void
-sc_mutex_unlock(sc_mutex *mutex);
-
-sc_thread_id
-sc_thread_get_id(void);
-
-#ifndef NDEBUG
-bool
-sc_mutex_held(struct sc_mutex *mutex);
-# define sc_mutex_assert(mutex) assert(sc_mutex_held(mutex))
-#else
-# define sc_mutex_assert(mutex)
-#endif
-
-bool
-sc_cond_init(sc_cond *cond);
-
-void
-sc_cond_destroy(sc_cond *cond);
-
-void
-sc_cond_wait(sc_cond *cond, sc_mutex *mutex);
-
-// return true on signaled, false on timeout
-bool
-sc_cond_timedwait(sc_cond *cond, sc_mutex *mutex, uint32_t ms);
-
-void
-sc_cond_signal(sc_cond *cond);
-
-void
-sc_cond_broadcast(sc_cond *cond);
-
-#endif
--- a/app/src/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@@ -1,356 +0,0 @@
-#include "v4l2_sink.h"
-
-#include "util/log.h"
-#include "util/str_util.h"
-
-/** Downcast frame_sink to sc_v4l2_sink */
-#define DOWNCAST(SINK) container_of(SINK, struct sc_v4l2_sink, frame_sink)
-
-static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us
-
-static const AVOutputFormat *
-find_muxer(const char *name) {
-#ifdef SCRCPY_LAVF_HAS_NEW_MUXER_ITERATOR_API
-    void *opaque = NULL;
-#endif
-    const AVOutputFormat *oformat = NULL;
-    do {
-#ifdef SCRCPY_LAVF_HAS_NEW_MUXER_ITERATOR_API
-        oformat = av_muxer_iterate(&opaque);
-#else
-        oformat = av_oformat_next(oformat);
-#endif
-        // until null or containing the requested name
-    } while (oformat && !strlist_contains(oformat->name, ',', name));
-    return oformat;
-}
-
-static bool
-write_header(struct sc_v4l2_sink *vs, const AVPacket *packet) {
-    AVStream *ostream = vs->format_ctx->streams[0];
-
-    uint8_t *extradata = av_malloc(packet->size * sizeof(uint8_t));
-    if (!extradata) {
-        LOGC("Could not allocate extradata");
-        return false;
-    }
-
-    // copy the first packet to the extra data
-    memcpy(extradata, packet->data, packet->size);
-
-    ostream->codecpar->extradata = extradata;
-    ostream->codecpar->extradata_size = packet->size;
-
-    int ret = avformat_write_header(vs->format_ctx, NULL);
-    if (ret < 0) {
-        LOGE("Failed to write header to %s", vs->device_name);
-        return false;
-    }
-
-    return true;
-}
-
-static void
-rescale_packet(struct sc_v4l2_sink *vs, AVPacket *packet) {
-    AVStream *ostream = vs->format_ctx->streams[0];
-    av_packet_rescale_ts(packet, SCRCPY_TIME_BASE, ostream->time_base);
-}
-
-static bool
-write_packet(struct sc_v4l2_sink *vs, AVPacket *packet) {
-    if (!vs->header_written) {
-        bool ok = write_header(vs, packet);
-        if (!ok) {
-            return false;
-        }
-        vs->header_written = true;
-        return true;
-    }
-
-    rescale_packet(vs, packet);
-
-    bool ok = av_write_frame(vs->format_ctx, packet) >= 0;
-
-    // Failing to write the last frame is not very serious, no future frame may
-    // depend on it, so the resulting file will still be valid
-    (void) ok;
-
-    return true;
-}
-
-static bool
-encode_and_write_frame(struct sc_v4l2_sink *vs, const AVFrame *frame) {
-    int ret = avcodec_send_frame(vs->encoder_ctx, frame);
-    if (ret < 0 && ret != AVERROR(EAGAIN)) {
-        LOGE("Could not send v4l2 video frame: %d", ret);
-        return false;
-    }
-
-    AVPacket *packet = vs->packet;
-    ret = avcodec_receive_packet(vs->encoder_ctx, packet);
-    if (ret == 0) {
-        // A packet was received
-
-        bool ok = write_packet(vs, packet);
-        av_packet_unref(packet);
-        if (!ok) {
-            LOGW("Could not send packet to v4l2 sink");
-            return false;
-        }
-    } else if (ret != AVERROR(EAGAIN)) {
-        LOGE("Could not receive v4l2 video packet: %d", ret);
-        return false;
-    }
-
-    return true;
-}
-
-static int
-run_v4l2_sink(void *data) {
-    struct sc_v4l2_sink *vs = data;
-
-    for (;;) {
-        sc_mutex_lock(&vs->mutex);
-
-        while (!vs->stopped && vs->vb.pending_frame_consumed) {
-            sc_cond_wait(&vs->cond, &vs->mutex);
-        }
-
-        if (vs->stopped) {
-            sc_mutex_unlock(&vs->mutex);
-            break;
-        }
-
-        sc_mutex_unlock(&vs->mutex);
-
-        video_buffer_consume(&vs->vb, vs->frame);
-        bool ok = encode_and_write_frame(vs, vs->frame);
-        av_frame_unref(vs->frame);
-        if (!ok) {
-            LOGE("Could not send frame to v4l2 sink");
-            break;
-        }
-    }
-
-    LOGD("V4l2 thread ended");
-
-    return 0;
-}
-
-static bool
-sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {
-    bool ok = video_buffer_init(&vs->vb);
-    if (!ok) {
-        return false;
-    }
-
-    ok = sc_mutex_init(&vs->mutex);
-    if (!ok) {
-        LOGC("Could not create mutex");
-        goto error_video_buffer_destroy;
-    }
-
-    ok = sc_cond_init(&vs->cond);
-    if (!ok) {
-        LOGC("Could not create cond");
-        goto error_mutex_destroy;
-    }
-
-    // FIXME
-    const AVOutputFormat *format = find_muxer("video4linux2,v4l2");
-    if (!format) {
-        LOGE("Could not find v4l2 muxer");
-        goto error_cond_destroy;
-    }
-
-    const AVCodec *encoder = avcodec_find_encoder(AV_CODEC_ID_RAWVIDEO);
-    if (!encoder) {
-        LOGE("Raw video encoder not found");
-        return false;
-    }
-
-    vs->format_ctx = avformat_alloc_context();
-    if (!vs->format_ctx) {
-        LOGE("Could not allocate v4l2 output context");
-        return false;
-    }
-
-    // contrary to the deprecated API (av_oformat_next()), av_muxer_iterate()
-    // returns (on purpose) a pointer-to-const, but AVFormatContext.oformat
-    // still expects a pointer-to-non-const (it has not be updated accordingly)
-    // <https://github.com/FFmpeg/FFmpeg/commit/0694d8702421e7aff1340038559c438b61bb30dd>
-    vs->format_ctx->oformat = (AVOutputFormat *) format;
-#ifdef SCRCPY_LAVF_HAS_AVFORMATCONTEXT_URL
-    vs->format_ctx->url = strdup(vs->device_name);
-    if (!vs->format_ctx->url) {
-        LOGE("Could not strdup v4l2 device name");
-        goto error_avformat_free_context;
-        return false;
-    }
-#else
-    strncpy(vs->format_ctx->filename, vs->device_name,
-            sizeof(vs->format_ctx->filename));
-#endif
-
-    AVStream *ostream = avformat_new_stream(vs->format_ctx, encoder);
-    if (!ostream) {
-        LOGE("Could not allocate new v4l2 stream");
-        goto error_avformat_free_context;
-        return false;
-    }
-
-    ostream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
-    ostream->codecpar->codec_id = encoder->id;
-    ostream->codecpar->format = AV_PIX_FMT_YUV420P;
-    ostream->codecpar->width = vs->frame_size.width;
-    ostream->codecpar->height = vs->frame_size.height;
-
-    int ret = avio_open(&vs->format_ctx->pb, vs->device_name, AVIO_FLAG_WRITE);
-    if (ret < 0) {
-        LOGE("Failed to open output device: %s", vs->device_name);
-        // ostream will be cleaned up during context cleaning
-        goto error_avformat_free_context;
-    }
-
-    vs->encoder_ctx = avcodec_alloc_context3(encoder);
-    if (!vs->encoder_ctx) {
-        LOGC("Could not allocate codec context for v4l2");
-        goto error_avio_close;
-    }
-
-    vs->encoder_ctx->width = vs->frame_size.width;
-    vs->encoder_ctx->height = vs->frame_size.height;
-    vs->encoder_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-    vs->encoder_ctx->time_base.num = 1;
-    vs->encoder_ctx->time_base.den = 1;
-
-    if (avcodec_open2(vs->encoder_ctx, encoder, NULL) < 0) {
-        LOGE("Could not open codec for v4l2");
-        goto error_avcodec_free_context;
-    }
-
-    vs->frame = av_frame_alloc();
-    if (!vs->frame) {
-        LOGE("Could not create v4l2 frame");
-        goto error_avcodec_close;
-    }
-
-    vs->packet = av_packet_alloc();
-    if (!vs->packet) {
-        LOGE("Could not allocate packet");
-        goto error_av_frame_free;
-    }
-
-    LOGD("Starting v4l2 thread");
-    ok = sc_thread_create(&vs->thread, run_v4l2_sink, "v4l2", vs);
-    if (!ok) {
-        LOGC("Could not start v4l2 thread");
-        goto error_av_packet_free;
-    }
-
-    vs->header_written = false;
-    vs->stopped = false;
-
-    LOGI("v4l2 sink started to device: %s", vs->device_name);
-
-    return true;
-
-error_av_packet_free:
-    av_packet_free(&vs->packet);
-error_av_frame_free:
-    av_frame_free(&vs->frame);
-error_avcodec_close:
-    avcodec_close(vs->encoder_ctx);
-error_avcodec_free_context:
-    avcodec_free_context(&vs->encoder_ctx);
-error_avio_close:
-    avio_close(vs->format_ctx->pb);
-error_avformat_free_context:
-    avformat_free_context(vs->format_ctx);
-error_cond_destroy:
-    sc_cond_destroy(&vs->cond);
-error_mutex_destroy:
-    sc_mutex_destroy(&vs->mutex);
-error_video_buffer_destroy:
-    video_buffer_destroy(&vs->vb);
-
-    return false;
-}
-
-static void
-sc_v4l2_sink_close(struct sc_v4l2_sink *vs) {
-    sc_mutex_lock(&vs->mutex);
-    vs->stopped = true;
-    sc_cond_signal(&vs->cond);
-    sc_mutex_unlock(&vs->mutex);
-
-    sc_thread_join(&vs->thread, NULL);
-
-    av_packet_free(&vs->packet);
-    av_frame_free(&vs->frame);
-    avcodec_close(vs->encoder_ctx);
-    avcodec_free_context(&vs->encoder_ctx);
-    avio_close(vs->format_ctx->pb);
-    avformat_free_context(vs->format_ctx);
-    sc_cond_destroy(&vs->cond);
-    sc_mutex_destroy(&vs->mutex);
-    video_buffer_destroy(&vs->vb);
-}
-
-static bool
-sc_v4l2_sink_push(struct sc_v4l2_sink *vs, const AVFrame *frame) {
-    bool ok = video_buffer_push(&vs->vb, frame, NULL);
-    if (!ok) {
-        return false;
-    }
-
-    // signal possible change of vs->vb.pending_frame_consumed
-    sc_cond_signal(&vs->cond);
-
-    return true;
-}
-
-static bool
-sc_v4l2_frame_sink_open(struct sc_frame_sink *sink) {
-    struct sc_v4l2_sink *vs = DOWNCAST(sink);
-    return sc_v4l2_sink_open(vs);
-}
-
-static void
-sc_v4l2_frame_sink_close(struct sc_frame_sink *sink) {
-    struct sc_v4l2_sink *vs = DOWNCAST(sink);
-    sc_v4l2_sink_close(vs);
-}
-
-static bool
-sc_v4l2_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
-    struct sc_v4l2_sink *vs = DOWNCAST(sink);
-    return sc_v4l2_sink_push(vs, frame);
-}
-
-bool
-sc_v4l2_sink_init(struct sc_v4l2_sink *vs, const char *device_name,
-                  struct size frame_size) {
-    vs->device_name = strdup(device_name);
-    if (!vs->device_name) {
-        LOGE("Could not strdup v4l2 device name");
-        return false;
-    }
-
-    vs->frame_size = frame_size;
-
-    static const struct sc_frame_sink_ops ops = {
-        .open = sc_v4l2_frame_sink_open,
-        .close = sc_v4l2_frame_sink_close,
-        .push = sc_v4l2_frame_sink_push,
-    };
-
-    vs->frame_sink.ops = &ops;
-
-    return true;
-}
-
-void
-sc_v4l2_sink_destroy(struct sc_v4l2_sink *vs) {
-    free(vs->device_name);
-}
--- a/app/src/v4l2_sink.h
+++ b/app/src/v4l2_sink.h
@@ -1,39 +0,0 @@
-#ifndef SC_V4L2_SINK_H
-#define SC_V4L2_SINK_H
-
-#include "common.h"
-
-#include "coords.h"
-#include "trait/frame_sink.h"
-#include "video_buffer.h"
-
-#include <libavformat/avformat.h>
-
-struct sc_v4l2_sink {
-    struct sc_frame_sink frame_sink; // frame sink trait
-
-    struct video_buffer vb;
-    AVFormatContext *format_ctx;
-    AVCodecContext *encoder_ctx;
-
-    char *device_name;
-    struct size frame_size;
-
-    sc_thread thread;
-    sc_mutex mutex;
-    sc_cond cond;
-    bool stopped;
-    bool header_written;
-
-    AVFrame *frame;
-    AVPacket *packet;
-};
-
-bool
-sc_v4l2_sink_init(struct sc_v4l2_sink *vs, const char *device_name,
-                  struct size frame_size);
-
-void
-sc_v4l2_sink_destroy(struct sc_v4l2_sink *vs);
-
-#endif
--- a/app/src/video_buffer.c
+++ b/app/src/video_buffer.c
@@ -1,88 +1,113 @@
 #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
-video_buffer_init(struct video_buffer *vb) {
-    vb->pending_frame = av_frame_alloc();
-    if (!vb->pending_frame) {
-        return false;
+video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
+                  bool render_expired_frames) {
+    vb->fps_counter = fps_counter;
+
+    if (!(vb->decoding_frame = av_frame_alloc())) {
+        goto error_0;
    }

-    vb->tmp_frame = av_frame_alloc();
-    if (!vb->tmp_frame) {
-        av_frame_free(&vb->pending_frame);
-        return false;
+    if (!(vb->rendering_frame = av_frame_alloc())) {
+        goto error_1;
    }

-    bool ok = sc_mutex_init(&vb->mutex);
-    if (!ok) {
-        av_frame_free(&vb->pending_frame);
-        av_frame_free(&vb->tmp_frame);
-        return false;
+    if (!(vb->mutex = SDL_CreateMutex())) {
+        goto error_2;
    }

-    // there is initially no frame, so consider it has already been consumed
-    vb->pending_frame_consumed = true;
+    vb->render_expired_frames = render_expired_frames;
+    if (render_expired_frames) {
+        if (!(vb->rendering_frame_consumed_cond = SDL_CreateCond())) {
+            SDL_DestroyMutex(vb->mutex);
+            goto error_2;
+        }
+        // interrupted is not used if expired frames are not rendered
+        // since offering a frame will never block
+        vb->interrupted = false;
+    }
+
+    // there is initially no rendering frame, so consider it has already been
+    // consumed
+    vb->rendering_frame_consumed = true;

    return true;
+
+error_2:
+    av_frame_free(&vb->rendering_frame);
+error_1:
+    av_frame_free(&vb->decoding_frame);
+error_0:
+    return false;
 }

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

-static inline void
-swap_frames(AVFrame **lhs, AVFrame **rhs) {
-    AVFrame *tmp = *lhs;
-    *lhs = *rhs;
-    *rhs = tmp;
-}
-
-bool
-video_buffer_push(struct video_buffer *vb, const AVFrame *frame,
-                  bool *previous_frame_skipped) {
-    sc_mutex_lock(&vb->mutex);
-
-    // Use a temporary frame to preserve pending_frame in case of error.
-    // tmp_frame is an empty frame, no need to call av_frame_unref() beforehand.
-    int r = av_frame_ref(vb->tmp_frame, frame);
-    if (r) {
-        LOGE("Could not ref frame: %d", r);
-        return false;
-    }
-
-    // Now that av_frame_ref() succeeded, we can replace the previous
-    // pending_frame
-    swap_frames(&vb->pending_frame, &vb->tmp_frame);
-    av_frame_unref(vb->tmp_frame);
-
-    if (previous_frame_skipped) {
-        *previous_frame_skipped = !vb->pending_frame_consumed;
-    }
-    vb->pending_frame_consumed = false;
-
-    sc_mutex_unlock(&vb->mutex);
-
-    return true;
+static void
+video_buffer_swap_frames(struct video_buffer *vb) {
+    AVFrame *tmp = vb->decoding_frame;
+    vb->decoding_frame = vb->rendering_frame;
+    vb->rendering_frame = tmp;
 }

 void
-video_buffer_consume(struct video_buffer *vb, AVFrame *dst) {
-    sc_mutex_lock(&vb->mutex);
-    assert(!vb->pending_frame_consumed);
-    vb->pending_frame_consumed = true;
+video_buffer_offer_decoded_frame(struct video_buffer *vb,
+                                 bool *previous_frame_skipped) {
+    mutex_lock(vb->mutex);
+    if (vb->render_expired_frames) {
+        // wait for the current (expired) frame to be consumed
+        while (!vb->rendering_frame_consumed && !vb->interrupted) {
+            cond_wait(vb->rendering_frame_consumed_cond, vb->mutex);
+        }
+    } else if (!vb->rendering_frame_consumed) {
+        fps_counter_add_skipped_frame(vb->fps_counter);
+    }

-    av_frame_move_ref(dst, vb->pending_frame);
-    // av_frame_move_ref() resets its source frame, so no need to call
-    // av_frame_unref()
+    video_buffer_swap_frames(vb);

-    sc_mutex_unlock(&vb->mutex);
+    *previous_frame_skipped = !vb->rendering_frame_consumed;
+    vb->rendering_frame_consumed = false;
+
+    mutex_unlock(vb->mutex);
+}
+
+const AVFrame *
+video_buffer_consume_rendered_frame(struct video_buffer *vb) {
+    assert(!vb->rendering_frame_consumed);
+    vb->rendering_frame_consumed = true;
+    fps_counter_add_rendered_frame(vb->fps_counter);
+    if (vb->render_expired_frames) {
+        // unblock video_buffer_offer_decoded_frame()
+        cond_signal(vb->rendering_frame_consumed_cond);
+    }
+    return vb->rendering_frame;
+}
+
+void
+video_buffer_interrupt(struct video_buffer *vb) {
+    if (vb->render_expired_frames) {
+        mutex_lock(vb->mutex);
+        vb->interrupted = true;
+        mutex_unlock(vb->mutex);
+        // wake up blocking wait
+        cond_signal(vb->rendering_frame_consumed_cond);
+    }
 }
--- a/app/src/video_buffer.h
+++ b/app/src/video_buffer.h
@@ -1,50 +1,49 @@
 #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;

-/**
- * A video buffer holds 1 pending frame, which is the last frame received from
- * the producer (typically, the decoder).
- *
- * If a pending frame has not been consumed when the producer pushes a new
- * frame, then it is lost. The intent is to always provide access to the very
- * last frame to minimize latency.
- *
- * The producer and the consumer typically do not live in the same thread.
- * That's the reason why the callback on_frame_available() does not provide the
- * frame as parameter: the consumer might post an event to its own thread to
- * retrieve the pending frame from there, and that frame may have changed since
- * the callback if producer pushed a new one in between.
- */
-
 struct video_buffer {
-    AVFrame *pending_frame;
-    AVFrame *tmp_frame; // To preserve the pending frame on error
-
-    sc_mutex mutex;
-
-    bool pending_frame_consumed;
+    AVFrame *decoding_frame;
+    AVFrame *rendering_frame;
+    SDL_mutex *mutex;
+    bool render_expired_frames;
+    bool interrupted;
+    SDL_cond *rendering_frame_consumed_cond;
+    bool rendering_frame_consumed;
+    struct fps_counter *fps_counter;
 };

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

 void
 video_buffer_destroy(struct video_buffer *vb);

-bool
-video_buffer_push(struct video_buffer *vb, const AVFrame *frame, bool *skipped);
-
+// 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_consume(struct video_buffer *vb, AVFrame *dst);
+video_buffer_offer_decoded_frame(struct video_buffer *vb,
+                                 bool *previous_frame_skipped);
+
+// mark the rendering frame as consumed and return it
+// MUST be called with frames->mutex locked!!!
+// the caller is expected to render the returned frame to some texture before
+// unlocking frames->mutex
+const AVFrame *
+video_buffer_consume_rendered_frame(struct video_buffer *vb);
+
+// wake up and avoid any blocking call
+void
+video_buffer_interrupt(struct video_buffer *vb);

 #endif
--- 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) {
@@ -51,13 +50,14 @@ static void test_options(void) {
        "--fullscreen",
        "--max-fps", "30",
        "--max-size", "1024",
-        "--lock-video-orientation=2", // optional arguments require '='
+        "--lock-video-orientation", "2",
        // "--no-control" is not compatible with "--turn-screen-off"
        // "--no-display" is not compatible with "--fulscreen"
        "--port", "1234:1236",
        "--push-target", "/sdcard/Movies",
        "--record", "file",
        "--record-format", "mkv",
+        "--render-expired-frames",
        "--serial", "0123456789abcdef",
        "--show-touches",
        "--turn-screen-off",
@@ -86,6 +86,7 @@ static void test_options(void) {
    assert(!strcmp(opts->push_target, "/sdcard/Movies"));
    assert(!strcmp(opts->record_filename, "file"));
    assert(opts->record_format == SC_RECORD_FORMAT_MKV);
+    assert(opts->render_expired_frames);
    assert(!strcmp(opts->serial, "0123456789abcdef"));
    assert(opts->show_touches);
    assert(opts->turn_screen_off);
--- 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[] = {
@@ -146,18 +144,14 @@ static void test_serialize_inject_scroll_event(void) {
 static void test_serialize_back_or_screen_on(void) {
    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
-        .back_or_screen_on = {
-            .action = AKEY_EVENT_ACTION_UP,
-        },
    };

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

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
-        0x01, // AKEY_EVENT_ACTION_UP
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -168,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[] = {
@@ -177,32 +171,17 @@ static void test_serialize_expand_notification_panel(void) {
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

-static void test_serialize_expand_settings_panel(void) {
+static void test_serialize_collapse_notification_panel(void) {
    struct control_msg msg = {
-        .type = CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
+        .type = CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL,
    };

    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[] = {
-        CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
-    };
-    assert(!memcmp(buf, expected, sizeof(expected)));
-}
-
-static void test_serialize_collapse_panels(void) {
-    struct control_msg msg = {
-        .type = CONTROL_MSG_TYPE_COLLAPSE_PANELS,
-    };
-
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = control_msg_serialize(&msg, buf);
-    assert(size == 1);
-
-    const unsigned char expected[] = {
-        CONTROL_MSG_TYPE_COLLAPSE_PANELS,
+        CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL,
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -213,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[] = {
@@ -232,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[] = {
@@ -253,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[] = {
@@ -269,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[] = {
@@ -289,8 +268,7 @@ int main(int argc, char *argv[]) {
    test_serialize_inject_scroll_event();
    test_serialize_back_or_screen_on();
    test_serialize_expand_notification_panel();
-    test_serialize_expand_settings_panel();
-    test_serialize_collapse_panels();
+    test_serialize_collapse_notification_panel();
    test_serialize_get_clipboard();
    test_serialize_set_clipboard();
    test_serialize_set_screen_power_mode();
--- 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) {
@@ -287,18 +286,6 @@ static void test_parse_integer_with_suffix(void) {
    assert(!ok);
 }

-static void test_strlist_contains(void) {
-    assert(strlist_contains("a,bc,def", ',', "bc"));
-    assert(!strlist_contains("a,bc,def", ',', "b"));
-    assert(strlist_contains("", ',', ""));
-    assert(strlist_contains("abc,", ',', ""));
-    assert(strlist_contains(",abc", ',', ""));
-    assert(strlist_contains("abc,,def", ',', ""));
-    assert(!strlist_contains("abc", ',', ""));
-    assert(strlist_contains(",,|x", '|', ",,"));
-    assert(strlist_contains("xyz", '\0', "xyz"));
-}
-
 int main(int argc, char *argv[]) {
    (void) argc;
    (void) argv;
@@ -316,6 +303,5 @@ int main(int argc, char *argv[]) {
    test_parse_integer();
    test_parse_integers();
    test_parse_integer_with_suffix();
-    test_strlist_contains();
    return 0;
 }
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -2,11 +2,11 @@

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

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

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

 [host_machine]
 system = 'windows'
--- a/data/scrcpy-noconsole.vbs
+++ b/data/scrcpy-noconsole.vbs
@@ -1,7 +1 @@
-strCommand = "cmd /c scrcpy.exe"
-
-For Each Arg In WScript.Arguments
-    strCommand = strCommand & " """ & replace(Arg, """", """""""""") & """"
-Next
-
-CreateObject("Wscript.Shell").Run strCommand, 0, false
+CreateObject("Wscript.Shell").Run "cmd /c scrcpy.exe", 0, false
--- a/install_release.sh
+++ b/install_release.sh
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-server-v1.17
-PREBUILT_SERVER_SHA256=11b5ad2d1bc9b9730fb7254a78efd71a8ff46b1938ff468e47a21b653a1b6725
-
-echo "[scrcpy] Downloading prebuilt server..."
-wget "$PREBUILT_SERVER_URL" -O scrcpy-server
-echo "[scrcpy] Verifying prebuilt server..."
-echo "$PREBUILT_SERVER_SHA256  scrcpy-server" | sha256sum --check
-
-echo "[scrcpy] Building client..."
-rm -rf "$BUILDDIR"
-meson "$BUILDDIR" --buildtype release --strip -Db_lto=true \
-    -Dprebuilt_server=scrcpy-server
-cd "$BUILDDIR"
-ninja
-
-echo "[scrcpy] Installing (sudo)..."
-sudo ninja install
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,6 @@ project('scrcpy', 'c',
        default_options: [
            'c_std=c11',
            'warning_level=2',
-            'b_ndebug=if-release',
        ])

 if get_option('compile_app')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,5 +3,6 @@ option('compile_server', type: 'boolean', value: true, description: 'Build the s
 option('crossbuild_windows', type: 'boolean', value: false, description: 'Build for Windows from Linux')
 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')
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
 option('server_debugger_method', type: 'combo', choices: ['old', 'new'], value: 'new', description: 'Select the debugger method (Android < 9: "old", Android >= 9: "new")')
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -3,10 +3,6 @@ package com.genymobile.scrcpy;
 import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.Base64;
-
 import java.io.File;
 import java.io.IOException;

@@ -19,123 +15,23 @@ public final class CleanUp {

    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";

-    // A simple struct to be passed from the main process to the cleanup process
-    public static class Config implements Parcelable {
-
-        public static final Creator<Config> CREATOR = new Creator<Config>() {
-            @Override
-            public Config createFromParcel(Parcel in) {
-                return new Config(in);
-            }
-
-            @Override
-            public Config[] newArray(int size) {
-                return new Config[size];
-            }
-        };
-
-        private static final int FLAG_DISABLE_SHOW_TOUCHES = 1;
-        private static final int FLAG_RESTORE_NORMAL_POWER_MODE = 2;
-        private static final int FLAG_POWER_OFF_SCREEN = 4;
-
-        private int displayId;
-
-        // Restore the value (between 0 and 7), -1 to not restore
-        // <https://developer.android.com/reference/android/provider/Settings.Global#STAY_ON_WHILE_PLUGGED_IN>
-        private int restoreStayOn = -1;
-
-        private boolean disableShowTouches;
-        private boolean restoreNormalPowerMode;
-        private boolean powerOffScreen;
-
-        public Config() {
-            // Default constructor, the fields are initialized by CleanUp.configure()
-        }
-
-        protected Config(Parcel in) {
-            displayId = in.readInt();
-            restoreStayOn = in.readInt();
-            byte options = in.readByte();
-            disableShowTouches = (options & FLAG_DISABLE_SHOW_TOUCHES) != 0;
-            restoreNormalPowerMode = (options & FLAG_RESTORE_NORMAL_POWER_MODE) != 0;
-            powerOffScreen = (options & FLAG_POWER_OFF_SCREEN) != 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(displayId);
-            dest.writeInt(restoreStayOn);
-            byte options = 0;
-            if (disableShowTouches) {
-                options |= FLAG_DISABLE_SHOW_TOUCHES;
-            }
-            if (restoreNormalPowerMode) {
-                options |= FLAG_RESTORE_NORMAL_POWER_MODE;
-            }
-            if (powerOffScreen) {
-                options |= FLAG_POWER_OFF_SCREEN;
-            }
-            dest.writeByte(options);
-        }
-
-        private boolean hasWork() {
-            return disableShowTouches || restoreStayOn != -1 || restoreNormalPowerMode || powerOffScreen;
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        byte[] serialize() {
-            Parcel parcel = Parcel.obtain();
-            writeToParcel(parcel, 0);
-            byte[] bytes = parcel.marshall();
-            parcel.recycle();
-            return bytes;
-        }
-
-        static Config deserialize(byte[] bytes) {
-            Parcel parcel = Parcel.obtain();
-            parcel.unmarshall(bytes, 0, bytes.length);
-            parcel.setDataPosition(0);
-            return CREATOR.createFromParcel(parcel);
-        }
-
-        static Config fromBase64(String base64) {
-            byte[] bytes = Base64.decode(base64, Base64.NO_WRAP);
-            return deserialize(bytes);
-        }
-
-        String toBase64() {
-            byte[] bytes = serialize();
-            return Base64.encodeToString(bytes, Base64.NO_WRAP);
-        }
-    }
-
    private CleanUp() {
        // not instantiable
    }

-    public static void configure(int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode, boolean powerOffScreen)
-            throws IOException {
-        Config config = new Config();
-        config.displayId = displayId;
-        config.disableShowTouches = disableShowTouches;
-        config.restoreStayOn = restoreStayOn;
-        config.restoreNormalPowerMode = restoreNormalPowerMode;
-        config.powerOffScreen = powerOffScreen;
-
-        if (config.hasWork()) {
-            startProcess(config);
+    public static void configure(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode) throws IOException {
+        boolean needProcess = disableShowTouches || restoreStayOn != -1 || restoreNormalPowerMode;
+        if (needProcess) {
+            startProcess(disableShowTouches, restoreStayOn, restoreNormalPowerMode);
        } else {
            // There is no additional clean up to do when scrcpy dies
            unlinkSelf();
        }
    }

-    private static void startProcess(Config config) throws IOException {
-        String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};
+    private static void startProcess(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode) throws IOException {
+        String[] cmd = {"app_process", "/", CleanUp.class.getName(), String.valueOf(disableShowTouches), String.valueOf(
+                restoreStayOn), String.valueOf(restoreNormalPowerMode)};

        ProcessBuilder builder = new ProcessBuilder(cmd);
        builder.environment().put("CLASSPATH", SERVER_PATH);
@@ -162,28 +58,27 @@ public final class CleanUp {

        Ln.i("Cleaning up");

-        Config config = Config.fromBase64(args[0]);
+        boolean disableShowTouches = Boolean.parseBoolean(args[0]);
+        int restoreStayOn = Integer.parseInt(args[1]);
+        boolean restoreNormalPowerMode = Boolean.parseBoolean(args[2]);

-        if (config.disableShowTouches || config.restoreStayOn != -1) {
+        if (disableShowTouches || restoreStayOn != -1) {
            ServiceManager serviceManager = new ServiceManager();
            try (ContentProvider settings = serviceManager.getActivityManager().createSettingsProvider()) {
-                if (config.disableShowTouches) {
+                if (disableShowTouches) {
                    Ln.i("Disabling \"show touches\"");
                    settings.putValue(ContentProvider.TABLE_SYSTEM, "show_touches", "0");
                }
-                if (config.restoreStayOn != -1) {
+                if (restoreStayOn != -1) {
                    Ln.i("Restoring \"stay awake\"");
-                    settings.putValue(ContentProvider.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
+                    settings.putValue(ContentProvider.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(restoreStayOn));
                }
            }
        }

-        if (Device.isScreenOn()) {
-            if (config.powerOffScreen) {
-                Ln.i("Power off screen");
-                Device.powerOffScreen(config.displayId);
-            } else if (config.restoreNormalPowerMode) {
-                Ln.i("Restoring normal power mode");
+        if (restoreNormalPowerMode) {
+            Ln.i("Restoring normal power mode");
+            if (Device.isScreenOn()) {
                Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
            }
        }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@@ -11,12 +11,11 @@ public final class ControlMessage {
    public static final int TYPE_INJECT_SCROLL_EVENT = 3;
    public static final int TYPE_BACK_OR_SCREEN_ON = 4;
    public static final int TYPE_EXPAND_NOTIFICATION_PANEL = 5;
-    public static final int TYPE_EXPAND_SETTINGS_PANEL = 6;
-    public static final int TYPE_COLLAPSE_PANELS = 7;
-    public static final int TYPE_GET_CLIPBOARD = 8;
-    public static final int TYPE_SET_CLIPBOARD = 9;
-    public static final int TYPE_SET_SCREEN_POWER_MODE = 10;
-    public static final int TYPE_ROTATE_DEVICE = 11;
+    public static final int TYPE_COLLAPSE_NOTIFICATION_PANEL = 6;
+    public static final int TYPE_GET_CLIPBOARD = 7;
+    public static final int TYPE_SET_CLIPBOARD = 8;
+    public static final int TYPE_SET_SCREEN_POWER_MODE = 9;
+    public static final int TYPE_ROTATE_DEVICE = 10;

    private int type;
    private String text;
@@ -72,13 +71,6 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createBackOrScreenOn(int action) {
-        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_BACK_OR_SCREEN_ON;
-        msg.action = action;
-        return msg;
-    }
-
    public static ControlMessage createSetClipboard(String text, boolean paste) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_SET_CLIPBOARD;
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -11,7 +11,6 @@ public class ControlMessageReader {
    static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 13;
    static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 27;
    static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
-    static final int BACK_OR_SCREEN_ON_LENGTH = 1;
    static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
    static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 1;

@@ -67,18 +66,15 @@ public class ControlMessageReader {
            case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                msg = parseInjectScrollEvent();
                break;
-            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
-                msg = parseBackOrScreenOnEvent();
-                break;
            case ControlMessage.TYPE_SET_CLIPBOARD:
                msg = parseSetClipboard();
                break;
            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                msg = parseSetScreenPowerMode();
                break;
+            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
-            case ControlMessage.TYPE_EXPAND_SETTINGS_PANEL:
-            case ControlMessage.TYPE_COLLAPSE_PANELS:
+            case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_GET_CLIPBOARD:
            case ControlMessage.TYPE_ROTATE_DEVICE:
                msg = ControlMessage.createEmpty(type);
@@ -154,14 +150,6 @@ public class ControlMessageReader {
        return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll);
    }

-    private ControlMessage parseBackOrScreenOnEvent() {
-        if (buffer.remaining() < BACK_OR_SCREEN_ON_LENGTH) {
-            return null;
-        }
-        int action = toUnsigned(buffer.get());
-        return ControlMessage.createBackOrScreenOn(action);
-    }
-
    private ControlMessage parseSetClipboard() {
        if (buffer.remaining() < SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH) {
            return null;
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;

 public class Controller {

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

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

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

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

            pointerProperties[i] = props;
            pointerCoords[i] = coords;
@@ -55,7 +55,7 @@ public class Controller {
    public void control() throws IOException {
        // on start, power on the device
        if (!Device.isScreenOn()) {
-            device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER);
+            device.injectKeycode(KeyEvent.KEYCODE_POWER);

            // dirty hack
            // After POWER is injected, the device is powered on asynchronously.
@@ -101,16 +101,13 @@ public class Controller {
                break;
            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
                if (device.supportsInputEvents()) {
-                    pressBackOrTurnScreenOn(msg.getAction());
+                    pressBackOrTurnScreenOn();
                }
                break;
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
                Device.expandNotificationPanel();
                break;
-            case ControlMessage.TYPE_EXPAND_SETTINGS_PANEL:
-                Device.expandSettingsPanel();
-                break;
-            case ControlMessage.TYPE_COLLAPSE_PANELS:
+            case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
                Device.collapsePanels();
                break;
            case ControlMessage.TYPE_GET_CLIPBOARD:
@@ -211,13 +208,9 @@ public class Controller {
        // Right-click and middle-click only work if the source is a mouse
        boolean nonPrimaryButtonPressed = (buttons & ~MotionEvent.BUTTON_PRIMARY) != 0;
        int source = nonPrimaryButtonPressed ? InputDevice.SOURCE_MOUSE : InputDevice.SOURCE_TOUCHSCREEN;
-        if (source != InputDevice.SOURCE_MOUSE) {
-            // Buttons must not be set for touch events
-            buttons = 0;
-        }

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

        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEFAULT_DEVICE_ID, 0,
+                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
                        InputDevice.SOURCE_TOUCHSCREEN, 0);
        return device.injectEvent(event);
    }
@@ -258,22 +251,12 @@ public class Controller {
        }, 200, TimeUnit.MILLISECONDS);
    }

-    private boolean pressBackOrTurnScreenOn(int action) {
-        if (Device.isScreenOn()) {
-            return device.injectKeyEvent(action, KeyEvent.KEYCODE_BACK, 0, 0);
-        }
-
-        // Screen is off
-        // Only press POWER on ACTION_DOWN
-        if (action != KeyEvent.ACTION_DOWN) {
-            // do nothing,
-            return true;
-        }
-
-        if (keepPowerModeOff) {
+    private boolean pressBackOrTurnScreenOn() {
+        int keycode = Device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
+        if (keepPowerModeOff && keycode == KeyEvent.KEYCODE_POWER) {
            schedulePowerModeOff();
        }
-        return device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER);
+        return device.injectKeycode(keycode);
    }

    private boolean setClipboard(String text, boolean paste) {
@@ -284,7 +267,7 @@ public class Controller {

        // On Android >= 7, also press the PASTE key if requested
        if (paste && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && device.supportsInputEvents()) {
-            device.pressReleaseKeycode(KeyEvent.KEYCODE_PASTE);
+            device.injectKeycode(KeyEvent.KEYCODE_PASTE);
        }

        return ok;
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -25,9 +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;

-    public static final int LOCK_VIDEO_ORIENTATION_UNLOCKED = -1;
-    public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;
-
    private static final ServiceManager SERVICE_MANAGER = new ServiceManager();

    public interface RotationListener {
@@ -156,16 +153,12 @@ public final class Device {
        return Build.MODEL;
    }

-    public static boolean supportsInputEvents(int displayId) {
-        return displayId == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
-    }
-
    public boolean supportsInputEvents() {
        return supportsInputEvents;
    }

-    public static boolean injectEvent(InputEvent inputEvent, int displayId) {
-        if (!supportsInputEvents(displayId)) {
+    public boolean injectEvent(InputEvent inputEvent, int mode) {
+        if (!supportsInputEvents()) {
            throw new AssertionError("Could not inject input event if !supportsInputEvents()");
        }

@@ -173,30 +166,22 @@ public final class Device {
            return false;
        }

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

    public boolean injectEvent(InputEvent event) {
-        return injectEvent(event, displayId);
-    }
-
-    public static boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState, int displayId) {
-        long now = SystemClock.uptimeMillis();
-        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
-                InputDevice.SOURCE_KEYBOARD);
-        return injectEvent(event, displayId);
+        return injectEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
    }

    public boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
-        return injectKeyEvent(action, keyCode, repeat, metaState, displayId);
+        long now = SystemClock.uptimeMillis();
+        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
+                InputDevice.SOURCE_KEYBOARD);
+        return injectEvent(event);
    }

-    public static boolean pressReleaseKeycode(int keyCode, int displayId) {
-        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0, displayId) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0, displayId);
-    }
-
-    public boolean pressReleaseKeycode(int keyCode) {
-        return pressReleaseKeycode(keyCode, displayId);
+    public boolean injectKeycode(int keyCode) {
+        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
    }

    public static boolean isScreenOn() {
@@ -215,10 +200,6 @@ public final class Device {
        SERVICE_MANAGER.getStatusBarManager().expandNotificationsPanel();
    }

-    public static void expandSettingsPanel() {
-        SERVICE_MANAGER.getStatusBarManager().expandSettingsPanel();
-    }
-
    public static void collapsePanels() {
        SERVICE_MANAGER.getStatusBarManager().collapsePanels();
    }
@@ -268,13 +249,6 @@ public final class Device {
        return SurfaceControl.setDisplayPowerMode(d, mode);
    }

-    public static boolean powerOffScreen(int displayId) {
-        if (!isScreenOn()) {
-            return true;
-        }
-        return pressReleaseKeycode(KeyEvent.KEYCODE_POWER, displayId);
-    }
-
    /**
     * Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
     */
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -17,7 +17,6 @@ public class Options {
    private boolean stayAwake;
    private String codecOptions;
    private String encoderName;
-    private boolean powerOffScreenOnClose;

    public Ln.Level getLogLevel() {
        return logLevel;
@@ -130,12 +129,4 @@ public class Options {
    public void setEncoderName(String encoderName) {
        this.encoderName = encoderName;
    }
-
-    public void setPowerOffScreenOnClose(boolean powerOffScreenOnClose) {
-        this.powerOffScreenOnClose = powerOffScreenOnClose;
-    }
-
-    public boolean getPowerOffScreenOnClose() {
-        return this.powerOffScreenOnClose;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -7,7 +7,6 @@ import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaFormat;
-import android.os.Build;
 import android.os.IBinder;
 import android.view.Surface;

@@ -226,11 +225,7 @@ public class ScreenEncoder implements Device.RotationListener {
    }

    private static IBinder createDisplay() {
-        // Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
-        // On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
-        boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S"
-                .equals(Build.VERSION.CODENAME));
-        return SurfaceControl.createDisplay("scrcpy", secure);
+        return SurfaceControl.createDisplay("scrcpy", true);
    }

    private static void configure(MediaCodec codec, MediaFormat format) {
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
@@ -82,12 +82,6 @@ public final class ScreenInfo {

    public static ScreenInfo computeScreenInfo(DisplayInfo displayInfo, Rect crop, int maxSize, int lockedVideoOrientation) {
        int rotation = displayInfo.getRotation();
-
-        if (lockedVideoOrientation == Device.LOCK_VIDEO_ORIENTATION_INITIAL) {
-            // The user requested to lock the video orientation to the current orientation
-            lockedVideoOrientation = rotation;
-        }
-
        Size deviceSize = displayInfo.getSize();
        Rect contentRect = new Rect(0, 0, deviceSize.getWidth(), deviceSize.getHeight());
        if (crop != null) {
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -50,7 +50,7 @@ public final class Server {
            }
        }

-        CleanUp.configure(options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp, true, options.getPowerOffScreenOnClose());
+        CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn, true);

        boolean tunnelForward = options.isTunnelForward();

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

-        final int expectedParameters = 16;
+        final int expectedParameters = 15;
        if (args.length != expectedParameters) {
            throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");
        }
@@ -185,9 +185,6 @@ public final class Server {
        String encoderName = "-".equals(args[14]) ? null : args[14];
        options.setEncoderName(encoderName);

-        boolean powerOffScreenOnClose = Boolean.parseBoolean(args[15]);
-        options.setPowerOffScreenOnClose(powerOffScreenOnClose);
-
        return options;
    }

@@ -233,7 +230,7 @@ public final class Server {
            if (encoders != null && encoders.length > 0) {
                Ln.e("Try to use one of the available encoders:");
                for (MediaCodecInfo encoder : encoders) {
-                    Ln.e("    scrcpy --encoder '" + encoder.getName() + "'");
+                    Ln.e("    scrcpy --encoder-name '" + encoder.getName() + "'");
                }
            }
        }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
@@ -14,7 +14,7 @@ public class ActivityManager {

    private final IInterface manager;
    private Method getContentProviderExternalMethod;
-    private boolean getContentProviderExternalMethodNewVersion = true;
+    private boolean getContentProviderExternalMethodLegacy;
    private Method removeContentProviderExternalMethod;

    public ActivityManager(IInterface manager) {
@@ -29,7 +29,7 @@ public class ActivityManager {
            } catch (NoSuchMethodException e) {
                // old version
                getContentProviderExternalMethod = manager.getClass().getMethod("getContentProviderExternal", String.class, int.class, IBinder.class);
-                getContentProviderExternalMethodNewVersion = false;
+                getContentProviderExternalMethodLegacy = true;
            }
        }
        return getContentProviderExternalMethod;
@@ -46,7 +46,7 @@ public class ActivityManager {
        try {
            Method method = getGetContentProviderExternalMethod();
            Object[] args;
-            if (getContentProviderExternalMethodNewVersion) {
+            if (!getContentProviderExternalMethodLegacy) {
                // new version
                args = new Object[]{name, ServiceManager.USER_ID, token, null};
            } else {
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy.wrappers;

 import com.genymobile.scrcpy.Ln;

-import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.IBinder;

@@ -38,8 +37,6 @@ public class ContentProvider implements Closeable {
    private Method callMethod;
    private int callMethodVersion;

-    private Object attributionSource;
-
    ContentProvider(ActivityManager manager, Object provider, String name, IBinder token) {
        this.manager = manager;
        this.provider = provider;
@@ -47,58 +44,36 @@ public class ContentProvider implements Closeable {
        this.token = token;
    }

-    @SuppressLint("PrivateApi")
    private Method getCallMethod() throws NoSuchMethodException {
        if (callMethod == null) {
+
            try {
-                Class<?> attributionSourceClass = Class.forName("android.content.AttributionSource");
-                callMethod = provider.getClass().getMethod("call", attributionSourceClass, String.class, String.class, String.class, Bundle.class);
+                callMethod = provider.getClass()
+                        .getMethod("call", String.class, String.class, String.class, String.class, String.class, Bundle.class);
                callMethodVersion = 0;
-            } catch (NoSuchMethodException | ClassNotFoundException e0) {
+            } catch (NoSuchMethodException e) {
                // old versions
                try {
-                    callMethod = provider.getClass()
-                            .getMethod("call", String.class, String.class, String.class, String.class, String.class, Bundle.class);
+                    callMethod = provider.getClass().getMethod("call", String.class, String.class, String.class, String.class, Bundle.class);
                    callMethodVersion = 1;
-                } catch (NoSuchMethodException e1) {
-                    try {
-                        callMethod = provider.getClass().getMethod("call", String.class, String.class, String.class, String.class, Bundle.class);
-                        callMethodVersion = 2;
-                    } catch (NoSuchMethodException e2) {
-                        callMethod = provider.getClass().getMethod("call", String.class, String.class, String.class, Bundle.class);
-                        callMethodVersion = 3;
-                    }
+                } catch (NoSuchMethodException e2) {
+                    callMethod = provider.getClass().getMethod("call", String.class, String.class, String.class, Bundle.class);
+                    callMethodVersion = 2;
                }
            }
        }
        return callMethod;
    }

-    @SuppressLint("PrivateApi")
-    private Object getAttributionSource()
-            throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
-        if (attributionSource == null) {
-            Class<?> cl = Class.forName("android.content.AttributionSource$Builder");
-            Object builder = cl.getConstructor(int.class).newInstance(ServiceManager.USER_ID);
-            cl.getDeclaredMethod("setPackageName", String.class).invoke(builder, ServiceManager.PACKAGE_NAME);
-            attributionSource = cl.getDeclaredMethod("build").invoke(builder);
-        }
-
-        return attributionSource;
-    }
-
    private Bundle call(String callMethod, String arg, Bundle extras) {
        try {
            Method method = getCallMethod();
            Object[] args;
            switch (callMethodVersion) {
                case 0:
-                    args = new Object[]{getAttributionSource(), "settings", callMethod, arg, extras};
-                    break;
-                case 1:
                    args = new Object[]{ServiceManager.PACKAGE_NAME, null, "settings", callMethod, arg, extras};
                    break;
-                case 2:
+                case 1:
                    args = new Object[]{ServiceManager.PACKAGE_NAME, "settings", callMethod, arg, extras};
                    break;
                default:
@@ -106,7 +81,7 @@ public class ContentProvider implements Closeable {
                    break;
            }
            return (Bundle) method.invoke(provider, args);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException | ClassNotFoundException | InstantiationException e) {
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
            Ln.e("Could not invoke method", e);
            return null;
        }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
@@ -11,8 +11,6 @@ public class StatusBarManager {

    private final IInterface manager;
    private Method expandNotificationsPanelMethod;
-    private Method expandSettingsPanelMethod;
-    private boolean expandSettingsPanelMethodNewVersion = true;
    private Method collapsePanelsMethod;

    public StatusBarManager(IInterface manager) {
@@ -26,20 +24,6 @@ public class StatusBarManager {
        return expandNotificationsPanelMethod;
    }

-    private Method getExpandSettingsPanel() throws NoSuchMethodException {
-        if (expandSettingsPanelMethod == null) {
-            try {
-                // Since Android 7: https://android.googlesource.com/platform/frameworks/base.git/+/a9927325eda025504d59bb6594fee8e240d95b01%5E%21/
-                expandSettingsPanelMethod = manager.getClass().getMethod("expandSettingsPanel", String.class);
-            } catch (NoSuchMethodException e) {
-                // old version
-                expandSettingsPanelMethod = manager.getClass().getMethod("expandSettingsPanel");
-                expandSettingsPanelMethodNewVersion = false;
-            }
-        }
-        return expandSettingsPanelMethod;
-    }
-
    private Method getCollapsePanelsMethod() throws NoSuchMethodException {
        if (collapsePanelsMethod == null) {
            collapsePanelsMethod = manager.getClass().getMethod("collapsePanels");
@@ -56,21 +40,6 @@ public class StatusBarManager {
        }
    }

-    public void expandSettingsPanel() {
-        try {
-            Method method = getExpandSettingsPanel();
-            if (expandSettingsPanelMethodNewVersion) {
-                // new version
-                method.invoke(manager, (Object) null);
-            } else {
-                // old version
-                method.invoke(manager);
-            }
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
-        }
-    }
-
    public void collapsePanels() {
        try {
            Method method = getCollapsePanelsMethod();
--- a/Show More
+++ b/Show More