Add support for AAC audio codec

Add option --audio-codec=aac.

README.md

@@ -199,7 +199,7 @@ preserved. That way, a device in 1920×1080 will be mirrored at 1024×576.
 The default bit-rate is 8 Mbps. To change the video bitrate (e.g. to 2 Mbps):
 
 ```bash
-scrcpy --video-bit-rate=2M
+scrcpy --bit-rate=2M
 scrcpy -b 2M  # short version
 ```
 
@@ -258,9 +258,9 @@ The video codec can be selected. The possible values are `h264` (default),
 `h265` and `av1`:
 
 ```bash
-scrcpy --video-codec=h264  # default
-scrcpy --video-codec=h265
-scrcpy --video-codec=av1
+scrcpy --codec=h264  # default
+scrcpy --codec=h265
+scrcpy --codec=av1
 ```
 
 
@@ -270,13 +270,15 @@ Some devices have more than one encoder for a specific codec, and some of them
 may cause issues or crash. It is possible to select a different encoder:
 
 ```bash
-scrcpy --video-encoder=OMX.qcom.video.encoder.avc
+scrcpy --encoder=OMX.qcom.video.encoder.avc
 ```
 
-To list the available encoders:
+To list the available encoders, you can pass an invalid encoder name; the
+error will give the available encoders:
 
 ```bash
-scrcpy --list-encoders
+scrcpy --encoder=_               # for the default codec
+scrcpy --codec=h265 --encoder=_  # for a specific codec
 ```
 
 ### Capture
@@ -442,7 +444,7 @@ none found, try running `adb disconnect`, and then run those two commands again.
 It may be useful to decrease the bit-rate and the resolution:
 
 ```bash
-scrcpy --video-bit-rate=2M --max-size=800
+scrcpy --bit-rate=2M --max-size=800
 scrcpy -b2M -m800  # short version
 ```
 

app/data/bash-completion/scrcpy

@@ -2,33 +2,28 @@ _scrcpy() {
     local cur prev words cword
     local opts="
         --always-on-top
-        --audio-bit-rate=
-        --audio-codec=
-        --audio-codec-options=
-        --audio-encoder=
-        -b --video-bit-rate=
+        -b --bit-rate=
+        --codec-options=
         --crop=
         -d --select-usb
         --disable-screensaver
         --display=
         --display-buffer=
         -e --select-tcpip
+        --encoder=
         --force-adb-forward
         --forward-all-clicks
         -f --fullscreen
         -K --hid-keyboard
         -h --help
         --legacy-paste
-        --list-displays
-        --list-encoders
         --lock-video-orientation
         --lock-video-orientation=
         --max-fps=
         -M --hid-mouse
         -m --max-size=
-        --no-audio
         --no-cleanup
-        --no-clipboard-autosync
+        --no-clipboard-on-error
         --no-downsize-on-error
         -n --no-control
         -N --no-display
@@ -58,9 +53,6 @@ _scrcpy() {
         --v4l2-sink=
         -V --verbosity=
         -v --version
-        --video-codec=
-        --video-codec-options=
-        --video-encoder=
         -w --stay-awake
         --window-borderless
         --window-title=
@@ -72,14 +64,6 @@ _scrcpy() {
     _init_completion -s || return
 
     case "$prev" in
-        --video-codec)
-            COMPREPLY=($(compgen -W 'h264 h265 av1' -- "$cur"))
-            return
-            ;;
-        --audio-codec)
-            COMPREPLY=($(compgen -W 'opus aac' -- "$cur"))
-            return
-            ;;
         --lock-video-orientation)
             COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
             return
