Camera WIP hardcode to make it work

Add camera support WIP
Add --list-cameras
2023-10-10 21:15:43 +02:00 · 2023-10-10 21:15:28 +02:00 · 2023-08-27 19:02:53 +02:00 · 2023-08-27 19:02:53 +02:00
37 changed files with 129 additions and 750 deletions
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -10,13 +10,10 @@ _scrcpy() {
        --audio-source=
        --audio-output-buffer=
        -b --video-bit-rate=
-        --camera-id=
-        --camera-facing=
-        --camera-size=
        --crop=
        -d --select-usb
        --disable-screensaver
-        --display-id=
+        --display=
        --display-buffer=
        -e --select-tcpip
        -f --fullscreen
@@ -26,7 +23,6 @@ _scrcpy() {
        --kill-adb-on-close
        -K --hid-keyboard
        --legacy-paste
-        --list-camera-sizes
        --list-cameras
        --list-displays
        --list-encoders
@@ -49,8 +45,6 @@ _scrcpy() {
        --no-video-playback
        --otg
        -p --port=
-        --pause-on-exit
-        --pause-on-exit=
        --power-off-on-close
        --prefer-text
        --print-fps
@@ -77,7 +71,6 @@ _scrcpy() {
        --video-codec=
        --video-codec-options=
        --video-encoder=
-        --video-source=
        -w --stay-awake
        --window-borderless
        --window-title=
@@ -97,26 +90,14 @@ _scrcpy() {
            COMPREPLY=($(compgen -W 'opus aac raw' -- "$cur"))
            return
            ;;
-        --video-source)
-            COMPREPLY=($(compgen -W 'display camera' -- "$cur"))
-            return
-            ;;
        --audio-source)
            COMPREPLY=($(compgen -W 'output mic' -- "$cur"))
            return
            ;;
-        --camera-facing)
-            COMPREPLY=($(compgen -W 'front back external' -- "$cur"))
-            return
-            ;;
        --lock-video-orientation)
            COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
            return
            ;;
-        --pause-on-exit)
-            COMPREPLY=($(compgen -W 'true false if-error' -- "$cur"))
-            return
-            ;;
        -r|--record)
            COMPREPLY=($(compgen -f -- "$cur"))
            return
