Support camera size selection using -m/--camera-ar

In addition to --camera-size to specify an explicit size, make it possible to select the camera size automatically, respecting the maximum size (already used for display mirroring) and an aspect ratio. For example, "scrcpy --video-source=camera" followed by: - (no additional arguments) : mirrors at the maximum size, any a-r - -m1920 : only consider valid sizes having both dimensions not above 1920 - --camera-ar=4:3 : only consider valid sizes having an aspect ratio of 4:3 (+/- 10%) - -m2048 --camera-ar=1.6 : only consider valid sizes having both dimensions not above 2048 and an aspect ratio of 1.6 (+/- 10%) Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
Add --camera-facing
2023-10-27 17:19:20 +02:00 · 2023-10-27 17:19:20 +02:00 · 2023-10-27 17:19:20 +02:00 · 2023-10-27 17:19:20 +02:00 · 2023-10-27 17:19:20 +02:00 · 2023-10-27 17:19:20 +02:00
40 changed files with 131 additions and 538 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ build/
 .gradle/
 /x/
 local.properties
-/scrcpy-server
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# scrcpy (v2.2)
+# scrcpy (v2.1.1)

 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />

@@ -25,13 +25,12 @@ It focuses on:
 [lowlatency]: https://github.com/Genymobile/scrcpy/pull/646

 Its features include:
- - [audio forwarding](doc/audio.md) (Android 11+)
+ - [audio forwarding](doc/audio.md) (Android >= 11)
 - [recording](doc/recording.md)
 - mirroring with [Android device screen off](doc/device.md#turn-screen-off)
 - [copy-paste](doc/control.md#copy-paste) in both directions
 - [configurable quality](doc/video.md)
- - [camera mirroring](doc/camera.md) (Android 12+)
- - [mirroring as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
+ - Android device screen [as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
 - [physical keyboard/mouse simulation (HID)](doc/hid-otg.md)
 - [OTG mode](doc/hid-otg.md#otg)
 - and more…
@@ -78,7 +77,6 @@ documented in the following pages:
 - [Recording](doc/recording.md)
 - [Tunnels](doc/tunnels.md)
 - [HID/OTG](doc/hid-otg.md)
- - [Camera](doc/camera.md)
 - [Video4Linux](doc/v4l2.md)
 - [Shortcuts](doc/shortcuts.md)

--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -13,8 +13,6 @@ _scrcpy() {
        --camera-ar=
        --camera-id=
        --camera-facing=
-        --camera-fps=
-        --camera-high-speed
        --camera-size=
        --crop=
        -d --select-usb
@@ -158,7 +156,6 @@ _scrcpy() {
        |--audio-output-buffer \
        |--camera-ar \
        |--camera-id \
-        |--camera-fps \
        |--camera-size \
        |--crop \
        |--display-id \
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -18,10 +18,8 @@ arguments=(
    '--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-ar=[Select the camera size by its aspect ratio]'
-    '--camera-high-speed=[Enable high-speed camera capture mode]'
    '--camera-id=[Specify the camera id to mirror]'
    '--camera-facing=[Select the device camera by its facing direction]:facing:(front back external)'
-    '--camera-fps=[Specify the camera capture frame rate]'
    '--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]'
--- a/app/prebuilt-deps/prepare-adb.sh
+++ b/app/prebuilt-deps/prepare-adb.sh
@@ -6,10 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"

-DEP_DIR=platform-tools-34.0.5
+DEP_DIR=platform-tools-34.0.3

-FILENAME=platform-tools_r34.0.5-windows.zip
-SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571
+FILENAME=platform-tools_r34.0.3-windows.zip
+SHA256SUM=fce992e93eb786fc9f47df93d83a7b912c46742d45c39d712c02e06d05b72e2b

 if [[ -d "$DEP_DIR" ]]
 then
--- a/app/prebuilt-deps/prepare-sdl.sh
+++ b/app/prebuilt-deps/prepare-sdl.sh
@@ -6,10 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"

-DEP_DIR=SDL2-2.28.4
+DEP_DIR=SDL2-2.28.0

-FILENAME=SDL2-devel-2.28.4-mingw.tar.gz
-SHA256SUM=779d091072cf97291f80030f5232d97aa3d48ab0f2c14fe0b9d9a33c593cdc35
+FILENAME=SDL2-devel-2.28.0-mingw.tar.gz
+SHA256SUM=b91ce59eeacd4a9db403f976fd2337d9360b21ada374124417d716065c380e20

 if [[ -d "$DEP_DIR" ]]
 then
--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@@ -13,7 +13,7 @@ BEGIN
      VALUE "LegalCopyright", "Romain Vimont, Genymobile"
      VALUE "OriginalFilename", "scrcpy.exe"
      VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "v2.2"
+      VALUE "ProductVersion", "2.1.1"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -45,15 +45,15 @@ Set a list of comma-separated key:type=value options for the device audio encode

 The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.

-The list of possible codec options is available in the Android documentation:
-
-<https://d.android.com/reference/android/media/MediaFormat>
+The list of possible codec options is available in the Android documentation
+.UR https://d.android.com/reference/android/media/MediaFormat
+.UE .

 .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 \fB\-\-list\-encoders\fR.
+The available encoders can be listed by \-\-list\-encoders.

 .TP
 .BI "\-\-audio\-source " source
@@ -79,19 +79,13 @@ Default is 8M (8000000).
 .BI "\-\-camera\-ar " ar
 Select the camera size by its aspect ratio (+/- 10%).

-Possible values are "sensor" (use the camera sensor aspect ratio), "\fInum\fR:\fIden\fR" (e.g. "4:3") and "\fIvalue\fR" (e.g. "1.6").
-
-.TP
-.B \-\-camera\-high\-speed
-Enable high-speed camera capture mode.
-
-This mode is restricted to specific resolutions and frame rates, listed by \fB\-\-list\-camera\-sizes\fR.
+Possible values are "sensor" (use the camera sensor aspect ratio), "<num>:<den>" (e.g. "4:3") and "<value>" (e.g. "1.6").

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

-The available camera ids can be listed by \fB\-\-list\-cameras\fR.
+The available camera ids can be listed by \-\-list\-cameras.

 .TP
 .BI "\-\-camera\-facing " facing
@@ -99,12 +93,6 @@ Select the device camera by its facing direction.

 Possible values are "front", "back" and "external".

-.TP
-.BI "\-\-camera\-fps " fps
-Specify the camera capture frame rate.
-
-If not specified, Android's default frame rate (30 fps) is used.
-
 .TP
 .BI "\-\-camera\-size " width\fRx\fIheight
 Specify an explicit camera capture size.
@@ -131,7 +119,7 @@ Disable screensaver while scrcpy is running.
 .BI "\-\-display\-id " id
 Specify the device display id to mirror.

-The available display ids can be listed by \fB\-\-list\-displays\fR.
+The available display ids can be listed by \-\-list\-displays.

 Default is 0.

@@ -189,11 +177,9 @@ 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\-camera\-sizes
 List the valid camera capture sizes.

-.TP
 .B \-\-list\-cameras
 List cameras available on the device.

@@ -241,7 +227,7 @@ Disable device control (mirror the device in read\-only).

 .TP
 .B \-N, \-\-no\-playback
-Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video\-playback \-\-no\-audio\-playback\fR).
+Disable video and audio playback on the computer (equivalent to --no-video-playback --no-audio-playback).

 .TP
 .B \-\-no\-audio
@@ -363,7 +349,8 @@ Request SDL to use the given render driver (this is just a hint).

 Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "metal" and "software".

-<https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER>
+.UR https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER
+.UE

 .TP
 .B \-\-require\-audio
@@ -411,13 +398,13 @@ Set the maximum mirroring time, in seconds.

 .TP
 .BI "\-\-tunnel\-host " ip
-Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables \fB\-\-force\-adb\-forward\fR.
+Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.

 Default is localhost.

 .TP
 .BI "\-\-tunnel\-port " port
-Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables \fB\-\-force\-adb\-forward\fR.
+Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.

 Default is 0 (not forced): the local port used for establishing the tunnel will be used.

@@ -457,22 +444,20 @@ Set a list of comma-separated key:type=value options for the device video encode

 The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.

-The list of possible codec options is available in the Android documentation:
-
-<https://d.android.com/reference/android/media/MediaFormat>
+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 \fB\-\-list\-encoders\fR.
+The available encoders can be listed by \-\-list\-encoders.

 .TP
 .BI "\-\-video\-source " source
 Select the video source (display or camera).

-Camera mirroring requires Android 12+.
-
 Default is display.

 .TP
@@ -635,7 +620,7 @@ Path to adb.

 .TP
 .B ANDROID_SERIAL
-Device serial to use if no selector (\fB-s\fR, \fB-d\fR, \fB-e\fR or \fB\-\-tcpip=\fIaddr\fR) is specified.
+Device serial to use if no selector (-s, -d, -e or --tcpip=<addr>) is specified.

 .TP
 .B SCRCPY_ICON_PATH
@@ -658,14 +643,23 @@ for the Debian Project (and may be used by others).


 .SH "REPORTING BUGS"
-Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
+Report bugs to
+.UR https://github.com/Genymobile/scrcpy/issues
+.UE .

 .SH COPYRIGHT
-Copyright \(co 2018 Genymobile <https://www.genymobile.com>
+Copyright \(co 2018 Genymobile
+.UR https://www.genymobile.com
+Genymobile
+.UE

-Copyright \(co 2018\-2023 Romain Vimont <rom@rom1v.com>
+Copyright \(co 2018\-2023
+.MT rom@rom1v.com
+Romain Vimont
+.ME

 Licensed under the Apache License, Version 2.0.

 .SH WWW
-<https://github.com/Genymobile/scrcpy>
+.UR https://github.com/Genymobile/scrcpy
+.UE
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -88,8 +88,6 @@ enum {
    OPT_CAMERA_SIZE,
    OPT_CAMERA_FACING,
    OPT_CAMERA_AR,
-    OPT_CAMERA_FPS,
-    OPT_CAMERA_HIGH_SPEED,
 };

 struct sc_option {
@@ -230,27 +228,12 @@ static const struct sc_option options[] = {
        .text = "Select the device camera by its facing direction.\n"
                "Possible values are \"front\", \"back\" and \"external\".",
    },
-    {
-        .longopt_id = OPT_CAMERA_HIGH_SPEED,
-        .longopt = "camera-high-speed",
-        .text = "Enable high-speed camera capture mode.\n"
-                "This mode is restricted to specific resolutions and frame "
-                "rates, listed by --list-camera-sizes.",
-    },
    {
        .longopt_id = OPT_CAMERA_SIZE,
        .longopt = "camera-size",
        .argdesc = "<width>x<height>",
        .text = "Specify an explicit camera capture size.",
    },
-    {
-        .longopt_id = OPT_CAMERA_FPS,
-        .longopt = "camera-fps",
-        .argdesc = "value",
-        .text = "Specify the camera capture frame rate.\n"
-                "If not specified, Android's default frame rate (30 fps) is "
-                "used.",
-    },
    {
        // Not really deprecated (--codec has never been released), but without
        // declaring an explicit --codec option, getopt_long() partial matching
@@ -760,7 +743,6 @@ static const struct sc_option options[] = {
        .longopt = "video-source",
        .argdesc = "source",
        .text = "Select the video source (display or camera).\n"
-                "Camera mirroring requires Android 12+.\n"
                "Default is display.",
    },
    {
@@ -1332,7 +1314,7 @@ parse_max_size(const char *s, uint16_t *max_size) {
 static bool
 parse_max_fps(const char *s, uint16_t *max_fps) {
    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "max fps");
+    bool ok = parse_integer_arg(s, &value, false, 0, 1000, "max fps");
    if (!ok) {
        return false;
    }
@@ -1763,18 +1745,6 @@ parse_camera_facing(const char *optarg, enum sc_camera_facing *facing) {
    return false;
 }

-static bool
-parse_camera_fps(const char *s, uint16_t *camera_fps) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "camera fps");
-    if (!ok) {
-        return false;
-    }
-
-    *camera_fps = (uint16_t) value;
-    return true;
-}
-
 static bool
 parse_time_limit(const char *s, sc_tick *tick) {
    long value;
@@ -2183,14 +2153,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case OPT_CAMERA_FPS:
-                if (!parse_camera_fps(optarg, &opts->camera_fps)) {
-                    return false;
-                }
-                break;
-            case OPT_CAMERA_HIGH_SPEED:
-                opts->camera_high_speed = true;
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -2290,13 +2252,19 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            return false;
        }

+        if (opts->lock_video_orientation !=
+                SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
+            LOGE("--lock-video-orientation is not supported for camera");
+            return false;
+        }
+
        if (opts->camera_id && opts->camera_facing != SC_CAMERA_FACING_ANY) {
            LOGE("Could not specify both --camera-id and --camera-facing");
            return false;
        }

        if (opts->camera_size) {
-            if (opts->max_size) {
+            if (opts->camera_ar) {
                LOGE("Could not specify both --camera-size and -m/--max-size");
                return false;
            }
@@ -2307,11 +2275,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            }
        }

-        if (opts->camera_high_speed && !opts->camera_fps) {
-            LOGE("--camera-high-speed requires an explicit --camera-fps value");
-            return false;
-        }
-
        if (opts->control) {
            LOGI("Camera video source: control disabled");
            opts->control = false;
@@ -2319,8 +2282,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    } else if (opts->camera_id
            || opts->camera_ar
            || opts->camera_facing != SC_CAMERA_FACING_ANY
-            || opts->camera_fps
-            || opts->camera_high_speed
            || opts->camera_size) {
        LOGE("Camera options are only available with --video-source=camera");
        return false;
--- a/app/src/options.c
+++ b/app/src/options.c
@@ -14,7 +14,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .camera_id = NULL,
    .camera_size = NULL,
    .camera_ar = NULL,
-    .camera_fps = 0,
    .log_level = SC_LOG_LEVEL_INFO,
    .video_codec = SC_CODEC_H264,
    .audio_codec = SC_CODEC_OPUS,
@@ -86,6 +85,5 @@ const struct scrcpy_options scrcpy_options_default = {
    .audio = true,
    .require_audio = false,
    .kill_adb_on_close = false,
-    .camera_high_speed = false,
    .list = 0,
 };
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -133,7 +133,6 @@ struct scrcpy_options {
    const char *camera_id;
    const char *camera_size;
    const char *camera_ar;
-    uint16_t camera_fps;
    enum sc_log_level log_level;
    enum sc_codec video_codec;
    enum sc_codec audio_codec;
@@ -199,7 +198,6 @@ struct scrcpy_options {
    bool audio;
    bool require_audio;
    bool kill_adb_on_close;
-    bool camera_high_speed;
 #define SC_OPTION_LIST_ENCODERS 0x1
 #define SC_OPTION_LIST_DISPLAYS 0x2
 #define SC_OPTION_LIST_CAMERAS 0x4
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -376,7 +376,6 @@ scrcpy(struct scrcpy_options *options) {
        .camera_id = options->camera_id,
        .camera_size = options->camera_size,
        .camera_ar = options->camera_ar,
-        .camera_fps = options->camera_fps,
        .force_adb_forward = options->force_adb_forward,
        .power_off_on_close = options->power_off_on_close,
        .clipboard_autosync = options->clipboard_autosync,
@@ -386,7 +385,6 @@ scrcpy(struct scrcpy_options *options) {
        .cleanup = options->cleanup,
        .power_on = options->power_on,
        .kill_adb_on_close = options->kill_adb_on_close,
-        .camera_high_speed = options->camera_high_speed,
        .list = options->list,
    };

--- a/app/src/server.c
+++ b/app/src/server.c
@@ -308,12 +308,6 @@ execute_server(struct sc_server *server,
    if (params->camera_ar) {
        ADD_PARAM("camera_ar=%s", params->camera_ar);
    }
-    if (params->camera_fps) {
-        ADD_PARAM("camera_fps=%" PRIu16, params->camera_fps);
-    }
-    if (params->camera_high_speed) {
-        ADD_PARAM("camera_high_speed=true");
-    }
    if (params->show_touches) {
        ADD_PARAM("show_touches=true");
    }
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -37,7 +37,6 @@ struct sc_server_params {
    const char *camera_id;
    const char *camera_size;
    const char *camera_ar;
-    uint16_t camera_fps;
    struct sc_port_range port_range;
    uint32_t tunnel_host;
    uint16_t tunnel_port;
@@ -63,7 +62,6 @@ struct sc_server_params {
    bool cleanup;
    bool power_on;
    bool kill_adb_on_close;
-    bool camera_high_speed;
    uint8_t list;
 };

--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -17,5 +17,5 @@ endian = 'little'

 [properties]
 prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win32'
-prebuilt_sdl2 = 'SDL2-2.28.4/i686-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.28.0/i686-w64-mingw32'
 prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-Win32'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -17,5 +17,5 @@ endian = 'little'

 [properties]
 prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win64'
-prebuilt_sdl2 = 'SDL2-2.28.4/x86_64-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.28.0/x86_64-w64-mingw32'
 prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-x64'
--- a/doc/build.md
+++ b/doc/build.md
@@ -233,10 +233,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v2.2`][direct-scrcpy-server]  
-   <sub>SHA-256: `c85c4aa84305efb69115cd497a120ebdd10258993b4cf123a8245b3d99d49874`</sub>
+ - [`scrcpy-server-v2.1.1`][direct-scrcpy-server]  
+   <sub>SHA-256: `9558db6c56743a1dc03b38f59801fb40e91cc891f8fc0c89e5b0b067761f148e`</sub>

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.2/scrcpy-server-v2.2
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.1.1/scrcpy-server-v2.1.1

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/doc/camera.md
+++ b/doc/camera.md
@@ -1,150 +0,0 @@
-# Camera
-
-Camera mirroring is supported for devices with Android 12 or higher.
-
-To capture the camera instead of the device screen:
-
-```
-scrcpy --video-source=camera
-```
-
-By default, it automatically switches [audio source](audio.md#source) to
-microphone (as if `--audio-source=mic` were also passed).
-
-```bash
-scrcpy --video-source=display  # default is --audio-source=output
-scrcpy --video-source=camera   # default is --audio-source=mic
-scrcpy --video-source=display --audio-source=mic    # force display AND microphone
-scrcpy --video-source=camera --audio-source=output  # force camera AND device audio output
-```
-
-
-## List
-
-To list the cameras available (with their declared valid sizes and frame rates):
-
-```
-scrcpy --list-cameras
-scrcpy --list-camera-sizes
-```
-
-_Note that the sizes and frame rates are declarative. They are not accurate on
-all devices: some of them are declared but not supported, while some others are
-not declared but supported._
-
-
-## Selection
-
-It is possible to pass an explicit camera id (as listed by `--list-cameras`):
-
-```
-scrcpy --video-source=camera --camera-id=0
-```
-
-Alternatively, the camera may be selected automatically:
-
-```bash
-scrcpy --video-source=camera                           # use the first camera
-scrcpy --video-source=camera --camera-facing=front     # use the first front camera
-scrcpy --video-source=camera --camera-facing=back      # use the first back camera
-scrcpy --video-source=camera --camera-facing=external  # use the first external camera
-```
-
-If `--camera-id` is specified, then `--camera-facing` is forbidden (the id
-already determines the camera):
-
-```bash
-scrcpy --video-source=camera --camera-id=0 --camera-facing=front  # error
-```
-
-
-### Size selection
-
-It is possible to pass an explicit camera size:
-
-```
-scrcpy --video-source=camera --camera-size=1920x1080
-```
-
-The given size may be listed among the declared valid sizes
-(`--list-camera-sizes`), but may also be anything else (some devices support
-arbitrary sizes):
-
-```
-scrcpy --video-source=camera --camera-size=1840x444
-```
-
-Alternatively, a declared valid size (among the ones listed by
-`list-camera-sizes`) may be selected automatically.
-
-Two constraints are supported:
- - `-m`/`--max-size` (already used for display mirroring), for example `-m1920`;
- - `--camera-ar` to specify an aspect ratio (`<num>:<den>`, `<value>` or
-   `sensor`).
-
-Some examples:
-
-```bash
-scrcpy --video-source=camera                          # use the greatest width and the greatest associated height
-scrcpy --video-source=camera -m1920                   # use the greatest width not above 1920 and the greatest associated height
-scrcpy --video-source=camera --camera-ar=4:3          # use the greatest size with an aspect ratio of 4:3 (+/- 10%)
-scrcpy --video-source=camera --camera-ar=1.6          # use the greatest size with an aspect ratio of 1.6 (+/- 10%)
-scrcpy --video-source=camera --camera-ar=sensor       # use the greatest size with the aspect ratio of the camera sensor (+/- 10%)
-scrcpy --video-source=camera -m1920 --camera-ar=16:9  # use the greatest width not above 1920 and the closest to 16:9 aspect ratio
-```
-
-If `--camera-size` is specified, then `-m`/`--max-size` and `--camera-ar` are
-forbidden (the size is determined by the value given explicitly):
-
-```bash
-scrcpy --video-source=camera --camera-size=1920x1080 -m3000  # error
-```
-
-
-## Frame rate
-
-By default, camera is captured at Android's default frame rate (30 fps).
-
-To configure a different frame rate:
-
-```
-scrcpy --video-source=camera --camera-fps=60
-```
-
-
-## High speed capture
-
-The Android camera API also supports a [high speed capture mode][high speed].
-
-This mode is restricted to specific resolutions and frame rates, listed by
-`--list-camera-sizes`.
-
-```
-scrcpy --video-source=camera --camera-size=1920x1080 --camera-fps=240
-```
-
-[high speed]: https://developer.android.com/reference/android/hardware/camera2/CameraConstrainedHighSpeedCaptureSession
-
-
-## Brace expansion tip
-
-All camera options start with `--camera-`, so if your shell supports it, you can
-benefit from [brace expansion] (for example, it is supported _bash_ and _zsh_):
-
-```bash
-scrcpy --video-source=camera --camera-{facing=back,ar=16:9,high-speed,fps=120}
-```
-
-This will be expanded as:
-
-```bash
-scrcpy --video-source=camera --camera-facing=back --camera-ar=16:9 --camera-high-speed --camera-fps=120
-```
-
-[brace expansion]: https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html
-
-
-## Webcam
-
-Combined with the [V4L2](v4l2.md) feature on Linux, the Android device camera
-may be used as a webcam on the computer.
--- a/doc/video.md
+++ b/doc/video.md
@@ -1,14 +1,5 @@
 # Video

-## Source
-
-By default, scrcpy mirrors the device screen.
-
-It is possible to capture the device camera instead.
-
-See the dedicated [camera](camera.md) page.
-
-
 ## Size

 By default, scrcpy attempts to mirror at the Android device resolution.
--- a/doc/windows.md
+++ b/doc/windows.md
@@ -4,14 +4,14 @@

 Download the [latest release]:

- - [`scrcpy-win64-v2.2.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `9f9da88ac4c8319dcb9bf852f2d9bba942bac663413383419cddf64eaa5685bd`</sub>
- - [`scrcpy-win32-v2.2.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `cb84269fc847b8b880e320879492a1ae6c017b42175f03e199530f7a53be9d74`</sub>
+ - [`scrcpy-win64-v2.1.1.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `f77281e1bce2f9934617699c581f063d5b327f012eff602ee98fb2ef550c25c2`</sub>
+ - [`scrcpy-win32-v2.1.1.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `ef7ae7fbe9449f2643febdc2244fb186d1a746a3c736394150cfd14f06d3c943`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.2/scrcpy-win64-v2.2.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.2/scrcpy-win32-v2.2.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.1.1/scrcpy-win64-v2.1.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.1.1/scrcpy-win32-v2.1.1.zip

 and extract it.

--- a/install_release.sh
+++ b/install_release.sh
@@ -2,8 +2,8 @@
 set -e

 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.2/scrcpy-server-v2.2
-PREBUILT_SERVER_SHA256=c85c4aa84305efb69115cd497a120ebdd10258993b4cf123a8245b3d99d49874
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.1.1/scrcpy-server-v2.1.1
+PREBUILT_SERVER_SHA256=9558db6c56743a1dc03b38f59801fb40e91cc891f8fc0c89e5b0b067761f148e

 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: 'v2.2',
+        version: '2.1.1',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/release.mk
+++ b/release.mk
@@ -98,10 +98,10 @@ dist-win32: build-server build-win32
 	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win32/bin/avcodec-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win32/bin/avformat-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win32/bin/swresample-4.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.28.4/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.3/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.3/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.28.0/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/bin/msys-usb-1.0.dll "$(DIST)/$(WIN32_TARGET_DIR)/"

 dist-win64: build-server build-win64
@@ -116,10 +116,10 @@ dist-win64: build-server build-win64
 	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win64/bin/avcodec-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win64/bin/avformat-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-4/win64/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/platform-tools-34.0.5/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.28.4/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.3/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.3/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/platform-tools-34.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.28.0/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/bin/msys-usb-1.0.dll "$(DIST)/$(WIN64_TARGET_DIR)/"

 zip-win32: dist-win32
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -7,8 +7,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 33
-        versionCode 200
-        versionName "v2.2"
+        versionCode 20101
+        versionName "2.1.1"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -12,7 +12,7 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=v2.2
+SCRCPY_VERSION_NAME=2.1.1

 PLATFORM=${ANDROID_PLATFORM:-33}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-33.0.0}
--- a/server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraAspectRatio.java
@@ -1,6 +1,6 @@
 package com.genymobile.scrcpy;

-public final class CameraAspectRatio {
+public class CameraAspectRatio {
    private static final float SENSOR = -1;

    private float ar;
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
@@ -8,7 +8,6 @@ import android.graphics.Rect;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CaptureFailure;
@@ -20,11 +19,11 @@ import android.media.MediaCodec;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.util.Range;
 import android.view.Surface;

 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -40,8 +39,6 @@ public class CameraCapture extends SurfaceCapture {
    private final Size explicitSize;
    private int maxSize;
    private final CameraAspectRatio aspectRatio;
-    private final int fps;
-    private final boolean highSpeed;

    private String cameraId;
    private Size size;
@@ -53,15 +50,12 @@ public class CameraCapture extends SurfaceCapture {

    private final AtomicBoolean disconnected = new AtomicBoolean();

-    public CameraCapture(String explicitCameraId, CameraFacing cameraFacing, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio, int fps,
-            boolean highSpeed) {
+    public CameraCapture(String explicitCameraId, CameraFacing cameraFacing, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio) {
        this.explicitCameraId = explicitCameraId;
        this.cameraFacing = cameraFacing;
        this.explicitSize = explicitSize;
        this.maxSize = maxSize;
        this.aspectRatio = aspectRatio;
-        this.fps = fps;
-        this.highSpeed = highSpeed;
    }

    @Override
@@ -77,7 +71,7 @@ public class CameraCapture extends SurfaceCapture {
                throw new IOException("No matching camera found");
            }

-            size = selectSize(cameraId, explicitSize, maxSize, aspectRatio, highSpeed);
+            size = selectSize(cameraId, explicitSize, maxSize, aspectRatio);
            if (size == null) {
                throw new IOException("Could not select camera size");
            }
@@ -116,8 +110,7 @@ public class CameraCapture extends SurfaceCapture {
    }

    @TargetApi(Build.VERSION_CODES.N)
-    private static Size selectSize(String cameraId, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio, boolean highSpeed)
-            throws CameraAccessException {
+    private static Size selectSize(String cameraId, Size explicitSize, int maxSize, CameraAspectRatio aspectRatio) throws CameraAccessException {
        if (explicitSize != null) {
            return explicitSize;
        }
@@ -126,7 +119,7 @@ public class CameraCapture extends SurfaceCapture {
        CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraId);

        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-        android.util.Size[] sizes = highSpeed ? configs.getHighSpeedVideoSizes() : configs.getOutputSizes(MediaCodec.class);
+        android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
        Stream<android.util.Size> stream = Arrays.stream(sizes);
        if (maxSize > 0) {
            stream = stream.filter(it -> it.getWidth() <= maxSize && it.getHeight() <= maxSize);
@@ -142,34 +135,8 @@ public class CameraCapture extends SurfaceCapture {
            });
        }

-        Optional<android.util.Size> selected = stream.max((s1, s2) -> {
-            // Greater width is better
-            int cmp = Integer.compare(s1.getWidth(), s2.getWidth());
-            if (cmp != 0) {
-                return cmp;
-            }
-
-            if (targetAspectRatio != null) {
-                // Closer to the target aspect ratio is better
-                float ar1 = ((float) s1.getWidth() / s1.getHeight());
-                float arRatio1 = ar1 / targetAspectRatio;
-                float distance1 = Math.abs(1 - arRatio1);
-
-                float ar2 = ((float) s2.getWidth() / s2.getHeight());
-                float arRatio2 = ar2 / targetAspectRatio;
-                float distance2 = Math.abs(1 - arRatio2);
-
-                // Reverse the order because lower distance is better
-                cmp = Float.compare(distance2, distance1);
-                if (cmp != 0) {
-                    return cmp;
-                }
-            }
-
-            // Greater height is better
-            return Integer.compare(s1.getHeight(), s2.getHeight());
-        });
-
+        Optional<android.util.Size> selected = stream.min(
+                Comparator.comparing(android.util.Size::getWidth).thenComparing(android.util.Size::getHeight).reversed());
        if (selected.isPresent()) {
            android.util.Size size = selected.get();
            return new Size(size.getWidth(), size.getHeight());
@@ -196,7 +163,9 @@ public class CameraCapture extends SurfaceCapture {
    public void start(Surface surface) throws IOException {
        try {
            CameraCaptureSession session = createCaptureSession(cameraDevice, surface);
-            CaptureRequest request = createCaptureRequest(surface);
+            CaptureRequest.Builder requestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+            requestBuilder.addTarget(surface);
+            CaptureRequest request = requestBuilder.build();
            setRepeatingRequest(session, request);
        } catch (CameraAccessException | InterruptedException e) {
            throw new IOException(e);
@@ -226,8 +195,8 @@ public class CameraCapture extends SurfaceCapture {

        this.maxSize = maxSize;
        try {
-            size = selectSize(cameraId, null, maxSize, aspectRatio, highSpeed);
-            return size != null;
+            size = selectSize(cameraId, null, maxSize, aspectRatio);
+            return true;
        } catch (CameraAccessException e) {
            Ln.w("Could not select camera size", e);
            return false;
@@ -237,11 +206,13 @@ public class CameraCapture extends SurfaceCapture {
    @SuppressLint("MissingPermission")
    @TargetApi(Build.VERSION_CODES.S)
    private CameraDevice openCamera(String id) throws CameraAccessException, InterruptedException {
+        Ln.v("Open Camera: " + id);
+
        CompletableFuture<CameraDevice> future = new CompletableFuture<>();
        ServiceManager.getCameraManager().openCamera(id, new CameraDevice.StateCallback() {
            @Override
            public void onOpened(CameraDevice camera) {
-                Ln.d("Camera opened successfully");
+                Ln.v("Open Camera Success");
                future.complete(camera);
            }

@@ -284,15 +255,17 @@ public class CameraCapture extends SurfaceCapture {

    @TargetApi(Build.VERSION_CODES.S)
    private CameraCaptureSession createCaptureSession(CameraDevice camera, Surface surface) throws CameraAccessException, InterruptedException {
+        Ln.d("Create Capture Session");
+
        CompletableFuture<CameraCaptureSession> future = new CompletableFuture<>();
+        // replace by createCaptureSession(SessionConfiguration)
        OutputConfiguration outputConfig = new OutputConfiguration(surface);
        List<OutputConfiguration> outputs = Arrays.asList(outputConfig);
-
-        int sessionType = highSpeed ? SessionConfiguration.SESSION_HIGH_SPEED : SessionConfiguration.SESSION_REGULAR;
-        SessionConfiguration sessionConfig = new SessionConfiguration(sessionType, outputs, cameraExecutor,
+        SessionConfiguration sessionConfig = new SessionConfiguration(SessionConfiguration.SESSION_REGULAR, outputs, cameraExecutor,
                new CameraCaptureSession.StateCallback() {
                    @Override
                    public void onConfigured(CameraCaptureSession session) {
+                        Ln.d("Create Capture Session Success");
                        future.complete(session);
                    }

@@ -311,37 +284,25 @@ public class CameraCapture extends SurfaceCapture {
        }
    }

-    private CaptureRequest createCaptureRequest(Surface surface) throws CameraAccessException {
-        CaptureRequest.Builder requestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
-        requestBuilder.addTarget(surface);
-
-        if (fps > 0) {
-            requestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, new Range<>(fps, fps));
-        }
-
-        return requestBuilder.build();
-    }
-
    @TargetApi(Build.VERSION_CODES.S)
    private void setRepeatingRequest(CameraCaptureSession session, CaptureRequest request) throws CameraAccessException, InterruptedException {
-        CameraCaptureSession.CaptureCallback callback = new CameraCaptureSession.CaptureCallback() {
+        CompletableFuture<Void> future = new CompletableFuture<>();
+        session.setRepeatingRequest(request, new CameraCaptureSession.CaptureCallback() {
            @Override
            public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, long timestamp, long frameNumber) {
-                // Called for each frame captured, do nothing
+                future.complete(null);
            }

            @Override
            public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request, CaptureFailure failure) {
-                Ln.w("Camera capture failed: frame " + failure.getFrameNumber());
+                future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
            }
-        };
+        }, cameraHandler);

-        if (highSpeed) {
-            CameraConstrainedHighSpeedCaptureSession highSpeedSession = (CameraConstrainedHighSpeedCaptureSession) session;
-            List<CaptureRequest> requests = highSpeedSession.createHighSpeedRequestList(request);
-            highSpeedSession.setRepeatingBurst(requests, callback, cameraHandler);
-        } else {
-            session.setRepeatingRequest(request, callback, cameraHandler);
+        try {
+            future.get();
+        } catch (ExecutionException e) {
+            throw (CameraAccessException) e.getCause();
        }
    }

@@ -349,4 +310,4 @@ public class CameraCapture extends SurfaceCapture {
    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,12 +1,10 @@
 package com.genymobile.scrcpy;

-import android.annotation.SuppressLint;
 import android.hardware.camera2.CameraCharacteristics;

 public enum CameraFacing {
    FRONT("front", CameraCharacteristics.LENS_FACING_FRONT),
    BACK("back", CameraCharacteristics.LENS_FACING_BACK),
-    @SuppressLint("InlinedApi") // introduced in API 23
    EXTERNAL("external", CameraCharacteristics.LENS_FACING_EXTERNAL);

    private final String name;
--- a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
@@ -132,29 +132,20 @@ public final class DesktopConnection implements Closeable {
        return controlSocket;
    }

-    public void shutdown() throws IOException {
+    public void close() throws IOException {
        if (videoSocket != null) {
            videoSocket.shutdownInput();
            videoSocket.shutdownOutput();
+            videoSocket.close();
        }
        if (audioSocket != null) {
            audioSocket.shutdownInput();
            audioSocket.shutdownOutput();
+            audioSocket.close();
        }
        if (controlSocket != null) {
            controlSocket.shutdownInput();
            controlSocket.shutdownOutput();
-        }
-    }
-
-    public void close() throws IOException {
-        if (videoSocket != null) {
-            videoSocket.close();
-        }
-        if (audioSocket != null) {
-            audioSocket.close();
-        }
-        if (controlSocket != null) {
            controlSocket.close();
        }
    }
--- a/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
+++ b/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
@@ -18,7 +18,7 @@ public final class FakeContext extends MutableContextWrapper {
    }

    private FakeContext() {
-        super(Workarounds.retrieveSystemContext());
+        super(null);
    }

    @Override
--- a/server/src/main/java/com/genymobile/scrcpy/Ln.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Ln.java
@@ -2,11 +2,6 @@ package com.genymobile.scrcpy;

 import android.util.Log;

-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
 /**
 * Log both to Android logger (so that logs are visible in "adb logcat") and standard output/error (so that they are visible in the terminal
 * directly).
@@ -16,9 +11,6 @@ public final class Ln {
    private static final String TAG = "scrcpy";
    private static final String PREFIX = "[server] ";

-    private static final PrintStream CONSOLE_OUT = new PrintStream(new FileOutputStream(FileDescriptor.out));
-    private static final PrintStream CONSOLE_ERR = new PrintStream(new FileOutputStream(FileDescriptor.err));
-
    enum Level {
        VERBOSE, DEBUG, INFO, WARN, ERROR
    }
@@ -29,12 +21,6 @@ public final class Ln {
        // not instantiable
    }

-    public static void disableSystemStreams() {
-        PrintStream nullStream = new PrintStream(new NullOutputStream());
-        System.setOut(nullStream);
-        System.setErr(nullStream);
-    }
-
    /**
     * Initialize the log level.
     * <p>
@@ -53,30 +39,30 @@ public final class Ln {
    public static void v(String message) {
        if (isEnabled(Level.VERBOSE)) {
            Log.v(TAG, message);
-            CONSOLE_OUT.print(PREFIX + "VERBOSE: " + message + '\n');
+            System.out.print(PREFIX + "VERBOSE: " + message + '\n');
        }
    }

    public static void d(String message) {
        if (isEnabled(Level.DEBUG)) {
            Log.d(TAG, message);
-            CONSOLE_OUT.print(PREFIX + "DEBUG: " + message + '\n');
+            System.out.print(PREFIX + "DEBUG: " + message + '\n');
        }
    }

    public static void i(String message) {
        if (isEnabled(Level.INFO)) {
            Log.i(TAG, message);
-            CONSOLE_OUT.print(PREFIX + "INFO: " + message + '\n');
+            System.out.print(PREFIX + "INFO: " + message + '\n');
        }
    }

    public static void w(String message, Throwable throwable) {
        if (isEnabled(Level.WARN)) {
            Log.w(TAG, message, throwable);
-            CONSOLE_ERR.print(PREFIX + "WARN: " + message + '\n');
+            System.err.print(PREFIX + "WARN: " + message + '\n');
            if (throwable != null) {
-                throwable.printStackTrace(CONSOLE_ERR);
+                throwable.printStackTrace();
            }
        }
    }
@@ -88,9 +74,9 @@ public final class Ln {
    public static void e(String message, Throwable throwable) {
        if (isEnabled(Level.ERROR)) {
            Log.e(TAG, message, throwable);
-            CONSOLE_ERR.print(PREFIX + "ERROR: " + message + '\n');
+            System.err.print(PREFIX + "ERROR: " + message + "\n");
            if (throwable != null) {
-                throwable.printStackTrace(CONSOLE_ERR);
+                throwable.printStackTrace();
            }
        }
    }
@@ -98,21 +84,4 @@ public final class Ln {
    public static void e(String message) {
        e(message, null);
    }
-
-    static class NullOutputStream extends OutputStream {
-        @Override
-        public void write(byte[] b) {
-            // ignore
-        }
-
-        @Override
-        public void write(byte[] b, int off, int len) {
-            // ignore
-        }
-
-        @Override
-        public void write(int b) {
-            // ignore
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
@@ -9,11 +9,8 @@ import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.MediaCodec;
-import android.util.Range;

 import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;

 public final class LogUtils {

@@ -95,36 +92,19 @@ public final class LogUtils {
                for (String id : cameraIds) {
                    builder.append("\n    --video-source=camera --camera-id=").append(id);
                    CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(id);
-
                    int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
                    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()).append(", ");
-
-                    // Capture frame rates for low-FPS mode are the same for every resolution
-                    Range<Integer>[] lowFpsRanges = characteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
-                    SortedSet<Integer> uniqueLowFps = getUniqueSet(lowFpsRanges);
-                    builder.append("fps=").append(uniqueLowFps).append(')');
+                    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());
                        }
-
-                        android.util.Size[] highSpeedSizes = configs.getHighSpeedVideoSizes();
-                        if (highSpeedSizes.length > 0) {
-                            builder.append("\n      High speed capture (--camera-high-speed):");
-                            for (android.util.Size size : highSpeedSizes) {
-                                Range<Integer>[] highFpsRanges = configs.getHighSpeedVideoFpsRanges();
-                                SortedSet<Integer> uniqueHighFps = getUniqueSet(highFpsRanges);
-                                builder.append("\n        - ").append(size.getWidth()).append("x").append(size.getHeight());
-                                builder.append(" (fps=").append(uniqueHighFps).append(')');
-                            }
-                        }
                    }
                }
            }
@@ -133,12 +113,4 @@ public final class LogUtils {
        }
        return builder.toString();
    }
-
-    private static SortedSet<Integer> getUniqueSet(Range<Integer>[] ranges) {
-        SortedSet<Integer> set = new TreeSet<>();
-        for (Range<Integer> range : ranges) {
-            set.add(range.getUpper());
-        }
-        return set;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -28,8 +28,6 @@ public class Options {
    private Size cameraSize;
    private CameraFacing cameraFacing;
    private CameraAspectRatio cameraAspectRatio;
-    private int cameraFps;
-    private boolean cameraHighSpeed;
    private boolean showTouches;
    private boolean stayAwake;
    private List<CodecOption> videoCodecOptions;
@@ -138,14 +136,6 @@ public class Options {
        return cameraAspectRatio;
    }

-    public int getCameraFps() {
-        return cameraFps;
-    }
-
-    public boolean getCameraHighSpeed() {
-        return cameraHighSpeed;
-    }
-
    public boolean getShowTouches() {
        return showTouches;
    }
@@ -394,12 +384,6 @@ public class Options {
                        options.cameraAspectRatio = parseCameraAspectRatio(value);
                    }
                    break;
-                case "camera_fps":
-                    options.cameraFps = Integer.parseInt(value);
-                    break;
-                case "camera_high_speed":
-                    options.cameraHighSpeed = Boolean.parseBoolean(value);
-                    break;
                case "send_device_meta":
                    options.sendDeviceMeta = Boolean.parseBoolean(value);
                    break;
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
@@ -48,8 +48,8 @@ public class ScreenCapture extends SurfaceCapture implements Device.RotationList
    }

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

--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -2,6 +2,7 @@ package com.genymobile.scrcpy;

 import android.os.BatteryManager;
 import android.os.Build;
+import android.os.Looper;

 import java.io.IOException;
 import java.util.ArrayList;
@@ -87,11 +88,7 @@ public final class Server {
    }

    private static void scrcpy(Options options) throws IOException, ConfigurationException {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S && options.getVideoSource() == VideoSource.CAMERA) {
-            Ln.e("Camera mirroring is not supported before Android 12");
-            throw new ConfigurationException("Camera mirroring is not supported");
-        }
-
+        Ln.i("Device: [" + Build.MANUFACTURER + "] " + Build.BRAND + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
        final Device device = new Device(options);

        Thread initThread = startInitThread(options);
@@ -102,8 +99,8 @@ public final class Server {
        boolean video = options.getVideo();
        boolean audio = options.getAudio();
        boolean sendDummyByte = options.getSendDummyByte();
-        boolean camera = options.getVideoSource() == VideoSource.CAMERA;

+        boolean camera = true;
        Workarounds.apply(audio, camera);

        List<AsyncProcessor> asyncProcessors = new ArrayList<>();
@@ -142,7 +139,7 @@ public final class Server {
                    surfaceCapture = new ScreenCapture(device);
                } else {
                    surfaceCapture = new CameraCapture(options.getCameraId(), options.getCameraFacing(), options.getCameraSize(),
-                            options.getMaxSize(), options.getCameraAspectRatio(), options.getCameraFps(), options.getCameraHighSpeed());
+                            options.getMaxSize(), options.getCameraAspectRatio());
                }
                SurfaceEncoder surfaceEncoder = new SurfaceEncoder(surfaceCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
                        options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
@@ -163,8 +160,6 @@ public final class Server {
                asyncProcessor.stop();
            }

-            connection.shutdown();
-
            try {
                initThread.join();
                for (AsyncProcessor asyncProcessor : asyncProcessors) {
@@ -184,33 +179,15 @@ public final class Server {
        return thread;
    }

-    public static void main(String... args) {
-        int status = 0;
-        try {
-            internalMain(args);
-        } catch (Throwable t) {
-            Ln.e(t.getMessage(), t);
-            status = 1;
-        } finally {
-            // By default, the Java process exits when all non-daemon threads are terminated.
-            // The Android SDK might start some non-daemon threads internally, preventing the scrcpy server to exit.
-            // So force the process to exit explicitly.
-            System.exit(status);
-        }
-    }
-
-    private static void internalMain(String... args) throws Exception {
+    public static void main(String... args) throws Exception {
        Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
            Ln.e("Exception on thread " + t, e);
        });

        Options options = Options.parse(args);

-        Ln.disableSystemStreams();
        Ln.initLogLevel(options.getLogLevel());

-        Ln.i("Device: [" + Build.MANUFACTURER + "] " + Build.BRAND + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
-
        if (options.getList()) {
            if (options.getCleanup()) {
                CleanUp.unlinkSelf();
--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/SurfaceCapture.java
@@ -56,9 +56,9 @@ public abstract class SurfaceCapture {
    /**
     * Set the maximum capture size (set by the encoder if it does not support the current size).
     *
-     * @param maxSize Maximum size
+     * @param size Maximum size
     */
-    public abstract boolean setMaxSize(int maxSize);
+    public abstract boolean setMaxSize(int size);

    /**
     * Indicate if the capture has been closed internally.
--- a/server/src/main/java/com/genymobile/scrcpy/VideoCodec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/VideoCodec.java
@@ -6,7 +6,7 @@ import android.media.MediaFormat;
 public enum VideoCodec implements Codec {
    H264(0x68_32_36_34, "h264", MediaFormat.MIMETYPE_VIDEO_AVC),
    H265(0x68_32_36_35, "h265", MediaFormat.MIMETYPE_VIDEO_HEVC),
-    @SuppressLint("InlinedApi") // introduced in API 29
+    @SuppressLint("InlinedApi") // introduced in API 21
    AV1(0x00_61_76_31, "av1", MediaFormat.MIMETYPE_VIDEO_AV1);

    private final int id; // 4-byte ASCII representation of the name
--- a/server/src/main/java/com/genymobile/scrcpy/VideoSource.java
+++ b/server/src/main/java/com/genymobile/scrcpy/VideoSource.java
@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy;

+import android.media.MediaRecorder;
+
 public enum VideoSource {
    DISPLAY("display"),
    CAMERA("camera");
--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
@@ -7,7 +7,6 @@ import android.content.AttributionSource;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -31,15 +30,9 @@ public final class Workarounds {

    public static void apply(boolean audio, boolean camera) {
        Workarounds.prepareMainLooper();
-        try {
-            fillActivityThread();
-            FakeContext.get();
-        } catch (Exception e) {
-            throw new AssertionError(e);
-        }

        boolean mustFillAppInfo = false;
-        boolean mustFillBaseContext = false;
+        boolean mustFillBaseContext = true;
        boolean mustFillAppContext = false;

        if (Build.BRAND.equalsIgnoreCase("meizu")) {
@@ -73,7 +66,6 @@ public final class Workarounds {

        if (camera) {
            mustFillAppInfo = true;
-            mustFillBaseContext = true;
        }

        if (mustFillAppInfo) {
@@ -130,22 +122,6 @@ public final class Workarounds {
            ApplicationInfo applicationInfo = new ApplicationInfo();
            applicationInfo.packageName = FakeContext.PACKAGE_NAME;

-            Application application = new Application() {
-                @Override
-                public String getOpPackageName() {
-                    return FakeContext.PACKAGE_NAME;
-                }
-
-                @Override
-                public PackageManager getPackageManager() {
-                    return FakeContext.get().getPackageManager();
-                }
-            };
-
-            Field initialApplicationField = activityThreadClass.getDeclaredField("mInitialApplication");
-            initialApplicationField.setAccessible(true);
-            initialApplicationField.set(activityThread, application);
-
            // appBindData.appInfo = applicationInfo;
            Field appInfoField = appBindDataClass.getDeclaredField("appInfo");
            appInfoField.setAccessible(true);
@@ -329,16 +305,4 @@ public final class Workarounds {
            throw new RuntimeException("Cannot create AudioRecord");
        }
    }
-
-    static Context retrieveSystemContext() {
-        try {
-            Method getSystemContextMethod = activityThreadClass.getDeclaredMethod("getSystemContext");
-            Context ctx = (Context) getSystemContextMethod.invoke(activityThread);
-            Ln.i("===== " + ctx);
-            return ctx;
-        } catch (Exception e) {
-            Ln.e("Cannot retrieve system context", e);
-            return null;
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
@@ -1,6 +1,7 @@
 package com.genymobile.scrcpy.wrappers;

 import com.genymobile.scrcpy.FakeContext;
+import com.genymobile.scrcpy.Workarounds;

 import android.annotation.SuppressLint;
 import android.content.Context;
Author	SHA1	Message	Date
Romain Vimont	fe8b63b921	Support camera size selection using -m/--camera-ar In addition to --camera-size to specify an explicit size, make it possible to select the camera size automatically, respecting the maximum size (already used for display mirroring) and an aspect ratio. For example, "scrcpy --video-source=camera" followed by: - (no additional arguments) : mirrors at the maximum size, any a-r - -m1920 : only consider valid sizes having both dimensions not above 1920 - --camera-ar=4:3 : only consider valid sizes having an aspect ratio of 4:3 (+/- 10%) - -m2048 --camera-ar=1.6 : only consider valid sizes having both dimensions not above 2048 and an aspect ratio of 1.6 (+/- 10%) Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>	2023-10-27 17:19:20 +02:00
Simon Chan	9b38f63ab1	Add --camera-facing Add an option to select the camera by its lens facing (any, front, back or external). Co-authored-by: Romain Vimont <rom@rom1v.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-10-27 17:19:20 +02:00
Romain Vimont	88edb20e53	Make camera id optional If no camera id is provided, use the first camera available.	2023-10-27 17:19:20 +02:00
Romain Vimont	24c5a38fc0	Handle camera disconnection	2023-10-27 17:19:20 +02:00
Romain Vimont	645d06bc93	Automatically select audio source If --audio-source is not specified, select the default value according to the video source: - for display mirroring, use device audio by default; - for camera mirroring, use microphone by default.	2023-10-27 17:19:20 +02:00
Romain Vimont	c122c351b8	DONOTMERGE workaround for Android 11 testing	2023-10-27 17:19:20 +02:00
Simon Chan	31bbb97650	Add camera mirroring Add --video-source=camera, and related options: - --camera-id=ID: select the camera (ids are listed by --list-cameras); - --camera-size=WIDTHxHEIGHT: select the capture size. Signed-off-by: Romain Vimont <rom@rom1v.com>	2023-10-27 17:19:20 +02:00
Romain Vimont	4d059cab52	Add --list-camera-sizes	2023-10-27 17:19:20 +02:00
Simon Chan	5406c93283	Add --list-cameras Add an option to list the device cameras. Co-authored-by: Romain Vimont <rom@rom1v.com>	2023-10-27 17:19:20 +02:00
Romain Vimont	8c96ab130e	Factorize --list- options handling This will limit code duplication as more list options will be added.	2023-10-27 17:19:20 +02:00
Romain Vimont	c191e9a46e	Make separator configurable for parsing integers The separator was hardcoded to ':'. This will allow to reuse the function to parse sizes as WIDTHxHEIGHT.	2023-10-27 17:19:20 +02:00
Simon Chan	e30b7575b2	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-10-27 17:19:20 +02:00
Romain Vimont	c79e0f6989	Rename --display to --display-id The option is named "display id" everywhere. This will be consistent with --camera-id (there will be many camera options, so an option --camera would be confusing).	2023-10-27 17:19:20 +02:00