@@ -114,7 +98,7 @@ _scrcpy() {
             COMPREPLY=($(compgen -W "$("${ADB:-adb}" devices | awk '$2 == "device" {print $1}')" -- ${cur}))
             return
             ;;
-        -b|--video-bit-rate \
+        -b|--bitrate \
         |--codec-options \
         |--crop \
         |--display \

app/data/zsh-completion/_scrcpy

@@ -9,30 +9,25 @@ local arguments
 
 arguments=(
     '--always-on-top[Make scrcpy window always on top \(above other windows\)]'
-    '--audio-bit-rate=[Encode the audio at the given bit-rate]'
-    '--audio-codec=[Select the audio codec]:codec:(opus aac)'
-    '--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
-    '--audio-encoder=[Use a specific MediaCodec audio encoder]'
-    {-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
+    {-b,--bit-rate=}'[Encode the video at the given bit-rate]'
+    '--codec-options=[Set a list of comma-separated key\:type=value options for the device encoder]'
     '--crop=[\[width\:height\:x\:y\] Crop the device screen on the server]'
     {-d,--select-usb}'[Use USB device]'
     '--disable-screensaver[Disable screensaver while scrcpy is running]'
     '--display=[Specify the display id to mirror]'
     '--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
     {-e,--select-tcpip}'[Use TCP/IP device]'
+    '--encoder=[Use a specific MediaCodec encoder \(must be a H.264 encoder\)]'
     '--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
     '--forward-all-clicks[Forward clicks to device]'
     {-f,--fullscreen}'[Start in fullscreen]'
     {-K,--hid-keyboard}'[Simulate a physical keyboard by using HID over AOAv2]'
     {-h,--help}'[Print the help]'
     '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
-    '--list-displays[List displays available on the device]'
-    '--list-encoders[List video and audio encoders available on the device]'
     '--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 1 2 3)'
     '--max-fps=[Limit the frame rate of screen capture]'
     {-M,--hid-mouse}'[Simulate a physical mouse by using HID over AOAv2]'
     {-m,--max-size=}'[Limit both the width and height of the video to value]'
-    '--no-audio[Disable audio forwarding]'
     '--no-cleanup[Disable device cleanup actions on exit]'
     '--no-clipboard-autosync[Disable automatic clipboard synchronization]'
     '--no-downsize-on-error[Disable lowering definition on MediaCodec error]'
@@ -63,9 +58,6 @@ arguments=(
     '--v4l2-sink=[\[\/dev\/videoN\] Output to v4l2loopback device]'
     {-V,--verbosity=}'[Set the log level]:verbosity:(verbose debug info warn error)'
     {-v,--version}'[Print the version of scrcpy]'
-    '--video-codec=[Select the video codec]:codec:(h264 h265 av1)'
-    '--video-codec-options=[Set a list of comma-separated key\:type=value options for the device video encoder]'
-    '--video-encoder=[Use a specific MediaCodec video encoder]'
     {-w,--stay-awake}'[Keep the device on while scrcpy is running, when the device is plugged in]'
     '--window-borderless[Disable window decorations \(display borderless window\)]'
     '--window-title=[Set a custom window title]'

app/meson.build

@@ -4,7 +4,6 @@ src = [
     'src/adb/adb_device.c',
     'src/adb/adb_parser.c',
     'src/adb/adb_tunnel.c',
-    'src/audio_player.c',
     'src/cli.c',
     'src/clock.c',
     'src/compat.c',
@@ -31,7 +30,6 @@ src = [
     'src/version.c',
     'src/video_buffer.c',
     'src/util/acksync.c',
-    'src/util/bytebuf.c',
     'src/util/file.c',
     'src/util/intmap.c',
     'src/util/intr.c',
@@ -262,10 +260,6 @@ if get_option('buildtype') == 'debug'
         ['test_binary', [
             'tests/test_binary.c',
         ]],
-        ['test_bytebuf', [
-            'tests/test_bytebuf.c',
-            'src/util/bytebuf.c',
-        ]],
         ['test_cbuf', [
             'tests/test_cbuf.c',
         ]],

app/scrcpy.1

@@ -32,17 +32,27 @@ Select an audio codec (opus or aac).
 Default is opus.
 
 .TP
-.BI "\-\-audio\-encoder " name
-Use a specific MediaCodec audio encoder (depending on the codec provided by \fB\-\-audio\-codec\fR).
-
-The available encoders can be listed by \-\-list\-encoders.
-
-.TP
-.BI "\-b, \-\-video\-bit\-rate " value
+.BI "\-b, \-\-bit\-rate " value
 Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
 
 Default is 8M (8000000).
 
+.TP
+.BI "\-\-codec " name
+Select a video codec (h264, h265 or av1).
+
+Default is h264.
+
+.TP
+.BI "\-\-codec\-options " key\fR[:\fItype\fR]=\fIvalue\fR[,...]
+Set a list of comma-separated key:type=value options for the device encoder.
+
+The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
+
+The list of possible codec options is available in the Android documentation
+.UR https://d.android.com/reference/android/media/MediaFormat
+.UE .
+
 .TP
 .BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.
@@ -63,9 +73,10 @@ Disable screensaver while scrcpy is running.
 
 .TP
 .BI "\-\-display " id
-Specify the device display id to mirror.
+Specify the display id to mirror.
 
-The available display ids can be listed by \-\-list\-displays.
+The list of possible display ids can be listed by "adb shell dumpsys display"
+(search "mDisplayId=" in the output).
 
 Default is 0.
 
@@ -81,6 +92,10 @@ Use TCP/IP device (if there is exactly one, like adb -e).
 
 Also see \fB\-d\fR (\fB\-\-select\-usb\fR).
 
+.TP
+.BI "\-\-encoder " name
+Use a specific MediaCodec encoder (must be a H.264 encoder).
+
 .TP
 .B \-\-force\-adb\-forward
 Do not attempt to use "adb reverse" to connect to the device.
@@ -119,14 +134,6 @@ 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
-.B \-\-list\-encoders
-List video and audio encoders available on the device.
-
-.TP
-.B \-\-list\-displays
-List displays available on the device.
-
 .TP
 \fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
 Lock video orientation to \fIvalue\fR. Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees rotation counterclockwise.
@@ -334,28 +341,6 @@ Default is "info" for release builds, "debug" for debug builds.
 .B \-v, \-\-version
 Print the version of scrcpy.
 
-.TP
-.BI "\-\-video\-codec " name
-Select a video codec (h264, h265 or av1).
-
-Default is h264.
-
-.TP
-.BI "\-\-video\-codec\-options " key\fR[:\fItype\fR]=\fIvalue\fR[,...]
-Set a list of comma-separated key:type=value options for the device video encoder.
-
-The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
-
-The list of possible codec options is available in the Android documentation
-.UR https://d.android.com/reference/android/media/MediaFormat
-.UE .
-
-.TP
-.BI "\-\-video\-encoder " name
-Use a specific MediaCodec video encoder (depending on the codec provided by \fB\-\-video\-codec\fR).
-
-The available encoders can be listed by \-\-list\-encoders.
-
 .TP
 .B \-w, \-\-stay-awake
 Keep the device on while scrcpy is running, when the device is plugged in.

app/src/audio_player.c

@@ -1,150 +0,0 @@
-#include "audio_player.h"
-
-#include "util/log.h"
-
-/** Downcast frame_sink to sc_v4l2_sink */
-#define DOWNCAST(SINK) container_of(SINK, struct sc_audio_player, frame_sink)
-
-void
-sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
-    struct sc_audio_player *ap = userdata;
-
-    // This callback is called with the lock used by SDL_AudioDeviceLock(), so
-    // the bytebuf is protected
-
-    assert(len_int > 0);
-    size_t len = len_int;
-
-    size_t read = sc_bytebuf_read_remaining(&ap->buf);
-    if (read) {
-        if (read > len) {
-            read = len;
-        }
-        sc_bytebuf_read(&ap->buf, stream, read);
-    }
-    if (read < len) {
-        // Insert silence
-        memset(stream + read, 0, len - read);
-    }
-}
-
-static SDL_AudioFormat
-sc_audio_player_ffmpeg_to_sdl_format(enum AVSampleFormat format) {
-    switch (format) {
-        case AV_SAMPLE_FMT_S16:
-            return AUDIO_S16;
-        case AV_SAMPLE_FMT_S32:
-            return AUDIO_S32;
-        case AV_SAMPLE_FMT_FLT:
-            return AUDIO_F32;
-        default:
-            LOGE("Unsupported FFmpeg sample format: %s",
-                 av_get_sample_fmt_name(format));
-            return 0;
-    }
-}
-
-static bool
-sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
-                                const AVCodecContext *ctx) {
-    struct sc_audio_player *ap = DOWNCAST(sink);
-
-    SDL_AudioFormat format =
-        sc_audio_player_ffmpeg_to_sdl_format(ctx->sample_fmt);
-    if (!format) {
-        // error already logged
-        //return false;
-        format = AUDIO_F32; // it's planar, but for now there is only 1 channel
-    }
-    LOGI("%d\n", ctx->sample_rate);
-
-    SDL_AudioSpec desired = {
-        .freq = ctx->sample_rate,
-        .format = format,
-        .channels = 1,
-        .samples = 2048,
-        .callback = sc_audio_player_sdl_callback,
-        .userdata = ap,
-    };
-    SDL_AudioSpec obtained;
-
-    ap->device = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
-    if (!ap->device) {
-        LOGE("Could not open audio device: %s", SDL_GetError());
-        return false;
-    }
-
-    SDL_PauseAudioDevice(ap->device, 0);
-
-    return true;
-}
-
-static void
-sc_audio_player_frame_sink_close(struct sc_frame_sink *sink) {
-    struct sc_audio_player *ap = DOWNCAST(sink);
-
-    assert(ap->device);
-    SDL_PauseAudioDevice(ap->device, 1);
-    SDL_CloseAudioDevice(ap->device);
-}
-
-static bool
-sc_audio_player_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
-    struct sc_audio_player *ap = DOWNCAST(sink);
-
-    const uint8_t *data = frame->data[0];
-    size_t size = frame->linesize[0];
-
-    // TODO convert to non planar format
-    // TODO then re-enable stereo
-    // TODO clock drift compensation
-
-    // It should almost always be possible to write without lock
-    bool can_write_without_lock = size <= ap->safe_empty_buffer;
-    if (can_write_without_lock) {
-        sc_bytebuf_prepare_write(&ap->buf, data, size);
-    }
-
-    SDL_LockAudioDevice(ap->device);
-    if (can_write_without_lock) {
-        sc_bytebuf_commit_write(&ap->buf, size);
-    } else {
-        sc_bytebuf_write(&ap->buf, data, size);
-    }
-
-    // The next time, it will remain at least the current empty space
-    ap->safe_empty_buffer = sc_bytebuf_write_remaining(&ap->buf);
-    SDL_UnlockAudioDevice(ap->device);
-
-    return true;
-}
-
-bool
-sc_audio_player_init(struct sc_audio_player *ap,
-                     const struct sc_audio_player_callbacks *cbs,
-                     void *cbs_userdata) {
-    bool ok = sc_bytebuf_init(&ap->buf, 128 * 1024);
-    if (!ok) {
-        return false;
-    }
-
-    ap->safe_empty_buffer = sc_bytebuf_write_remaining(&ap->buf);
-
-    assert(cbs && cbs->on_ended);
-    ap->cbs = cbs;
-    ap->cbs_userdata = cbs_userdata;
-
-    static const struct sc_frame_sink_ops ops = {
-        .open = sc_audio_player_frame_sink_open,
-        .close = sc_audio_player_frame_sink_close,
-        .push = sc_audio_player_frame_sink_push,
-    };
-
-    ap->frame_sink.ops = &ops;
-    return true;
-}
-
-void
-sc_audio_player_destroy(struct sc_audio_player *ap) {
-    sc_bytebuf_destroy(&ap->buf);
-}

app/src/audio_player.h

@@ -1,40 +0,0 @@
-#ifndef SC_AUDIO_PLAYER_H
-#define SC_AUDIO_PLAYER_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include "trait/frame_sink.h"
-#include <util/bytebuf.h>
-#include <util/thread.h>
-
-#include <libavformat/avformat.h>
-#include <SDL2/SDL.h>
-
-struct sc_audio_player {
-    struct sc_frame_sink frame_sink;
-
-    SDL_AudioDeviceID device;
-
-    // protected by SDL_AudioDeviceLock()
-    struct sc_bytebuf buf;
-    // Number of bytes which could be written without locking
-    size_t safe_empty_buffer;
-
-    const struct sc_audio_player_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct sc_audio_player_callbacks {
-    void (*on_ended)(struct sc_audio_player *ap, bool success, void *userdata);
-};
-
-bool
-sc_audio_player_init(struct sc_audio_player *ap,
-                     const struct sc_audio_player_callbacks *cbs,
-                     void *cbs_userdata);
-
-void
-sc_audio_player_destroy(struct sc_audio_player *ap);
-
-#endif

app/src/cli.c

@@ -17,59 +17,50 @@
 #define STR_IMPL_(x) #x
 #define STR(x) STR_IMPL_(x)
 
-enum {
-    OPT_RENDER_EXPIRED_FRAMES = 1000,
-    OPT_WINDOW_TITLE,
-    OPT_PUSH_TARGET,
-    OPT_ALWAYS_ON_TOP,
-    OPT_CROP,
-    OPT_RECORD_FORMAT,
-    OPT_PREFER_TEXT,
-    OPT_WINDOW_X,
-    OPT_WINDOW_Y,
-    OPT_WINDOW_WIDTH,
-    OPT_WINDOW_HEIGHT,
-    OPT_WINDOW_BORDERLESS,
-    OPT_MAX_FPS,
-    OPT_LOCK_VIDEO_ORIENTATION,
-    OPT_DISPLAY_ID,
-    OPT_ROTATION,
-    OPT_RENDER_DRIVER,
-    OPT_NO_MIPMAPS,
-    OPT_CODEC_OPTIONS,
-    OPT_VIDEO_CODEC_OPTIONS,
-    OPT_FORCE_ADB_FORWARD,
-    OPT_DISABLE_SCREENSAVER,
-    OPT_SHORTCUT_MOD,
-    OPT_NO_KEY_REPEAT,
-    OPT_FORWARD_ALL_CLICKS,
-    OPT_LEGACY_PASTE,
-    OPT_ENCODER,
-    OPT_VIDEO_ENCODER,
-    OPT_POWER_OFF_ON_CLOSE,
-    OPT_V4L2_SINK,
-    OPT_DISPLAY_BUFFER,
-    OPT_V4L2_BUFFER,
-    OPT_TUNNEL_HOST,
-    OPT_TUNNEL_PORT,
-    OPT_NO_CLIPBOARD_AUTOSYNC,
-    OPT_TCPIP,
-    OPT_RAW_KEY_EVENTS,
-    OPT_NO_DOWNSIZE_ON_ERROR,
-    OPT_OTG,
-    OPT_NO_CLEANUP,
-    OPT_PRINT_FPS,
-    OPT_NO_POWER_ON,
-    OPT_CODEC,
-    OPT_VIDEO_CODEC,
-    OPT_NO_AUDIO,
-    OPT_AUDIO_BIT_RATE,
-    OPT_AUDIO_CODEC,
-    OPT_AUDIO_CODEC_OPTIONS,
-    OPT_AUDIO_ENCODER,
-    OPT_LIST_ENCODERS,
-    OPT_LIST_DISPLAYS,
-};
+#define OPT_RENDER_EXPIRED_FRAMES  1000
+#define OPT_WINDOW_TITLE           1001
+#define OPT_PUSH_TARGET            1002
+#define OPT_ALWAYS_ON_TOP          1003
+#define OPT_CROP                   1004
+#define OPT_RECORD_FORMAT          1005
+#define OPT_PREFER_TEXT            1006
+#define OPT_WINDOW_X               1007
+#define OPT_WINDOW_Y               1008
+#define OPT_WINDOW_WIDTH           1009
+#define OPT_WINDOW_HEIGHT          1010
+#define OPT_WINDOW_BORDERLESS      1011
+#define OPT_MAX_FPS                1012
+#define OPT_LOCK_VIDEO_ORIENTATION 1013
+#define OPT_DISPLAY_ID             1014
+#define OPT_ROTATION               1015
+#define OPT_RENDER_DRIVER          1016
+#define OPT_NO_MIPMAPS             1017
+#define OPT_CODEC_OPTIONS          1018
+#define OPT_FORCE_ADB_FORWARD      1019
+#define OPT_DISABLE_SCREENSAVER    1020
+#define OPT_SHORTCUT_MOD           1021
+#define OPT_NO_KEY_REPEAT          1022
+#define OPT_FORWARD_ALL_CLICKS     1023
+#define OPT_LEGACY_PASTE           1024
+#define OPT_ENCODER_NAME           1025
+#define OPT_POWER_OFF_ON_CLOSE     1026
+#define OPT_V4L2_SINK              1027
+#define OPT_DISPLAY_BUFFER         1028
+#define OPT_V4L2_BUFFER            1029
+#define OPT_TUNNEL_HOST            1030
+#define OPT_TUNNEL_PORT            1031
+#define OPT_NO_CLIPBOARD_AUTOSYNC  1032
+#define OPT_TCPIP                  1033
+#define OPT_RAW_KEY_EVENTS         1034
+#define OPT_NO_DOWNSIZE_ON_ERROR   1035
+#define OPT_OTG                    1036
+#define OPT_NO_CLEANUP             1037
+#define OPT_PRINT_FPS              1038
+#define OPT_NO_POWER_ON            1039
+#define OPT_CODEC                  1040
+#define OPT_NO_AUDIO               1041
+#define OPT_AUDIO_BIT_RATE         1042
+#define OPT_AUDIO_CODEC            1043
 
 struct sc_option {
     char shortopt;
@@ -125,48 +116,32 @@ static const struct sc_option options[] = {
         .text = "Select an audio codec (opus or aac).\n"
                 "Default is opus.",
     },
-    {
-        .longopt_id = OPT_AUDIO_CODEC_OPTIONS,
-        .longopt = "audio-codec-options",
-        .argdesc = "key[:type]=value[,...]",
-        .text = "Set a list of comma-separated key:type=value options for the "
-                "device audio encoder.\n"
-                "The possible values for 'type' are 'int' (default), 'long', "
-                "'float' and 'string'.\n"
-                "The list of possible codec options is available in the "
-                "Android documentation: "
-                "<https://d.android.com/reference/android/media/MediaFormat>",
-    },
-    {
-        .longopt_id = OPT_AUDIO_ENCODER,
-        .longopt = "audio-encoder",
-        .argdesc = "name",
-        .text = "Use a specific MediaCodec audio encoder (depending on the "
-                "codec provided by --audio-codec).\n"
-                "The available encoders can be listed by --list-encoders.",
-    },
     {
         .shortopt = 'b',
-        .longopt = "video-bit-rate",
+        .longopt = "bit-rate",
         .argdesc = "value",
         .text = "Encode the video at the given bit-rate, expressed in bits/s. "
                 "Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
                 "Default is 8M (8000000).",
     },
     {
-        // Not really deprecated (--codec has never been released), but without
-        // declaring an explicit --codec option, getopt_long() partial matching
-        // behavior would consider --codec to be equivalent to --codec-options,
-        // which would be confusing.
         .longopt_id = OPT_CODEC,
         .longopt = "codec",
-        .argdesc = "value",
+        .argdesc = "name",
+        .text = "Select a video codec (h264, h265 or av1).\n"
+                "Default is h264.",
     },
     {
-        // deprecated
         .longopt_id = OPT_CODEC_OPTIONS,
         .longopt = "codec-options",
         .argdesc = "key[:type]=value[,...]",
+        .text = "Set a list of comma-separated key:type=value options for the "
+                "device encoder.\n"
+                "The possible values for 'type' are 'int' (default), 'long', "
+                "'float' and 'string'.\n"
+                "The list of possible codec options is available in the "
+                "Android documentation: "
+                "<https://d.android.com/reference/android/media/MediaFormat>",
     },
     {
         .longopt_id = OPT_CROP,
@@ -192,9 +167,10 @@ static const struct sc_option options[] = {
         .longopt_id = OPT_DISPLAY_ID,
         .longopt = "display",
         .argdesc = "id",
-        .text = "Specify the device display id to mirror.\n"
-                "The available display ids can be listed by:\n"
-                "    scrcpy --list-displays\n"
+        .text = "Specify the display id to mirror.\n"
+                "The list of possible display ids can be listed by:\n"
+                "    adb shell dumpsys display\n"
+                "(search \"mDisplayId=\" in the output)\n"
                 "Default is 0.",
     },
     {
@@ -212,10 +188,10 @@ static const struct sc_option options[] = {
                 "Also see -d (--select-usb).",
     },
     {
-        // deprecated
-        .longopt_id = OPT_ENCODER,
+        .longopt_id = OPT_ENCODER_NAME,
         .longopt = "encoder",
         .argdesc = "name",
+        .text = "Use a specific MediaCodec encoder (must be a H.264 encoder).",
     },
     {
         .longopt_id = OPT_FORCE_ADB_FORWARD,
@@ -265,16 +241,6 @@ static const struct sc_option options[] = {
                 "This is a workaround for some devices not behaving as "
                 "expected when setting the device clipboard programmatically.",
     },
-    {
-        .longopt_id = OPT_LIST_DISPLAYS,
-        .longopt = "list-displays",
-        .text = "List device displays.",
-    },
-    {
-        .longopt_id = OPT_LIST_ENCODERS,
-        .longopt = "list-encoders",
-        .text = "List video and audio encoders available on the device.",
-    },
     {
         .longopt_id = OPT_LOCK_VIDEO_ORIENTATION,
         .longopt = "lock-video-orientation",
@@ -316,11 +282,6 @@ static const struct sc_option options[] = {
                 "is preserved.\n"
                 "Default is 0 (unlimited).",
     },
-    {
-        .longopt_id = OPT_NO_AUDIO,
-        .longopt = "no-audio",
-        .text = "Disable audio forwarding.",
-    },
     {
         .longopt_id = OPT_NO_CLEANUP,
         .longopt = "no-cleanup",
@@ -356,6 +317,11 @@ static const struct sc_option options[] = {
         .text = "Do not display device (only when screen recording or V4L2 "
                 "sink is enabled).",
     },
+    {
+        .longopt_id = OPT_NO_AUDIO,
+        .longopt = "no-audio",
+        .text = "Disable audio forwarding.",
+    },
     {
         .longopt_id = OPT_NO_KEY_REPEAT,
         .longopt = "no-key-repeat",
@@ -567,33 +533,6 @@ static const struct sc_option options[] = {
         .longopt = "version",
         .text = "Print the version of scrcpy.",
     },
-    {
-        .longopt_id = OPT_VIDEO_CODEC,
-        .longopt = "video-codec",
-        .argdesc = "name",
-        .text = "Select a video codec (h264, h265 or av1).\n"
-                "Default is h264.",
-    },
-    {
-        .longopt_id = OPT_VIDEO_CODEC_OPTIONS,
-        .longopt = "video-codec-options",
-        .argdesc = "key[:type]=value[,...]",
-        .text = "Set a list of comma-separated key:type=value options for the "
-                "device video encoder.\n"
-                "The possible values for 'type' are 'int' (default), 'long', "
-                "'float' and 'string'.\n"
-                "The list of possible codec options is available in the "
-                "Android documentation: "
-                "<https://d.android.com/reference/android/media/MediaFormat>",
-    },
-    {
-        .longopt_id = OPT_VIDEO_ENCODER,
-        .longopt = "video-encoder",
-        .argdesc = "name",
-        .text = "Use a specific MediaCodec video encoder (depending on the "
-                "codec provided by --video-codec).\n"
-                "The available encoders can be listed by --list-encoders.",
-    },
     {
         .shortopt = 'w',
         .longopt = "stay-awake",
@@ -1470,7 +1409,7 @@ guess_record_format(const char *filename) {
 }
 
 static bool
-parse_video_codec(const char *optarg, enum sc_codec *codec) {
+parse_codec(const char *optarg, enum sc_codec *codec) {
     if (!strcmp(optarg, "h264")) {
         *codec = SC_CODEC_H264;
         return true;
@@ -1483,7 +1422,7 @@ parse_video_codec(const char *optarg, enum sc_codec *codec) {
         *codec = SC_CODEC_AV1;
         return true;
     }
-    LOGE("Unsupported video codec: %s (expected h264, h265 or av1)", optarg);
+    LOGE("Unsupported codec: %s (expected h264, h265 or av1)", optarg);
     return false;
 }
 
@@ -1512,7 +1451,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
     while ((c = getopt_long(argc, argv, optstring, longopts, NULL)) != -1) {
         switch (c) {
             case 'b':
-                if (!parse_bit_rate(optarg, &opts->video_bit_rate)) {
+                if (!parse_bit_rate(optarg, &opts->bit_rate)) {
                     return false;
                 }
                 break;
@@ -1690,23 +1629,10 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                 opts->forward_key_repeat = false;
                 break;
             case OPT_CODEC_OPTIONS:
-                LOGW("--codec-options is deprecated, use --video-codec-options "
-                     "instead.");
-                // fall through
-            case OPT_VIDEO_CODEC_OPTIONS:
-                opts->video_codec_options = optarg;
+                opts->codec_options = optarg;
                 break;
-            case OPT_AUDIO_CODEC_OPTIONS:
-                opts->audio_codec_options = optarg;
-                break;
-            case OPT_ENCODER:
-                LOGW("--encoder is deprecated, use --video-encoder instead.");
-                // fall through
-            case OPT_VIDEO_ENCODER:
-                opts->video_encoder = optarg;
-                break;
-            case OPT_AUDIO_ENCODER:
-                opts->audio_encoder = optarg;
+            case OPT_ENCODER_NAME:
+                opts->encoder_name = optarg;
                 break;
             case OPT_FORCE_ADB_FORWARD:
                 opts->force_adb_forward = true;
@@ -1756,10 +1682,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                 opts->start_fps_counter = true;
                 break;
             case OPT_CODEC:
-                LOGW("--codec is deprecated, use --video-codec instead.");
-                // fall through
-            case OPT_VIDEO_CODEC:
-                if (!parse_video_codec(optarg, &opts->video_codec)) {
+                if (!parse_codec(optarg, &opts->codec)) {
                     return false;
                 }
                 break;
@@ -1795,12 +1718,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                 LOGE("V4L2 (--v4l2-buffer) is only available on Linux.");
                 return false;
 #endif
-            case OPT_LIST_ENCODERS:
-                opts->list_encoders = true;
-                break;
-            case OPT_LIST_DISPLAYS:
-                opts->list_displays = true;
-                break;
             default:
                 // getopt prints the error message on stderr
                 return false;
@@ -1882,6 +1799,13 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         }
     }
 
+    if (opts->record_format == SC_RECORD_FORMAT_MP4
+            && opts->codec == SC_CODEC_AV1) {
+        LOGE("Could not mux AV1 stream into MP4 container "
+             "(record to mkv or select another video codec)");
+        return false;
+    }
+
     if (!opts->control) {
         if (opts->turn_screen_off) {
             LOGE("Could not request to turn screen off if control is disabled");

app/src/decoder.c

@@ -25,10 +25,10 @@ sc_decoder_close_sinks(struct sc_decoder *decoder) {
 }
 
 static bool
-sc_decoder_open_sinks(struct sc_decoder *decoder, const AVCodecContext *ctx) {
+sc_decoder_open_sinks(struct sc_decoder *decoder) {
     for (unsigned i = 0; i < decoder->sink_count; ++i) {
         struct sc_frame_sink *sink = decoder->sinks[i];
-        if (!sink->ops->open(sink, ctx)) {
+        if (!sink->ops->open(sink)) {
             sc_decoder_close_first_sinks(decoder, i);
             return false;
         }
@@ -47,13 +47,8 @@ sc_decoder_open(struct sc_decoder *decoder, const AVCodec *codec) {
 
     decoder->codec_ctx->flags |= AV_CODEC_FLAG_LOW_DELAY;
 
-    if (codec->type == AVMEDIA_TYPE_VIDEO) {
-        // Only YUV 4:2:0 is supported, hardcode it
-        decoder->codec_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-    }
-
     if (avcodec_open2(decoder->codec_ctx, codec, NULL) < 0) {
-        LOGE("Decoder '%s': could not open codec", decoder->name);
+        LOGE("Could not open codec");
         avcodec_free_context(&decoder->codec_ctx);
         return false;
     }
@@ -66,7 +61,7 @@ sc_decoder_open(struct sc_decoder *decoder, const AVCodec *codec) {
         return false;
     }
 
-    if (!sc_decoder_open_sinks(decoder, decoder->codec_ctx)) {
+    if (!sc_decoder_open_sinks(decoder)) {
         av_frame_free(&decoder->frame);
         avcodec_close(decoder->codec_ctx);
         avcodec_free_context(&decoder->codec_ctx);
@@ -106,8 +101,7 @@ sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
 
     int ret = avcodec_send_packet(decoder->codec_ctx, packet);
     if (ret < 0 && ret != AVERROR(EAGAIN)) {
-        LOGE("Decoder '%s': could not send video packet: %d",
-             decoder->name, ret);
+        LOGE("Could not send video packet: %d", ret);
         return false;
     }
     ret = avcodec_receive_frame(decoder->codec_ctx, decoder->frame);
@@ -120,8 +114,7 @@ sc_decoder_push(struct sc_decoder *decoder, const AVPacket *packet) {
 
         av_frame_unref(decoder->frame);
     } else if (ret != AVERROR(EAGAIN)) {
-        LOGE("Decoder '%s', could not receive video frame: %d",
-             decoder->name, ret);
+        LOGE("Could not receive video frame: %d", ret);
         return false;
     }
     return true;
@@ -147,8 +140,7 @@ sc_decoder_packet_sink_push(struct sc_packet_sink *sink,
 }
 
 void
-sc_decoder_init(struct sc_decoder *decoder, const char *name) {
-    decoder->name = name; // statically allocated
+sc_decoder_init(struct sc_decoder *decoder) {
     decoder->sink_count = 0;
 
     static const struct sc_packet_sink_ops ops = {

app/src/decoder.h

@@ -14,8 +14,6 @@
 struct sc_decoder {
     struct sc_packet_sink packet_sink; // packet sink trait
 
-    const char *name; // must be statically allocated (e.g. a string literal)
-
     struct sc_frame_sink *sinks[SC_DECODER_MAX_SINKS];
     unsigned sink_count;
 
@@ -23,9 +21,8 @@ struct sc_decoder {
     AVFrame *frame;
 };
 
-// The name must be statically allocated (e.g. a string literal)
 void
-sc_decoder_init(struct sc_decoder *decoder, const char *name);
+sc_decoder_init(struct sc_decoder *decoder);
 
 void
 sc_decoder_add_sink(struct sc_decoder *decoder, struct sc_frame_sink *sink);

app/src/demuxer.c

@@ -195,12 +195,6 @@ run_demuxer(void *data) {
         goto end;
     }
 
-    if (raw_codec_id == 1) {
-        LOGE("Demuxer '%s': stream configuration error on the device",
-             demuxer->name);
-        goto end;
-    }
-
     enum AVCodecID codec_id = sc_demuxer_to_avcodec_id(raw_codec_id);
     if (codec_id == AV_CODEC_ID_NONE) {
         LOGE("Demuxer '%s': stream disabled due to unsupported codec",

app/src/main.c

@@ -73,8 +73,6 @@ main_scrcpy(int argc, char *argv[]) {
         return SCRCPY_EXIT_FAILURE;
     }
 
-    sc_log_configure();
-
 #ifdef HAVE_USB
     enum scrcpy_exit_code ret = args.opts.otg ? scrcpy_otg(&args.opts)
                                               : scrcpy(&args.opts);

app/src/options.c

@@ -7,19 +7,16 @@ const struct scrcpy_options scrcpy_options_default = {
     .window_title = NULL,
     .push_target = NULL,
     .render_driver = NULL,
-    .video_codec_options = NULL,
-    .audio_codec_options = NULL,
-    .video_encoder = NULL,
-    .audio_encoder = NULL,
+    .codec_options = NULL,
+    .encoder_name = NULL,
 #ifdef HAVE_V4L2
     .v4l2_device = NULL,
 #endif
     .log_level = SC_LOG_LEVEL_INFO,
-    .video_codec = SC_CODEC_H264,
+    .codec = SC_CODEC_H264,
     .audio_codec = SC_CODEC_OPUS,
     .record_format = SC_RECORD_FORMAT_AUTO,
     .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT,
-    .mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,
     .port_range = {
         .first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
         .last = DEFAULT_LOCAL_PORT_RANGE_LAST,
@@ -31,7 +28,7 @@ const struct scrcpy_options scrcpy_options_default = {
         .count = 2,
     },
     .max_size = 0,
-    .video_bit_rate = 0,
+    .bit_rate = 0,
     .audio_bit_rate = 0,
     .max_fps = 0,
     .lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
@@ -72,6 +69,4 @@ const struct scrcpy_options scrcpy_options_default = {
     .start_fps_counter = false,
     .power_on = true,
     .audio = true,
-    .list_encoders = false,
-    .list_displays = false,
 };

app/src/options.h

@@ -95,15 +95,13 @@ struct scrcpy_options {
     const char *window_title;
     const char *push_target;
     const char *render_driver;
-    const char *video_codec_options;
-    const char *audio_codec_options;
-    const char *video_encoder;
-    const char *audio_encoder;
+    const char *codec_options;
+    const char *encoder_name;
 #ifdef HAVE_V4L2
     const char *v4l2_device;
 #endif
     enum sc_log_level log_level;
-    enum sc_codec video_codec;
+    enum sc_codec codec;
     enum sc_codec audio_codec;
     enum sc_record_format record_format;
     enum sc_keyboard_input_mode keyboard_input_mode;
@@ -113,7 +111,7 @@ struct scrcpy_options {
     uint16_t tunnel_port;
     struct sc_shortcut_mods shortcut_mods;
     uint16_t max_size;
-    uint32_t video_bit_rate;
+    uint32_t bit_rate;
     uint32_t audio_bit_rate;
     uint16_t max_fps;
     enum sc_lock_video_orientation lock_video_orientation;
@@ -154,8 +152,6 @@ struct scrcpy_options {
     bool start_fps_counter;
     bool power_on;
     bool audio;
-    bool list_encoders;
-    bool list_displays;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/recorder.c

@@ -630,6 +630,7 @@ sc_recorder_audio_packet_sink_close(struct sc_packet_sink *sink) {
 
     sc_mutex_lock(&recorder->mutex);
     // EOS also stops the recorder
+    // TODO must stop only once both video and audio stream are complete
     recorder->stopped = true;
     sc_cond_signal(&recorder->queue_cond);
     sc_mutex_unlock(&recorder->mutex);
@@ -726,6 +727,7 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
     recorder->declared_frame_size = declared_frame_size;
 
     assert(cbs && cbs->on_ended);
+
     recorder->cbs = cbs;
     recorder->cbs_userdata = cbs_userdata;
 
@@ -748,8 +750,17 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
         recorder->audio_packet_sink.ops = &audio_ops;
     }
 
+    ok = sc_thread_create(&recorder->thread, run_recorder, "scrcpy-recorder",
+                          recorder);
+    if (!ok) {
+        LOGE("Could not start recorder thread");
+        goto error_stream_cond_destroy;
+    }
+
     return true;
 
+error_stream_cond_destroy:
+    sc_cond_destroy(&recorder->stream_cond);
 error_queue_cond_destroy:
     sc_cond_destroy(&recorder->queue_cond);
 error_mutex_destroy:
@@ -760,18 +771,6 @@ error_free_filename:
     return false;
 }
 
-bool
-sc_recorder_start(struct sc_recorder *recorder) {
-    bool ok = sc_thread_create(&recorder->thread, run_recorder,
-                               "scrcpy-recorder", recorder);
-    if (!ok) {
-        LOGE("Could not start recorder thread");
-        return false;
-    }
-
-    return true;
-}
-
 void
 sc_recorder_stop(struct sc_recorder *recorder) {
     sc_mutex_lock(&recorder->mutex);

app/src/recorder.h

@@ -72,9 +72,6 @@ sc_recorder_init(struct sc_recorder *recorder, const char *filename,
                  struct sc_size declared_frame_size,
                  const struct sc_recorder_callbacks *cbs, void *cbs_userdata);
 
-bool
-sc_recorder_start(struct sc_recorder *recorder);
-
 void
 sc_recorder_stop(struct sc_recorder *recorder);
 

app/src/scrcpy.c

@@ -13,7 +13,6 @@
 # include <windows.h>
 #endif
 
-#include "audio_player.h"
 #include "controller.h"
 #include "decoder.h"
 #include "demuxer.h"
@@ -41,11 +40,9 @@
 struct scrcpy {
     struct sc_server server;
     struct sc_screen screen;
-    struct sc_audio_player audio_player;
     struct sc_demuxer video_demuxer;
     struct sc_demuxer audio_demuxer;
-    struct sc_decoder video_decoder;
-    struct sc_decoder audio_decoder;
+    struct sc_decoder decoder;
     struct sc_recorder recorder;
 #ifdef HAVE_V4L2
     struct sc_v4l2_sink v4l2_sink;
@@ -186,16 +183,15 @@ await_for_server(bool *connected) {
     while (SDL_WaitEvent(&event)) {
         switch (event.type) {
             case SDL_QUIT:
-                if (connected) {
-                    *connected = false;
-                }
+                LOGD("User requested to quit");
+                *connected = false;
                 return true;
             case SC_EVENT_SERVER_CONNECTION_FAILED:
+                LOGE("Server connection failed");
                 return false;
             case SC_EVENT_SERVER_CONNECTED:
-                if (connected) {
-                    *connected = true;
-                }
+                LOGD("Server connected");
+                *connected = true;
                 return true;
             default:
                 break;
@@ -206,6 +202,43 @@ await_for_server(bool *connected) {
     return false;
 }
 
+static SDL_LogPriority
+sdl_priority_from_av_level(int level) {
+    switch (level) {
+        case AV_LOG_PANIC:
+        case AV_LOG_FATAL:
+            return SDL_LOG_PRIORITY_CRITICAL;
+        case AV_LOG_ERROR:
+            return SDL_LOG_PRIORITY_ERROR;
+        case AV_LOG_WARNING:
+            return SDL_LOG_PRIORITY_WARN;
+        case AV_LOG_INFO:
+            return SDL_LOG_PRIORITY_INFO;
+    }
+    // do not forward others, which are too verbose
+    return 0;
+}
+
+static void
+av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
+    (void) avcl;
+    SDL_LogPriority priority = sdl_priority_from_av_level(level);
+    if (priority == 0) {
+        return;
+    }
+
+    size_t fmt_len = strlen(fmt);
+    char *local_fmt = malloc(fmt_len + 10);
+    if (!local_fmt) {
+        LOG_OOM();
+        return;
+    }
+    memcpy(local_fmt, "[FFmpeg] ", 9); // do not write the final '\0'
+    memcpy(local_fmt + 9, fmt, fmt_len + 1); // include '\0'
+    SDL_LogMessageV(SDL_LOG_CATEGORY_VIDEO, priority, local_fmt, vl);
+    free(local_fmt);
+}
+
 static void
 sc_recorder_on_ended(struct sc_recorder *recorder, bool success,
                      void *userdata) {
@@ -217,17 +250,6 @@ sc_recorder_on_ended(struct sc_recorder *recorder, bool success,
     }
 }
 
-static void
-sc_audio_player_on_ended(struct sc_audio_player *ap, bool success,
-                         void *userdata) {
-    (void) ap;
-    (void) userdata;
-
-    if (!success) {
-        // TODO
-    }
-}
-
 static void
 sc_video_demuxer_on_ended(struct sc_demuxer *demuxer, bool eos,
                           void *userdata) {
@@ -245,19 +267,10 @@ static void
 sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer, bool eos,
                           void *userdata) {
     (void) demuxer;
+    (void) eos;
     (void) userdata;
 
-    // Contrary to the video demuxer, keep mirroring if only the audio fails.
-    // 'eos' is true on end-of-stream, including when audio capture is not
-    // possible on the device (so that scrcpy continue to mirror video without
-    // failing).
-    // However, if an audio configuration failure occurs (for example the user
-    // explicitly selected an unknown audio encoder), 'eos' is false and scrcpy
-    // must exit.
-
-    if (!eos) {
-        PUSH_EVENT(SC_EVENT_DEMUXER_ERROR);
-    }
+    // Contrary to the video demuxer, keep mirroring if only the audio fails
 }
 
 static void
@@ -313,8 +326,6 @@ scrcpy(struct scrcpy_options *options) {
     bool server_started = false;
     bool file_pusher_initialized = false;
     bool recorder_initialized = false;
-    bool recorder_started = false;
-    bool audio_player_initialized = false;
 #ifdef HAVE_V4L2
     bool v4l2_sink_initialized = false;
 #endif
@@ -339,14 +350,14 @@ scrcpy(struct scrcpy_options *options) {
         .select_usb = options->select_usb,
         .select_tcpip = options->select_tcpip,
         .log_level = options->log_level,
-        .video_codec = options->video_codec,
+        .codec = options->codec,
         .audio_codec = options->audio_codec,
         .crop = options->crop,
         .port_range = options->port_range,
         .tunnel_host = options->tunnel_host,
         .tunnel_port = options->tunnel_port,
         .max_size = options->max_size,
-        .video_bit_rate = options->video_bit_rate,
+        .bit_rate = options->bit_rate,
         .audio_bit_rate = options->audio_bit_rate,
         .max_fps = options->max_fps,
         .lock_video_orientation = options->lock_video_orientation,
@@ -355,10 +366,8 @@ scrcpy(struct scrcpy_options *options) {
         .audio = options->audio,
         .show_touches = options->show_touches,
         .stay_awake = options->stay_awake,
-        .video_codec_options = options->video_codec_options,
-        .audio_codec_options = options->audio_codec_options,
-        .video_encoder = options->video_encoder,
-        .audio_encoder = options->audio_encoder,
+        .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,
         .clipboard_autosync = options->clipboard_autosync,
@@ -367,8 +376,6 @@ scrcpy(struct scrcpy_options *options) {
         .tcpip_dst = options->tcpip_dst,
         .cleanup = options->cleanup,
         .power_on = options->power_on,
-        .list_encoders = options->list_encoders,
-        .list_displays = options->list_displays,
     };
 
     static const struct sc_server_callbacks cbs = {
@@ -386,27 +393,14 @@ scrcpy(struct scrcpy_options *options) {
 
     server_started = true;
 
-    if (options->list_encoders || options->list_displays) {
-        bool ok = await_for_server(NULL);
-        ret = ok ? SCRCPY_EXIT_SUCCESS : SCRCPY_EXIT_FAILURE;
-        goto end;
-    }
-
     if (options->display) {
         sdl_set_hints(options->render_driver);
     }
 
     // Initialize SDL video in addition if display is enabled
-    if (options->display) {
-        if (SDL_Init(SDL_INIT_VIDEO)) {
-            LOGE("Could not initialize SDL video: %s", SDL_GetError());
-            goto end;
-        }
-
-        if (options->audio && SDL_Init(SDL_INIT_AUDIO)) {
-            LOGE("Could not initialize SDL audio: %s", SDL_GetError());
-            goto end;
-        }
+    if (options->display && SDL_Init(SDL_INIT_VIDEO)) {
+        LOGE("Could not initialize SDL: %s", SDL_GetError());
+        goto end;
     }
 
     sdl_configure(options->display, options->disable_screensaver);
@@ -414,19 +408,15 @@ scrcpy(struct scrcpy_options *options) {
     // Await for server without blocking Ctrl+C handling
     bool connected;
     if (!await_for_server(&connected)) {
-        LOGE("Server connection failed");
         goto end;
     }
 
     if (!connected) {
         // This is not an error, user requested to quit
-        LOGD("User requested to quit");
         ret = SCRCPY_EXIT_SUCCESS;
         goto end;
     }
 
-    LOGD("Server connected");
-
     // It is necessarily initialized here, since the device is connected
     struct sc_server_info *info = &s->server.info;
 
@@ -444,6 +434,32 @@ scrcpy(struct scrcpy_options *options) {
         file_pusher_initialized = true;
     }
 
+    struct sc_decoder *dec = NULL;
+    bool needs_decoder = options->display;
+#ifdef HAVE_V4L2
+    needs_decoder |= !!options->v4l2_device;
+#endif
+    if (needs_decoder) {
+        sc_decoder_init(&s->decoder);
+        dec = &s->decoder;
+    }
+
+    struct sc_recorder *rec = NULL;
+    if (options->record_filename) {
+        static const struct sc_recorder_callbacks recorder_cbs = {
+            .on_ended = sc_recorder_on_ended,
+        };
+        if (!sc_recorder_init(&s->recorder, options->record_filename,
+                              options->record_format, options->audio,
+                              info->frame_size, &recorder_cbs, NULL)) {
+            goto end;
+        }
+        rec = &s->recorder;
+        recorder_initialized = true;
+    }
+
+    av_log_set_callback(av_log_callback);
+
     static const struct sc_demuxer_callbacks video_demuxer_cbs = {
         .on_ended = sc_video_demuxer_on_ended,
     };
@@ -458,40 +474,14 @@ scrcpy(struct scrcpy_options *options) {
                         &audio_demuxer_cbs, NULL);
     }
 
-    bool needs_video_decoder = options->display;
-    bool needs_audio_decoder = options->audio && options->display;
-#ifdef HAVE_V4L2
-    needs_video_decoder |= !!options->v4l2_device;
-#endif
-    if (needs_video_decoder) {
-        sc_decoder_init(&s->video_decoder, "video");
-        sc_demuxer_add_sink(&s->video_demuxer, &s->video_decoder.packet_sink);
-    }
-    if (needs_audio_decoder) {
-        sc_decoder_init(&s->audio_decoder, "audio");
-        sc_demuxer_add_sink(&s->audio_demuxer, &s->audio_decoder.packet_sink);
+    if (dec) {
+        sc_demuxer_add_sink(&s->video_demuxer, &dec->packet_sink);
     }
 
-    if (options->record_filename) {
-        static const struct sc_recorder_callbacks recorder_cbs = {
-            .on_ended = sc_recorder_on_ended,
-        };
-        if (!sc_recorder_init(&s->recorder, options->record_filename,
-                              options->record_format, options->audio,
-                              info->frame_size, &recorder_cbs, NULL)) {
-            goto end;
-        }
-        recorder_initialized = true;
-
-        if (!sc_recorder_start(&s->recorder)) {
-            goto end;
-        }
-        recorder_started = true;
-
-        sc_demuxer_add_sink(&s->video_demuxer, &s->recorder.video_packet_sink);
+    if (rec) {
+        sc_demuxer_add_sink(&s->video_demuxer, &rec->video_packet_sink);
         if (options->audio) {
-            sc_demuxer_add_sink(&s->audio_demuxer,
-                                &s->recorder.audio_packet_sink);
+            sc_demuxer_add_sink(&s->audio_demuxer, &rec->audio_packet_sink);
         }
     }
 
@@ -683,20 +673,7 @@ aoa_hid_end:
         }
         screen_initialized = true;
 
-        sc_decoder_add_sink(&s->video_decoder, &s->screen.frame_sink);
-
-        if (options->audio) {
-            static const struct sc_audio_player_callbacks audio_player_cbs = {
-                .on_ended = sc_audio_player_on_ended,
-            };
-            if (!sc_audio_player_init(&s->audio_player,
-                                      &audio_player_cbs, NULL)) {
-                goto end;
-            }
-            audio_player_initialized = true;
-
-            sc_decoder_add_sink(&s->audio_decoder, &s->audio_player.frame_sink);
-        }
+        sc_decoder_add_sink(&s->decoder, &s->screen.frame_sink);
     }
 
 #ifdef HAVE_V4L2
@@ -706,7 +683,7 @@ aoa_hid_end:
             goto end;
         }
 
-        sc_decoder_add_sink(&s->video_decoder, &s->v4l2_sink.frame_sink);
+        sc_decoder_add_sink(&s->decoder, &s->v4l2_sink.frame_sink);
 
         v4l2_sink_initialized = true;
     }
@@ -810,26 +787,16 @@ end:
         sc_controller_destroy(&s->controller);
     }
 
-    if (recorder_started) {
-        sc_recorder_join(&s->recorder);
-    }
     if (recorder_initialized) {
+        sc_recorder_join(&s->recorder);
         sc_recorder_destroy(&s->recorder);
     }
 
-    if (audio_player_initialized) {
-        sc_audio_player_destroy(&s->audio_player);
-    }
-
     if (file_pusher_initialized) {
         sc_file_pusher_join(&s->file_pusher);
         sc_file_pusher_destroy(&s->file_pusher);
     }
 
-    if (server_started) {
-        sc_server_join(&s->server);
-    }
-
     sc_server_destroy(&s->server);
 
     return ret;

app/src/screen.c

@@ -330,10 +330,7 @@ event_watcher(void *data, SDL_Event *event) {
 #endif
 
 static bool
-sc_screen_frame_sink_open(struct sc_frame_sink *sink,
-                          const AVCodecContext *ctx) {
-    assert(ctx->pix_fmt == AV_PIX_FMT_YUV420P);
-
+sc_screen_frame_sink_open(struct sc_frame_sink *sink) {
     struct sc_screen *screen = DOWNCAST(sink);
     (void) screen;
 #ifndef NDEBUG

app/src/server.c

@@ -71,10 +71,8 @@ sc_server_params_destroy(struct sc_server_params *params) {
     // The server stores a copy of the params provided by the user
     free((char *) params->req_serial);
     free((char *) params->crop);
-    free((char *) params->video_codec_options);
-    free((char *) params->audio_codec_options);
-    free((char *) params->video_encoder);
-    free((char *) params->audio_encoder);
+    free((char *) params->codec_options);
+    free((char *) params->encoder_name);
     free((char *) params->tcpip_dst);
 }
 
@@ -97,10 +95,8 @@ sc_server_params_copy(struct sc_server_params *dst,
 
     COPY(req_serial);
     COPY(crop);
-    COPY(video_codec_options);
-    COPY(audio_codec_options);
-    COPY(video_encoder);
-    COPY(audio_encoder);
+    COPY(codec_options);
+    COPY(encoder_name);
     COPY(tcpip_dst);
 #undef COPY
 
@@ -224,17 +220,16 @@ execute_server(struct sc_server *server,
     ADD_PARAM("scid=%08x", params->scid);
     ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
 
-    if (params->video_bit_rate) {
-        ADD_PARAM("video_bit_rate=%" PRIu32, params->video_bit_rate);
+    if (params->bit_rate) {
+        ADD_PARAM("bit_rate=%" PRIu32, params->bit_rate);
     }
     if (!params->audio) {
         ADD_PARAM("audio=false");
     } else if (params->audio_bit_rate) {
         ADD_PARAM("audio_bit_rate=%" PRIu32, params->audio_bit_rate);
     }
-    if (params->video_codec != SC_CODEC_H264) {
-        ADD_PARAM("video_codec=%s",
-                  sc_server_get_codec_name(params->video_codec));
+    if (params->codec != SC_CODEC_H264) {
+        ADD_PARAM("codec=%s", sc_server_get_codec_name(params->codec));
     }
     if (params->audio_codec != SC_CODEC_OPUS) {
         ADD_PARAM("audio_codec=%s",
@@ -269,17 +264,11 @@ execute_server(struct sc_server *server,
     if (params->stay_awake) {
         ADD_PARAM("stay_awake=true");
     }
-    if (params->video_codec_options) {
-        ADD_PARAM("video_codec_options=%s", params->video_codec_options);
+    if (params->codec_options) {
+        ADD_PARAM("codec_options=%s", params->codec_options);
     }
-    if (params->audio_codec_options) {
-        ADD_PARAM("audio_codec_options=%s", params->audio_codec_options);
-    }
-    if (params->video_encoder) {
-        ADD_PARAM("video_encoder=%s", params->video_encoder);
-    }
-    if (params->audio_encoder) {
-        ADD_PARAM("audio_encoder=%s", params->audio_encoder);
+    if (params->encoder_name) {
+        ADD_PARAM("encoder_name=%s", params->encoder_name);
     }
     if (params->power_off_on_close) {
         ADD_PARAM("power_off_on_close=true");
@@ -300,12 +289,6 @@ execute_server(struct sc_server *server,
         // By default, power_on is true
         ADD_PARAM("power_on=false");
     }
-    if (params->list_encoders) {
-        ADD_PARAM("list_encoders=true");
-    }
-    if (params->list_displays) {
-        ADD_PARAM("list_displays=true");
-    }
 
 #undef ADD_PARAM
 
@@ -849,25 +832,6 @@ run_server(void *data) {
     assert(serial);
     LOGD("Device serial: %s", serial);
 
-    ok = push_server(&server->intr, serial);
-    if (!ok) {
-        goto error_connection_failed;
-    }
-
-    // If --list-* is passed, then the server just prints the requested data
-    // then exits.
-    if (params->list_encoders || params->list_displays) {
-        sc_pid pid = execute_server(server, params);
-        if (pid == SC_PROCESS_NONE) {
-            goto error_connection_failed;
-        }
-        sc_process_wait(pid, NULL); // ignore exit code
-        sc_process_close(pid);
-        // Wake up await_for_server()
-        server->cbs->on_connected(server, server->cbs_userdata);
-        return 0;
-    }
-
     int r = asprintf(&server->device_socket_name, SC_SOCKET_NAME_PREFIX "%08x",
                      params->scid);
     if (r == -1) {
@@ -877,6 +841,11 @@ run_server(void *data) {
     assert(r == sizeof(SC_SOCKET_NAME_PREFIX) - 1 + 8);
     assert(server->device_socket_name);
 
+    ok = push_server(&server->intr, serial);
+    if (!ok) {
+        goto error_connection_failed;
+    }
+
     ok = sc_adb_tunnel_open(&server->tunnel, &server->intr, serial,
                             server->device_socket_name, params->port_range,
                             params->force_adb_forward);
@@ -986,10 +955,7 @@ sc_server_stop(struct sc_server *server) {
     sc_cond_signal(&server->cond_stopped);
     sc_intr_interrupt(&server->intr);
     sc_mutex_unlock(&server->mutex);
-}
 
-void
-sc_server_join(struct sc_server *server) {
     sc_thread_join(&server->thread, NULL);
 }
 

app/src/server.h

@@ -25,18 +25,16 @@ struct sc_server_params {
     uint32_t scid;
     const char *req_serial;
     enum sc_log_level log_level;
-    enum sc_codec video_codec;
+    enum sc_codec codec;
     enum sc_codec audio_codec;
     const char *crop;
-    const char *video_codec_options;
-    const char *audio_codec_options;
-    const char *video_encoder;
-    const char *audio_encoder;
+    const char *codec_options;
+    const char *encoder_name;
     struct sc_port_range port_range;
     uint32_t tunnel_host;
     uint16_t tunnel_port;
     uint16_t max_size;
-    uint32_t video_bit_rate;
+    uint32_t bit_rate;
     uint32_t audio_bit_rate;
     uint16_t max_fps;
     int8_t lock_video_orientation;
@@ -55,8 +53,6 @@ struct sc_server_params {
     bool select_tcpip;
     bool cleanup;
     bool power_on;
-    bool list_encoders;
-    bool list_displays;
 };
 
 struct sc_server {
@@ -116,10 +112,6 @@ sc_server_start(struct sc_server *server);
 void
 sc_server_stop(struct sc_server *server);
 
-// join the server thread
-void
-sc_server_join(struct sc_server *server);
-
 // close and release sockets
 void
 sc_server_destroy(struct sc_server *server);

app/src/trait/frame_sink.h

@@ -5,7 +5,6 @@
 
 #include <assert.h>
 #include <stdbool.h>
-#include <libavcodec/avcodec.h>
 
 typedef struct AVFrame AVFrame;
 
@@ -19,7 +18,7 @@ struct sc_frame_sink {
 };
 
 struct sc_frame_sink_ops {
-    bool (*open)(struct sc_frame_sink *sink, const AVCodecContext *ctx);
+    bool (*open)(struct sc_frame_sink *sink);
     void (*close)(struct sc_frame_sink *sink);
     bool (*push)(struct sc_frame_sink *sink, const AVFrame *frame);
 };

app/src/util/bytebuf.c

@@ -1,114 +0,0 @@
-#include "bytebuf.h"
-
-#include <assert.h>
-
-#include "util/log.h"
-
-bool
-sc_bytebuf_init(struct sc_bytebuf *buf, size_t alloc_size) {
-    assert(alloc_size);
-    // sufficient, but use more for alignment.
-    buf->data = malloc(alloc_size);
-    if (!buf->data) {
-        LOG_OOM();
-        return false;
-    }
-
-    buf->alloc_size = alloc_size;
-    buf->head = 0;
-    buf->tail = 0;
-
-    return true;
-}
-
-void
-sc_bytebuf_destroy(struct sc_bytebuf *buf) {
-    free(buf->data);
-}
-
-void
-sc_bytebuf_read(struct sc_bytebuf *buf, uint8_t *to, size_t len) {
-    assert(len);
-    assert(sc_bytebuf_read_remaining(buf) >= len);
-    assert(buf->tail != buf->head); // the buffer could not be empty
-
-    size_t right_limit = buf->tail < buf->head ? buf->head : buf->alloc_size;
-    size_t right_len = right_limit - buf->tail;
-    if (len < right_len) {
-        right_len = len;
-    }
-    memcpy(to, buf->data + buf->tail, right_len);
-
-    if (len > right_len) {
-        memcpy(to + right_len, buf->data, len - right_len);
-    }
-
-    buf->tail = (buf->tail + len) % buf->alloc_size;
-}
-
-void
-sc_bytebuf_skip(struct sc_bytebuf *buf, size_t len) {
-    assert(len);
-    assert(sc_bytebuf_read_remaining(buf) >= len);
-    assert(buf->tail != buf->head); // the buffer could not be empty
-
-    buf->tail = (buf->tail + len) % buf->alloc_size;
-}
-
-void
-sc_bytebuf_write(struct sc_bytebuf *buf, const uint8_t *from, size_t len) {
-    assert(len);
-
-    size_t max_len = buf->alloc_size - 1;
-    if (len >= max_len) {
-        // Copy only the right-most bytes
-        memcpy(buf->data, from + len - max_len, max_len);
-        buf->tail = 0;
-        buf->head = max_len;
-        return;
-    }
-
-    size_t right_limit = buf->head < buf->tail ? buf->tail : buf->alloc_size;
-    size_t right_len = right_limit - buf->head;
-    if (len < right_len) {
-        right_len = len;
-    }
-    memcpy(buf->data + buf->head, from, right_len);
-    if (len > right_len) {
-        memcpy(buf->data, from + right_len, len - right_len);
-    }
-
-    size_t empty_space = sc_bytebuf_write_remaining(buf);
-    if (len > empty_space) {
-        buf->tail = (buf->tail + len - empty_space) % buf->alloc_size;
-    }
-    buf->head = (buf->head + len) % buf->alloc_size;
-}
-
-void
-sc_bytebuf_prepare_write(struct sc_bytebuf *buf, const uint8_t *from,
-                         size_t len) {
-    // *This function MUST NOT access buf->tail (even in assert()).*
-    // The purpose of this function is to allow a reader and a writer to access
-    // different parts of the buffer in parallel simultaneously. It is intended
-    // to be called without lock (only sc_bytebuf_commit_write() is intended to
-    // be called with lock held).
-
-    assert(len < buf->alloc_size - 1);
-
-    size_t right_len = buf->alloc_size - buf->head;
-    if (len < right_len) {
-        right_len = len;
-    }
-
-    memcpy(buf->data + buf->head, from, right_len);
-    if (len > right_len) {
-        memcpy(buf->data, from + right_len, len - right_len);
-    }
-}
-
-void
-sc_bytebuf_commit_write(struct sc_bytebuf *buf, size_t len) {
-    assert(len <= sc_bytebuf_write_remaining(buf));
-    buf->head = (buf->head + len) % buf->alloc_size;
-}

app/src/util/bytebuf.h

@@ -1,104 +0,0 @@
-#ifndef SC_BYTEBUF_H
-#define SC_BYTEBUF_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct sc_bytebuf {
-    uint8_t *data;
-    // The actual capacity is (allocated - 1) so that head == tail is
-    // non-ambiguous
-    size_t alloc_size;
-    size_t head;
-    size_t tail;
-    // empty: tail == head
-    // full: (tail + 1) % allocated == head
-};
-
-bool
-sc_bytebuf_init(struct sc_bytebuf *buf, size_t alloc_size);
-
-/**
- * Copy from the bytebuf to a user-provided array
- *
- * The caller must check that len <= buf->len (it is an error to attempt to read
- * more bytes than available).
- *
- * This function is guaranteed to not change the head.
- */
-void
-sc_bytebuf_read(struct sc_bytebuf *buf, uint8_t *to, size_t len);
-
-/**
- * Drop len bytes from the buffer
- *
- * The caller must check that len <= buf->len (it is an error to attempt to skip
- * more bytes than available).
- *
- * This function is guaranteed to not change the head.
- *
- * It is equivalent to call sc_bytebuf_read() to some array and discard the
- * array (but more efficient since there is no copy).
- */
-void
-sc_bytebuf_skip(struct sc_bytebuf *buf, size_t len);
-
-/**
- * Copy the user-provided array to the bytebuf
- *
- * The length of the input array is not restricted:
- * if len >= sc_bytebuf_write_remaining(buf), then the excessive input bytes
- * will overwrite the oldest bytes in the buffer.
- */
-void
-sc_bytebuf_write(struct sc_bytebuf *buf, const uint8_t *from, size_t len);
-
-/**
- * Copy the user-provided array to the bytebuf, but do not advance the cursor
- *
- * The caller must check that len <= buf->len (it is an error to attempt to
- * write more bytes than available).
- *
- * After this function is called, the write must be committed with
- * sc_bytebuf_commit_write().
- *
- * The purpose of this mechanism is to acquire a lock only to commit the write,
- * but not to perform the actual copy.
- */
-void
-sc_bytebuf_prepare_write(struct sc_bytebuf *buf, const uint8_t *from,
-                         size_t len);
-
-/**
- * Commit a prepared write
- */
-void
-sc_bytebuf_commit_write(struct sc_bytebuf *buf, size_t len);
-
-/**
- * Return the number of bytes which can be read
- *
- * It is an error to read more bytes than available.
- */
-static inline size_t
-sc_bytebuf_read_remaining(struct sc_bytebuf *buf) {
-    return (buf->alloc_size + buf->head - buf->tail) % buf->alloc_size;
-}
-
-/**
- * Return the number of bytes which can be written without overwriting
- *
- * It is not an error to write more bytes than the available space, but this
- * would overwrite the oldest bytes in the buffer.
- */
-static inline size_t
-sc_bytebuf_write_remaining(struct sc_bytebuf *buf) {
-    return (buf->alloc_size + buf->tail - buf->head - 1) % buf->alloc_size;
-}
-
-void
-sc_bytebuf_destroy(struct sc_bytebuf *buf);
-
-#endif

app/src/util/log.c

@@ -4,7 +4,6 @@
 # include <windows.h>
 #endif
 #include <assert.h>
-#include <libavformat/avformat.h>
 
 static SDL_LogPriority
 log_level_sc_to_sdl(enum sc_log_level level) {
@@ -48,7 +47,6 @@ void
 sc_set_log_level(enum sc_log_level level) {
     SDL_LogPriority sdl_log = log_level_sc_to_sdl(level);
     SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, sdl_log);
-    SDL_LogSetPriority(SDL_LOG_CATEGORY_CUSTOM, sdl_log);
 }
 
 enum sc_log_level
@@ -87,46 +85,3 @@ sc_log_windows_error(const char *prefix, int error) {
     return true;
 }
 #endif
-
-static SDL_LogPriority
-sdl_priority_from_av_level(int level) {
-    switch (level) {
-        case AV_LOG_PANIC:
-        case AV_LOG_FATAL:
-            return SDL_LOG_PRIORITY_CRITICAL;
-        case AV_LOG_ERROR:
-            return SDL_LOG_PRIORITY_ERROR;
-        case AV_LOG_WARNING:
-            return SDL_LOG_PRIORITY_WARN;
-        case AV_LOG_INFO:
-            return SDL_LOG_PRIORITY_INFO;
-    }
-    // do not forward others, which are too verbose
-    return 0;
-}
-
-static void
-sc_av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
-    (void) avcl;
-    SDL_LogPriority priority = sdl_priority_from_av_level(level);
-    if (priority == 0) {
-        return;
-    }
-
-    size_t fmt_len = strlen(fmt);
-    char *local_fmt = malloc(fmt_len + 10);
-    if (!local_fmt) {
-        LOG_OOM();
-        return;
-    }
-    memcpy(local_fmt, "[FFmpeg] ", 9); // do not write the final '\0'
-    memcpy(local_fmt + 9, fmt, fmt_len + 1); // include '\0'
-    SDL_LogMessageV(SDL_LOG_CATEGORY_CUSTOM, priority, local_fmt, vl);
-    free(local_fmt);
-}
-
-void
-sc_log_configure() {
-    // Redirect FFmpeg logs to SDL logs
-    av_log_set_callback(sc_av_log_callback);
-}

app/src/util/log.h

@@ -35,7 +35,4 @@ bool
 sc_log_windows_error(const char *prefix, int error);
 #endif
 
-void
-sc_log_configure();
-
 #endif

app/src/v4l2_sink.c

@@ -156,9 +156,7 @@ sc_video_buffer_on_new_frame(struct sc_video_buffer *vb, bool previous_skipped,
 }
 
 static bool
-sc_v4l2_sink_open(struct sc_v4l2_sink *vs, const AVCodecContext *ctx) {
-    assert(ctx->pix_fmt == AV_PIX_FMT_YUV420P);
-
+sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {
     static const struct sc_video_buffer_callbacks cbs = {
         .on_new_frame = sc_video_buffer_on_new_frame,
     };

app/tests/test_bytebuf.c

@@ -1,154 +0,0 @@
-#include "common.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "util/bytebuf.h"
-
-void test_bytebuf_simple(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[20];
-
-    bool ok = sc_bytebuf_init(&buf, 20);
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello", sizeof("hello") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 5);
-
-    sc_bytebuf_read(&buf, data, 4);
-    assert(!strncmp((char *) data, "hell", 4));
-
-    sc_bytebuf_write(&buf, (uint8_t *) " world", sizeof(" world") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 7);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 8);
-
-    sc_bytebuf_read(&buf, &data[4], 8);
-    assert(sc_bytebuf_read_remaining(&buf) == 0);
-
-    data[12] = '\0';
-    assert(!strcmp((char *) data, "hello world!"));
-    assert(sc_bytebuf_read_remaining(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-void test_bytebuf_boundaries(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[20];
-
-    bool ok = sc_bytebuf_init(&buf, 20);
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 6);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 12);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 18);
-
-    sc_bytebuf_read(&buf, data, 9);
-    assert(!strncmp((char *) data, "hello hel", 9));
-    assert(sc_bytebuf_read_remaining(&buf) == 9);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "world", sizeof("world") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 14);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 15);
-
-    sc_bytebuf_skip(&buf, 3);
-    assert(sc_bytebuf_read_remaining(&buf) == 12);
-
-    sc_bytebuf_read(&buf, data, 12);
-    data[12] = '\0';
-    assert(!strcmp((char *) data, "hello world!"));
-    assert(sc_bytebuf_read_remaining(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-void test_bytebuf_overwrite(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[10];
-
-    bool ok = sc_bytebuf_init(&buf, 10); // so actual capacity is 9
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 6);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "abcdef", sizeof("abcdef") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 9);
-
-    sc_bytebuf_read(&buf, data, 9);
-    assert(!strncmp((char *) data, "lo abcdef", 9));
-
-    sc_bytebuf_write(&buf, (uint8_t *) "a very big buffer",
-                     sizeof("a very big buffer") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 9);
-
-    sc_bytebuf_read(&buf, data, 9);
-    assert(!strncmp((char *) data, "ig buffer", 9));
-    assert(sc_bytebuf_read_remaining(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-void test_bytebuf_two_steps_write(void) {
-    struct sc_bytebuf buf;
-    uint8_t data[20];
-
-    bool ok = sc_bytebuf_init(&buf, 20);
-    assert(ok);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 6);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 12);
-
-    sc_bytebuf_prepare_write(&buf, (uint8_t *) "hello ", sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 12); // write not committed yet
-
-    sc_bytebuf_read(&buf, data, 9);
-    assert(!strncmp((char *) data, "hello hel", 3));
-    assert(sc_bytebuf_read_remaining(&buf) == 3);
-
-    sc_bytebuf_commit_write(&buf, sizeof("hello ") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 9);
-
-    sc_bytebuf_prepare_write(&buf, (uint8_t *) "world", sizeof("world") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 9); // write not committed yet
-
-    sc_bytebuf_commit_write(&buf, sizeof("world") - 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 14);
-
-    sc_bytebuf_write(&buf, (uint8_t *) "!", 1);
-    assert(sc_bytebuf_read_remaining(&buf) == 15);
-
-    sc_bytebuf_skip(&buf, 3);
-    assert(sc_bytebuf_read_remaining(&buf) == 12);
-
-    sc_bytebuf_read(&buf, data, 12);
-    data[12] = '\0';
-    assert(!strcmp((char *) data, "hello world!"));
-    assert(sc_bytebuf_read_remaining(&buf) == 0);
-
-    sc_bytebuf_destroy(&buf);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
-    test_bytebuf_simple();
-    test_bytebuf_boundaries();
-    test_bytebuf_overwrite();
-    test_bytebuf_two_steps_write();
-
-    return 0;
-}

app/tests/test_cli.c

@@ -46,7 +46,7 @@ static void test_options(void) {
     char *argv[] = {
         "scrcpy",
         "--always-on-top",
-        "--video-bit-rate", "5M",
+        "--bit-rate", "5M",
         "--crop", "100:200:300:400",
         "--fullscreen",
         "--max-fps", "30",
@@ -75,7 +75,7 @@ static void test_options(void) {
 
     const struct scrcpy_options *opts = &args.opts;
     assert(opts->always_on_top);
-    assert(opts->video_bit_rate == 5000000);
+    assert(opts->bit_rate == 5000000);
     assert(!strcmp(opts->crop, "100:200:300:400"));
     assert(opts->fullscreen);
     assert(opts->max_fps == 30);

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

@@ -11,11 +11,9 @@ import android.media.MediaRecorder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.os.Looper;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
@@ -40,15 +38,16 @@ public final class AudioEncoder {
     }
 
     private static final int SAMPLE_RATE = 48000;
-    private static final int CHANNELS = 1;
+    private static final int CHANNELS = 2;
 
-    private static final int BUFFER_MS = 10; // milliseconds
+    private static final int BUFFER_MS = 15; // milliseconds
     private static final int BUFFER_SIZE = SAMPLE_RATE * CHANNELS * BUFFER_MS / 1000;
 
     private final Streamer streamer;
     private final int bitRate;
-    private final List<CodecOption> codecOptions;
-    private final String encoderName;
+
+    private AudioRecord recorder;
+    private MediaCodec mediaCodec;
 
     // Capacity of 64 is in practice "infinite" (it is limited by the number of available MediaCodec buffers, typically 4).
     // So many pending tasks would lead to an unacceptable delay anyway.
@@ -63,11 +62,9 @@ public final class AudioEncoder {
 
     private boolean ended;
 
-    public AudioEncoder(Streamer streamer, int bitRate, List<CodecOption> codecOptions, String encoderName) {
+    public AudioEncoder(Streamer streamer, int bitRate) {
         this.streamer = streamer;
         this.bitRate = bitRate;
-        this.codecOptions = codecOptions;
-        this.encoderName = encoderName;
     }
 
     private static AudioFormat createAudioFormat() {
@@ -92,27 +89,17 @@ public final class AudioEncoder {
         return builder.build();
     }
 
-    private static MediaFormat createFormat(String mimeType, int bitRate, List<CodecOption> codecOptions) {
+    private static MediaFormat createFormat(String mimeType, int bitRate) {
         MediaFormat format = new MediaFormat();
         format.setString(MediaFormat.KEY_MIME, mimeType);
         format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
         format.setInteger(MediaFormat.KEY_CHANNEL_COUNT, CHANNELS);
         format.setInteger(MediaFormat.KEY_SAMPLE_RATE, SAMPLE_RATE);
-
-        if (codecOptions != null) {
-            for (CodecOption option : codecOptions) {
-                String key = option.getKey();
-                Object value = option.getValue();
-                CodecUtils.setCodecOption(format, key, value);
-                Ln.d("Audio codec option set: " + key + " (" + value.getClass().getSimpleName() + ") = " + value);
-            }
-        }
-
         return format;
     }
 
     @TargetApi(Build.VERSION_CODES.N)
-    private void inputThread(MediaCodec mediaCodec, AudioRecord recorder) throws IOException, InterruptedException {
+    private void inputThread() throws IOException, InterruptedException {
         final AudioTimestamp timestamp = new AudioTimestamp();
         long previousPts = 0;
         long nextPts = 0;
@@ -156,7 +143,7 @@ public final class AudioEncoder {
         }
     }
 
-    private void outputThread(MediaCodec mediaCodec) throws IOException, InterruptedException {
+    private void outputThread() throws IOException, InterruptedException {
         streamer.writeHeader();
 
         while (!Thread.currentThread().isInterrupted()) {
@@ -213,38 +200,30 @@ public final class AudioEncoder {
 
     @TargetApi(Build.VERSION_CODES.M)
     public void encode() throws IOException {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-            Ln.w("Audio disabled: it is not supported before Android 11");
-            streamer.writeDisableStream(false);
-            return;
-        }
-
-        MediaCodec mediaCodec = null;
-        AudioRecord recorder = null;
-
-        boolean mediaCodecStarted = false;
-        boolean recorderStarted = false;
-        boolean configurationError = false;
         try {
-            Codec codec = streamer.getCodec();
-            mediaCodec = createMediaCodec(codec, encoderName);
-            recorder = createAudioRecord();
+            try {
+                String mimeType = streamer.getCodec().getMimeType();
 
-            mediaCodecThread = new HandlerThread("AudioEncoder");
-            mediaCodecThread.start();
+                mediaCodec = MediaCodec.createEncoderByType(mimeType); // may throw IOException
+                recorder = createAudioRecord();
 
-            MediaFormat format = createFormat(codec.getMimeType(), bitRate, codecOptions);
-            mediaCodec.setCallback(new EncoderCallback(), new Handler(mediaCodecThread.getLooper()));
-            mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+                mediaCodecThread = new HandlerThread("AudioEncoder");
+                mediaCodecThread.start();
 
-            recorder.startRecording();
-            recorderStarted = true;
+                MediaFormat format = createFormat(mimeType, bitRate);
+                mediaCodec.setCallback(new EncoderCallback(), new Handler(mediaCodecThread.getLooper()));
+                mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+
+                recorder.startRecording();
+            } catch (Throwable e) {
+                // Notify the client that the audio could not be captured
+                streamer.writeDisableStream();
+                throw e;
+            }
 
-            final MediaCodec mediaCodecRef = mediaCodec;
-            final AudioRecord recorderRef = recorder;
             inputThread = new Thread(() -> {
                 try {
-                    inputThread(mediaCodecRef, recorderRef);
+                    inputThread();
                 } catch (IOException | InterruptedException e) {
                     Ln.e("Audio capture error", e);
                 } finally {
@@ -254,7 +233,7 @@ public final class AudioEncoder {
 
             outputThread = new Thread(() -> {
                 try {
-                    outputThread(mediaCodecRef);
+                    outputThread();
                 } catch (InterruptedException e) {
                     // this is expected on close
                 } catch (IOException e) {
@@ -268,78 +247,43 @@ public final class AudioEncoder {
             });
 
             mediaCodec.start();
-            mediaCodecStarted = true;
             inputThread.start();
             outputThread.start();
-
-            waitEnded();
-        } catch (ConfigurationException e) {
-            // Do not print stack trace, a user-friendly error-message has already been logged
-            // Notify the error to scrcpy to make it exit
-            configurationError = true;
-        } finally {
-            if (!recorderStarted) {
-                // Notify the client that the audio could not be captured
-                streamer.writeDisableStream(configurationError);
-            }
-
-            // Cleanup everything (either at the end or on error at any step of the initialization)
-            if (mediaCodecThread != null) {
-                Looper looper = mediaCodecThread.getLooper();
-                if (looper != null) {
-                    looper.quitSafely();
-                }
-            }
-            if (inputThread != null) {
-                inputThread.interrupt();
-            }
-            if (outputThread != null) {
-                outputThread.interrupt();
-            }
-
-            try {
-                if (mediaCodecThread != null) {
-                    mediaCodecThread.join();
-                }
-                if (inputThread != null) {
-                    inputThread.join();
-                }
-                if (outputThread != null) {
-                    outputThread.join();
-                }
-            } catch (InterruptedException e) {
-                // Should never happen
-                throw new AssertionError(e);
-            }
-
+        } catch (Throwable e) {
             if (mediaCodec != null) {
-                if (mediaCodecStarted) {
-                    mediaCodec.stop();
-                }
                 mediaCodec.release();
             }
             if (recorder != null) {
-                if (recorderStarted) {
-                    recorder.stop();
-                }
                 recorder.release();
             }
+            throw e;
+        }
+
+        try {
+            waitEnded();
+        } finally {
+            cleanUp();
         }
     }
 
-    private static MediaCodec createMediaCodec(Codec codec, String encoderName) throws IOException, ConfigurationException {
-        if (encoderName != null) {
-            Ln.d("Creating audio encoder by name: '" + encoderName + "'");
-            try {
-                return MediaCodec.createByCodecName(encoderName);
-            } catch (IllegalArgumentException e) {
-                Ln.e("Encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildAudioEncoderListMessage());
-                throw new ConfigurationException("Unknown encoder: " + encoderName);
-            }
+    private void cleanUp() {
+        mediaCodecThread.getLooper().quit();
+        inputThread.interrupt();
+        outputThread.interrupt();
+
+        try {
+            mediaCodecThread.join();
+            inputThread.join();
+            outputThread.join();
+        } catch (InterruptedException e) {
+            // Should never happen
+            throw new AssertionError(e);
         }
-        MediaCodec mediaCodec = MediaCodec.createEncoderByType(codec.getMimeType());
-        Ln.d("Using audio encoder: '" + mediaCodec.getName() + "'");
-        return mediaCodec;
+
+        mediaCodec.stop();
+        mediaCodec.release();
+        recorder.stop();
+        recorder.release();
     }
 
     private class EncoderCallback extends MediaCodec.Callback {

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

@@ -139,7 +139,7 @@ public final class CleanUp {
         builder.start();
     }
 
-    public static void unlinkSelf() {
+    private static void unlinkSelf() {
         try {
             new File(SERVER_PATH).delete();
         } catch (Exception e) {

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

@@ -1,78 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
-import android.media.MediaFormat;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public final class CodecUtils {
-
-    public static final class DeviceEncoder {
-        private final Codec codec;
-        private final MediaCodecInfo info;
-
-        DeviceEncoder(Codec codec, MediaCodecInfo info) {
-            this.codec = codec;
-            this.info = info;
-        }
-
-        public Codec getCodec() {
-            return codec;
-        }
-
-        public MediaCodecInfo getInfo() {
-            return info;
-        }
-    }
-
-    private CodecUtils() {
-        // not instantiable
-    }
-
-    public static void setCodecOption(MediaFormat format, String key, Object value) {
-        if (value instanceof Integer) {
-            format.setInteger(key, (Integer) value);
-        } else if (value instanceof Long) {
-            format.setLong(key, (Long) value);
-        } else if (value instanceof Float) {
-            format.setFloat(key, (Float) value);
-        } else if (value instanceof String) {
-            format.setString(key, (String) value);
-        }
-    }
-
-    private static MediaCodecInfo[] getEncoders(MediaCodecList codecs, String mimeType) {
-        List<MediaCodecInfo> result = new ArrayList<>();
-        for (MediaCodecInfo codecInfo : codecs.getCodecInfos()) {
-            if (codecInfo.isEncoder() && Arrays.asList(codecInfo.getSupportedTypes()).contains(mimeType)) {
-                result.add(codecInfo);
-            }
-        }
-        return result.toArray(new MediaCodecInfo[result.size()]);
-    }
-
-    public static List<DeviceEncoder> listVideoEncoders() {
-        List<DeviceEncoder> encoders = new ArrayList<>();
-        MediaCodecList codecs = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-        for (VideoCodec codec : VideoCodec.values()) {
-            for (MediaCodecInfo info : getEncoders(codecs, codec.getMimeType())) {
-                encoders.add(new DeviceEncoder(codec, info));
-            }
-        }
-        return encoders;
-    }
-
-    public static List<DeviceEncoder> listAudioEncoders() {
-        List<DeviceEncoder> encoders = new ArrayList<>();
-        MediaCodecList codecs = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-        for (AudioCodec codec : AudioCodec.values()) {
-            for (MediaCodecInfo info : getEncoders(codecs, codec.getMimeType())) {
-                encoders.add(new DeviceEncoder(codec, info));
-            }
-        }
-        return encoders;
-    }
-}

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

@@ -1,7 +0,0 @@
-package com.genymobile.scrcpy;
-
-public class ConfigurationException extends Exception {
-    public ConfigurationException(String message) {
-        super(message);
-    }
-}

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

@@ -61,12 +61,12 @@ public final class Device {
 
     private final boolean supportsInputEvents;
 
-    public Device(Options options) throws ConfigurationException {
+    public Device(Options options) {
         displayId = options.getDisplayId();
         DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
         if (displayInfo == null) {
-            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
-            throw new ConfigurationException("Unknown display id: " + displayId);
+            int[] displayIds = ServiceManager.getDisplayManager().getDisplayIds();
+            throw new InvalidDisplayIdException(displayId, displayIds);
         }
 
         int displayInfoFlags = displayInfo.getFlags();

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

@@ -0,0 +1,21 @@
+package com.genymobile.scrcpy;
+
+public class InvalidDisplayIdException extends RuntimeException {
+
+    private final int displayId;
+    private final int[] availableDisplayIds;
+
+    public InvalidDisplayIdException(int displayId, int[] availableDisplayIds) {
+        super("There is no display having id " + displayId);
+        this.displayId = displayId;
+        this.availableDisplayIds = availableDisplayIds;
+    }
+
+    public int getDisplayId() {
+        return displayId;
+    }
+
+    public int[] getAvailableDisplayIds() {
+        return availableDisplayIds;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.genymobile.scrcpy;
+
+import android.media.MediaCodecInfo;
+
+public class InvalidEncoderException extends RuntimeException {
+
+    private final String name;
+    private final MediaCodecInfo[] availableEncoders;
+
+    public InvalidEncoderException(String name, MediaCodecInfo[] availableEncoders) {
+        super("There is no encoder having name '" + name + '"');
+        this.name = name;
+        this.availableEncoders = availableEncoders;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public MediaCodecInfo[] getAvailableEncoders() {
+        return availableEncoders;
+    }
+}

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

@@ -1,63 +0,0 @@
-package com.genymobile.scrcpy;
-
-import com.genymobile.scrcpy.wrappers.DisplayManager;
-import com.genymobile.scrcpy.wrappers.ServiceManager;
-
-import java.util.List;
-
-public final class LogUtils {
-
-    private LogUtils() {
-        // not instantiable
-    }
-
-    public static String buildVideoEncoderListMessage() {
-        StringBuilder builder = new StringBuilder("List of video encoders:");
-        List<CodecUtils.DeviceEncoder> videoEncoders = CodecUtils.listVideoEncoders();
-        if (videoEncoders.isEmpty()) {
-            builder.append("\n    (none)");
-        } else {
-            for (CodecUtils.DeviceEncoder encoder : videoEncoders) {
-                builder.append("\n    --video-codec=").append(encoder.getCodec().getName());
-                builder.append(" --video-encoder='").append(encoder.getInfo().getName()).append("'");
-            }
-        }
-        return builder.toString();
-    }
-
-    public static String buildAudioEncoderListMessage() {
-        StringBuilder builder = new StringBuilder("List of audio encoders:");
-        List<CodecUtils.DeviceEncoder> audioEncoders = CodecUtils.listAudioEncoders();
-        if (audioEncoders.isEmpty()) {
-            builder.append("\n    (none)");
-        } else {
-            for (CodecUtils.DeviceEncoder encoder : audioEncoders) {
-                builder.append("\n    --audio-codec=").append(encoder.getCodec().getName());
-                builder.append(" --audio-encoder='").append(encoder.getInfo().getName()).append("'");
-            }
-        }
-        return builder.toString();
-    }
-
-    public static String buildDisplayListMessage() {
-        StringBuilder builder = new StringBuilder("List of displays:");
-        DisplayManager displayManager = ServiceManager.getDisplayManager();
-        int[] displayIds = displayManager.getDisplayIds();
-        if (displayIds == null || displayIds.length == 0) {
-            builder.append("\n    (none)");
-        } else {
-            for (int id : displayIds) {
-                builder.append("\n    --display=").append(id).append("    (");
-                DisplayInfo displayInfo = displayManager.getDisplayInfo(id);
-                if (displayInfo != null) {
-                    Size size = displayInfo.getSize();
-                    builder.append(size.getWidth()).append("x").append(size.getHeight());
-                } else {
-                    builder.append("size unknown");
-                }
-                builder.append(")");
-            }
-        }
-        return builder.toString();
-    }
-}

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

@@ -10,9 +10,9 @@ public class Options {
     private int scid = -1; // 31-bit non-negative value, or -1
     private boolean audio = true;
     private int maxSize;
-    private VideoCodec videoCodec = VideoCodec.H264;
+    private VideoCodec codec = VideoCodec.H264;
     private AudioCodec audioCodec = AudioCodec.OPUS;
-    private int videoBitRate = 8000000;
+    private int bitRate = 8000000;
     private int audioBitRate = 196000;
     private int maxFps;
     private int lockVideoOrientation = -1;
@@ -22,20 +22,14 @@ public class Options {
     private int displayId;
     private boolean showTouches;
     private boolean stayAwake;
-    private List<CodecOption> videoCodecOptions;
-    private List<CodecOption> audioCodecOptions;
-
-    private String videoEncoder;
-    private String audioEncoder;
+    private List<CodecOption> codecOptions;
+    private String encoderName;
     private boolean powerOffScreenOnClose;
     private boolean clipboardAutosync = true;
     private boolean downsizeOnError = true;
     private boolean cleanup = true;
     private boolean powerOn = true;
 
-    private boolean listEncoders;
-    private boolean listDisplays;
-
     // Options not used by the scrcpy client, but useful to use scrcpy-server directly
     private boolean sendDeviceMeta = true; // send device name and size
     private boolean sendFrameMeta = true; // send PTS so that the client may record properly
@@ -74,12 +68,12 @@ public class Options {
         this.maxSize = maxSize;
     }
 
-    public VideoCodec getVideoCodec() {
-        return videoCodec;
+    public VideoCodec getCodec() {
+        return codec;
     }
 
-    public void setVideoCodec(VideoCodec videoCodec) {
-        this.videoCodec = videoCodec;
+    public void setCodec(VideoCodec codec) {
+        this.codec = codec;
     }
 
     public AudioCodec getAudioCodec() {
@@ -90,12 +84,12 @@ public class Options {
         this.audioCodec = audioCodec;
     }
 
-    public int getVideoBitRate() {
-        return videoBitRate;
+    public int getBitRate() {
+        return bitRate;
     }
 
-    public void setVideoBitRate(int videoBitRate) {
-        this.videoBitRate = videoBitRate;
+    public void setBitRate(int bitRate) {
+        this.bitRate = bitRate;
     }
 
     public int getAudioBitRate() {
@@ -170,36 +164,20 @@ public class Options {
         this.stayAwake = stayAwake;
     }
 
-    public List<CodecOption> getVideoCodecOptions() {
-        return videoCodecOptions;
+    public List<CodecOption> getCodecOptions() {
+        return codecOptions;
     }
 
-    public void setVideoCodecOptions(List<CodecOption> videoCodecOptions) {
-        this.videoCodecOptions = videoCodecOptions;
+    public void setCodecOptions(List<CodecOption> codecOptions) {
+        this.codecOptions = codecOptions;
     }
 
-    public List<CodecOption> getAudioCodecOptions() {
-        return audioCodecOptions;
+    public String getEncoderName() {
+        return encoderName;
     }
 
-    public void setAudioCodecOptions(List<CodecOption> audioCodecOptions) {
-        this.audioCodecOptions = audioCodecOptions;
-    }
-
-    public String getVideoEncoder() {
-        return videoEncoder;
-    }
-
-    public void setVideoEncoder(String videoEncoder) {
-        this.videoEncoder = videoEncoder;
-    }
-
-    public String getAudioEncoder() {
-        return audioEncoder;
-    }
-
-    public void setAudioEncoder(String audioEncoder) {
-        this.audioEncoder = audioEncoder;
+    public void setEncoderName(String encoderName) {
+        this.encoderName = encoderName;
     }
 
     public void setPowerOffScreenOnClose(boolean powerOffScreenOnClose) {
@@ -242,22 +220,6 @@ public class Options {
         this.powerOn = powerOn;
     }
 
-    public boolean getListEncoders() {
-        return listEncoders;
-    }
-
-    public void setListEncoders(boolean listEncoders) {
-        this.listEncoders = listEncoders;
-    }
-
-    public boolean getListDisplays() {
-        return listDisplays;
-    }
-
-    public void setListDisplays(boolean listDisplays) {
-        this.listDisplays = listDisplays;
-    }
-
     public boolean getSendDeviceMeta() {
         return sendDeviceMeta;
     }

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

@@ -5,6 +5,7 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import android.graphics.Rect;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
+import android.media.MediaCodecList;
 import android.media.MediaFormat;
 import android.os.Build;
 import android.os.IBinder;
@@ -13,6 +14,8 @@ import android.view.Surface;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -32,18 +35,18 @@ public class ScreenEncoder implements Device.RotationListener {
     private final Streamer streamer;
     private final String encoderName;
     private final List<CodecOption> codecOptions;
-    private final int videoBitRate;
+    private final int bitRate;
     private final int maxFps;
     private final boolean downsizeOnError;
 
     private boolean firstFrameSent;
     private int consecutiveErrors;
 
-    public ScreenEncoder(Device device, Streamer streamer, int videoBitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
+    public ScreenEncoder(Device device, Streamer streamer, int bitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
             boolean downsizeOnError) {
         this.device = device;
         this.streamer = streamer;
-        this.videoBitRate = videoBitRate;
+        this.bitRate = bitRate;
         this.maxFps = maxFps;
         this.codecOptions = codecOptions;
         this.encoderName = encoderName;
@@ -59,10 +62,10 @@ public class ScreenEncoder implements Device.RotationListener {
         return rotationChanged.getAndSet(false);
     }
 
-    public void streamScreen() throws IOException, ConfigurationException {
-        Codec codec = streamer.getCodec();
-        MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
-        MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);
+    public void streamScreen() throws IOException {
+        String videoMimeType = streamer.getCodec().getMimeType();
+        MediaCodec codec = createCodec(videoMimeType, encoderName);
+        MediaFormat format = createFormat(videoMimeType, bitRate, maxFps, codecOptions);
         IBinder display = createDisplay();
         device.setRotationListener(this);
 
@@ -81,8 +84,8 @@ public class ScreenEncoder implements Device.RotationListener {
 
                 Surface surface = null;
                 try {
-                    mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-                    surface = mediaCodec.createInputSurface();
+                    codec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+                    surface = codec.createInputSurface();
 
                     // does not include the locked video orientation
                     Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
@@ -90,11 +93,11 @@ public class ScreenEncoder implements Device.RotationListener {
                     int layerStack = device.getLayerStack();
                     setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
 
-                    mediaCodec.start();
+                    codec.start();
 
-                    alive = encode(mediaCodec, streamer);
+                    alive = encode(codec, streamer);
                     // do not call stop() on exception, it would trigger an IllegalStateException
-                    mediaCodec.stop();
+                    codec.stop();
                 } catch (IllegalStateException | IllegalArgumentException e) {
                     Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
                     if (!prepareRetry(device, screenInfo)) {
@@ -103,14 +106,14 @@ public class ScreenEncoder implements Device.RotationListener {
                     Ln.i("Retrying...");
                     alive = true;
                 } finally {
-                    mediaCodec.reset();
+                    codec.reset();
                     if (surface != null) {
                         surface.release();
                     }
                 }
             } while (alive);
         } finally {
-            mediaCodec.release();
+            codec.release();
             device.setRotationListener(null);
             SurfaceControl.destroyDisplay(display);
         }
@@ -196,19 +199,47 @@ public class ScreenEncoder implements Device.RotationListener {
         return !eof;
     }
 
-    private static MediaCodec createMediaCodec(Codec codec, String encoderName) throws IOException, ConfigurationException {
+    private static MediaCodecInfo[] listEncoders(String videoMimeType) {
+        List<MediaCodecInfo> result = new ArrayList<>();
+        MediaCodecList list = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        for (MediaCodecInfo codecInfo : list.getCodecInfos()) {
+            if (codecInfo.isEncoder() && Arrays.asList(codecInfo.getSupportedTypes()).contains(videoMimeType)) {
+                result.add(codecInfo);
+            }
+        }
+        return result.toArray(new MediaCodecInfo[result.size()]);
+    }
+
+    private static MediaCodec createCodec(String videoMimeType, String encoderName) throws IOException {
         if (encoderName != null) {
             Ln.d("Creating encoder by name: '" + encoderName + "'");
             try {
                 return MediaCodec.createByCodecName(encoderName);
             } catch (IllegalArgumentException e) {
-                Ln.e("Encoder '" + encoderName + "' for " + codec.getName() + " not found\n" + LogUtils.buildVideoEncoderListMessage());
-                throw new ConfigurationException("Unknown encoder: " + encoderName);
+                MediaCodecInfo[] encoders = listEncoders(videoMimeType);
+                throw new InvalidEncoderException(encoderName, encoders);
             }
         }
-        MediaCodec mediaCodec = MediaCodec.createEncoderByType(codec.getMimeType());
-        Ln.d("Using encoder: '" + mediaCodec.getName() + "'");
-        return mediaCodec;
+        MediaCodec codec = MediaCodec.createEncoderByType(videoMimeType);
+        Ln.d("Using encoder: '" + codec.getName() + "'");
+        return codec;
+    }
+
+    private static void setCodecOption(MediaFormat format, CodecOption codecOption) {
+        String key = codecOption.getKey();
+        Object value = codecOption.getValue();
+
+        if (value instanceof Integer) {
+            format.setInteger(key, (Integer) value);
+        } else if (value instanceof Long) {
+            format.setLong(key, (Long) value);
+        } else if (value instanceof Float) {
+            format.setFloat(key, (Float) value);
+        } else if (value instanceof String) {
+            format.setString(key, (String) value);
+        }
+
+        Ln.d("Codec option set: " + key + " (" + value.getClass().getSimpleName() + ") = " + value);
     }
 
     private static MediaFormat createFormat(String videoMimeType, int bitRate, int maxFps, List<CodecOption> codecOptions) {
@@ -230,10 +261,7 @@ public class ScreenEncoder implements Device.RotationListener {
 
         if (codecOptions != null) {
             for (CodecOption option : codecOptions) {
-                String key = option.getKey();
-                Object value = option.getValue();
-                CodecUtils.setCodecOption(format, key, value);
-                Ln.d("Video codec option set: " + key + " (" + value.getClass().getSimpleName() + ") = " + value);
+                setCodecOption(format, option);
             }
         }
 

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

@@ -1,6 +1,7 @@
 package com.genymobile.scrcpy;
 
 import android.graphics.Rect;
+import android.media.MediaCodecInfo;
 import android.os.BatteryManager;
 import android.os.Build;
 
@@ -58,9 +59,10 @@ public final class Server {
         }
     }
 
-    private static void scrcpy(Options options) throws IOException, ConfigurationException {
+    private static void scrcpy(Options options) throws IOException {
         Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
         final Device device = new Device(options);
+        List<CodecOption> codecOptions = options.getCodecOptions();
 
         Thread initThread = startInitThread(options);
 
@@ -91,15 +93,14 @@ public final class Server {
             Workarounds.fillAppInfo();
         }
 
-        Controller controller = null;
-        AudioEncoder audioEncoder = null;
-
         try (DesktopConnection connection = DesktopConnection.open(scid, tunnelForward, audio, control, sendDummyByte)) {
+            VideoCodec codec = options.getCodec();
             if (options.getSendDeviceMeta()) {
                 Size videoSize = device.getScreenInfo().getVideoSize();
                 connection.sendDeviceMeta(Device.getDeviceName(), videoSize.getWidth(), videoSize.getHeight());
             }
 
+            Controller controller = null;
             if (control) {
                 controller = new Controller(device, connection, options.getClipboardAutosync(), options.getPowerOn());
                 controller.start();
@@ -108,17 +109,17 @@ public final class Server {
                 device.setClipboardListener(text -> controllerRef.getSender().pushClipboardText(text));
             }
 
+            AudioEncoder audioEncoder = null;
             if (audio) {
                 Streamer audioStreamer = new Streamer(connection.getAudioFd(), options.getAudioCodec(), options.getSendCodecId(),
                         options.getSendFrameMeta());
-                audioEncoder = new AudioEncoder(audioStreamer, options.getAudioBitRate(), options.getAudioCodecOptions(), options.getAudioEncoder());
+                audioEncoder = new AudioEncoder(audioStreamer, options.getAudioBitRate());
                 audioEncoder.start();
             }
 
-            Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecId(),
-                    options.getSendFrameMeta());
-            ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
-                    options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
+            Streamer videoStreamer = new Streamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
+            ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getBitRate(), options.getMaxFps(),
+                    codecOptions, options.getEncoderName(), options.getDownsizeOnError());
             try {
                 // synchronous
                 screenEncoder.streamScreen();
@@ -127,27 +128,27 @@ public final class Server {
                 if (!IO.isBrokenPipe(e)) {
                     Ln.e("Video encoding error", e);
                 }
-            }
-        } finally {
-            Ln.d("Screen streaming stopped");
-            initThread.interrupt();
-            if (audioEncoder != null) {
-                audioEncoder.stop();
-            }
-            if (controller != null) {
-                controller.stop();
-            }
-
-            try {
-                initThread.join();
+            } finally {
+                Ln.d("Screen streaming stopped");
+                initThread.interrupt();
                 if (audioEncoder != null) {
-                    audioEncoder.join();
+                    audioEncoder.stop();
                 }
                 if (controller != null) {
-                    controller.join();
+                    controller.stop();
+                }
+
+                try {
+                    initThread.join();
+                    if (audioEncoder != null) {
+                        audioEncoder.join();
+                    }
+                    if (controller != null) {
+                        controller.join();
+                    }
+                } catch (InterruptedException e) {
+                    // ignore
                 }
-            } catch (InterruptedException e) {
-                // ignore
             }
         }
     }
@@ -196,12 +197,12 @@ public final class Server {
                     boolean audio = Boolean.parseBoolean(value);
                     options.setAudio(audio);
                     break;
-                case "video_codec":
-                    VideoCodec videoCodec = VideoCodec.findByName(value);
-                    if (videoCodec == null) {
+                case "codec":
+                    VideoCodec codec = VideoCodec.findByName(value);
+                    if (codec == null) {
                         throw new IllegalArgumentException("Video codec " + value + " not supported");
                     }
-                    options.setVideoCodec(videoCodec);
+                    options.setCodec(codec);
                     break;
                 case "audio_codec":
                     AudioCodec audioCodec = AudioCodec.findByName(value);
@@ -214,9 +215,9 @@ public final class Server {
                     int maxSize = Integer.parseInt(value) & ~7; // multiple of 8
                     options.setMaxSize(maxSize);
                     break;
-                case "video_bit_rate":
-                    int videoBitRate = Integer.parseInt(value);
-                    options.setVideoBitRate(videoBitRate);
+                case "bit_rate":
+                    int bitRate = Integer.parseInt(value);
+                    options.setBitRate(bitRate);
                     break;
                 case "audio_bit_rate":
                     int audioBitRate = Integer.parseInt(value);
@@ -254,23 +255,15 @@ public final class Server {
                     boolean stayAwake = Boolean.parseBoolean(value);
                     options.setStayAwake(stayAwake);
                     break;
-                case "video_codec_options":
-                    List<CodecOption> videoCodecOptions = CodecOption.parse(value);
-                    options.setVideoCodecOptions(videoCodecOptions);
+                case "codec_options":
+                    List<CodecOption> codecOptions = CodecOption.parse(value);
+                    options.setCodecOptions(codecOptions);
                     break;
-                case "audio_codec_options":
-                    List<CodecOption> audioCodecOptions = CodecOption.parse(value);
-                    options.setAudioCodecOptions(audioCodecOptions);
-                    break;
-                case "video_encoder":
+                case "encoder_name":
                     if (!value.isEmpty()) {
-                        options.setVideoEncoder(value);
+                        options.setEncoderName(value);
                     }
                     break;
-                case "audio_encoder":
-                    if (!value.isEmpty()) {
-                        options.setAudioEncoder(value);
-                    }
                 case "power_off_on_close":
                     boolean powerOffScreenOnClose = Boolean.parseBoolean(value);
                     options.setPowerOffScreenOnClose(powerOffScreenOnClose);
@@ -291,14 +284,6 @@ public final class Server {
                     boolean powerOn = Boolean.parseBoolean(value);
                     options.setPowerOn(powerOn);
                     break;
-                case "list_encoders":
-                    boolean listEncoders = Boolean.parseBoolean(value);
-                    options.setListEncoders(listEncoders);
-                    break;
-                case "list_displays":
-                    boolean listDisplays = Boolean.parseBoolean(value);
-                    options.setListDisplays(listDisplays);
-                    break;
                 case "send_device_meta":
                     boolean sendDeviceMeta = Boolean.parseBoolean(value);
                     options.setSendDeviceMeta(sendDeviceMeta);
@@ -349,35 +334,38 @@ public final class Server {
         return new Rect(x, y, x + width, y + height);
     }
 
+    private static void suggestFix(Throwable e) {
+        if (e instanceof InvalidDisplayIdException) {
+            InvalidDisplayIdException idie = (InvalidDisplayIdException) e;
+            int[] displayIds = idie.getAvailableDisplayIds();
+            if (displayIds != null && displayIds.length > 0) {
+                Ln.e("Try to use one of the available display ids:");
+                for (int id : displayIds) {
+                    Ln.e("    scrcpy --display " + id);
+                }
+            }
+        } else if (e instanceof InvalidEncoderException) {
+            InvalidEncoderException iee = (InvalidEncoderException) e;
+            MediaCodecInfo[] encoders = iee.getAvailableEncoders();
+            if (encoders != null && encoders.length > 0) {
+                Ln.e("Try to use one of the available encoders:");
+                for (MediaCodecInfo encoder : encoders) {
+                    Ln.e("    scrcpy --encoder '" + encoder.getName() + "'");
+                }
+            }
+        }
+    }
+
     public static void main(String... args) throws Exception {
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
             Ln.e("Exception on thread " + t, e);
+            suggestFix(e);
         });
 
         Options options = createOptions(args);
 
         Ln.initLogLevel(options.getLogLevel());
 
-        if (options.getListEncoders() || options.getListDisplays()) {
-            if (options.getCleanup()) {
-                CleanUp.unlinkSelf();
-            }
-
-            if (options.getListEncoders()) {
-                Ln.i(LogUtils.buildVideoEncoderListMessage());
-                Ln.i(LogUtils.buildAudioEncoderListMessage());
-            }
-            if (options.getListDisplays()) {
-                Ln.i(LogUtils.buildDisplayListMessage());
-            }
-            // Just print the requested data, do not mirror
-            return;
-        }
-
-        try {
-            scrcpy(options);
-        } catch (ConfigurationException e) {
-            // Do not print stack trace, a user-friendly error-message has already been logged
-        }
+        scrcpy(options);
     }
 }

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

@@ -40,15 +40,10 @@ public final class Streamer {
         }
     }
 
-    public void writeDisableStream(boolean error) throws IOException {
-        // Writing a specific code as codec-id means that the device disables the stream
-        //   code 0: it explicitly disables the stream (because it could not capture audio), scrcpy should continue mirroring video only
-        //   code 1: a configuration error occurred, scrcpy must be stopped
-        byte[] code = new byte[4];
-        if (error) {
-            code[3] = 1;
-        }
-        IO.writeFully(fd, code, 0, code.length);
+    public void writeDisableStream() throws IOException {
+        // Writing 0 (32-bit) as codec-id means that the device disables the stream (because it could not capture)
+        byte[] zeros = new byte[4];
+        IO.writeFully(fd, zeros, 0, zeros.length);
     }
 
     public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
@@ -96,34 +91,31 @@ public final class Streamer {
         // 00000050  00 00 00                                          |...|
         //
         // Each "section" is prefixed by a 64-bit ID and a 64-bit length.
-        //
-        // <https://developer.android.com/reference/android/media/MediaCodec#CSD>
 
         boolean isConfig = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0;
         if (!isConfig) {
             return;
         }
 
-        if (buffer.remaining() < 16) {
-            throw new IOException("Not enough data in OPUS config packet");
+        while (buffer.remaining() >= 16) {
+            long id = buffer.getLong();
+            long sizeLong = buffer.getLong();
+            if (sizeLong < 0 || sizeLong >= 0x7FFFFFFF) {
+                throw new IOException("Invalid block size in OPUS header: " + sizeLong);
+            }
+            int size = (int) sizeLong;
+            if (id == AOPUSHDR) {
+                if (buffer.remaining() < size) {
+                    throw new IOException("Not enough data in OPUS header (invalid size: " + size + ")");
+                }
+                // Set the buffer to point to the OPUS header slice
+                buffer.limit(buffer.position() + size);
+                return;
+            }
+
+            buffer.position(buffer.position() + size);
         }
 
-        long id = buffer.getLong();
-        if (id != AOPUSHDR) {
-            throw new IOException("OPUS header not found");
-        }
-
-        long sizeLong = buffer.getLong();
-        if (sizeLong < 0 || sizeLong >= 0x7FFFFFFF) {
-            throw new IOException("Invalid block size in OPUS header: " + sizeLong);
-        }
-
-        int size = (int) sizeLong;
-        if (buffer.remaining() < size) {
-            throw new IOException("Not enough data in OPUS header (invalid size: " + size + ")");
-        }
-
-        // Set the buffer to point to the OPUS header slice
-        buffer.limit(buffer.position() + size);
+        throw new IOException("OPUS header not found");
     }
 }

u/.ninja_log

@@ -1,62 +0,0 @@
-# ninja log v5
-0	243	1542027815	build.ninja	ef03cd8523486e97
-0	58	1542027815	app/app@@scrcpy@exe/src_str_util.c.o	2aa692e7aa83914
-0	87	1542027815	app/app@@scrcpy@exe/src_sys_unix_net.c.o	7ea14bd07e90ff97
-0	91	1542027815	app/app@@scrcpy@exe/src_sys_unix_command.c.o	dd44ba15cc3d6a7e
-1	113	1542027815	app/app@@scrcpy@exe/src_command.c.o	1eaa0f061a5c0447
-0	114	1542027815	app/app@@scrcpy@exe/src_server.c.o	8b376071b5e0aaf1
-1	117	1542027815	app/app@@scrcpy@exe/src_controller.c.o	907de440054c77e7
-1	146	1542027815	app/app@@scrcpy@exe/src_control_event.c.o	fcfa5a6c322ebf8b
-91	202	1542027815	app/app@@scrcpy@exe/src_device.c.o	9ac9441f4f2e4d54
-58	215	1542027815	app/app@@scrcpy@exe/src_convert.c.o	9de268e9b915094e
-115	219	1542027815	app/app@@scrcpy@exe/src_fps_counter.c.o	22b968c51acd256b
-114	235	1542027815	app/app@@scrcpy@exe/src_file_handler.c.o	11e303a26f189d9a
-117	286	1542027815	app/app@@scrcpy@exe/src_frames.c.o	3c5c4dbee035e5ab
-88	319	1542027815	app/app@@scrcpy@exe/src_decoder.c.o	60c1438cf7786895
-202	338	1542027815	app/app@@scrcpy@exe/src_lock_util.c.o	9265bcc92f144427
-215	367	1542027815	app/app@@scrcpy@exe/src_net.c.o	718f65aa73583163
-220	408	1542027815	app/app@@scrcpy@exe/src_recorder.c.o	676a7500fb0d45cb
-1	470	1542027815	app/app@@scrcpy@exe/src_tiny_xpm.c.o	91851ad29940a4b1
-286	485	1542027815	app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o	46bff52a98c0b5ca
-319	487	1542027815	app/app@@test_control_event_queue@exe/src_control_event.c.o	76492af89a914173
-1	488	1542027815	app/app@@scrcpy@exe/src_main.c.o	e7dc8583797471c5
-367	488	1542027815	app/app@@test_control_event_serialize@exe/src_control_event.c.o	fcff2e1105474edf
-0	497	1542027815	app/app@@scrcpy@exe/src_screen.c.o	329c18ec2111c8ff
-408	515	1542027815	app/app@@test_strutil@exe/tests_test_strutil.c.o	15440f4bca20c50d
-338	517	1542027815	app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o	baa0b48891372fcc
-470	525	1542027815	app/app@@test_strutil@exe/src_str_util.c.o	fcb3a91d36e23e11
-525	561	1542027815	app/test_strutil	3448478dadf99adf
-487	582	1542027815	app/test_control_event_queue	bfca00bc894d3c4f
-517	606	1542027815	app/test_control_event_serialize	e06ab4ce04dd4fad
-147	638	1542027815	app/app@@scrcpy@exe/src_input_manager.c.o	1fe285b256bf5908
-236	713	1542027815	app/app@@scrcpy@exe/src_scrcpy.c.o	8b0bae90b272da98
-713	891	1542027816	app/scrcpy	8fba96817bb2802c
-485	5716	1542027820	server/scrcpy-server.jar	8511d30842df298f
-0	264	1542027826	build.ninja	ef03cd8523486e97
-1	31	1542027826	app/app@@scrcpy@exe/src_fps_counter.c.o	22b968c51acd256b
-1	44	1542027826	app/app@@scrcpy@exe/src_file_handler.c.o	11e303a26f189d9a
-1	47	1542027826	app/app@@scrcpy@exe/src_controller.c.o	907de440054c77e7
-2	50	1542027826	app/app@@scrcpy@exe/src_frames.c.o	3c5c4dbee035e5ab
-2	50	1542027826	app/app@@scrcpy@exe/src_recorder.c.o	676a7500fb0d45cb
-1	65	1542027826	app/app@@scrcpy@exe/src_decoder.c.o	60c1438cf7786895
-31	82	1542027826	app/app@@scrcpy@exe/src_server.c.o	8b376071b5e0aaf1
-2	108	1542027826	app/app@@scrcpy@exe/src_input_manager.c.o	1fe285b256bf5908
-2	129	1542027826	app/app@@scrcpy@exe/src_screen.c.o	329c18ec2111c8ff
-2	162	1542027826	app/app@@scrcpy@exe/src_scrcpy.c.o	8b0bae90b272da98
-1	339	1542027826	app/app@@scrcpy@exe/src_main.c.o	e7dc8583797471c5
-339	538	1542027827	app/scrcpy	8fba96817bb2802c
-44	753	1542027827	server/scrcpy-server.jar	8511d30842df298f
-0	276	1542027871	build.ninja	ef03cd8523486e97
-1	37	1542027872	app/app@@scrcpy@exe/src_file_handler.c.o	11e303a26f189d9a
-1	42	1542027872	app/app@@scrcpy@exe/src_controller.c.o	907de440054c77e7
-1	45	1542027872	app/app@@scrcpy@exe/src_fps_counter.c.o	22b968c51acd256b
-2	49	1542027872	app/app@@scrcpy@exe/src_recorder.c.o	676a7500fb0d45cb
-1	52	1542027872	app/app@@scrcpy@exe/src_frames.c.o	3c5c4dbee035e5ab
-0	64	1542027872	app/app@@scrcpy@exe/src_decoder.c.o	60c1438cf7786895
-37	80	1542027872	app/app@@scrcpy@exe/src_server.c.o	8b376071b5e0aaf1
-1	128	1542027872	app/app@@scrcpy@exe/src_input_manager.c.o	1fe285b256bf5908
-2	138	1542027872	app/app@@scrcpy@exe/src_screen.c.o	329c18ec2111c8ff
-2	150	1542027872	app/app@@scrcpy@exe/src_scrcpy.c.o	8b0bae90b272da98
-1	370	1542027872	app/app@@scrcpy@exe/src_main.c.o	e7dc8583797471c5
-370	578	1542027872	app/scrcpy	8fba96817bb2802c
-42	688	1542027872	server/scrcpy-server.jar	8511d30842df298f

u/app/config.h

@@ -1,29 +0,0 @@
-/*
- * Autogenerated by the Meson build system.
- * Do not edit, your changes will be lost.
- */
-
-#pragma once
-
-#define BUILD_DEBUG
-
-#define DEFAULT_BIT_RATE 8000000
-
-#define DEFAULT_LOCAL_PORT 27183
-
-#define DEFAULT_MAX_SIZE 0
-
-#define HIDPI_SUPPORT
-
-#undef OVERRIDE_SERVER_PATH
-
-#define PREFIX "/usr/local"
-
-#define PREFIXED_SERVER_PATH "/share/scrcpy/scrcpy-server.jar"
-
-#define SCRCPY_VERSION "1.6"
-
-#define SKIP_FRAMES
-
-#undef WINDOWS_NOCONSOLE
-

u/build.ninja

@@ -1,263 +0,0 @@
-# This is the build file for project "scrcpy"
-# It is autogenerated by the Meson build system.
-# Do not edit by hand.
-
-ninja_required_version = 1.5.1
-
-# Rules for compiling.
-
-rule c_COMPILER
- command = ccache cc $ARGS  -MD -MQ $out -MF '$DEPFILE' -o $out -c $in
- deps = gcc
- depfile = $DEPFILE
- description = Compiling C object $out.
-
-rule c_PCH
- command = ccache cc $ARGS  -MD -MQ $out -MF '$DEPFILE' -o $out -c $in
- deps = gcc
- depfile = $DEPFILE
- description = Precompiling header $in.
-
-
-# Rules for linking.
-
-rule STATIC_LINKER
- command =  rm -f $out && gcc-ar $LINK_ARGS $out $in
- description = Linking static target $out.
-
-rule c_LINKER
- command = ccache cc $ARGS -o $out $in $LINK_ARGS  $aliasing
- description = Linking target $out.
-
-
-rule SHSYM
- command = /usr/bin/meson --internal symbolextractor $in $out $CROSS
- restat = 1
- description = Generating symbol file $out.
-
-# Other rules
-
-rule CUSTOM_COMMAND
- command = $COMMAND
- description = $DESC
- restat = 1
-
-rule CUSTOM_COMMAND_DEP
- command = $COMMAND
- description = $DESC
- deps = gcc
- depfile = $DEPFILE
- restat = 1
-
-rule REGENERATE_BUILD
- command = /usr/bin/meson --internal regenerate /home/rom/projects/scrcpy /home/rom/projects/scrcpy/u --backend ninja
- description = Regenerating build files.
- generator = 1
-
-
-# Phony build target, always out of date
-build PHONY: phony
-
-# Build rules for targets
-
-build app/app@@scrcpy@exe/src_main.c.o: c_COMPILER ../app/src/main.c
- DEPFILE = app/app@@scrcpy@exe/src_main.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_command.c.o: c_COMPILER ../app/src/command.c
- DEPFILE = app/app@@scrcpy@exe/src_command.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_control_event.c.o: c_COMPILER ../app/src/control_event.c
- DEPFILE = app/app@@scrcpy@exe/src_control_event.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_controller.c.o: c_COMPILER ../app/src/controller.c
- DEPFILE = app/app@@scrcpy@exe/src_controller.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_convert.c.o: c_COMPILER ../app/src/convert.c
- DEPFILE = app/app@@scrcpy@exe/src_convert.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_decoder.c.o: c_COMPILER ../app/src/decoder.c
- DEPFILE = app/app@@scrcpy@exe/src_decoder.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_device.c.o: c_COMPILER ../app/src/device.c
- DEPFILE = app/app@@scrcpy@exe/src_device.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_file_handler.c.o: c_COMPILER ../app/src/file_handler.c
- DEPFILE = app/app@@scrcpy@exe/src_file_handler.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_fps_counter.c.o: c_COMPILER ../app/src/fps_counter.c
- DEPFILE = app/app@@scrcpy@exe/src_fps_counter.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_frames.c.o: c_COMPILER ../app/src/frames.c
- DEPFILE = app/app@@scrcpy@exe/src_frames.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_input_manager.c.o: c_COMPILER ../app/src/input_manager.c
- DEPFILE = app/app@@scrcpy@exe/src_input_manager.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_lock_util.c.o: c_COMPILER ../app/src/lock_util.c
- DEPFILE = app/app@@scrcpy@exe/src_lock_util.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_net.c.o: c_COMPILER ../app/src/net.c
- DEPFILE = app/app@@scrcpy@exe/src_net.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_recorder.c.o: c_COMPILER ../app/src/recorder.c
- DEPFILE = app/app@@scrcpy@exe/src_recorder.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_scrcpy.c.o: c_COMPILER ../app/src/scrcpy.c
- DEPFILE = app/app@@scrcpy@exe/src_scrcpy.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_screen.c.o: c_COMPILER ../app/src/screen.c
- DEPFILE = app/app@@scrcpy@exe/src_screen.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_server.c.o: c_COMPILER ../app/src/server.c
- DEPFILE = app/app@@scrcpy@exe/src_server.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_str_util.c.o: c_COMPILER ../app/src/str_util.c
- DEPFILE = app/app@@scrcpy@exe/src_str_util.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_tiny_xpm.c.o: c_COMPILER ../app/src/tiny_xpm.c
- DEPFILE = app/app@@scrcpy@exe/src_tiny_xpm.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_sys_unix_command.c.o: c_COMPILER ../app/src/sys/unix/command.c
- DEPFILE = app/app@@scrcpy@exe/src_sys_unix_command.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@scrcpy@exe/src_sys_unix_net.c.o: c_COMPILER ../app/src/sys/unix/net.c
- DEPFILE = app/app@@scrcpy@exe/src_sys_unix_net.c.o.d
- ARGS = -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/scrcpy: c_LINKER app/app@@scrcpy@exe/src_main.c.o app/app@@scrcpy@exe/src_command.c.o app/app@@scrcpy@exe/src_control_event.c.o app/app@@scrcpy@exe/src_controller.c.o app/app@@scrcpy@exe/src_convert.c.o app/app@@scrcpy@exe/src_decoder.c.o app/app@@scrcpy@exe/src_device.c.o app/app@@scrcpy@exe/src_file_handler.c.o app/app@@scrcpy@exe/src_fps_counter.c.o app/app@@scrcpy@exe/src_frames.c.o app/app@@scrcpy@exe/src_input_manager.c.o app/app@@scrcpy@exe/src_lock_util.c.o app/app@@scrcpy@exe/src_net.c.o app/app@@scrcpy@exe/src_recorder.c.o app/app@@scrcpy@exe/src_scrcpy.c.o app/app@@scrcpy@exe/src_screen.c.o app/app@@scrcpy@exe/src_server.c.o app/app@@scrcpy@exe/src_str_util.c.o app/app@@scrcpy@exe/src_tiny_xpm.c.o app/app@@scrcpy@exe/src_sys_unix_command.c.o app/app@@scrcpy@exe/src_sys_unix_net.c.o | /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so
- LINK_ARGS = -Wl,--no-undefined -Wl,--as-needed -Wl,--start-group /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so -Wl,--end-group
-
-build app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o: c_COMPILER ../app/tests/test_control_event_queue.c
- DEPFILE = app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o.d
- ARGS = -Iapp/app@@test_control_event_queue@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@test_control_event_queue@exe/src_control_event.c.o: c_COMPILER ../app/src/control_event.c
- DEPFILE = app/app@@test_control_event_queue@exe/src_control_event.c.o.d
- ARGS = -Iapp/app@@test_control_event_queue@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/test_control_event_queue: c_LINKER app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o app/app@@test_control_event_queue@exe/src_control_event.c.o | /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so
- LINK_ARGS = -Wl,--no-undefined -Wl,--as-needed -Wl,--start-group /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so -Wl,--end-group
-
-build app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o: c_COMPILER ../app/tests/test_control_event_serialize.c
- DEPFILE = app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o.d
- ARGS = -Iapp/app@@test_control_event_serialize@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@test_control_event_serialize@exe/src_control_event.c.o: c_COMPILER ../app/src/control_event.c
- DEPFILE = app/app@@test_control_event_serialize@exe/src_control_event.c.o.d
- ARGS = -Iapp/app@@test_control_event_serialize@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/test_control_event_serialize: c_LINKER app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o app/app@@test_control_event_serialize@exe/src_control_event.c.o | /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so
- LINK_ARGS = -Wl,--no-undefined -Wl,--as-needed -Wl,--start-group /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so -Wl,--end-group
-
-build app/app@@test_strutil@exe/tests_test_strutil.c.o: c_COMPILER ../app/tests/test_strutil.c
- DEPFILE = app/app@@test_strutil@exe/tests_test_strutil.c.o.d
- ARGS = -Iapp/app@@test_strutil@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/app@@test_strutil@exe/src_str_util.c.o: c_COMPILER ../app/src/str_util.c
- DEPFILE = app/app@@test_strutil@exe/src_str_util.c.o.d
- ARGS = -Iapp/app@@test_strutil@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT
-
-build app/test_strutil: c_LINKER app/app@@test_strutil@exe/tests_test_strutil.c.o app/app@@test_strutil@exe/src_str_util.c.o | /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so
- LINK_ARGS = -Wl,--no-undefined -Wl,--as-needed -Wl,--start-group /usr/lib/x86_64-linux-gnu/libavformat.so /usr/lib/x86_64-linux-gnu/libavcodec.so /usr/lib/x86_64-linux-gnu/libavutil.so /usr/lib/x86_64-linux-gnu/libSDL2.so -Wl,--end-group
-
-build server/scrcpy-server.jar: CUSTOM_COMMAND ../server/. | /home/rom/projects/scrcpy/server/./scripts/build-wrapper.sh PHONY
- COMMAND = /home/rom/projects/scrcpy/server/./scripts/build-wrapper.sh ../server/. server/scrcpy-server.jar debug
- description = Generating$ scrcpy-server$ with$ a$ custom$ command.
-
-build meson-run: CUSTOM_COMMAND 
- COMMAND = /usr/bin/meson --internal commandrunner /home/rom/projects/scrcpy /home/rom/projects/scrcpy/u '' /usr/bin/meson scripts/run-scrcpy.sh
- description = Running$ external$ command$ run.
- pool = console
-
-build run: phony meson-run
-
-# Test rules
-
-build meson-test: CUSTOM_COMMAND all PHONY
- COMMAND = /usr/bin/meson test --no-rebuild --print-errorlogs
- DESC = Running$ all$ tests.
- pool = console
-
-build test: phony meson-test
-
-build meson-benchmark: CUSTOM_COMMAND all PHONY
- COMMAND = /usr/bin/meson test --benchmark --logbase benchmarklog --num-processes=1 --no-rebuild
- DESC = Running$ benchmark$ suite.
- pool = console
-
-build benchmark: phony meson-benchmark
-
-# Install rules
-
-build meson-install: CUSTOM_COMMAND PHONY | all
- DESC = Installing$ files.
- COMMAND = /usr/bin/meson install --no-rebuild
- pool = console
-
-build install: phony meson-install
-
-build meson-dist: CUSTOM_COMMAND PHONY
- DESC = Creating$ source$ packages
- COMMAND = /usr/bin/meson --internal dist /home/rom/projects/scrcpy /home/rom/projects/scrcpy/u /usr/bin/meson
- pool = console
-
-build dist: phony meson-dist
-
-# Suffix
-
-build meson-scan-build: CUSTOM_COMMAND PHONY
- COMMAND = /usr/bin/meson --internal scanbuild /home/rom/projects/scrcpy /home/rom/projects/scrcpy/u /usr/bin/meson -Dbuild_app=true -Dbuild_server=true -Dcrossbuild_windows=false -Dhidpi_support=true -Doverride_server_path= -Dprebuilt_server= -Dskip_frames=true -Dwindows_noconsole=false
- pool = console
-
-build scan-build: phony meson-scan-build
-
-build meson-uninstall: CUSTOM_COMMAND PHONY
- COMMAND = /usr/bin/meson --internal uninstall
- pool = console
-
-build uninstall: phony meson-uninstall
-
-build all: phony app/scrcpy app/test_control_event_queue app/test_control_event_serialize app/test_strutil server/scrcpy-server.jar
-
-default all
-
-build clean: phony meson-clean
-
-build meson-clean-ctlist: CUSTOM_COMMAND PHONY
- COMMAND = /usr/bin/meson --internal cleantrees /home/rom/projects/scrcpy/u/meson-private/cleantrees.dat
- description = Cleaning$ custom$ target$ directories.
-
-build clean-ctlist: phony meson-clean-ctlist
-
-build meson-clean: CUSTOM_COMMAND PHONY | clean-ctlist
- COMMAND = ninja -t clean
- description = Cleaning.
-
-build build.ninja: REGENERATE_BUILD ../meson.build ../app/meson.build ../server/meson.build meson-private/coredata.dat ../meson_options.txt
- pool = console
-
-build reconfigure: REGENERATE_BUILD PHONY
- pool = console
-
-build ../meson.build ../app/meson.build ../server/meson.build meson-private/coredata.dat ../meson_options.txt: phony 
-

u/compile_commands.json

@@ -1,137 +0,0 @@
-[
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_main.c.o' -MF 'app/app@@scrcpy@exe/src_main.c.o.d' -o 'app/app@@scrcpy@exe/src_main.c.o' -c ../app/src/main.c",
-    "file": "../app/src/main.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_command.c.o' -MF 'app/app@@scrcpy@exe/src_command.c.o.d' -o 'app/app@@scrcpy@exe/src_command.c.o' -c ../app/src/command.c",
-    "file": "../app/src/command.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_control_event.c.o' -MF 'app/app@@scrcpy@exe/src_control_event.c.o.d' -o 'app/app@@scrcpy@exe/src_control_event.c.o' -c ../app/src/control_event.c",
-    "file": "../app/src/control_event.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_controller.c.o' -MF 'app/app@@scrcpy@exe/src_controller.c.o.d' -o 'app/app@@scrcpy@exe/src_controller.c.o' -c ../app/src/controller.c",
-    "file": "../app/src/controller.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_convert.c.o' -MF 'app/app@@scrcpy@exe/src_convert.c.o.d' -o 'app/app@@scrcpy@exe/src_convert.c.o' -c ../app/src/convert.c",
-    "file": "../app/src/convert.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_decoder.c.o' -MF 'app/app@@scrcpy@exe/src_decoder.c.o.d' -o 'app/app@@scrcpy@exe/src_decoder.c.o' -c ../app/src/decoder.c",
-    "file": "../app/src/decoder.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_device.c.o' -MF 'app/app@@scrcpy@exe/src_device.c.o.d' -o 'app/app@@scrcpy@exe/src_device.c.o' -c ../app/src/device.c",
-    "file": "../app/src/device.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_file_handler.c.o' -MF 'app/app@@scrcpy@exe/src_file_handler.c.o.d' -o 'app/app@@scrcpy@exe/src_file_handler.c.o' -c ../app/src/file_handler.c",
-    "file": "../app/src/file_handler.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_fps_counter.c.o' -MF 'app/app@@scrcpy@exe/src_fps_counter.c.o.d' -o 'app/app@@scrcpy@exe/src_fps_counter.c.o' -c ../app/src/fps_counter.c",
-    "file": "../app/src/fps_counter.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_frames.c.o' -MF 'app/app@@scrcpy@exe/src_frames.c.o.d' -o 'app/app@@scrcpy@exe/src_frames.c.o' -c ../app/src/frames.c",
-    "file": "../app/src/frames.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_input_manager.c.o' -MF 'app/app@@scrcpy@exe/src_input_manager.c.o.d' -o 'app/app@@scrcpy@exe/src_input_manager.c.o' -c ../app/src/input_manager.c",
-    "file": "../app/src/input_manager.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_lock_util.c.o' -MF 'app/app@@scrcpy@exe/src_lock_util.c.o.d' -o 'app/app@@scrcpy@exe/src_lock_util.c.o' -c ../app/src/lock_util.c",
-    "file": "../app/src/lock_util.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_net.c.o' -MF 'app/app@@scrcpy@exe/src_net.c.o.d' -o 'app/app@@scrcpy@exe/src_net.c.o' -c ../app/src/net.c",
-    "file": "../app/src/net.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_recorder.c.o' -MF 'app/app@@scrcpy@exe/src_recorder.c.o.d' -o 'app/app@@scrcpy@exe/src_recorder.c.o' -c ../app/src/recorder.c",
-    "file": "../app/src/recorder.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_scrcpy.c.o' -MF 'app/app@@scrcpy@exe/src_scrcpy.c.o.d' -o 'app/app@@scrcpy@exe/src_scrcpy.c.o' -c ../app/src/scrcpy.c",
-    "file": "../app/src/scrcpy.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_screen.c.o' -MF 'app/app@@scrcpy@exe/src_screen.c.o.d' -o 'app/app@@scrcpy@exe/src_screen.c.o' -c ../app/src/screen.c",
-    "file": "../app/src/screen.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_server.c.o' -MF 'app/app@@scrcpy@exe/src_server.c.o.d' -o 'app/app@@scrcpy@exe/src_server.c.o' -c ../app/src/server.c",
-    "file": "../app/src/server.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_str_util.c.o' -MF 'app/app@@scrcpy@exe/src_str_util.c.o.d' -o 'app/app@@scrcpy@exe/src_str_util.c.o' -c ../app/src/str_util.c",
-    "file": "../app/src/str_util.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_tiny_xpm.c.o' -MF 'app/app@@scrcpy@exe/src_tiny_xpm.c.o.d' -o 'app/app@@scrcpy@exe/src_tiny_xpm.c.o' -c ../app/src/tiny_xpm.c",
-    "file": "../app/src/tiny_xpm.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_sys_unix_command.c.o' -MF 'app/app@@scrcpy@exe/src_sys_unix_command.c.o.d' -o 'app/app@@scrcpy@exe/src_sys_unix_command.c.o' -c ../app/src/sys/unix/command.c",
-    "file": "../app/src/sys/unix/command.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@scrcpy@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@scrcpy@exe/src_sys_unix_net.c.o' -MF 'app/app@@scrcpy@exe/src_sys_unix_net.c.o.d' -o 'app/app@@scrcpy@exe/src_sys_unix_net.c.o' -c ../app/src/sys/unix/net.c",
-    "file": "../app/src/sys/unix/net.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@test_control_event_queue@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o' -MF 'app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o.d' -o 'app/app@@test_control_event_queue@exe/tests_test_control_event_queue.c.o' -c ../app/tests/test_control_event_queue.c",
-    "file": "../app/tests/test_control_event_queue.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@test_control_event_queue@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@test_control_event_queue@exe/src_control_event.c.o' -MF 'app/app@@test_control_event_queue@exe/src_control_event.c.o.d' -o 'app/app@@test_control_event_queue@exe/src_control_event.c.o' -c ../app/src/control_event.c",
-    "file": "../app/src/control_event.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@test_control_event_serialize@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o' -MF 'app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o.d' -o 'app/app@@test_control_event_serialize@exe/tests_test_control_event_serialize.c.o' -c ../app/tests/test_control_event_serialize.c",
-    "file": "../app/tests/test_control_event_serialize.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@test_control_event_serialize@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@test_control_event_serialize@exe/src_control_event.c.o' -MF 'app/app@@test_control_event_serialize@exe/src_control_event.c.o.d' -o 'app/app@@test_control_event_serialize@exe/src_control_event.c.o' -c ../app/src/control_event.c",
-    "file": "../app/src/control_event.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@test_strutil@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@test_strutil@exe/tests_test_strutil.c.o' -MF 'app/app@@test_strutil@exe/tests_test_strutil.c.o.d' -o 'app/app@@test_strutil@exe/tests_test_strutil.c.o' -c ../app/tests/test_strutil.c",
-    "file": "../app/tests/test_strutil.c"
-  },
-  {
-    "directory": "/home/rom/projects/scrcpy/u",
-    "command": "ccache cc -Iapp/app@@test_strutil@exe -Iapp -I../app -I../app/src -I/usr/include/x86_64-linux-gnu -I/usr/include/SDL2 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 -g -D_REENTRANT  -MD -MQ 'app/app@@test_strutil@exe/src_str_util.c.o' -MF 'app/app@@test_strutil@exe/src_str_util.c.o.d' -o 'app/app@@test_strutil@exe/src_str_util.c.o' -c ../app/src/str_util.c",
-    "file": "../app/src/str_util.c"
-  }
-]

u/meson-logs/meson-log.txt

@@ -1,38 +0,0 @@
-Build started at 2018-11-12T14:04:31.900569
-Main binary: /usr/bin/python3
-Python system: Linux
-The Meson build system
-Version: 0.48.1
-Source dir: /home/rom/projects/scrcpy
-Build dir: /home/rom/projects/scrcpy/u
-Build type: native build
-Project name: scrcpy
-Project version: 1.6
-Native C compiler: ccache cc (gcc 8.2.0 "cc (Debian 8.2.0-9) 8.2.0")
-Build machine cpu family: x86_64
-Build machine cpu: x86_64
-Dependency libavformat found: YES (cached)
-Dependency libavcodec found: YES (cached)
-Dependency libavutil found: YES (cached)
-Dependency sdl2 found: YES (cached)
-Configuring config.h using configuration
-Adding test "test_control_event_queue"
-Adding test "test_control_event_serialize"
-Adding test "test_strutil"
-Program ./scripts/build-wrapper.sh found: YES (/home/rom/projects/scrcpy/server/./scripts/build-wrapper.sh)
-DEPRECATION: build_always is deprecated. Combine build_by_default and build_always_stale instead.
-Build targets in project: 6
-Found ninja-1.8.2 at /usr/bin/ninja
-Running compile:
-Working directory:  /tmp/tmpk1bh9k5g
-Command line:  ccache cc /tmp/tmpk1bh9k5g/testfile.c -pipe -D_FILE_OFFSET_BITS=64 -c -o /tmp/tmpk1bh9k5g/output.obj -O0 --print-search-dirs 
-
-Code:
- 
-Compiler stdout:
- install: /usr/lib/gcc/x86_64-linux-gnu/8/
-programs: =/usr/lib/gcc/x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/bin/x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/bin/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/bin/
-libraries: =/usr/lib/gcc/x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/lib/x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/lib/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../x86_64-linux-gnu/8/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../lib/:/lib/x86_64-linux-gnu/8/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/8/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../../x86_64-linux-gnu/lib/:/usr/lib/gcc/x86_64-linux-gnu/8/../../../:/lib/:/usr/lib/
-
-Compiler stderr:
- 

u/meson-private/sanitycheckc.c

@@ -1 +0,0 @@
-int main(int argc, char **argv) { int class=0; return class; }