longlong

They could be useful anywhere.

BUILD.md

@@ -233,10 +233,10 @@ You can then [run](README.md#run) _scrcpy_.
 
 ## Prebuilt server
 
- - [`scrcpy-server-v1.12.1`][direct-scrcpy-server]  
-   _(SHA-256: 63e569c8a1d0c1df31d48c4214871c479a601782945fed50c1e61167d78266ea)_
+ - [`scrcpy-server-v1.12`][direct-scrcpy-server]  
+   _(SHA-256: b6595262c230e9773fdb817257abcc8c6e6e00f15b1c32b6a850ccfd8176dc10)_
 
-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-server-v1.12.1
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.12/scrcpy-server-v1.12
 
 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:

README.md

@@ -1,4 +1,4 @@
-# scrcpy (v1.12.1)
+# scrcpy (v1.12)
 
 This application provides display and control of Android devices connected on
 USB (or [over TCP/IP][article-tcpip]). It does not require any _root_ access.
@@ -62,13 +62,13 @@ For Gentoo, an [Ebuild] is available: [`scrcpy/`][ebuild-link].
 For Windows, for simplicity, prebuilt archives with all the dependencies
 (including `adb`) are available:
 
- - [`scrcpy-win32-v1.12.1.zip`][direct-win32]  
-   _(SHA-256: 0f4b3b063536b50a2df05dc42c760f9cc0093a9a26dbdf02d8232c74dab43480)_
- - [`scrcpy-win64-v1.12.1.zip`][direct-win64]  
-   _(SHA-256: 57d34b6d16cfd9fe169bc37c4df58ebd256d05c1ea3febc63d9cb0a027ab47c9)_
+ - [`scrcpy-win32-v1.12.zip`][direct-win32]  
+   _(SHA-256: b2c8c4a3899c037cf448a2102906775114826ba646ce1b847826925103fa801d)_
+ - [`scrcpy-win64-v1.12.zip`][direct-win64]  
+   _(SHA-256: 7d47983b426f7287de0230b88975dc17c1d9c343fa61a93ff2af78b6e9ef5c8c)_
 
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win32-v1.12.1.zip
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win64-v1.12.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v1.12/scrcpy-win32-v1.12.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.12/scrcpy-win64-v1.12.zip
 
 You can also [build the app manually][BUILD].
 
@@ -137,14 +137,12 @@ scrcpy -b 2M  # short version
 
 #### Limit frame rate
 
-The capture frame rate can be limited:
+On devices with Android >= 10, the capture frame rate can be limited:
 
 ```bash
 scrcpy --max-fps 15
 ```
 
-This is officially supported since Android 10, but may work on earlier versions.
-
 #### Crop
 
 The device screen may be cropped to mirror only part of the screen.

app/meson.build

@@ -76,9 +76,11 @@ cc = meson.get_compiler('c')
 
 if host_machine.system() == 'windows'
     src += [ 'src/sys/win/command.c' ]
+    src += [ 'src/sys/win/net.c' ]
     dependencies += cc.find_library('ws2_32')
 else
     src += [ 'src/sys/unix/command.c' ]
+    src += [ 'src/sys/unix/net.c' ]
 endif
 
 conf = configuration_data()
@@ -96,10 +98,9 @@ conf.set_quoted('PREFIX', get_option('prefix'))
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))
 
-# the default client TCP port range for the "adb reverse" tunnel
+# the default client TCP port for the "adb reverse" tunnel
 # overridden by option --port
-conf.set('DEFAULT_LOCAL_PORT_RANGE_FIRST', '27183')
-conf.set('DEFAULT_LOCAL_PORT_RANGE_LAST', '27199')
+conf.set('DEFAULT_LOCAL_PORT', '27183')
 
 # the default max video size for both dimensions, in pixels
 # overridden by option --max-size

app/scrcpy.1

@@ -43,7 +43,7 @@ Print this help.
 
 .TP
 .BI "\-\-max\-fps " value
-Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
+Limit the framerate of screen capture (only supported on devices with Android >= 10).
 
 .TP
 .BI "\-m, \-\-max\-size " value
@@ -60,10 +60,10 @@ Disable device control (mirror the device in read\-only).
 Do not display device (only when screen recording is enabled).
 
 .TP
-.BI "\-p, \-\-port " port[:port]
-Set the TCP port (range) used by the client to listen.
+.BI "\-p, \-\-port " port
+Set the TCP port the client listens on.
 
-Default is 27183:27199.
+Default is 27183.
 
 .TP
 .B \-\-prefer\-text

app/src/cli.c

@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <unistd.h>
 
 #include "config.h"