@@ -153,10 +134,8 @@ _scrcpy() {
        |--audio-codec-options \
        |--audio-encoder \
        |--audio-output-buffer \
-        |--camera-id \
-        |--camera-size \
        |--crop \
-        |--display-id \
+        |--display \
        |--display-buffer \
        |--max-fps \
        |-m|--max-size \
--- a/app/data/scrcpy-console.bat
+++ b/app/data/scrcpy-console.bat
@@ -1,2 +1,4 @@
@echo off
-scrcpy.exe --pause-on-exit=if-error %*
+scrcpy.exe %*
+:: if the exit code is >= 1, then pause
+if errorlevel 1 pause
--- a/app/data/scrcpy-console.desktop
+++ b/app/data/scrcpy-console.desktop
@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy --pause-on-exit=if-error"
+Exec=/bin/bash --norc --noprofile -i -c "\"\\$SHELL\" -i -c scrcpy || read -p 'Press Enter to quit...'"
 Icon=scrcpy
 Terminal=true
 Type=Application
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -17,13 +17,10 @@ arguments=(
    '--audio-source=[Select the audio source]:source:(output mic)'
    '--audio-output-buffer=[Configure the size of the SDL audio output buffer (in milliseconds)]'
    {-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
-    '--camera-id=[Specify the camera id to mirror]'
-    '--camera-facing=[Select the device camera by its facing direction]:facing:(front back external)'
-    '--camera-size=[Specify an explicit camera capture size]'
    '--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-id=[Specify the display id to mirror]'
+    '--display=[Specify the display id to mirror]'
    '--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
    {-e,--select-tcpip}'[Use TCP/IP device]'
    {-f,--fullscreen}'[Start in fullscreen]'
@@ -33,7 +30,6 @@ arguments=(
    '--kill-adb-on-close[Kill adb when scrcpy terminates]'
    {-K,--hid-keyboard}'[Simulate a physical keyboard by using HID over AOAv2]'
    '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
-    '--list-camera-sizes[List the valid camera capture sizes]'
    '--list-cameras[List cameras available on the device]'
    '--list-displays[List displays available on the device]'
    '--list-encoders[List video and audio encoders available on the device]'
@@ -55,7 +51,6 @@ arguments=(
    '--no-video-playback[Disable video playback]'
    '--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
    {-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
-    '--pause-on-exit=[Make scrcpy pause before exiting]:mode:(true false if-error)'
    '--power-off-on-close[Turn the device screen off when closing scrcpy]'
    '--prefer-text[Inject alpha characters and space as text events instead of key events]'
    '--print-fps[Start FPS counter, to print frame logs to the console]'
@@ -81,7 +76,6 @@ arguments=(
    '--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]'
-    '--video-source=[Select the video source]:source:(display camera)'
    {-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]'
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -75,22 +75,6 @@ Encode the video at the given bit rate, expressed in bits/s. Unit suffixes are s

 Default is 8M (8000000).

-.TP
-.BI "\-\-camera\-id " id
-Specify the device camera id to mirror.
-
-The available camera ids can be listed by \-\-list\-cameras.
-
-.TP
-.BI "\-\-camera\-facing " facing
-Select the device camera by its facing direction.
-
-Possible values are "front", "back" and "external".
-
-.TP
-.BI "\-\-camera\-size " width\fRx\fIheight
-Specify an explicit camera capture size.
-
 .TP
 .BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.
@@ -110,7 +94,7 @@ Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).
 Disable screensaver while scrcpy is running.

 .TP
-.BI "\-\-display\-id " id
+.BI "\-\-display " id
 Specify the device display id to mirror.

 The available display ids can be listed by \-\-list\-displays.
@@ -171,9 +155,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.

-.B \-\-list\-camera\-sizes
-List the valid camera capture sizes.
-
 .B \-\-list\-cameras
 List cameras available on the device.

@@ -289,16 +270,6 @@ Set the TCP port (range) used by the client to listen.

 Default is 27183:27199.

-.TP
-\fB\-\-pause\-on\-exit\fR[=\fImode\fR]
-Configure pause on exit. Possible values are "true" (always pause on exit), "false" (never pause on exit) and "if-error" (pause only if an error occured).
-
-This is useful to prevent the terminal window from automatically closing, so that error messages can be read.
-
-Default is "false".
-
-Passing the option without argument is equivalent to passing "true".
-
 .TP
 .B \-\-power\-off\-on\-close
 Turn the device screen off when closing scrcpy.
@@ -448,12 +419,6 @@ Use a specific MediaCodec video encoder (depending on the codec provided by \fB\

 The available encoders can be listed by \-\-list\-encoders.

-.TP
-.BI "\-\-video\-source " source
-Select the video source (display or camera).
-
-Default is display.
-
 .TP
 .B \-w, \-\-stay-awake
 Keep the device on while scrcpy is running, when the device is plugged in.
--- a/app/src/adb/adb.c
+++ b/app/src/adb/adb.c
@@ -70,7 +70,7 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
 }

 static void
-show_adb_installation_msg(void) {
+show_adb_installation_msg() {
 #ifndef __WINDOWS__
    static const struct {
        const char *binary;
@@ -218,16 +218,8 @@ sc_adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
               const char *device_socket_name, unsigned flags) {
    char local[4 + 5 + 1]; // tcp:PORT
    char remote[108 + 14 + 1]; // localabstract:NAME
-
-    int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
-    assert(r >= 0 && (size_t) r < sizeof(local));
-
-    r = snprintf(remote, sizeof(remote), "localabstract:%s",
-                 device_socket_name);
-    if (r < 0 || (size_t) r >= sizeof(remote)) {
-        LOGE("Could not write socket name");
-        return false;
-    }
+    sprintf(local, "tcp:%" PRIu16, local_port);
+    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);

    assert(serial);
    const char *const argv[] =
@@ -241,9 +233,7 @@ bool
 sc_adb_forward_remove(struct sc_intr *intr, const char *serial,
                      uint16_t local_port, unsigned flags) {
    char local[4 + 5 + 1]; // tcp:PORT
-    int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
-    assert(r >= 0 && (size_t) r < sizeof(local));
-    (void) r;
+    sprintf(local, "tcp:%" PRIu16, local_port);

    assert(serial);
    const char *const argv[] =
@@ -259,16 +249,8 @@ sc_adb_reverse(struct sc_intr *intr, const char *serial,
               unsigned flags) {
    char local[4 + 5 + 1]; // tcp:PORT
    char remote[108 + 14 + 1]; // localabstract:NAME
-    int r = snprintf(local, sizeof(local), "tcp:%" PRIu16, local_port);
-    assert(r >= 0 && (size_t) r < sizeof(local));
-
-    r = snprintf(remote, sizeof(remote), "localabstract:%s",
-                 device_socket_name);
-    if (r < 0 || (size_t) r >= sizeof(remote)) {
-        LOGE("Could not write socket name");
-        return false;
-    }
-
+    sprintf(local, "tcp:%" PRIu16, local_port);
+    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
    assert(serial);
    const char *const argv[] =
        SC_ADB_COMMAND("-s", serial, "reverse", remote, local);
@@ -281,12 +263,7 @@ bool
 sc_adb_reverse_remove(struct sc_intr *intr, const char *serial,
                      const char *device_socket_name, unsigned flags) {
    char remote[108 + 14 + 1]; // localabstract:NAME
-    int r = snprintf(remote, sizeof(remote), "localabstract:%s",
-                     device_socket_name);
-    if (r < 0 || (size_t) r >= sizeof(remote)) {
-        LOGE("Device socket name too long");
-        return false;
-    }
+    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);

    assert(serial);
    const char *const argv[] =
@@ -356,9 +333,7 @@ bool
 sc_adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
             unsigned flags) {
    char port_string[5 + 1];
-    int r = snprintf(port_string, sizeof(port_string), "%" PRIu16, port);
-    assert(r >= 0 && (size_t) r < sizeof(port_string));
-    (void) r;
+    sprintf(port_string, "%" PRIu16, port);

    assert(serial);
    const char *const argv[] =
--- a/app/src/adb/adb_parser.c
+++ b/app/src/adb/adb_parser.c
@@ -7,7 +7,7 @@
 #include "util/log.h"
 #include "util/str.h"

-static bool
+bool
 sc_adb_parse_device(char *line, struct sc_adb_device *device) {
    // One device line looks like:
    // "0123456789abcdef	device usb:2-1 product:MyProduct model:MyModel "
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -32,7 +32,6 @@ enum {
    OPT_WINDOW_BORDERLESS,
    OPT_MAX_FPS,
    OPT_LOCK_VIDEO_ORIENTATION,
-    OPT_DISPLAY,
    OPT_DISPLAY_ID,
    OPT_ROTATION,
    OPT_RENDER_DRIVER,
@@ -77,16 +76,10 @@ enum {
    OPT_NO_VIDEO,
    OPT_NO_AUDIO_PLAYBACK,
    OPT_NO_VIDEO_PLAYBACK,
-    OPT_VIDEO_SOURCE,
    OPT_AUDIO_SOURCE,
    OPT_KILL_ADB_ON_CLOSE,
    OPT_TIME_LIMIT,
-    OPT_PAUSE_ON_EXIT,
    OPT_LIST_CAMERAS,
-    OPT_LIST_CAMERA_SIZES,
-    OPT_CAMERA_ID,
-    OPT_CAMERA_SIZE,
-    OPT_CAMERA_FACING,
 };

 struct sc_option {
@@ -203,27 +196,6 @@ static const struct sc_option options[] = {
        .longopt = "bit-rate",
        .argdesc = "value",
    },
-    {
-        .longopt_id = OPT_CAMERA_ID,
-        .longopt = "camera-id",
-        .argdesc = "id",
-        .text = "Specify the device camera id to mirror.\n"
-                "The available camera ids can be listed by:\n"
-                "    scrcpy --list-cameras",
-    },
-    {
-        .longopt_id = OPT_CAMERA_FACING,
-        .longopt = "camera-facing",
-        .argdesc = "facing",
-        .text = "Select the device camera by its facing direction.\n"
-                "Possible values are \"front\", \"back\" and \"external\".",
-    },
-    {
-        .longopt_id = OPT_CAMERA_SIZE,
-        .longopt = "camera-size",
-        .argdesc = "<width>x<height>",
-        .text = "Specify an explicit camera capture size.",
-    },
    {
        // Not really deprecated (--codec has never been released), but without
        // declaring an explicit --codec option, getopt_long() partial matching
@@ -259,15 +231,9 @@ static const struct sc_option options[] = {
        .longopt = "disable-screensaver",
        .text = "Disable screensaver while scrcpy is running.",
    },
-    {
-        // deprecated
-        .longopt_id = OPT_DISPLAY,
-        .longopt = "display",
-        .argdesc = "id",
-    },
    {
        .longopt_id = OPT_DISPLAY_ID,
-        .longopt = "display-id",
+        .longopt = "display",
        .argdesc = "id",
        .text = "Specify the device display id to mirror.\n"
                "The available display ids can be listed by:\n"
@@ -352,11 +318,6 @@ static const struct sc_option options[] = {
        .longopt = "list-cameras",
        .text = "List device cameras.",
    },
-    {
-        .longopt_id = OPT_LIST_CAMERA_SIZES,
-        .longopt = "list-camera-sizes",
-        .text = "List the valid camera capture sizes.",
-    },
    {
        .longopt_id = OPT_LIST_DISPLAYS,
        .longopt = "list-displays",
@@ -508,20 +469,6 @@ static const struct sc_option options[] = {
                "Default is " STR(DEFAULT_LOCAL_PORT_RANGE_FIRST) ":"
                              STR(DEFAULT_LOCAL_PORT_RANGE_LAST) ".",
    },
-    {
-        .longopt_id = OPT_PAUSE_ON_EXIT,
-        .longopt = "pause-on-exit",
-        .argdesc = "mode",
-        .optional_arg = true,
-        .text = "Configure pause on exit. Possible values are \"true\" (always "
-                "pause on exit), \"false\" (never pause on exit) and "
-                "\"if-error\" (pause only if an error occured).\n"
-                "This is useful to prevent the terminal window from "
-                "automatically closing, so that error messages can be read.\n"
-                "Default is \"false\".\n"
-                "Passing the option without argument is equivalent to passing "
-                "\"true\".",
-    },
    {
        .longopt_id = OPT_POWER_OFF_ON_CLOSE,
        .longopt = "power-off-on-close",
@@ -728,13 +675,6 @@ static const struct sc_option options[] = {
                "codec provided by --video-codec).\n"
                "The available encoders can be listed by --list-encoders.",
    },
-    {
-        .longopt_id = OPT_VIDEO_SOURCE,
-        .longopt = "video-source",
-        .argdesc = "source",
-        .text = "Select the video source (display or camera).\n"
-                "Default is display.",
-    },
    {
        .shortopt = 'w',
        .longopt = "stay-awake",
@@ -1136,7 +1076,7 @@ print_shortcut(const struct sc_shortcut *shortcut, unsigned cols) {
    while (shortcut->shortcuts[i]) {
        printf("    %s\n", shortcut->shortcuts[i]);
        ++i;
-    }
+    };

    char *text = sc_str_wrap_lines(shortcut->text, cols, 8);
    if (!text) {
@@ -1255,9 +1195,9 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
 }

 static size_t
-parse_integers_arg(const char *s, const char sep, size_t max_items, long *out,
-                   long min, long max, const char *name) {
-    size_t count = sc_str_parse_integers(s, sep, max_items, out);
+parse_integers_arg(const char *s, size_t max_items, long *out, long min,
+                   long max, const char *name) {
+    size_t count = sc_str_parse_integers(s, ':', max_items, out);
    if (!count) {
        LOGE("Could not parse %s: %s", name, s);
        return 0;
@@ -1413,7 +1353,7 @@ parse_window_dimension(const char *s, uint16_t *dimension) {
 static bool
 parse_port_range(const char *s, struct sc_port_range *port_range) {
    long values[2];
-    size_t count = parse_integers_arg(s, ':', 2, values, 0, 0xFFFF, "port");
+    size_t count = parse_integers_arg(s, 2, values, 0, 0xFFFF, "port");
    if (!count) {
        return false;
    }
@@ -1675,22 +1615,6 @@ parse_audio_codec(const char *optarg, enum sc_codec *codec) {
    return false;
 }

-static bool
-parse_video_source(const char *optarg, enum sc_video_source *source) {
-    if (!strcmp(optarg, "display")) {
-        *source = SC_VIDEO_SOURCE_DISPLAY;
-        return true;
-    }
-
-    if (!strcmp(optarg, "camera")) {
-        *source = SC_VIDEO_SOURCE_CAMERA;
-        return true;
-    }
-
-    LOGE("Unsupported video source: %s (expected display or camera)", optarg);
-    return false;
-}
-
 static bool
 parse_audio_source(const char *optarg, enum sc_audio_source *source) {
    if (!strcmp(optarg, "mic")) {
@@ -1707,34 +1631,6 @@ parse_audio_source(const char *optarg, enum sc_audio_source *source) {
    return false;
 }

-static bool
-parse_camera_facing(const char *optarg, enum sc_camera_facing *facing) {
-    if (!strcmp(optarg, "front")) {
-        *facing = SC_CAMERA_FACING_FRONT;
-        return true;
-    }
-
-    if (!strcmp(optarg, "back")) {
-        *facing = SC_CAMERA_FACING_BACK;
-        return true;
-    }
-
-    if (!strcmp(optarg, "external")) {
-        *facing = SC_CAMERA_FACING_EXTERNAL;
-        return true;
-    }
-
-    if (*optarg == '\0') {
-        // Empty string is a valid value (equivalent to not passing the option)
-        *facing = SC_CAMERA_FACING_ANY;
-        return true;
-    }
-
-    LOGE("Unsupported camera facing: %s (expected front, back or external)",
-         optarg);
-    return false;
-}
-
 static bool
 parse_time_limit(const char *s, sc_tick *tick) {
    long value;
@@ -1747,29 +1643,6 @@ parse_time_limit(const char *s, sc_tick *tick) {
    return true;
 }

-static bool
-parse_pause_on_exit(const char *s, enum sc_pause_on_exit *pause_on_exit) {
-    if (!s || !strcmp(s, "true")) {
-        *pause_on_exit = SC_PAUSE_ON_EXIT_TRUE;
-        return true;
-    }
-
-    if (!strcmp(s, "false")) {
-        *pause_on_exit = SC_PAUSE_ON_EXIT_FALSE;
-        return true;
-    }
-
-    if (!strcmp(s, "if-error")) {
-        *pause_on_exit = SC_PAUSE_ON_EXIT_IF_ERROR;
-        return true;
-    }
-
-    LOGE("Unsupported pause on exit mode: %s "
-         "(expected true, false or if-error)", optarg);
-    return false;
-
-}
-
 static bool
 parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                       const char *optstring, const struct option *longopts) {
@@ -1797,9 +1670,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_CROP:
                opts->crop = optarg;
                break;
-            case OPT_DISPLAY:
-                LOGW("--display is deprecated, use --display-id instead.");
-                // fall through
            case OPT_DISPLAY_ID:
                if (!parse_display_id(optarg, &opts->display_id)) {
                    return false;
@@ -2080,17 +1950,14 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                     "platform).");
                return false;
 #endif
+            case OPT_LIST_CAMERAS:
+                opts->list_cameras = true;
+                break;
            case OPT_LIST_ENCODERS:
-                opts->list |= SC_OPTION_LIST_ENCODERS;
+                opts->list_encoders = true;
                break;
            case OPT_LIST_DISPLAYS:
-                opts->list |= SC_OPTION_LIST_DISPLAYS;
-                break;
-            case OPT_LIST_CAMERAS:
-                opts->list |= SC_OPTION_LIST_CAMERAS;
-                break;
-            case OPT_LIST_CAMERA_SIZES:
-                opts->list |= SC_OPTION_LIST_CAMERA_SIZES;
+                opts->list_displays = true;
                break;
            case OPT_REQUIRE_AUDIO:
                opts->require_audio = true;
@@ -2106,11 +1973,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case OPT_VIDEO_SOURCE:
-                if (!parse_video_source(optarg, &opts->video_source)) {
-                    return false;
-                }
-                break;
            case OPT_AUDIO_SOURCE:
                if (!parse_audio_source(optarg, &opts->audio_source)) {
                    return false;
@@ -2124,22 +1986,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case OPT_PAUSE_ON_EXIT:
-                if (!parse_pause_on_exit(optarg, &args->pause_on_exit)) {
-                    return false;
-                }
-                break;
-            case OPT_CAMERA_ID:
-                opts->camera_id = optarg;
-                break;
-            case OPT_CAMERA_SIZE:
-                opts->camera_size = optarg;
-                break;
-            case OPT_CAMERA_FACING:
-                if (!parse_camera_facing(optarg, &opts->camera_facing)) {
-                    return false;
-                }
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -2233,34 +2079,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        opts->force_adb_forward = true;
    }

-    if (opts->video_source == SC_VIDEO_SOURCE_CAMERA) {
-        if (opts->lock_video_orientation !=
-                SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
-            LOGE("--lock-video-orientation is not supported for camera");
-            return false;
-        }
-
-        if (!opts->camera_size) {
-            LOGE("Camera size must be specified by --camera-size=WIDTHxHEIGHT");
-            return false;
-        }
-
-        if (opts->control) {
-            LOGI("Camera video source: control disabled");
-            opts->control = false;
-        }
-    }
-
-    if (opts->audio && opts->audio_source == SC_AUDIO_SOURCE_AUTO) {
-        // Select the audio source according to the video source
-        if (opts->video_source == SC_VIDEO_SOURCE_DISPLAY) {
-            opts->audio_source = SC_AUDIO_SOURCE_OUTPUT;
-        } else {
-            opts->audio_source = SC_AUDIO_SOURCE_MIC;
-            LOGI("Camera video source: microphone audio source selected");
-        }
-    }
-
    if (opts->record_format && !opts->record_filename) {
        LOGE("Record format specified without recording");
        return false;
@@ -2381,37 +2199,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    return true;
 }

-static enum sc_pause_on_exit
-sc_get_pause_on_exit(int argc, char *argv[]) {
-    // Read arguments backwards so that the last --pause-on-exit is considered
-    // (same behavior as getopt())
-    for (int i = argc - 1; i >= 1; --i) {
-        const char *arg = argv[i];
-        // Starts with "--pause-on-exit"
-        if (!strncmp("--pause-on-exit", arg, 15)) {
-            if (arg[15] == '\0') {
-                // No argument
-                return SC_PAUSE_ON_EXIT_TRUE;
-            }
-            if (arg[15] != '=') {
-                // Invalid parameter, ignore
-                return SC_PAUSE_ON_EXIT_FALSE;
-            }
-            const char *value = &arg[16];
-            if (!strcmp(value, "true")) {
-                return SC_PAUSE_ON_EXIT_TRUE;
-            }
-            if (!strcmp(value, "if-error")) {
-                return SC_PAUSE_ON_EXIT_IF_ERROR;
-            }
-            // Set to false, inclusing when the value is invalid
-            return SC_PAUSE_ON_EXIT_FALSE;
-        }
-    }
-
-    return SC_PAUSE_ON_EXIT_FALSE;
-}
-
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
    struct sc_getopt_adapter adapter;
@@ -2425,11 +2212,5 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {

    sc_getopt_adapter_destroy(&adapter);

-    if (!ret && args->pause_on_exit == SC_PAUSE_ON_EXIT_FALSE) {
-        // Check if "--pause-on-exit" is present in the arguments list, because
-        // it must be taken into account even if command line parsing failed
-        args->pause_on_exit = sc_get_pause_on_exit(argc, argv);
-    }
-
    return ret;
 }
--- a/app/src/cli.h
+++ b/app/src/cli.h
@@ -7,17 +7,10 @@

 #include "options.h"

-enum sc_pause_on_exit {
-    SC_PAUSE_ON_EXIT_TRUE,
-    SC_PAUSE_ON_EXIT_FALSE,
-    SC_PAUSE_ON_EXIT_IF_ERROR,
-};
-
 struct scrcpy_cli_args {
    struct scrcpy_options opts;
    bool help;
    bool version;
-    enum sc_pause_on_exit pause_on_exit;
 };

 void
--- a/app/src/icon.c
+++ b/app/src/icon.c
@@ -271,7 +271,7 @@ error:
 }

 SDL_Surface *
-scrcpy_icon_load(void) {
+scrcpy_icon_load() {
    char *icon_path = get_icon_path();
    if (!icon_path) {
        return NULL;
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -23,7 +23,7 @@
 #include "util/str.h"
 #endif

-static int
+int
 main_scrcpy(int argc, char *argv[]) {
 #ifdef _WIN32
    // disable buffering, we want logs immediately
@@ -39,32 +39,26 @@ main_scrcpy(int argc, char *argv[]) {
        .opts = scrcpy_options_default,
        .help = false,
        .version = false,
-        .pause_on_exit = SC_PAUSE_ON_EXIT_FALSE,
    };

 #ifndef NDEBUG
    args.opts.log_level = SC_LOG_LEVEL_DEBUG;
 #endif

-    enum scrcpy_exit_code ret;
-
    if (!scrcpy_parse_args(&args, argc, argv)) {
-        ret = SCRCPY_EXIT_FAILURE;
-        goto end;
+        return SCRCPY_EXIT_FAILURE;
    }

    sc_set_log_level(args.opts.log_level);

    if (args.help) {
        scrcpy_print_usage(argv[0]);
-        ret = SCRCPY_EXIT_SUCCESS;
-        goto end;
+        return SCRCPY_EXIT_SUCCESS;
    }

    if (args.version) {
        scrcpy_print_version();
-        ret = SCRCPY_EXIT_SUCCESS;
-        goto end;
+        return SCRCPY_EXIT_SUCCESS;
    }

 #ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
@@ -78,26 +72,18 @@ main_scrcpy(int argc, char *argv[]) {
 #endif

    if (!net_init()) {
-        ret = SCRCPY_EXIT_FAILURE;
-        goto end;
+        return SCRCPY_EXIT_FAILURE;
    }

    sc_log_configure();

 #ifdef HAVE_USB
-    ret = args.opts.otg ? scrcpy_otg(&args.opts) : scrcpy(&args.opts);
+    enum scrcpy_exit_code ret = args.opts.otg ? scrcpy_otg(&args.opts)
+                                              : scrcpy(&args.opts);
 #else
-    ret = scrcpy(&args.opts);
+    enum scrcpy_exit_code ret = scrcpy(&args.opts);
 #endif

-end:
-    if (args.pause_on_exit == SC_PAUSE_ON_EXIT_TRUE ||
-            (args.pause_on_exit == SC_PAUSE_ON_EXIT_IF_ERROR &&
-                ret != SCRCPY_EXIT_SUCCESS)) {
-        printf("Press Enter to continue...\n");
-        getchar();
-    }
-
    return ret;
 }

--- a/app/src/options.c
+++ b/app/src/options.c
@@ -11,17 +11,13 @@ const struct scrcpy_options scrcpy_options_default = {
    .audio_codec_options = NULL,
    .video_encoder = NULL,
    .audio_encoder = NULL,
-    .camera_id = NULL,
-    .camera_size = NULL,
    .log_level = SC_LOG_LEVEL_INFO,
    .video_codec = SC_CODEC_H264,
    .audio_codec = SC_CODEC_OPUS,
-    .video_source = SC_VIDEO_SOURCE_DISPLAY,
-    .audio_source = SC_AUDIO_SOURCE_AUTO,
+    .audio_source = SC_AUDIO_SOURCE_OUTPUT,
    .record_format = SC_RECORD_FORMAT_AUTO,
    .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT,
    .mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,
-    .camera_facing = SC_CAMERA_FACING_ANY,
    .port_range = {
        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
        .last = DEFAULT_LOCAL_PORT_RANGE_LAST,
@@ -83,6 +79,8 @@ const struct scrcpy_options scrcpy_options_default = {
    .video = true,
    .audio = true,
    .require_audio = false,
+    .list_encoders = false,
+    .list_displays = false,
+    .list_cameras = false,
    .kill_adb_on_close = false,
-    .list = 0,
 };
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -44,24 +44,11 @@ enum sc_codec {
    SC_CODEC_RAW,
 };

-enum sc_video_source {
-    SC_VIDEO_SOURCE_DISPLAY,
-    SC_VIDEO_SOURCE_CAMERA,
-};
-
 enum sc_audio_source {
-    SC_AUDIO_SOURCE_AUTO, // OUTPUT for video DISPLAY, MIC for video CAMERA
    SC_AUDIO_SOURCE_OUTPUT,
    SC_AUDIO_SOURCE_MIC,
 };

-enum sc_camera_facing {
-    SC_CAMERA_FACING_ANY,
-    SC_CAMERA_FACING_FRONT,
-    SC_CAMERA_FACING_BACK,
-    SC_CAMERA_FACING_EXTERNAL,
-};
-
 enum sc_lock_video_orientation {
    SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
    // lock the current orientation when scrcpy starts
@@ -130,17 +117,13 @@ struct scrcpy_options {
    const char *audio_codec_options;
    const char *video_encoder;
    const char *audio_encoder;
-    const char *camera_id;
-    const char *camera_size;
    enum sc_log_level log_level;
    enum sc_codec video_codec;
    enum sc_codec audio_codec;
-    enum sc_video_source video_source;
    enum sc_audio_source audio_source;
    enum sc_record_format record_format;
    enum sc_keyboard_input_mode keyboard_input_mode;
    enum sc_mouse_input_mode mouse_input_mode;
-    enum sc_camera_facing camera_facing;
    struct sc_port_range port_range;
    uint32_t tunnel_host;
    uint16_t tunnel_port;
@@ -196,12 +179,10 @@ struct scrcpy_options {
    bool video;
    bool audio;
    bool require_audio;
+    bool list_encoders;
+    bool list_displays;
+    bool list_cameras;
    bool kill_adb_on_close;
-#define SC_OPTION_LIST_ENCODERS 0x1
-#define SC_OPTION_LIST_DISPLAYS 0x2
-#define SC_OPTION_LIST_CAMERAS 0x4
-#define SC_OPTION_LIST_CAMERA_SIZES 0x8
-    uint8_t list;
 };

 extern const struct scrcpy_options scrcpy_options_default;
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -90,7 +90,7 @@ push_event(uint32_t type, const char *name) {
 #define PUSH_EVENT(TYPE) push_event(TYPE, # TYPE)

 #ifdef _WIN32
-static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
+BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
    if (ctrl_type == CTRL_C_EVENT) {
        PUSH_EVENT(SDL_QUIT);
        return TRUE;
@@ -297,7 +297,7 @@ sc_timeout_on_timeout(struct sc_timeout *timeout, void *userdata) {

 // Generate a scrcpy id to differentiate multiple running scrcpy instances
 static uint32_t
-scrcpy_generate_scid(void) {
+scrcpy_generate_scid() {
    struct sc_rand rand;
    sc_rand_init(&rand);
    // Only use 31 bits to avoid issues with signed values on the Java-side
@@ -351,9 +351,7 @@ scrcpy(struct scrcpy_options *options) {
        .log_level = options->log_level,
        .video_codec = options->video_codec,
        .audio_codec = options->audio_codec,
-        .video_source = options->video_source,
        .audio_source = options->audio_source,
-        .camera_facing = options->camera_facing,
        .crop = options->crop,
        .port_range = options->port_range,
        .tunnel_host = options->tunnel_host,
@@ -373,8 +371,6 @@ scrcpy(struct scrcpy_options *options) {
        .audio_codec_options = options->audio_codec_options,
        .video_encoder = options->video_encoder,
        .audio_encoder = options->audio_encoder,
-        .camera_id = options->camera_id,
-        .camera_size = options->camera_size,
        .force_adb_forward = options->force_adb_forward,
        .power_off_on_close = options->power_off_on_close,
        .clipboard_autosync = options->clipboard_autosync,
@@ -383,8 +379,10 @@ 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,
+        .list_cameras = options->list_cameras,
        .kill_adb_on_close = options->kill_adb_on_close,
-        .list = options->list,
    };

    static const struct sc_server_callbacks cbs = {
@@ -402,7 +400,8 @@ scrcpy(struct scrcpy_options *options) {

    server_started = true;

-    if (options->list) {
+    if (options->list_encoders || options->list_displays
+            || options->list_cameras) {
        bool ok = await_for_server(NULL);
        ret = ok ? SCRCPY_EXIT_SUCCESS : SCRCPY_EXIT_FAILURE;
        goto end;
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -76,7 +76,6 @@ sc_server_params_destroy(struct sc_server_params *params) {
    free((char *) params->video_encoder);
    free((char *) params->audio_encoder);
    free((char *) params->tcpip_dst);
-    free((char *) params->camera_id);
 }

 static bool
@@ -87,15 +86,14 @@ sc_server_params_copy(struct sc_server_params *dst,
    // The params reference user-allocated memory, so we must copy them to
    // handle them from another thread

-#define COPY(FIELD) do { \
+#define COPY(FIELD) \
    dst->FIELD = NULL; \
    if (src->FIELD) { \
        dst->FIELD = strdup(src->FIELD); \
        if (!dst->FIELD) { \
            goto error; \
        } \
-    } \
-} while(0)
+    }

    COPY(req_serial);
    COPY(crop);
@@ -104,7 +102,6 @@ sc_server_params_copy(struct sc_server_params *dst,
    COPY(video_encoder);
    COPY(audio_encoder);
    COPY(tcpip_dst);
-    COPY(camera_id);
 #undef COPY

    return true;
@@ -183,20 +180,6 @@ sc_server_get_codec_name(enum sc_codec codec) {
    }
 }

-static const char *
-sc_server_get_camera_facing_name(enum sc_camera_facing camera_facing) {
-    switch (camera_facing) {
-        case SC_CAMERA_FACING_FRONT:
-            return "front";
-        case SC_CAMERA_FACING_BACK:
-            return "back";
-        case SC_CAMERA_FACING_EXTERNAL:
-            return "external";
-        default:
-            return NULL;
-    }
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
               const struct sc_server_params *params) {
@@ -232,13 +215,13 @@ execute_server(struct sc_server *server,
    cmd[count++] = SCRCPY_VERSION;

    unsigned dyn_idx = count; // from there, the strings are allocated
-#define ADD_PARAM(fmt, ...) do { \
+#define ADD_PARAM(fmt, ...) { \
        char *p; \
        if (asprintf(&p, fmt, ## __VA_ARGS__) == -1) { \
            goto end; \
        } \
        cmd[count++] = p; \
-    } while(0)
+    }

    ADD_PARAM("scid=%08x", params->scid);
    ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
@@ -263,11 +246,8 @@ execute_server(struct sc_server *server,
        ADD_PARAM("audio_codec=%s",
            sc_server_get_codec_name(params->audio_codec));
    }
-    if (params->video_source != SC_VIDEO_SOURCE_DISPLAY) {
-        assert(params->video_source == SC_VIDEO_SOURCE_CAMERA);
-        ADD_PARAM("video_source=camera");
-    }
-    if (params->audio_source == SC_AUDIO_SOURCE_MIC) {
+    if (params->audio_source != SC_AUDIO_SOURCE_OUTPUT) {
+        assert(params->audio_source == SC_AUDIO_SOURCE_MIC);
        ADD_PARAM("audio_source=mic");
    }
    if (params->max_size) {
@@ -293,16 +273,6 @@ execute_server(struct sc_server *server,
    if (params->display_id) {
        ADD_PARAM("display_id=%" PRIu32, params->display_id);
    }
-    if (params->camera_id) {
-        ADD_PARAM("camera_id=%s", params->camera_id);
-    }
-    if (params->camera_size) {
-        ADD_PARAM("camera_size=%s", params->camera_size);
-    }
-    if (params->camera_facing != SC_CAMERA_FACING_ANY) {
-        ADD_PARAM("camera_facing=%s",
-            sc_server_get_camera_facing_name(params->camera_facing));
-    }
    if (params->show_touches) {
        ADD_PARAM("show_touches=true");
    }
@@ -340,18 +310,15 @@ execute_server(struct sc_server *server,
        // By default, power_on is true
        ADD_PARAM("power_on=false");
    }
-    if (params->list & SC_OPTION_LIST_ENCODERS) {
+    if (params->list_encoders) {
        ADD_PARAM("list_encoders=true");
    }
-    if (params->list & SC_OPTION_LIST_DISPLAYS) {
+    if (params->list_displays) {
        ADD_PARAM("list_displays=true");
    }
-    if (params->list & SC_OPTION_LIST_CAMERAS) {
+    if (params->list_cameras) {
        ADD_PARAM("list_cameras=true");
    }
-    if (params->list & SC_OPTION_LIST_CAMERA_SIZES) {
-        ADD_PARAM("list_camera_sizes=true");
-    }

 #undef ADD_PARAM

@@ -931,7 +898,8 @@ run_server(void *data) {

    // If --list-* is passed, then the server just prints the requested data
    // then exits.
-    if (params->list) {
+    if (params->list_encoders || params->list_displays
+            || params->list_cameras) {
        sc_pid pid = execute_server(server, params);
        if (pid == SC_PROCESS_NONE) {
            goto error_connection_failed;
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -26,16 +26,12 @@ struct sc_server_params {
    enum sc_log_level log_level;
    enum sc_codec video_codec;
    enum sc_codec audio_codec;
-    enum sc_video_source video_source;
    enum sc_audio_source audio_source;
-    enum sc_camera_facing camera_facing;
    const char *crop;
    const char *video_codec_options;
    const char *audio_codec_options;
    const char *video_encoder;
    const char *audio_encoder;
-    const char *camera_id;
-    const char *camera_size;
    struct sc_port_range port_range;
    uint32_t tunnel_host;
    uint16_t tunnel_port;
@@ -60,8 +56,10 @@ struct sc_server_params {
    bool select_tcpip;
    bool cleanup;
    bool power_on;
+    bool list_encoders;
+    bool list_displays;
+    bool list_cameras;
    bool kill_adb_on_close;
-    uint8_t list;
 };

 struct sc_server {
--- a/app/src/usb/hid_keyboard.c
+++ b/app/src/usb/hid_keyboard.c
@@ -27,8 +27,7 @@
 // keyboard support, though OS could support more keys via modifying the report
 // desc. 6 should be enough for scrcpy.
 #define HID_KEYBOARD_MAX_KEYS 6
-#define HID_KEYBOARD_EVENT_SIZE \
-    (HID_KEYBOARD_INDEX_KEYS + HID_KEYBOARD_MAX_KEYS)
+#define HID_KEYBOARD_EVENT_SIZE (2 + HID_KEYBOARD_MAX_KEYS)

 #define HID_RESERVED 0x00
 #define HID_ERROR_ROLL_OVER 0x01
--- a/app/src/usb/usb.c
+++ b/app/src/usb/usb.c
@@ -93,7 +93,7 @@ sc_usb_device_move(struct sc_usb_device *dst, struct sc_usb_device *src) {
    src->product = NULL;
 }

-static void
+void
 sc_usb_devices_destroy(struct sc_vec_usb_devices *usb_devices) {
    for (size_t i = 0; i < usb_devices->size; ++i) {
        sc_usb_device_destroy(&usb_devices->data[i]);
--- a/app/src/util/log.c
+++ b/app/src/util/log.c
@@ -147,7 +147,7 @@ sc_sdl_log_print(void *userdata, int category, SDL_LogPriority priority,
 }

 void
-sc_log_configure(void) {
+sc_log_configure() {
    SDL_LogSetOutputFunction(sc_sdl_log_print, NULL);
    // Redirect FFmpeg logs to SDL logs
    av_log_set_callback(sc_av_log_callback);
--- a/app/src/util/log.h
+++ b/app/src/util/log.h
@@ -36,6 +36,6 @@ sc_log_windows_error(const char *prefix, int error);
 #endif

 void
-sc_log_configure(void);
+sc_log_configure();

 #endif
--- a/app/src/util/vecdeque.h
+++ b/app/src/util/vecdeque.h
@@ -190,10 +190,10 @@ sc_vecdeque_reallocdata_(void *ptr, size_t newcap, size_t item_size,

    size_t right_len = MIN(size, oldcap - oldorigin);
    assert(right_len);
-    memcpy(newptr, (char *) ptr + (oldorigin * item_size), right_len * item_size);
+    memcpy(newptr, ptr + (oldorigin * item_size), right_len * item_size);

    if (size > right_len) {
-        memcpy((char *) newptr + (right_len * item_size), ptr,
+        memcpy(newptr + (right_len * item_size), ptr,
               (size - right_len) * item_size);
    }

--- a/app/tests/test_bytebuf.c
+++ b/app/tests/test_bytebuf.c
@@ -5,7 +5,7 @@

 #include "util/bytebuf.h"

-static void test_bytebuf_simple(void) {
+void test_bytebuf_simple(void) {
    struct sc_bytebuf buf;
    uint8_t data[20];

@@ -34,7 +34,7 @@ static void test_bytebuf_simple(void) {
    sc_bytebuf_destroy(&buf);
 }

-static void test_bytebuf_boundaries(void) {
+void test_bytebuf_boundaries(void) {
    struct sc_bytebuf buf;
    uint8_t data[20];

@@ -71,7 +71,7 @@ static void test_bytebuf_boundaries(void) {
    sc_bytebuf_destroy(&buf);
 }

-static void test_bytebuf_two_steps_write(void) {
+void test_bytebuf_two_steps_write(void) {
    struct sc_bytebuf buf;
    uint8_t data[20];

--- a/app/tests/test_str.c
+++ b/app/tests/test_str.c
@@ -269,25 +269,21 @@ static void test_parse_integer_with_suffix(void) {

    char buf[32];

-    int r = snprintf(buf, sizeof(buf), "%ldk", LONG_MAX / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
+    sprintf(buf, "%ldk", LONG_MAX / 2000);
    ok = sc_str_parse_integer_with_suffix(buf, &value);
    assert(ok);
    assert(value == LONG_MAX / 2000 * 1000);

-    r = snprintf(buf, sizeof(buf), "%ldm", LONG_MAX / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
+    sprintf(buf, "%ldm", LONG_MAX / 2000);
    ok = sc_str_parse_integer_with_suffix(buf, &value);
    assert(!ok);

-    r = snprintf(buf, sizeof(buf), "%ldk", LONG_MIN / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
+    sprintf(buf, "%ldk", LONG_MIN / 2000);
    ok = sc_str_parse_integer_with_suffix(buf, &value);
    assert(ok);
    assert(value == LONG_MIN / 2000 * 1000);

-    r = snprintf(buf, sizeof(buf), "%ldm", LONG_MIN / 2000);
-    assert(r >= 0 && (size_t) r < sizeof(buf));
+    sprintf(buf, "%ldm", LONG_MIN / 2000);
    ok = sc_str_parse_integer_with_suffix(buf, &value);
    assert(!ok);
 }
@@ -362,7 +358,7 @@ static void test_index_of_column(void) {
    assert(sc_str_index_of_column("  a bc  d", 1, " ") == 2);
 }

-static void test_remove_trailing_cr(void) {
+static void test_remove_trailing_cr() {
    char s[] = "abc\r";
    sc_str_remove_trailing_cr(s, sizeof(s) - 1);
    assert(!strcmp(s, "abc"));
--- a/app/tests/test_vecdeque.c
+++ b/app/tests/test_vecdeque.c
@@ -102,7 +102,7 @@ static void test_vecdeque_reserve(void) {
    sc_vecdeque_destroy(&vdq);
 }

-static void test_vecdeque_grow(void) {
+static void test_vecdeque_grow() {
    struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;

    bool ok = sc_vecdeque_reserve(&vdq, 20);
@@ -142,7 +142,7 @@ static void test_vecdeque_grow(void) {
    sc_vecdeque_destroy(&vdq);
 }

-static void test_vecdeque_push_hole(void) {
+static void test_vecdeque_push_hole() {
    struct SC_VECDEQUE(int) vdq = SC_VECDEQUE_INITIALIZER;

    bool ok = sc_vecdeque_reserve(&vdq, 20);
--- a/app/tests/test_vector.c
+++ b/app/tests/test_vector.c
@@ -187,7 +187,7 @@ static void test_vector_index_of(void) {
    sc_vector_destroy(&vec);
 }

-static void test_vector_grow(void) {
+static void test_vector_grow() {
    struct SC_VECTOR(int) vec = SC_VECTOR_INITIALIZER;

    bool ok;
--- a/doc/video.md
+++ b/doc/video.md
@@ -143,7 +143,7 @@ If several displays are available on the Android device, it is possible to
 select the display to mirror:

 ```bash
-scrcpy --display-id=1
+scrcpy --display=1
 ```

 The list of display ids can be retrieved by:
--- a/meson.build
+++ b/meson.build
@@ -7,8 +7,6 @@ project('scrcpy', 'c',
            'b_ndebug=if-release',
        ])

-add_project_arguments('-Wmissing-prototypes', language: 'c')
-
 if get_option('compile_app')
    subdir('app')
 endif
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
@@ -4,61 +4,47 @@ import com.genymobile.scrcpy.wrappers.ServiceManager;

 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
+import android.graphics.Rect;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.SessionConfiguration;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.media.MediaCodec;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.util.Log;
 import android.view.Surface;

 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Executors;

 public class CameraCapture extends SurfaceCapture {

-    public static class CameraSelection {
-        private String explicitCameraId;
-        private CameraFacing cameraFacing;
+    private static final Executor EXECUTOR = Executors.newSingleThreadExecutor();

-        public CameraSelection(String explicitCameraId, CameraFacing cameraFacing) {
-            this.explicitCameraId = explicitCameraId;
-            this.cameraFacing = cameraFacing;
-        }
-
-        boolean hasId() {
-            return explicitCameraId != null;
-        }
-
-        boolean hasProperties() {
-            return cameraFacing != null;
-        }
-    }
-
-    private final CameraSelection cameraSelection;
-    private final Size explicitSize;
+    private final String cameraId;

    private HandlerThread cameraThread;
    private Handler cameraHandler;
    private CameraDevice cameraDevice;
-    private Executor cameraExecutor;
+    private int maxSize;

-    private final AtomicBoolean disconnected = new AtomicBoolean();
-
-    public CameraCapture(CameraSelection cameraSelection, Size explicitSize) {
-        this.cameraSelection = cameraSelection;
-        this.explicitSize = explicitSize;
+    public CameraCapture(String cameraId, int maxSize) {
+        this.cameraId = cameraId;
+        this.maxSize = maxSize;
    }

    @Override
@@ -66,52 +52,14 @@ public class CameraCapture extends SurfaceCapture {
        cameraThread = new HandlerThread("camera");
        cameraThread.start();
        cameraHandler = new Handler(cameraThread.getLooper());
-        cameraExecutor = new HandlerExecutor(cameraHandler);

        try {
-            String cameraId = selectCamera(cameraSelection);
-            if (cameraId == null) {
-                throw new IOException("No matching camera found");
-            }
-
-            Ln.i("Using camera '" + cameraId + "'");
            cameraDevice = openCamera(cameraId);
        } catch (CameraAccessException | InterruptedException e) {
            throw new IOException(e);
        }
    }

-    private String selectCamera(CameraSelection cameraSelection) throws CameraAccessException {
-        if (cameraSelection.hasId()) {
-            return cameraSelection.explicitCameraId;
-        }
-
-        CameraManager cameraManager = ServiceManager.getCameraManager();
-
-        String[] cameraIds = cameraManager.getCameraIdList();
-        if (!cameraSelection.hasProperties()) {
-            // Use the first one
-            return cameraIds.length > 0 ? cameraIds[0] : null;
-        }
-
-        for (String cameraId : cameraIds) {
-            CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);
-
-            if (cameraSelection.cameraFacing != null) {
-                int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
-                if (cameraSelection.cameraFacing.value() != facing) {
-                    // Does not match
-                    continue;
-                }
-            }
-
-            return cameraId;
-        }
-
-        // Not found
-        return null;
-    }
-
    @Override
    public void start(Surface surface) throws IOException {
        try {
@@ -137,12 +85,12 @@ public class CameraCapture extends SurfaceCapture {

    @Override
    public Size getSize() {
-        return explicitSize;
+        return new Size(1920, 1080);
    }

    @Override
-    public boolean setMaxSize(int size) {
-        return false;
+    public void setMaxSize(int size) {
+        maxSize = size;
    }

    @SuppressLint("MissingPermission")
@@ -161,8 +109,7 @@ public class CameraCapture extends SurfaceCapture {
            @Override
            public void onDisconnected(CameraDevice camera) {
                Ln.w("Camera disconnected");
-                disconnected.set(true);
-                requestReset();
+                // TODO
            }

            @Override
@@ -203,7 +150,7 @@ public class CameraCapture extends SurfaceCapture {
        // replace by createCaptureSession(SessionConfiguration)
        OutputConfiguration outputConfig = new OutputConfiguration(surface);
        List<OutputConfiguration> outputs = Arrays.asList(outputConfig);
-        SessionConfiguration sessionConfig = new SessionConfiguration(SessionConfiguration.SESSION_REGULAR, outputs, cameraExecutor,
+        SessionConfiguration sessionConfig = new SessionConfiguration(SessionConfiguration.SESSION_REGULAR, outputs, EXECUTOR,
                new CameraCaptureSession.StateCallback() {
                    @Override
                    public void onConfigured(CameraCaptureSession session) {
@@ -247,9 +194,4 @@ public class CameraCapture extends SurfaceCapture {
            throw (CameraAccessException) e.getCause();
        }
    }
-
-    @Override
-    public boolean isClosed() {
-        return disconnected.get();
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/CameraFacing.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraFacing.java
@@ -1,31 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.hardware.camera2.CameraCharacteristics;
-
-public enum CameraFacing {
-    FRONT("front", CameraCharacteristics.LENS_FACING_FRONT),
-    BACK("back", CameraCharacteristics.LENS_FACING_BACK),
-    EXTERNAL("external", CameraCharacteristics.LENS_FACING_EXTERNAL);
-
-    private final String name;
-    private final int value;
-
-    CameraFacing(String name, int value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    int value() {
-        return value;
-    }
-
-    static CameraFacing findByName(String name) {
-        for (CameraFacing facing : CameraFacing.values()) {
-            if (name.equals(facing.name)) {
-                return facing;
-            }
-        }
-
-        return null;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java
+++ b/server/src/main/java/com/genymobile/scrcpy/HandlerExecutor.java
@@ -1,23 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.os.Handler;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
-
-// Inspired from hidden android.os.HandlerExecutor
-
-public class HandlerExecutor implements Executor {
-    private final Handler handler;
-
-    public HandlerExecutor(Handler handler) {
-        this.handler = handler;
-    }
-
-    @Override
-    public void execute(Runnable command) {
-        if (!handler.post(command)) {
-            throw new RejectedExecutionException(handler + " is shutting down");
-        }
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
@@ -3,7 +3,6 @@ package com.genymobile.scrcpy;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

-import android.graphics.Rect;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
@@ -54,7 +53,7 @@ public final class LogUtils {
            builder.append("\n    (none)");
        } else {
            for (int id : displayIds) {
-                builder.append("\n    --display-id=").append(id).append("    (");
+                builder.append("\n    --display=").append(id).append("    (");
                DisplayInfo displayInfo = displayManager.getDisplayInfo(id);
                if (displayInfo != null) {
                    Size size = displayInfo.getSize();
@@ -81,7 +80,7 @@ public final class LogUtils {
        }
    }

-    public static String buildCameraListMessage(boolean includeSizes) {
+    public static String buildCameraListMessage() {
        StringBuilder builder = new StringBuilder("List of cameras:");
        CameraManager cameraManager = ServiceManager.getCameraManager();
        try {
@@ -90,21 +89,19 @@ public final class LogUtils {
                builder.append("\n    (none)");
            } else {
                for (String id : cameraIds) {
-                    builder.append("\n    --video-source=camera --camera-id=").append(id);
+                    builder.append("\n    --video-source=camera --camera=").append(id);
                    CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(id);
-                    int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
-                    builder.append("    (").append(getCameraFacingName(facing)).append(", ");
+                    Integer facingInteger = characteristics.get(CameraCharacteristics.LENS_FACING);
+                    if (facingInteger != null) {
+                        int facing = facingInteger;
+                        builder.append("    (").append(getCameraFacingName(facing)).append(')');
+                    }

-                    Rect activeSize = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-                    builder.append(activeSize.width()).append("x").append(activeSize.height());
-                    builder.append(')');
-
-                    if (includeSizes) {
-                        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-                        android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
-                        for (android.util.Size size : sizes) {
-                            builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
-                        }
+                    StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+                    android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
+                    for (android.util.Size size : sizes) {
+                        // TODO remove (just for testing)
+                        builder.append("\n        - " + size.getWidth() + "x" + size.getHeight());
                    }
                }
            }
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -14,7 +14,6 @@ public class Options {
    private int maxSize;
    private VideoCodec videoCodec = VideoCodec.H264;
    private AudioCodec audioCodec = AudioCodec.OPUS;
-    private VideoSource videoSource = VideoSource.DISPLAY;
    private AudioSource audioSource = AudioSource.OUTPUT;
    private int videoBitRate = 8000000;
    private int audioBitRate = 128000;
@@ -24,9 +23,6 @@ public class Options {
    private Rect crop;
    private boolean control = true;
    private int displayId;
-    private String cameraId;
-    private Size cameraSize;
-    private CameraFacing cameraFacing;
    private boolean showTouches;
    private boolean stayAwake;
    private List<CodecOption> videoCodecOptions;
@@ -43,7 +39,6 @@ public class Options {
    private boolean listEncoders;
    private boolean listDisplays;
    private boolean listCameras;
-    private boolean listCameraSizes;

    // Options not used by the scrcpy client, but useful to use scrcpy-server directly
    private boolean sendDeviceMeta = true; // send device name and size
@@ -79,10 +74,6 @@ public class Options {
        return audioCodec;
    }

-    public VideoSource getVideoSource() {
-        return videoSource;
-    }
-
    public AudioSource getAudioSource() {
        return audioSource;
    }
@@ -119,18 +110,6 @@ public class Options {
        return displayId;
    }

-    public String getCameraId() {
-        return cameraId;
-    }
-
-    public Size getCameraSize() {
-        return cameraSize;
-    }
-
-    public CameraFacing getCameraFacing() {
-        return cameraFacing;
-    }
-
    public boolean getShowTouches() {
        return showTouches;
    }
@@ -175,10 +154,6 @@ public class Options {
        return powerOn;
    }

-    public boolean getList() {
-        return listEncoders || listDisplays || listCameras || listCameraSizes;
-    }
-
    public boolean getListEncoders() {
        return listEncoders;
    }
@@ -191,10 +166,6 @@ public class Options {
        return listCameras;
    }

-    public boolean getListCameraSizes() {
-        return listCameraSizes;
-    }
-
    public boolean getSendDeviceMeta() {
        return sendDeviceMeta;
    }
@@ -264,13 +235,6 @@ public class Options {
                    }
                    options.audioCodec = audioCodec;
                    break;
-                case "video_source":
-                    VideoSource videoSource = VideoSource.findByName(value);
-                    if (videoSource == null) {
-                        throw new IllegalArgumentException("Video source " + value + " not supported");
-                    }
-                    options.videoSource = videoSource;
-                    break;
                case "audio_source":
                    AudioSource audioSource = AudioSource.findByName(value);
                    if (audioSource == null) {
@@ -297,9 +261,7 @@ public class Options {
                    options.tunnelForward = Boolean.parseBoolean(value);
                    break;
                case "crop":
-                    if (!value.isEmpty()) {
-                        options.crop = parseCrop(value);
-                    }
+                    options.crop = parseCrop(value);
                    break;
                case "control":
                    options.control = Boolean.parseBoolean(value);
@@ -352,26 +314,6 @@ public class Options {
                case "list_cameras":
                    options.listCameras = Boolean.parseBoolean(value);
                    break;
-                case "list_camera_sizes":
-                    options.listCameraSizes = Boolean.parseBoolean(value);
-                    break;
-                case "camera_id":
-                    if (!value.isEmpty()) {
-                        options.cameraId = value;
-                    }
-                    break;
-                case "camera_size":
-                    options.cameraSize = parseSize(value);
-                    break;
-                case "camera_facing":
-                    if (!value.isEmpty()) {
-                        CameraFacing facing = CameraFacing.findByName(value);
-                        if (facing == null) {
-                            throw new IllegalArgumentException("Camera facing " + value + " not supported");
-                        }
-                        options.cameraFacing = facing;
-                    }
-                    break;
                case "send_device_meta":
                    options.sendDeviceMeta = Boolean.parseBoolean(value);
                    break;
@@ -403,6 +345,9 @@ public class Options {
    }

    private static Rect parseCrop(String crop) {
+        if (crop.isEmpty()) {
+            return null;
+        }
        // input format: "width:height:x:y"
        String[] tokens = crop.split(":");
        if (tokens.length != 4) {
@@ -414,18 +359,4 @@ public class Options {
        int y = Integer.parseInt(tokens[3]);
        return new Rect(x, y, x + width, y + height);
    }
-
-    private static Size parseSize(String size) {
-        if (size.isEmpty()) {
-            return null;
-        }
-        // input format: "<width>x<height>"
-        String[] tokens = size.split("x");
-        if (tokens.length != 2) {
-            throw new IllegalArgumentException("Invalid size format (expected <width>x<height>): \"" + size + "\"");
-        }
-        int width = Integer.parseInt(tokens[0]);
-        int height = Integer.parseInt(tokens[1]);
-        return new Size(width, height);
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
@@ -48,9 +48,8 @@ public class ScreenCapture extends SurfaceCapture implements Device.RotationList
    }

    @Override
-    public boolean setMaxSize(int size) {
+    public void setMaxSize(int size) {
        device.setMaxSize(size);
-        return true;
    }

    @Override
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -134,17 +134,11 @@ public final class Server {
            if (video) {
                Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
                        options.getSendFrameMeta());
-                SurfaceCapture surfaceCapture;
-                if (options.getVideoSource() == VideoSource.DISPLAY) {
-                    surfaceCapture = new ScreenCapture(device);
-                } else {
-                    CameraCapture.CameraSelection cameraSelection = new CameraCapture.CameraSelection(options.getCameraId(),
-                            options.getCameraFacing());
-                    surfaceCapture = new CameraCapture(cameraSelection, options.getCameraSize());
-                }
-                SurfaceEncoder surfaceEncoder = new SurfaceEncoder(surfaceCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
+                CameraCapture capture = new CameraCapture("0", 1920);
+                //ScreenCapture screenCapture = new ScreenCapture(device);
+                SurfaceEncoder screenEncoder = new SurfaceEncoder(capture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
                        options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
-                asyncProcessors.add(surfaceEncoder);
+                asyncProcessors.add(screenEncoder);
            }

            Completion completion = new Completion(asyncProcessors.size());
@@ -189,7 +183,7 @@ public final class Server {

        Ln.initLogLevel(options.getLogLevel());

-        if (options.getList()) {
+        if (options.getListEncoders() || options.getListDisplays() || options.getListCameras()) {
            if (options.getCleanup()) {
                CleanUp.unlinkSelf();
            }
@@ -201,9 +195,9 @@ public final class Server {
            if (options.getListDisplays()) {
                Ln.i(LogUtils.buildDisplayListMessage());
            }
-            if (options.getListCameras() || options.getListCameraSizes()) {
+            if (options.getListCameras()) {
                Workarounds.apply(false, true);
-                Ln.i(LogUtils.buildCameraListMessage(options.getListCameraSizes()));
+                Ln.i(LogUtils.buildCameraListMessage());
            }
            // Just print the requested data, do not mirror
            return;
--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java
@@ -58,14 +58,5 @@ public abstract class SurfaceCapture {
     *
     * @param size Maximum size
     */
-    public abstract boolean setMaxSize(int size);
-
-    /**
-     * Indicate if the capture has been closed internally.
-     *
-     * @return {@code true} is the capture is closed, {@code false} otherwise.
-     */
-    public boolean isClosed() {
-        return false;
-    }
+    public abstract void setMaxSize(int size);
 }
--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
@@ -122,13 +122,9 @@ public class SurfaceEncoder implements AsyncProcessor {
            return false;
        }

-        boolean accepted = capture.setMaxSize(newMaxSize);
-        if (!accepted) {
-            return false;
-        }
-
-        // Retry with a smaller size
+        // Retry with a smaller device size
        Ln.i("Retrying with -m" + newMaxSize + "...");
+        capture.setMaxSize(newMaxSize);
        return true;
    }

@@ -181,11 +177,6 @@ public class SurfaceEncoder implements AsyncProcessor {
            }
        }

-        if (capture.isClosed()) {
-            // The capture might have been closed internally (for example if the camera is disconnected)
-            alive = false;
-        }
-
        return !eof && alive;
    }

--- a/server/src/main/java/com/genymobile/scrcpy/VideoSource.java
+++ b/server/src/main/java/com/genymobile/scrcpy/VideoSource.java
@@ -1,24 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.media.MediaRecorder;
-
-public enum VideoSource {
-    DISPLAY("display"),
-    CAMERA("camera");
-
-    private final String name;
-
-    VideoSource(String name) {
-        this.name = name;
-    }
-
-    static VideoSource findByName(String name) {
-        for (VideoSource videoSource : VideoSource.values()) {
-            if (name.equals(videoSource.name)) {
-                return videoSource;
-            }
-        }
-
-        return null;
-    }
-}
Author	SHA1	Message	Date
Romain Vimont	fb97bb813e	Camera WIP hardcode to make it work	2023-10-10 21:15:43 +02:00
Romain Vimont	a34f127551	Add camera support WIP	2023-10-10 21:15:28 +02:00
Simon Chan	91023cd17d	Add --list-cameras Add an option to list the device cameras. Co-authored-by: Romain Vimont <rom@rom1v.com>	2023-08-27 19:02:53 +02:00
Simon Chan	520c757322	Extract SurfaceCapture from ScreenEncoder Extract an interface SurfaceCapture from ScreenEncoder, representing a video source which can be rendered to a Surface for encoding. Split ScreenEncoder into: - ScreenCapture, implementing SurfaceCapture to capture the device screen, - SurfaceEncoder, to encode any SurfaceCapture. This separation prepares the introduction of another SurfaceCapture implementation to capture the camera instead of the device screen. Co-authored-by: Romain Vimont <rom@rom1v.com>	2023-08-27 19:02:53 +02:00