@@ -42,8 +43,8 @@ scrcpy_print_usage(const char *arg0) {
         "        Print this help.\n"
         "\n"
         "    --max-fps value\n"
-        "        Limit the frame rate of screen capture (officially supported\n"
-        "        since Android 10, but may work on earlier versions).\n"
+        "        Limit the frame rate of screen capture (only supported on\n"
+        "        devices with Android >= 10).\n"
         "\n"
         "    -m, --max-size value\n"
         "        Limit both the width and height of the video to value. The\n"
@@ -58,9 +59,9 @@ scrcpy_print_usage(const char *arg0) {
         "        Do not display device (only when screen recording is\n"
         "        enabled).\n"
         "\n"
-        "    -p, --port port[:port]\n"
-        "        Set the TCP port (range) used by the client to listen.\n"
-        "        Default is %d:%d.\n"
+        "    -p, --port port\n"
+        "        Set the TCP port the client listens on.\n"
+        "        Default is %d.\n"
         "\n"
         "    --prefer-text\n"
         "        Inject alpha characters and space as text events instead of\n"
@@ -193,13 +194,13 @@ scrcpy_print_usage(const char *arg0) {
         arg0,
         DEFAULT_BIT_RATE,
         DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
-        DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
+        DEFAULT_LOCAL_PORT);
 }
 
 static bool
-parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
-                  long max, const char *name) {
-    long value;
+parse_integer_arg(const char *s, long long *out, bool accept_suffix,
+                  long long min, long long max, const char *name) {
+    long long value;
     bool ok;
     if (accept_suffix) {
         ok = parse_integer_with_suffix(s, &value);
@@ -212,8 +213,8 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
     }
 
     if (value < min || value > max) {
-        LOGE("Could not parse %s: value (%ld) out-of-range (%ld; %ld)",
-             name, value, min, max);
+        LOGE("Could not parse %s: value (%" PRIlld ") out-of-range (%"
+             PRIlld "; %" PRIlld ")", name, value, min, max);
         return false;
     }
 
@@ -221,33 +222,10 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
     return true;
 }
 
-static size_t
-parse_integers_arg(const char *s, size_t max_items, long *out, long min,
-                   long max, const char *name) {
-    size_t count = parse_integers(s, ':', max_items, out);
-    if (!count) {
-        LOGE("Could not parse %s: %s", name, s);
-        return 0;
-    }
-
-    for (size_t i = 0; i < count; ++i) {
-        long value = out[i];
-        if (value < min || value > max) {
-            LOGE("Could not parse %s: value (%ld) out-of-range (%ld; %ld)",
-                 name, value, min, max);
-            return 0;
-        }
-    }
-
-    return count;
-}
-
 static bool
 parse_bit_rate(const char *s, uint32_t *bit_rate) {
-    long value;
-    // long may be 32 bits (it is the case on mingw), so do not use more than
-    // 31 bits (long is signed)
-    bool ok = parse_integer_arg(s, &value, true, 0, 0x7FFFFFFF, "bit-rate");
+    long long value;
+    bool ok = parse_integer_arg(s, &value, true, 0, 0xFFFFFFFFLL, "bit-rate");
     if (!ok) {
         return false;
     }
@@ -258,7 +236,7 @@ parse_bit_rate(const char *s, uint32_t *bit_rate) {
 
 static bool
 parse_max_size(const char *s, uint16_t *max_size) {
-    long value;
+    long long value;
     bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "max size");
     if (!ok) {
         return false;
@@ -270,7 +248,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;
+    long long value;
     bool ok = parse_integer_arg(s, &value, false, 0, 1000, "max fps");
     if (!ok) {
         return false;
@@ -282,7 +260,7 @@ parse_max_fps(const char *s, uint16_t *max_fps) {
 
 static bool
 parse_window_position(const char *s, int16_t *position) {
-    long value;
+    long long value;
     bool ok = parse_integer_arg(s, &value, false, -1, 0x7FFF,
                                 "window position");
     if (!ok) {
@@ -295,7 +273,7 @@ parse_window_position(const char *s, int16_t *position) {
 
 static bool
 parse_window_dimension(const char *s, uint16_t *dimension) {
-    long value;
+    long long value;
     bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF,
                                 "window dimension");
     if (!ok) {
@@ -307,30 +285,14 @@ parse_window_dimension(const char *s, uint16_t *dimension) {
 }
 
 static bool
-parse_port_range(const char *s, struct port_range *port_range) {
-    long values[2];
-    size_t count = parse_integers_arg(s, 2, values, 0, 0xFFFF, "port");
-    if (!count) {
+parse_port(const char *s, uint16_t *port) {
+    long long value;
+    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "port");
+    if (!ok) {
         return false;
     }
 
-    uint16_t v0 = (uint16_t) values[0];
-    if (count == 1) {
-        port_range->first = v0;
-        port_range->last = v0;
-        return true;
-    }
-
-    assert(count == 2);
-    uint16_t v1 = (uint16_t) values[1];
-    if (v0 < v1) {
-        port_range->first = v0;
-        port_range->last = v1;
-    } else {
-        port_range->first = v1;
-        port_range->last = v0;
-    }
-
+    *port = (uint16_t) value;
     return true;
 }
 
@@ -461,7 +423,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                 opts->display = false;
                 break;
             case 'p':
-                if (!parse_port_range(optarg, &opts->port_range)) {
+                if (!parse_port(optarg, &opts->port)) {
                     return false;
                 }
                 break;

app/src/command.c

@@ -4,6 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "common.h"
@@ -55,32 +58,6 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
     return idx;
 }
 
-static void
-show_adb_installation_msg() {
-#ifndef __WINDOWS__
-    static const struct {
-        const char *binary;
-        const char *command;
-    } pkg_managers[] = {
-        {"apt", "apt install adb"},
-        {"apt-get", "apt-get install adb"},
-        {"brew", "brew cask install android-platform-tools"},
-        {"dnf", "dnf install android-tools"},
-        {"emerge", "emerge dev-util/android-tools"},
-        {"pacman", "pacman -S android-tools"},
-    };
-    for (size_t i = 0; i < ARRAY_LEN(pkg_managers); ++i) {
-        if (cmd_search(pkg_managers[i].binary)) {
-            LOGI("You may install 'adb' by \"%s\"", pkg_managers[i].command);
-            return;
-        }
-    }
-#endif
-
-    LOGI("You may download and install 'adb' from "
-         "https://developer.android.com/studio/releases/platform-tools");
-}
-
 static void
 show_adb_err_msg(enum process_result err, const char *const argv[]) {
     char buf[512];
@@ -94,7 +71,6 @@ show_adb_err_msg(enum process_result err, const char *const argv[]) {
             LOGE("Command not found: %s", buf);
             LOGE("(make 'adb' accessible from your PATH or define its full"
                  "path in the ADB environment variable)");
-            show_adb_installation_msg();
             break;
         case PROCESS_SUCCESS:
             // do nothing
@@ -229,3 +205,14 @@ process_check_success(process_t proc, const char *name) {
     }
     return true;
 }
+
+bool
+is_regular_file(const char *path) {
+    struct stat path_stat;
+    int r = stat(path, &path_stat);
+    if (r) {
+        perror("stat");
+        return false;
+    }
+    return S_ISREG(path_stat.st_mode);
+}

app/src/command.h

@@ -4,38 +4,8 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
-#ifdef _WIN32
-
- // not needed here, but winsock2.h must never be included AFTER windows.h
-# include <winsock2.h>
-# include <windows.h>
-# define PATH_SEPARATOR '\\'
-# define PRIexitcode "lu"
-// <https://stackoverflow.com/a/44383330/1987178>
-# ifdef _WIN64
-#   define PRIsizet PRIu64
-# else
-#   define PRIsizet PRIu32
-# endif
-# define PROCESS_NONE NULL
-# define NO_EXIT_CODE -1u // max value as unsigned
-  typedef HANDLE process_t;
-  typedef DWORD exit_code_t;
-
-#else
-
-# include <sys/types.h>
-# define PATH_SEPARATOR '/'
-# define PRIsizet "zu"
-# define PRIexitcode "d"
-# define PROCESS_NONE -1
-# define NO_EXIT_CODE -1
-  typedef pid_t process_t;
-  typedef int exit_code_t;
-
-#endif
-
 #include "config.h"
+#include "common.h"
 
 enum process_result {
     PROCESS_SUCCESS,
@@ -43,11 +13,6 @@ enum process_result {
     PROCESS_ERROR_MISSING_BINARY,
 };
 
-#ifndef __WINDOWS__
-bool
-cmd_search(const char *file);
-#endif
-
 enum process_result
 cmd_execute(const char *const argv[], process_t *process);
 

app/src/common.h

@@ -5,6 +5,44 @@
 
 #include "config.h"
 
+#ifdef _WIN32
+
+ // not needed here, but winsock2.h must never be included AFTER windows.h
+# include <winsock2.h>
+# include <windows.h>
+# define PATH_SEPARATOR '\\'
+# define PRIexitcode "lu"
+// <https://stackoverflow.com/a/44383330/1987178>
+# ifdef _WIN64
+#   define PRIsizet PRIu64
+# else
+#   define PRIsizet PRIu32
+# endif
+# define PROCESS_NONE NULL
+# define NO_EXIT_CODE -1u // max value as unsigned
+  typedef HANDLE process_t;
+  typedef DWORD exit_code_t;
+
+#else
+
+# include <sys/types.h>
+# define PATH_SEPARATOR '/'
+# define PRIsizet "zu"
+# define PRIexitcode "d"
+# define PROCESS_NONE -1
+# define NO_EXIT_CODE -1
+  typedef pid_t process_t;
+  typedef int exit_code_t;
+
+#endif
+
+// in MinGW, "%ll" is not supported as printf format for long long
+# ifdef __MINGW32__
+#   define PRIlld "I64d"
+# else
+#   define PRIlld "lld"
+# endif
+
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)
 #define MAX(X,Y) (X) > (Y) ? (X) : (Y)
@@ -27,9 +65,4 @@ struct position {
     struct point point;
 };
 
-struct port_range {
-    uint16_t first;
-    uint16_t last;
-};
-
 #endif

app/src/scrcpy.c

@@ -280,7 +280,7 @@ scrcpy(const struct scrcpy_options *options) {
     bool record = !!options->record_filename;
     struct server_params params = {
         .crop = options->crop,
-        .port_range = options->port_range,
+        .local_port = options->port,
         .max_size = options->max_size,
         .bit_rate = options->bit_rate,
         .max_fps = options->max_fps,

app/src/scrcpy.h

@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "common.h"
 #include "input_manager.h"
 #include "recorder.h"
 
@@ -16,7 +15,7 @@ struct scrcpy_options {
     const char *window_title;
     const char *push_target;
     enum recorder_format record_format;
-    struct port_range port_range;
+    uint16_t port;
     uint16_t max_size;
     uint32_t bit_rate;
     uint16_t max_fps;
@@ -42,10 +41,7 @@ struct scrcpy_options {
     .window_title = NULL, \
     .push_target = NULL, \
     .record_format = RECORDER_FORMAT_AUTO, \
-    .port_range = { \
-        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST, \
-        .last = DEFAULT_LOCAL_PORT_RANGE_LAST, \
-    }, \
+    .port = DEFAULT_LOCAL_PORT, \
     .max_size = DEFAULT_MAX_SIZE, \
     .bit_rate = DEFAULT_BIT_RATE, \
     .max_fps = 0, \

app/src/server.c

@@ -6,13 +6,11 @@
 #include <libgen.h>
 #include <stdio.h>
 #include <SDL2/SDL_timer.h>
-#include <SDL2/SDL_platform.h>
 
 #include "config.h"
 #include "command.h"
 #include "util/log.h"
 #include "util/net.h"
-#include "util/str_util.h"
 
 #define SOCKET_NAME "scrcpy"
 #define SERVER_FILENAME "scrcpy-server"
@@ -20,39 +18,20 @@
 #define DEFAULT_SERVER_PATH PREFIX "/share/scrcpy/" SERVER_FILENAME
 #define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
 
-static char *
+static const char *
 get_server_path(void) {
-#ifdef __WINDOWS__
-    const wchar_t *server_path_env = _wgetenv(L"SCRCPY_SERVER_PATH");
-#else
     const char *server_path_env = getenv("SCRCPY_SERVER_PATH");
-#endif
     if (server_path_env) {
+        LOGD("Using SCRCPY_SERVER_PATH: %s", server_path_env);
         // if the envvar is set, use it
-#ifdef __WINDOWS__
-        char *server_path = utf8_from_wide_char(server_path_env);
-#else
-        char *server_path = SDL_strdup(server_path_env);
-#endif
-        if (!server_path) {
-            LOGE("Could not allocate memory");
-            return NULL;
-        }
-        LOGD("Using SCRCPY_SERVER_PATH: %s", server_path);
-        return server_path;
+        return server_path_env;
     }
 
 #ifndef PORTABLE
     LOGD("Using server: " DEFAULT_SERVER_PATH);
-    char *server_path = SDL_strdup(DEFAULT_SERVER_PATH);
-    if (!server_path) {
-        LOGE("Could not allocate memory");
-        return NULL;
-    }
     // the absolute path is hardcoded
-    return server_path;
+    return DEFAULT_SERVER_PATH;
 #else
-
     // use scrcpy-server in the same directory as the executable
     char *executable_path = get_executable_path();
     if (!executable_path) {
@@ -88,17 +67,12 @@ get_server_path(void) {
 
 static bool
 push_server(const char *serial) {
-    char *server_path = get_server_path();
-    if (!server_path) {
-        return false;
-    }
+    const char *server_path = get_server_path();
     if (!is_regular_file(server_path)) {
         LOGE("'%s' does not exist or is not a regular file\n", server_path);
-        SDL_free(server_path);
         return false;
     }
     process_t process = adb_push(serial, server_path, DEVICE_SERVER_PATH);
-    SDL_free(server_path);
     return process_check_success(process, "adb push");
 }
 
@@ -126,6 +100,17 @@ disable_tunnel_forward(const char *serial, uint16_t local_port) {
     return process_check_success(process, "adb forward --remove");
 }
 
+static bool
+enable_tunnel(struct server *server) {
+    if (enable_tunnel_reverse(server->serial, server->local_port)) {
+        return true;
+    }
+
+    LOGW("'adb reverse' failed, fallback to 'adb forward'");
+    server->tunnel_forward = true;
+    return enable_tunnel_forward(server->serial, server->local_port);
+}
+
 static bool
 disable_tunnel(struct server *server) {
     if (server->tunnel_forward) {
@@ -134,100 +119,6 @@ disable_tunnel(struct server *server) {
     return disable_tunnel_reverse(server->serial);
 }
 
-static socket_t
-listen_on_port(uint16_t port) {
-#define IPV4_LOCALHOST 0x7F000001
-    return net_listen(IPV4_LOCALHOST, port, 1);
-}
-
-static bool
-enable_tunnel_reverse_any_port(struct server *server,
-                               struct port_range port_range) {
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (!enable_tunnel_reverse(server->serial, port)) {
-            // the command itself failed, it will fail on any port
-            return false;
-        }
-
-        // At the application level, the device part is "the server" because it
-        // serves video stream and control. However, at the network level, the
-        // client listens and the server connects to the client. That way, the
-        // client can listen before starting the server app, so there is no
-        // need to try to connect until the server socket is listening on the
-        // device.
-        server->server_socket = listen_on_port(port);
-        if (server->server_socket != INVALID_SOCKET) {
-            // success
-            server->local_port = port;
-            return true;
-        }
-
-        // failure, disable tunnel and try another port
-        if (!disable_tunnel_reverse(server->serial)) {
-            LOGW("Could not remove reverse tunnel on port %" PRIu16, port);
-        }
-
-        // check before incrementing to avoid overflow on port 65535
-        if (port < port_range.last) {
-            LOGW("Could not listen on port %" PRIu16", retrying on %" PRIu16,
-                 port, port + 1);
-            port++;
-            continue;
-        }
-
-        if (port_range.first == port_range.last) {
-            LOGE("Could not listen on port %" PRIu16, port_range.first);
-        } else {
-            LOGE("Could not listen on any port in range %" PRIu16 ":%" PRIu16,
-                 port_range.first, port_range.last);
-        }
-        return false;
-    }
-}
-
-static bool
-enable_tunnel_forward_any_port(struct server *server,
-                               struct port_range port_range) {
-    server->tunnel_forward = true;
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (enable_tunnel_forward(server->serial, port)) {
-            // success
-            server->local_port = port;
-            return true;
-        }
-
-        if (port < port_range.last) {
-            LOGW("Could not forward port %" PRIu16", retrying on %" PRIu16,
-                 port, port + 1);
-            port++;
-            continue;
-        }
-
-        if (port_range.first == port_range.last) {
-            LOGE("Could not forward port %" PRIu16, port_range.first);
-        } else {
-            LOGE("Could not forward any port in range %" PRIu16 ":%" PRIu16,
-                 port_range.first, port_range.last);
-        }
-        return false;
-    }
-}
-
-static bool
-enable_tunnel_any_port(struct server *server, struct port_range port_range) {
-    if (enable_tunnel_reverse_any_port(server, port_range)) {
-        return true;
-    }
-
-    // if "adb reverse" does not work (e.g. over "adb connect"), it fallbacks to
-    // "adb forward", so the app socket is the client
-
-    LOGW("'adb reverse' failed, fallback to 'adb forward'");
-    return enable_tunnel_forward_any_port(server, port_range);
-}
-
 static process_t
 execute_server(struct server *server, const struct server_params *params) {
     char max_size_string[6];
@@ -270,6 +161,13 @@ execute_server(struct server *server, const struct server_params *params) {
     return adb_execute(server->serial, cmd, sizeof(cmd) / sizeof(cmd[0]));
 }
 
+#define IPV4_LOCALHOST 0x7F000001
+
+static socket_t
+listen_on_port(uint16_t port) {
+    return net_listen(IPV4_LOCALHOST, port, 1);
+}
+
 static socket_t
 connect_and_read_byte(uint16_t port) {
     socket_t socket = net_connect(IPV4_LOCALHOST, port);
@@ -323,7 +221,7 @@ server_init(struct server *server) {
 bool
 server_start(struct server *server, const char *serial,
              const struct server_params *params) {
-    server->port_range = params->port_range;
+    server->local_port = params->local_port;
 
     if (serial) {
         server->serial = SDL_strdup(serial);
@@ -337,11 +235,30 @@ server_start(struct server *server, const char *serial,
         return false;
     }
 
-    if (!enable_tunnel_any_port(server, params->port_range)) {
+    if (!enable_tunnel(server)) {
         SDL_free(server->serial);
         return false;
     }
 
+    // if "adb reverse" does not work (e.g. over "adb connect"), it fallbacks to
+    // "adb forward", so the app socket is the client
+    if (!server->tunnel_forward) {
+        // At the application level, the device part is "the server" because it
+        // serves video stream and control. However, at the network level, the
+        // client listens and the server connects to the client. That way, the
+        // client can listen before starting the server app, so there is no
+        // need to try to connect until the server socket is listening on the
+        // device.
+
+        server->server_socket = listen_on_port(params->local_port);
+        if (server->server_socket == INVALID_SOCKET) {
+            LOGE("Could not listen on port %" PRIu16, params->local_port);
+            disable_tunnel(server);
+            SDL_free(server->serial);
+            return false;
+        }
+    }
+
     // server will connect to our server socket
     server->process = execute_server(server, params);
 

app/src/server.h

@@ -6,7 +6,6 @@
 
 #include "config.h"
 #include "command.h"
-#include "common.h"
 #include "util/net.h"
 
 struct server {
@@ -15,30 +14,25 @@ struct server {
     socket_t server_socket; // only used if !tunnel_forward
     socket_t video_socket;
     socket_t control_socket;
-    struct port_range port_range;
-    uint16_t local_port; // selected from port_range
+    uint16_t local_port;
     bool tunnel_enabled;
     bool tunnel_forward; // use "adb forward" instead of "adb reverse"
 };
 
-#define SERVER_INITIALIZER { \
-    .serial = NULL, \
-    .process = PROCESS_NONE, \
-    .server_socket = INVALID_SOCKET, \
-    .video_socket = INVALID_SOCKET, \
+#define SERVER_INITIALIZER {          \
+    .serial = NULL,                   \
+    .process = PROCESS_NONE,          \
+    .server_socket = INVALID_SOCKET,  \
+    .video_socket = INVALID_SOCKET,   \
     .control_socket = INVALID_SOCKET, \
-    .port_range = { \
-        .first = 0, \
-        .last = 0, \
-    }, \
-    .local_port = 0, \
-    .tunnel_enabled = false, \
-    .tunnel_forward = false, \
+    .local_port = 0,                  \
+    .tunnel_enabled = false,          \
+    .tunnel_forward = false,          \
 }
 
 struct server_params {
     const char *crop;
-    struct port_range port_range;
+    uint16_t local_port;
     uint16_t max_size;
     uint32_t bit_rate;
     uint16_t max_fps;

app/src/sys/unix/command.c

@@ -14,50 +14,12 @@
 #include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include "util/log.h"
 
-bool
-cmd_search(const char *file) {
-    char *path = getenv("PATH");
-    if (!path)
-        return false;
-    path = strdup(path);
-    if (!path)
-        return false;
-
-    bool ret = false;
-    size_t file_len = strlen(file);
-    char *saveptr;
-    for (char *dir = strtok_r(path, ":", &saveptr); dir;
-            dir = strtok_r(NULL, ":", &saveptr)) {
-        size_t dir_len = strlen(dir);
-        char *fullpath = malloc(dir_len + file_len + 2);
-        if (!fullpath)
-            continue;
-        memcpy(fullpath, dir, dir_len);
-        fullpath[dir_len] = '/';
-        memcpy(fullpath + dir_len + 1, file, file_len + 1);
-
-        struct stat sb;
-        bool fullpath_executable = stat(fullpath, &sb) == 0 &&
-            sb.st_mode & S_IXUSR;
-        free(fullpath);
-        if (fullpath_executable) {
-            ret = true;
-            break;
-        }
-    }
-
-    free(path);
-    return ret;
-}
-
 enum process_result
 cmd_execute(const char *const argv[], pid_t *pid) {
     int fd[2];
@@ -165,14 +127,3 @@ get_executable_path(void) {
     return NULL;
 #endif
 }
-
-bool
-is_regular_file(const char *path) {
-    struct stat path_stat;
-
-    if (stat(path, &path_stat)) {
-        perror("stat");
-        return false;
-    }
-    return S_ISREG(path_stat.st_mode);
-}

app/src/sys/unix/net.c

@@ -0,0 +1,21 @@
+#include "util/net.h"
+
+#include <unistd.h>
+
+#include "config.h"
+
+bool
+net_init(void) {
+    // do nothing
+    return true;
+}
+
+void
+net_cleanup(void) {
+    // do nothing
+}
+
+bool
+net_close(socket_t socket) {
+    return !close(socket);
+}

app/src/sys/win/command.c

@@ -1,7 +1,5 @@
 #include "command.h"
 
-#include <sys/stat.h>
-
 #include "config.h"
 #include "util/log.h"
 #include "util/str_util.h"
@@ -92,22 +90,3 @@ get_executable_path(void) {
     buf[len] = '\0';
     return utf8_from_wide_char(buf);
 }
-
-bool
-is_regular_file(const char *path) {
-    wchar_t *wide_path = utf8_to_wide_char(path);
-    if (!wide_path) {
-        LOGC("Could not allocate wide char string");
-        return false;
-    }
-
-    struct _stat path_stat;
-    int r = _wstat(wide_path, &path_stat);
-    SDL_free(wide_path);
-
-    if (r) {
-        perror("stat");
-        return false;
-    }
-    return S_ISREG(path_stat.st_mode);
-}

app/src/sys/win/net.c

@@ -0,0 +1,25 @@
+#include "util/net.h"
+
+#include "config.h"
+#include "util/log.h"
+
+bool
+net_init(void) {
+    WSADATA wsa;
+    int res = WSAStartup(MAKEWORD(2, 2), &wsa) < 0;
+    if (res < 0) {
+        LOGC("WSAStartup failed with error %d", res);
+        return false;
+    }
+    return true;
+}
+
+void
+net_cleanup(void) {
+    WSACleanup();
+}
+
+bool
+net_close(socket_t socket) {
+    return !closesocket(socket);
+}

app/src/util/net.c

@@ -1,7 +1,6 @@
 #include "net.h"
 
 #include <stdio.h>
-#include <SDL2/SDL_platform.h>
 
 #include "config.h"
 #include "log.h"
@@ -116,32 +115,3 @@ bool
 net_shutdown(socket_t socket, int how) {
     return !shutdown(socket, how);
 }
-
-bool
-net_init(void) {
-#ifdef __WINDOWS__
-    WSADATA wsa;
-    int res = WSAStartup(MAKEWORD(2, 2), &wsa) < 0;
-    if (res < 0) {
-        LOGC("WSAStartup failed with error %d", res);
-        return false;
-    }
-#endif
-    return true;
-}
-
-void
-net_cleanup(void) {
-#ifdef __WINDOWS__
-    WSACleanup();
-#endif
-}
-
-bool
-net_close(socket_t socket) {
-#ifdef __WINDOWS__
-    return !closesocket(socket);
-#else
-    return !close(socket);
-#endif
-}

app/src/util/str_util.c

@@ -63,13 +63,13 @@ strquote(const char *src) {
 }
 
 bool
-parse_integer(const char *s, long *out) {
+parse_integer(const char *s, long long *out) {
     char *endptr;
     if (*s == '\0') {
         return false;
     }
     errno = 0;
-    long value = strtol(s, &endptr, 0);
+    long long value = strtol(s, &endptr, 0);
     if (errno == ERANGE) {
         return false;
     }
@@ -81,43 +81,14 @@ parse_integer(const char *s, long *out) {
     return true;
 }
 
-size_t
-parse_integers(const char *s, const char sep, size_t max_items, long *out) {
-    size_t count = 0;
-    char *endptr;
-    do {
-        errno = 0;
-        long value = strtol(s, &endptr, 0);
-        if (errno == ERANGE) {
-            return 0;
-        }
-
-        if (endptr == s || (*endptr != sep && *endptr != '\0')) {
-            return 0;
-        }
-
-        out[count++] = value;
-        if (*endptr == sep) {
-            if (count >= max_items) {
-                // max items already reached, could not accept a new item
-                return 0;
-            }
-            // parse the next token during the next iteration
-            s = endptr + 1;
-        }
-    } while (*endptr != '\0');
-
-    return count;
-}
-
 bool
-parse_integer_with_suffix(const char *s, long *out) {
+parse_integer_with_suffix(const char *s, long long *out) {
     char *endptr;
     if (*s == '\0') {
         return false;
     }
     errno = 0;
-    long value = strtol(s, &endptr, 0);
+    long long value = strtoll(s, &endptr, 0);
     if (errno == ERANGE) {
         return false;
     }
@@ -135,8 +106,8 @@ parse_integer_with_suffix(const char *s, long *out) {
         }
     }
 
-    if ((value < 0 && LONG_MIN / mul > value) ||
-        (value > 0 && LONG_MAX / mul < value)) {
+    if ((value < 0 && LLONG_MIN / mul > value) ||
+        (value > 0 && LLONG_MAX / mul < value)) {
         return false;
     }
 

app/src/util/str_util.h

@@ -29,19 +29,14 @@ strquote(const char *src);
 // parse s as an integer into value
 // returns true if the conversion succeeded, false otherwise
 bool
-parse_integer(const char *s, long *out);
-
-// parse s as integers separated by sep (for example '1234:2000')
-// returns the number of integers on success, 0 on failure
-size_t
-parse_integers(const char *s, const char sep, size_t max_items, long *out);
+parse_integer(const char *s, long long *out);
 
 // parse s as an integer into value
 // like parse_integer(), but accept 'k'/'K' (x1000) and 'm'/'M' (x1000000) as
 // suffix
 // returns true if the conversion succeeded, false otherwise
 bool
-parse_integer_with_suffix(const char *s, long *out);
+parse_integer_with_suffix(const char *s, long long *out);
 
 // return the index to truncate a UTF-8 string at a valid position
 size_t

app/tests/test_cli.c

@@ -50,7 +50,7 @@ static void test_options(void) {
         "--max-size", "1024",
         // "--no-control" is not compatible with "--turn-screen-off"
         // "--no-display" is not compatible with "--fulscreen"
-        "--port", "1234:1236",
+        "--port", "1234",
         "--push-target", "/sdcard/Movies",
         "--record", "file",
         "--record-format", "mkv",
@@ -78,8 +78,7 @@ static void test_options(void) {
     assert(opts->fullscreen);
     assert(opts->max_fps == 30);
     assert(opts->max_size == 1024);
-    assert(opts->port_range.first == 1234);
-    assert(opts->port_range.last == 1236);
+    assert(opts->port == 1234);
     assert(!strcmp(opts->push_target, "/sdcard/Movies"));
     assert(!strcmp(opts->record_filename, "file"));
     assert(opts->record_format == RECORDER_FORMAT_MKV);

app/tests/test_strutil.c

@@ -171,7 +171,7 @@ static void test_utf8_truncate(void) {
 }
 
 static void test_parse_integer(void) {
-    long value;
+    long long value;
     bool ok = parse_integer("1234", &value);
     assert(ok);
     assert(value == 1234);
@@ -187,57 +187,8 @@ static void test_parse_integer(void) {
     assert(!ok); // out-of-range
 }
 
-static void test_parse_integers(void) {
-    long values[5];
-
-    size_t count = parse_integers("1234", ':', 5, values);
-    assert(count == 1);
-    assert(values[0] == 1234);
-
-    count = parse_integers("1234:5678", ':', 5, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == 5678);
-
-    count = parse_integers("1234:5678", ':', 2, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == 5678);
-
-    count = parse_integers("1234:-5678", ':', 2, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == -5678);
-
-    count = parse_integers("1:2:3:4:5", ':', 5, values);
-    assert(count == 5);
-    assert(values[0] == 1);
-    assert(values[1] == 2);
-    assert(values[2] == 3);
-    assert(values[3] == 4);
-    assert(values[4] == 5);
-
-    count = parse_integers("1234:5678", ':', 1, values);
-    assert(count == 0); // max_items == 1
-
-    count = parse_integers("1:2:3:4:5", ':', 3, values);
-    assert(count == 0); // max_items == 3
-
-    count = parse_integers(":1234", ':', 5, values);
-    assert(count == 0); // invalid
-
-    count = parse_integers("1234:", ':', 5, values);
-    assert(count == 0); // invalid
-
-    count = parse_integers("1234:", ':', 1, values);
-    assert(count == 0); // invalid, even when max_items == 1
-
-    count = parse_integers("1234::5678", ':', 5, values);
-    assert(count == 0); // invalid
-}
-
 static void test_parse_integer_with_suffix(void) {
-    long value;
+    long long value;
     bool ok = parse_integer_with_suffix("1234", &value);
     assert(ok);
     assert(value == 1234);
@@ -298,7 +249,6 @@ int main(void) {
     test_strquote();
     test_utf8_truncate();
     test_parse_integer();
-    test_parse_integers();
     test_parse_integer_with_suffix();
     return 0;
 }

meson.build

@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '1.12.1',
+        version: '1.12',
         meson_version: '>= 0.37',
         default_options: [
             'c_std=c11',

server/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 14
-        versionName "1.12.1"
+        versionCode 13
+        versionName "1.12"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

server/build_without_gradle.sh

@@ -12,7 +12,7 @@
 set -e
 
 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=1.12.1
+SCRCPY_VERSION_NAME=1.12
 
 PLATFORM=${ANDROID_PLATFORM:-29}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-29.0.2}

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

@@ -19,7 +19,6 @@ public class ScreenEncoder implements Device.RotationListener {
 
     private static final int DEFAULT_I_FRAME_INTERVAL = 10; // seconds
     private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100ms
-    private static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";
 
     private static final int NO_PTS = -1;
 
@@ -151,10 +150,11 @@ public class ScreenEncoder implements Device.RotationListener {
         // display the very first frame, and recover from bad quality when no new frames
         format.setLong(MediaFormat.KEY_REPEAT_PREVIOUS_FRAME_AFTER, REPEAT_FRAME_DELAY_US); // µs
         if (maxFps > 0) {
-            // The key existed privately before Android 10:
-            // <https://android.googlesource.com/platform/frameworks/base/+/625f0aad9f7a259b6881006ad8710adce57d1384%5E%21/>
-            // <https://github.com/Genymobile/scrcpy/issues/488#issuecomment-567321437>
-            format.setFloat(KEY_MAX_FPS_TO_ENCODER, maxFps);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                format.setFloat(MediaFormat.KEY_MAX_FPS_TO_ENCODER, maxFps);
+            } else {
+                Ln.w("Max FPS is only supported since Android 10, the option has been ignored");
+            }
         }
         return format;
     }

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

@@ -73,7 +73,7 @@ public final class Workarounds {
             mInitialApplicationField.set(activityThread, app);
         } catch (Throwable throwable) {
             // this is a workaround, so failing is not an error
-            Ln.d("Could not fill app info: " + throwable.getMessage());
+            Ln.w("Could not fill app info: " + throwable.getMessage());
         }
     }
 }