Add --codec-options

Co-authored-by: Romain Vimont <rom@rom1v.com>
Add an option to keep the device awake
2020-05-04 01:17:02 +02:00 · 2020-05-02 02:14:25 +02:00 · 2020-05-02 01:55:32 +02:00 · 2020-05-02 01:55:30 +02:00 · 2020-05-02 01:22:18 +02:00 · 2020-05-02 01:22:18 +02:00
41 changed files with 1103 additions and 204 deletions
--- a/BUILD.md
+++ b/BUILD.md
@@ -249,10 +249,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.13`][direct-scrcpy-server]  
+   _(SHA-256: 5fee64ca1ccdc2f38550f31f5353c66de3de30c2e929a964e30fa2d005d5f885)_

-[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.13/scrcpy-server-v1.13

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/FAQ.md
+++ b/FAQ.md
@@ -134,18 +134,27 @@ that's all. See [#37].

 ### The quality is low

-On Windows, you may need to configure the [scaling behavior].
+If the definition of your client window is smaller than that of your device
+screen, then you might get poor quality, especially visible on text (see [#40]).
+
+[#40]: https://github.com/Genymobile/scrcpy/issues/40
+
+To improve downscaling quality, trilinear filtering is enabled automatically
+if the renderer is OpenGL and if it supports mipmapping.
+
+On Windows, you might want to force OpenGL:
+
+```
+scrcpy --render-driver=opengl
+```
+
+You may also need to configure the [scaling behavior]:

 > `scrcpy.exe` > Properties > Compatibility > Change high DPI settings >
 > Override high DPI scaling behavior > Scaling performed by: _Application_.

 [scaling behavior]: https://github.com/Genymobile/scrcpy/issues/40#issuecomment-424466723

-If the definition of your client window is far smaller than that of your device
-screen, then you'll get poor quality. This is especially visible on text. See
-[#40].
-
-[#40]: https://github.com/Genymobile/scrcpy/issues/40


 ### KWin compositor crashes
--- a/Makefile.CrossWindows
+++ b/Makefile.CrossWindows
@@ -100,30 +100,30 @@ dist-win32: build-server build-win32 build-win32-noconsole
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/scrcpy-noconsole.exe"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/SDL2-2.0.10/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/SDL2-2.0.12/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"

 dist-win64: build-server build-win64 build-win64-noconsole
 	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/scrcpy-noconsole.exe"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/swresample-3.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/swscale-5.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/swresample-3.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/swscale-5.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/SDL2-2.0.10/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/SDL2-2.0.12/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"

 zip-win32: dist-win32
 	cd "$(DIST)/$(WIN32_TARGET_DIR)"; \
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# scrcpy (v1.12.1)
+# scrcpy (v1.13)

 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.
@@ -37,7 +37,7 @@ control it using keyboard and mouse.

 ### Linux

-In Debian (_testing_ and _sid_ for now):
+On Debian (_testing_ and _sid_ for now) and Ubuntu (20.04):

 ```
 apt install scrcpy
@@ -69,10 +69,10 @@ hard).
 For Windows, for simplicity, a prebuilt archive with all the dependencies
 (including `adb`) is available:

- - [`scrcpy-win64-v1.12.1.zip`][direct-win64]  
-   _(SHA-256: 57d34b6d16cfd9fe169bc37c4df58ebd256d05c1ea3febc63d9cb0a027ab47c9)_
+ - [`scrcpy-win64-v1.13.zip`][direct-win64]  
+   _(SHA-256: 806aafc00d4db01513193addaa24f47858893ba5efe75770bfef6ae1ea987d27)_

-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win64-v1.12.1.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.13/scrcpy-win64-v1.13.zip

 It is also available in [Chocolatey]:

@@ -270,7 +270,7 @@ You could use [AutoAdb]:
 autoadb scrcpy -s '{}'
 ```

-[AutoAdb]: https://github.com/rom1v/usbaudio
+[AutoAdb]: https://github.com/rom1v/autoadb

 #### SSH tunnel

@@ -363,7 +363,7 @@ Note that _scrcpy_ manages 3 different rotations:
   current running app may refuse, if it does support the requested
   orientation).
 - `--lock-video-orientation` changes the mirroring orientation (the orientation
-   of the video sent from the device to the computer. This affects the
+   of the video sent from the device to the computer). This affects the
   recording.
 - `--rotation` (or `Ctrl`+`←`/`Ctrl`+`→`) rotates only the window content. This
   affects only the display, not the recording.
@@ -396,6 +396,18 @@ The list of display ids can be retrieved by:
 adb shell dumpsys display   # search "mDisplayId=" in the output
 ```

+#### Stay awake
+
+To prevent the device to sleep after some delay:
+
+```bash
+scrcpy --stay-awake
+scrcpy -w
+```
+
+The initial state is restored when scrcpy is closed.
+
+
 #### Turn screen off

 It is possible to turn the device screen off while mirroring on start with a
@@ -410,6 +422,14 @@ Or by pressing `Ctrl`+`o` at any time.

 To turn it back on, press `POWER` (or `Ctrl`+`p`).

+It can be useful to also prevent the device to sleep:
+
+```bash
+scrcpy --turn-screen-off --stay-awake
+scrcpy -Sw
+```
+
+
 #### Render expired frames

 By default, to minimize latency, _scrcpy_ always renders the last decoded frame
@@ -429,7 +449,8 @@ device).

 Android provides this feature in _Developers options_.

-_Scrcpy_ provides an option to enable this feature on start and disable on exit:
+_Scrcpy_ provides an option to enable this feature on start and restore the
+initial value on exit:

 ```bash
 scrcpy --show-touches
--- a/app/meson.build
+++ b/app/meson.build
@@ -11,6 +11,7 @@ src = [
    'src/file_handler.c',
    'src/fps_counter.c',
    'src/input_manager.c',
+    'src/opengl.c',
    'src/receiver.c',
    'src/recorder.c',
    'src/scrcpy.c',
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -25,6 +25,14 @@ Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are

 Default is 8000000.

+.TP
+.BI "\-\-\codec\-options " key[:type]=value[,...]
+Set a list of comma-separated key:type=value options for the device encoder.
+The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
+The list of possible codec options is available in the Android documentation:
+.UR https://d.android.com/reference/android/media/MediaFormat
+.UE .
+
 .TP
 .BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.
@@ -74,6 +82,10 @@ Disable device control (mirror the device in read\-only).
 .B \-N, \-\-no\-display
 Do not display device (only when screen recording is enabled).

+.TP
+.B \-\-no\-mipmaps
+If the renderer is OpenGL 3.0+ or OpenGL ES 2.0+, then mipmaps are automatically generated to improve downscaling quality. This option disables the generation of mipmaps.
+
 .TP
 .BI "\-p, \-\-port " port[:port]
 Set the TCP port (range) used by the client to listen.
@@ -106,6 +118,14 @@ option if set, or by the file extension (.mp4 or .mkv).
 .BI "\-\-record\-format " format
 Force recording format (either mp4 or mkv).

+.TP
+.BI "\-\-render\-driver " name
+Request SDL to use the given render driver (this is just a hint).
+
+Supported names are currently "direct3d", "opengl", "opengles2", "opengles", "metal" and "software".
+.UR https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER
+.UE
+
 .TP
 .B \-\-render\-expired\-frames
 By default, to minimize latency, scrcpy always renders the last available decoded frame, and drops any previous ones. This flag forces to render all frames, at a cost of a possible increased latency.
@@ -124,7 +144,7 @@ Turn the device screen off immediately.

 .TP
 .B \-t, \-\-show\-touches
-Enable "show touches" on start, disable on quit.
+Enable "show touches" on start, restore the initial value on exit..

 It only shows physical touches (not clicks from scrcpy).

@@ -132,6 +152,10 @@ It only shows physical touches (not clicks from scrcpy).
 .B \-v, \-\-version
 Print the version of scrcpy.

+.TP
+.B \-w, \-\-stay-awake
+Keep the device on while scrcpy is running.
+
 .TP
 .B \-\-window\-borderless
 Disable window decorations (display borderless window).
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -30,6 +30,15 @@ scrcpy_print_usage(const char *arg0) {
        "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
        "        Default is %d.\n"
        "\n"
+        "    --codec-options key[:type]=value[,...]\n"
+        "        Set a list of comma-separated key:type=value options for the\n"
+        "        device encoder.\n"
+        "        The possible values for 'type' are 'int' (default), 'long',\n"
+        "        'float' and 'string'.\n"
+        "        The list of possible codec options is available in the\n"
+        "        Android documentation:\n"
+        "        <https://d.android.com/reference/android/media/MediaFormat>\n"
+        "\n"
        "    --crop width:height:x:y\n"
        "        Crop the device screen on the server.\n"
        "        The values are expressed in the device natural orientation\n"
@@ -75,6 +84,11 @@ scrcpy_print_usage(const char *arg0) {
        "        Do not display device (only when screen recording is\n"
        "        enabled).\n"
        "\n"
+        "    --no-mipmaps\n"
+        "        If the renderer is OpenGL 3.0+ or OpenGL ES 2.0+, then\n"
+        "        mipmaps are automatically generated to improve downscaling\n"
+        "        quality. This option disables the generation of mipmaps.\n"
+        "\n"
        "    -p, --port port[:port]\n"
        "        Set the TCP port (range) used by the client to listen.\n"
        "        Default is %d:%d.\n"
@@ -99,6 +113,13 @@ scrcpy_print_usage(const char *arg0) {
        "    --record-format format\n"
        "        Force recording format (either mp4 or mkv).\n"
        "\n"
+        "    --render-driver name\n"
+        "        Request SDL to use the given render driver (this is just a\n"
+        "        hint).\n"
+        "        Supported names are currently \"direct3d\", \"opengl\",\n"
+        "        \"opengles2\", \"opengles\", \"metal\" and \"software\".\n"
+        "        <https://wiki.libsdl.org/SDL_HINT_RENDER_DRIVER>\n"
+        "\n"
        "    --render-expired-frames\n"
        "        By default, to minimize latency, scrcpy always renders the\n"
        "        last available decoded frame, and drops any previous ones.\n"
@@ -118,12 +139,16 @@ scrcpy_print_usage(const char *arg0) {
        "        Turn the device screen off immediately.\n"
        "\n"
        "    -t, --show-touches\n"
-        "        Enable \"show touches\" on start, disable on quit.\n"
+        "        Enable \"show touches\" on start, restore the initial value\n"
+        "        on exit.\n"
        "        It only shows physical touches (not clicks from scrcpy).\n"
        "\n"
        "    -v, --version\n"
        "        Print the version of scrcpy.\n"
        "\n"
+        "    -w, --stay-awake\n"
+        "        Keep the device on while scrcpy is running.\n"
+        "\n"
        "    --window-borderless\n"
        "        Disable window decorations (display borderless window).\n"
        "\n"
@@ -454,12 +479,16 @@ guess_record_format(const char *filename) {
 #define OPT_LOCK_VIDEO_ORIENTATION 1013
 #define OPT_DISPLAY_ID             1014
 #define OPT_ROTATION               1015
+#define OPT_RENDER_DRIVER          1016
+#define OPT_NO_MIPMAPS             1017
+#define OPT_CODEC_OPTIONS          1018

 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
    static const struct option long_options[] = {
        {"always-on-top",          no_argument,       NULL, OPT_ALWAYS_ON_TOP},
        {"bit-rate",               required_argument, NULL, 'b'},
+        {"codec-options",          required_argument, NULL, OPT_CODEC_OPTIONS},
        {"crop",                   required_argument, NULL, OPT_CROP},
        {"display",                required_argument, NULL, OPT_DISPLAY_ID},
        {"fullscreen",             no_argument,       NULL, 'f'},
@@ -470,17 +499,20 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        {"max-size",               required_argument, NULL, 'm'},
        {"no-control",             no_argument,       NULL, 'n'},
        {"no-display",             no_argument,       NULL, 'N'},
+        {"no-mipmaps",             no_argument,       NULL, OPT_NO_MIPMAPS},
        {"port",                   required_argument, NULL, 'p'},
+        {"prefer-text",            no_argument,       NULL, OPT_PREFER_TEXT},
        {"push-target",            required_argument, NULL, OPT_PUSH_TARGET},
        {"record",                 required_argument, NULL, 'r'},
        {"record-format",          required_argument, NULL, OPT_RECORD_FORMAT},
+        {"render-driver",          required_argument, NULL, OPT_RENDER_DRIVER},
        {"render-expired-frames",  no_argument,       NULL,
                                                  OPT_RENDER_EXPIRED_FRAMES},
        {"rotation",               required_argument, NULL, OPT_ROTATION},
        {"serial",                 required_argument, NULL, 's'},
        {"show-touches",           no_argument,       NULL, 't'},
+        {"stay-awake",             no_argument,       NULL, 'w'},
        {"turn-screen-off",        no_argument,       NULL, 'S'},
-        {"prefer-text",            no_argument,       NULL, OPT_PREFER_TEXT},
        {"version",                no_argument,       NULL, 'v'},
        {"window-title",           required_argument, NULL, OPT_WINDOW_TITLE},
        {"window-x",               required_argument, NULL, OPT_WINDOW_X},
@@ -497,7 +529,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
    optind = 0; // reset to start from the first argument in tests

    int c;
-    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv", long_options,
+    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTvw", long_options,
                            NULL)) != -1) {
        switch (c) {
            case 'b':
@@ -577,6 +609,9 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
            case 'v':
                args->version = true;
                break;
+            case 'w':
+                opts->stay_awake = true;
+                break;
            case OPT_RENDER_EXPIRED_FRAMES:
                opts->render_expired_frames = true;
                break;
@@ -617,6 +652,15 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                    return false;
                }
                break;
+            case OPT_RENDER_DRIVER:
+                opts->render_driver = optarg;
+                break;
+            case OPT_NO_MIPMAPS:
+                opts->mipmaps = false;
+                break;
+            case OPT_CODEC_OPTIONS:
+                opts->codec_options = optarg;
+                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -653,5 +697,10 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
        return false;
    }

+    if (!opts->control && opts->stay_awake) {
+        LOGE("Could not request to stay awake if control is disabled");
+        return false;
+    }
+
    return true;
 }
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -45,8 +45,9 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
            buffer_write32be(&buf[6], msg->inject_keycode.metastate);
            return 10;
        case CONTROL_MSG_TYPE_INJECT_TEXT: {
-            size_t len = write_string(msg->inject_text.text,
-                                      CONTROL_MSG_TEXT_MAX_LENGTH, &buf[1]);
+            size_t len =
+                write_string(msg->inject_text.text,
+                             CONTROL_MSG_INJECT_TEXT_MAX_LENGTH, &buf[1]);
            return 1 + len;
        }
        case CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT:
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -10,7 +10,7 @@
 #include "android/keycodes.h"
 #include "common.h"

-#define CONTROL_MSG_TEXT_MAX_LENGTH 300
+#define CONTROL_MSG_INJECT_TEXT_MAX_LENGTH 300
 #define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH 4093
 #define CONTROL_MSG_SERIALIZED_MAX_SIZE \
    (3 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -442,36 +442,6 @@ input_manager_process_key(struct input_manager *im,
    }
 }

-static struct point
-rotate_position(struct screen *screen, int32_t x, int32_t y) {
-    unsigned rotation = screen->rotation;
-    assert(rotation < 4);
-
-    int32_t w = screen->content_size.width;
-    int32_t h = screen->content_size.height;
-    struct point result;
-    switch (rotation) {
-        case 0:
-            result.x = x;
-            result.y = y;
-            break;
-        case 1:
-            result.x = h - y;
-            result.y = x;
-            break;
-        case 2:
-            result.x = w - x;
-            result.y = h - y;
-            break;
-        default:
-            assert(rotation == 3);
-            result.x = y;
-            result.y = w - x;
-            break;
-    }
-    return result;
-}
-
 static bool
 convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
                     struct control_msg *to) {
@@ -480,7 +450,7 @@ convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
    to->inject_touch_event.position.screen_size = screen->frame_size;
    to->inject_touch_event.position.point =
-        rotate_position(screen, from->x, from->y);
+        screen_convert_to_frame_coords(screen, from->x, from->y);
    to->inject_touch_event.pressure = 1.f;
    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);

@@ -515,14 +485,13 @@ convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
        return false;
    }

-    struct size frame_size = screen->frame_size;
-
    to->inject_touch_event.pointer_id = from->fingerId;
-    to->inject_touch_event.position.screen_size = frame_size;
+    to->inject_touch_event.position.screen_size = screen->frame_size;
    // SDL touch event coordinates are normalized in the range [0; 1]
-    float x = from->x * frame_size.width;
-    float y = from->y * frame_size.height;
-    to->inject_touch_event.position.point = rotate_position(screen, x, y);
+    float x = from->x * screen->content_size.width;
+    float y = from->y * screen->content_size.height;
+    to->inject_touch_event.position.point =
+        screen_convert_to_frame_coords(screen, x, y);
    to->inject_touch_event.pressure = from->pressure;
    to->inject_touch_event.buttons = 0;
    return true;
@@ -558,7 +527,7 @@ convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
    to->inject_touch_event.position.screen_size = screen->frame_size;
    to->inject_touch_event.position.point =
-        rotate_position(screen, from->x, from->y);
+        screen_convert_to_frame_coords(screen, from->x, from->y);
    to->inject_touch_event.pressure = 1.f;
    to->inject_touch_event.buttons =
        convert_mouse_buttons(SDL_BUTTON(from->button));
--- a/app/src/opengl.c
+++ b/app/src/opengl.c
@@ -0,0 +1,56 @@
+#include "opengl.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include "SDL2/SDL.h"
+
+void
+sc_opengl_init(struct sc_opengl *gl) {
+    gl->GetString = SDL_GL_GetProcAddress("glGetString");
+    assert(gl->GetString);
+
+    gl->TexParameterf = SDL_GL_GetProcAddress("glTexParameterf");
+    assert(gl->TexParameterf);
+
+    gl->TexParameteri = SDL_GL_GetProcAddress("glTexParameteri");
+    assert(gl->TexParameteri);
+
+    // optional
+    gl->GenerateMipmap = SDL_GL_GetProcAddress("glGenerateMipmap");
+
+    const char *version = (const char *) gl->GetString(GL_VERSION);
+    assert(version);
+    gl->version = version;
+
+#define OPENGL_ES_PREFIX "OpenGL ES "
+    /* starts with "OpenGL ES " */
+    gl->is_opengles = !strncmp(gl->version, OPENGL_ES_PREFIX,
+                               sizeof(OPENGL_ES_PREFIX) - 1);
+    if (gl->is_opengles) {
+        /* skip the prefix */
+        version += sizeof(PREFIX) - 1;
+    }
+
+    int r = sscanf(version, "%d.%d", &gl->version_major, &gl->version_minor);
+    if (r != 2) {
+        // failed to parse the version
+        gl->version_major = 0;
+        gl->version_minor = 0;
+    }
+}
+
+bool
+sc_opengl_version_at_least(struct sc_opengl *gl,
+                           int minver_major, int minver_minor,
+                           int minver_es_major, int minver_es_minor)
+{
+    if (gl->is_opengles) {
+        return gl->version_major > minver_es_major
+            || (gl->version_major == minver_es_major
+             && gl->version_minor >= minver_es_minor);
+    }
+
+    return gl->version_major > minver_major
+        || (gl->version_major == minver_major
+         && gl->version_minor >= minver_minor);
+}
--- a/app/src/opengl.h
+++ b/app/src/opengl.h
@@ -0,0 +1,36 @@
+#ifndef SC_OPENGL_H
+#define SC_OPENGL_H
+
+#include <stdbool.h>
+#include <SDL2/SDL_opengl.h>
+
+#include "config.h"
+
+struct sc_opengl {
+    const char *version;
+    bool is_opengles;
+    int version_major;
+    int version_minor;
+
+    const GLubyte *
+    (*GetString)(GLenum name);
+
+    void
+    (*TexParameterf)(GLenum target, GLenum pname, GLfloat param);
+
+    void
+    (*TexParameteri)(GLenum target, GLenum pname, GLint param);
+
+    void
+    (*GenerateMipmap)(GLenum target);
+};
+
+void
+sc_opengl_init(struct sc_opengl *gl);
+
+bool
+sc_opengl_version_at_least(struct sc_opengl *gl,
+                           int minver_major, int minver_minor,
+                           int minver_es_major, int minver_es_minor);
+
+#endif
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -47,7 +47,7 @@ static struct input_manager input_manager = {

 // init SDL and set appropriate hints
 static bool
-sdl_init_and_configure(bool display) {
+sdl_init_and_configure(bool display, const char *render_driver) {
    uint32_t flags = display ? SDL_INIT_VIDEO : SDL_INIT_EVENTS;
    if (SDL_Init(flags)) {
        LOGC("Could not initialize SDL: %s", SDL_GetError());
@@ -60,6 +60,10 @@ sdl_init_and_configure(bool display) {
        return true;
    }

+    if (render_driver && !SDL_SetHint(SDL_HINT_RENDER_DRIVER, render_driver)) {
+        LOGW("Could not set render driver");
+    }
+
    // Linear filtering
    if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1")) {
        LOGW("Could not enable linear filtering");
@@ -105,9 +109,10 @@ static int
 event_watcher(void *data, SDL_Event *event) {
    (void) data;
    if (event->type == SDL_WINDOWEVENT
-            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
-        // called from another thread, not very safe, but it's a workaround!
-        screen_render(&screen);
+            && event->window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+        // In practice, it seems to always be called from the same thread in
+        // that specific case. Anyway, it's just a workaround.
+        screen_handle_window_event(&screen, &event->window);
    }
    return 0;
 }
@@ -224,21 +229,6 @@ event_loop(bool display, bool control) {
    return false;
 }

-static process_t
-set_show_touches_enabled(const char *serial, bool enabled) {
-    const char *value = enabled ? "1" : "0";
-    const char *const adb_cmd[] = {
-        "shell", "settings", "put", "system", "show_touches", value
-    };
-    return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd));
-}
-
-static void
-wait_show_touches(process_t process) {
-    // reap the process, ignore the result
-    process_check_success(process, "show_touches");
-}
-
 static SDL_LogPriority
 sdl_priority_from_av_level(int level) {
    switch (level) {
@@ -287,19 +277,14 @@ scrcpy(const struct scrcpy_options *options) {
        .lock_video_orientation = options->lock_video_orientation,
        .control = options->control,
        .display_id = options->display_id,
+        .show_touches = options->show_touches,
+        .stay_awake = options->stay_awake,
+        .codec_options = options->codec_options,
    };
    if (!server_start(&server, options->serial, &params)) {
        return false;
    }

-    process_t proc_show_touches = PROCESS_NONE;
-    bool show_touches_waited;
-    if (options->show_touches) {
-        LOGI("Enable show_touches");
-        proc_show_touches = set_show_touches_enabled(options->serial, true);
-        show_touches_waited = false;
-    }
-
    bool ret = false;

    bool fps_counter_initialized = false;
@@ -310,7 +295,7 @@ scrcpy(const struct scrcpy_options *options) {
    bool controller_initialized = false;
    bool controller_started = false;

-    if (!sdl_init_and_configure(options->display)) {
+    if (!sdl_init_and_configure(options->display, options->render_driver)) {
        goto end;
    }

@@ -397,7 +382,7 @@ scrcpy(const struct scrcpy_options *options) {
                                   options->window_y, options->window_width,
                                   options->window_height,
                                   options->window_borderless,
-                                   options->rotation)) {
+                                   options->rotation, options-> mipmaps)) {
            goto end;
        }

@@ -416,11 +401,6 @@ scrcpy(const struct scrcpy_options *options) {
        }
    }

-    if (options->show_touches) {
-        wait_show_touches(proc_show_touches);
-        show_touches_waited = true;
-    }
-
    input_manager.prefer_text = options->prefer_text;

    ret = event_loop(options->display, options->control);
@@ -477,16 +457,6 @@ end:
        fps_counter_destroy(&fps_counter);
    }

-    if (options->show_touches) {
-        if (!show_touches_waited) {
-            // wait the process which enabled "show touches"
-            wait_show_touches(proc_show_touches);
-        }
-        LOGI("Disable show_touches");
-        proc_show_touches = set_show_touches_enabled(options->serial, false);
-        wait_show_touches(proc_show_touches);
-    }
-
    server_destroy(&server);

    return ret;
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -15,6 +15,8 @@ struct scrcpy_options {
    const char *record_filename;
    const char *window_title;
    const char *push_target;
+    const char *render_driver;
+    const char *codec_options;
    enum recorder_format record_format;
    struct port_range port_range;
    uint16_t max_size;
@@ -36,6 +38,8 @@ struct scrcpy_options {
    bool render_expired_frames;
    bool prefer_text;
    bool window_borderless;
+    bool mipmaps;
+    bool stay_awake;
 };

 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -44,6 +48,8 @@ struct scrcpy_options {
    .record_filename = NULL, \
    .window_title = NULL, \
    .push_target = NULL, \
+    .render_driver = NULL, \
+    .codec_options = NULL, \
    .record_format = RECORDER_FORMAT_AUTO, \
    .port_range = { \
        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST, \
@@ -68,6 +74,8 @@ struct scrcpy_options {
    .render_expired_frames = false, \
    .prefer_text = false, \
    .window_borderless = false, \
+    .mipmaps = true, \
+    .stay_awake = false, \
 }

 bool
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -113,6 +113,13 @@ get_optimal_size(struct size current_size, struct size content_size) {
        h = MIN(current_size.height, display_size.height);
    }

+    if (h == w * content_size.height / content_size.width
+     || w == h * content_size.width / content_size.height) {
+        // The size is already optimal, if we ignore rounding errors due to
+        // integer window dimensions
+        return (struct size) {w, h};
+    }
+
    bool keep_width = content_size.width * h > content_size.height * w;
    if (keep_width) {
        // remove black borders on top and bottom
@@ -168,10 +175,30 @@ screen_init(struct screen *screen) {
 }

 static inline SDL_Texture *
-create_texture(SDL_Renderer *renderer, struct size frame_size) {
-    return SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12,
-                             SDL_TEXTUREACCESS_STREAMING,
-                             frame_size.width, frame_size.height);
+create_texture(struct screen *screen) {
+    SDL_Renderer *renderer = screen->renderer;
+    struct size size = screen->frame_size;
+    SDL_Texture *texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12,
+                                             SDL_TEXTUREACCESS_STREAMING,
+                                             size.width, size.height);
+    if (!texture) {
+        return NULL;
+    }
+
+    if (screen->mipmaps) {
+        struct sc_opengl *gl = &screen->gl;
+
+        SDL_GL_BindTexture(texture, NULL, NULL);
+
+        // Enable trilinear filtering for downscaling
+        gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+                          GL_LINEAR_MIPMAP_LINEAR);
+        gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -.5f);
+
+        SDL_GL_UnbindTexture(texture);
+    }
+
+    return texture;
 }

 bool
@@ -179,7 +206,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,
                      struct size frame_size, bool always_on_top,
                      int16_t window_x, int16_t window_y, uint16_t window_width,
                      uint16_t window_height, bool window_borderless,
-                      uint8_t rotation) {
+                      uint8_t rotation, bool mipmaps) {
    screen->frame_size = frame_size;
    screen->rotation = rotation;
    if (rotation) {
@@ -226,6 +253,11 @@ screen_init_rendering(struct screen *screen, const char *window_title,
        return false;
    }

+    SDL_RendererInfo renderer_info;
+    int r = SDL_GetRendererInfo(screen->renderer, &renderer_info);
+    const char *renderer_name = r ? NULL : renderer_info.name;
+    LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");
+
    if (SDL_RenderSetLogicalSize(screen->renderer, content_size.width,
                                 content_size.height)) {
        LOGE("Could not set renderer logical size: %s", SDL_GetError());
@@ -233,6 +265,32 @@ screen_init_rendering(struct screen *screen, const char *window_title,
        return false;
    }

+    // starts with "opengl"
+    screen->use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
+    if (screen->use_opengl) {
+        struct sc_opengl *gl = &screen->gl;
+        sc_opengl_init(gl);
+
+        LOGI("OpenGL version: %s", gl->version);
+
+        if (mipmaps) {
+            bool supports_mipmaps =
+                sc_opengl_version_at_least(gl, 3, 0, /* OpenGL 3.0+ */
+                                               2, 0  /* OpenGL ES 2.0+ */);
+            if (supports_mipmaps) {
+                LOGI("Trilinear filtering enabled");
+                screen->mipmaps = true;
+            } else {
+                LOGW("Trilinear filtering disabled "
+                     "(OpenGL 3.0+ or ES 2.0+ required)");
+            }
+        } else {
+            LOGI("Trilinear filtering disabled");
+        }
+    } else {
+        LOGW("Trilinear filtering disabled (not an OpenGL renderer)");
+    }
+
    SDL_Surface *icon = read_xpm(icon_xpm);
    if (icon) {
        SDL_SetWindowIcon(screen->window, icon);
@@ -243,7 +301,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,

    LOGI("Initial texture: %" PRIu16 "x%" PRIu16, frame_size.width,
                                                  frame_size.height);
-    screen->texture = create_texture(screen->renderer, frame_size);
+    screen->texture = create_texture(screen);
    if (!screen->texture) {
        LOGC("Could not create texture: %s", SDL_GetError());
        screen_destroy(screen);
@@ -341,7 +399,7 @@ prepare_for_frame(struct screen *screen, struct size new_frame_size) {

        LOGI("New texture: %" PRIu16 "x%" PRIu16,
                     screen->frame_size.width, screen->frame_size.height);
-        screen->texture = create_texture(screen->renderer, new_frame_size);
+        screen->texture = create_texture(screen);
        if (!screen->texture) {
            LOGC("Could not create texture: %s", SDL_GetError());
            return false;
@@ -358,6 +416,13 @@ update_texture(struct screen *screen, const AVFrame *frame) {
            frame->data[0], frame->linesize[0],
            frame->data[1], frame->linesize[1],
            frame->data[2], frame->linesize[2]);
+
+    if (screen->mipmaps) {
+        assert(screen->use_opengl);
+        SDL_GL_BindTexture(screen->texture, NULL, NULL);
+        screen->gl.GenerateMipmap(GL_TEXTURE_2D);
+        SDL_GL_UnbindTexture(screen->texture);
+    }
 }

 bool
@@ -433,7 +498,8 @@ screen_resize_to_fit(struct screen *screen) {
    struct size optimal_size =
        get_optimal_window_size(screen, screen->content_size);
    SDL_SetWindowSize(screen->window, optimal_size.width, optimal_size.height);
-    LOGD("Resized to optimal size");
+    LOGD("Resized to optimal size: %ux%u", optimal_size.width,
+                                           optimal_size.height);
 }

 void
@@ -449,7 +515,8 @@ screen_resize_to_pixel_perfect(struct screen *screen) {

    struct size content_size = screen->content_size;
    SDL_SetWindowSize(screen->window, content_size.width, content_size.height);
-    LOGD("Resized to pixel-perfect");
+    LOGD("Resized to pixel-perfect: %ux%u", content_size.width,
+                                            content_size.height);
 }

 void
@@ -493,3 +560,33 @@ screen_handle_window_event(struct screen *screen,
            break;
    }
 }
+
+struct point
+screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y) {
+    unsigned rotation = screen->rotation;
+    assert(rotation < 4);
+
+    int32_t w = screen->content_size.width;
+    int32_t h = screen->content_size.height;
+    struct point result;
+    switch (rotation) {
+        case 0:
+            result.x = x;
+            result.y = y;
+            break;
+        case 1:
+            result.x = h - y;
+            result.y = x;
+            break;
+        case 2:
+            result.x = w - x;
+            result.y = h - y;
+            break;
+        default:
+            assert(rotation == 3);
+            result.x = y;
+            result.y = w - x;
+            break;
+    }
+    return result;
+}
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -7,6 +7,7 @@

 #include "config.h"
 #include "common.h"
+#include "opengl.h"

 #define WINDOW_POSITION_UNDEFINED (-0x8000)

@@ -16,6 +17,8 @@ struct screen {
    SDL_Window *window;
    SDL_Renderer *renderer;
    SDL_Texture *texture;
+    bool use_opengl;
+    struct sc_opengl gl;
    struct size frame_size;
    struct size content_size; // rotated frame_size
    // The window size the last time it was not maximized or fullscreen.
@@ -29,12 +32,15 @@ struct screen {
    bool fullscreen;
    bool maximized;
    bool no_window;
+    bool mipmaps;
 };

 #define SCREEN_INITIALIZER { \
    .window = NULL, \
    .renderer = NULL, \
    .texture = NULL, \
+    .use_opengl = false, \
+    .gl = {0}, \
    .frame_size = { \
        .width = 0, \
        .height = 0, \
@@ -56,6 +62,7 @@ struct screen {
    .fullscreen = false, \
    .maximized = false, \
    .no_window = false, \
+    .mipmaps = false, \
 }

 // initialize default values
@@ -69,7 +76,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,
                      struct size frame_size, bool always_on_top,
                      int16_t window_x, int16_t window_y, uint16_t window_width,
                      uint16_t window_height, bool window_borderless,
-                      uint8_t rotation);
+                      uint8_t rotation, bool mipmaps);

 // show the window
 void
@@ -107,4 +114,9 @@ screen_set_rotation(struct screen *screen, unsigned rotation);
 void
 screen_handle_window_event(struct screen *screen, const SDL_WindowEvent *event);

+// convert point from window coordinates to frame coordinates
+// x and y are expressed in pixels
+struct point
+screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y);
+
 #endif
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -268,6 +268,9 @@ execute_server(struct server *server, const struct server_params *params) {
        "true", // always send frame meta (packet boundaries + timestamp)
        params->control ? "true" : "false",
        display_id_string,
+        params->show_touches ? "true" : "false",
+        params->stay_awake ? "true" : "false",
+        params->codec_options ? params->codec_options : "-",
    };
 #ifdef SERVER_DEBUGGER
    LOGI("Server debugger waiting for a client on device port "
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -44,6 +44,7 @@ struct server {

 struct server_params {
    const char *crop;
+    const char *codec_options;
    struct port_range port_range;
    uint16_t max_size;
    uint32_t bit_rate;
@@ -51,6 +52,8 @@ struct server_params {
    int8_t lock_video_orientation;
    bool control;
    uint16_t display_id;
+    bool show_touches;
+    bool stay_awake;
 };

 // init default values
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -49,20 +49,20 @@ static void test_serialize_inject_text(void) {
 static void test_serialize_inject_text_long(void) {
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
-    char text[CONTROL_MSG_TEXT_MAX_LENGTH + 1];
+    char text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH + 1];
    memset(text, 'a', sizeof(text));
-    text[CONTROL_MSG_TEXT_MAX_LENGTH] = '\0';
+    text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';
    msg.inject_text.text = text;

    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
    int size = control_msg_serialize(&msg, buf);
-    assert(size == 3 + CONTROL_MSG_TEXT_MAX_LENGTH);
+    assert(size == 3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);

-    unsigned char expected[3 + CONTROL_MSG_TEXT_MAX_LENGTH];
+    unsigned char expected[3 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
    expected[0] = CONTROL_MSG_TYPE_INJECT_TEXT;
    expected[1] = 0x01;
    expected[2] = 0x2c; // text length (16 bits)
-    memset(&expected[3], 'a', CONTROL_MSG_TEXT_MAX_LENGTH);
+    memset(&expected[3], 'a', CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);

    assert(!memcmp(buf, expected, sizeof(expected)));
 }
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -15,6 +15,6 @@ cpu = 'i686'
 endian = 'little'

 [properties]
-prebuilt_ffmpeg_shared = 'ffmpeg-4.2.1-win32-shared'
-prebuilt_ffmpeg_dev = 'ffmpeg-4.2.1-win32-dev'
-prebuilt_sdl2 = 'SDL2-2.0.10/i686-w64-mingw32'
+prebuilt_ffmpeg_shared = 'ffmpeg-4.2.2-win32-shared'
+prebuilt_ffmpeg_dev = 'ffmpeg-4.2.2-win32-dev'
+prebuilt_sdl2 = 'SDL2-2.0.12/i686-w64-mingw32'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -15,6 +15,6 @@ cpu = 'x86_64'
 endian = 'little'

 [properties]
-prebuilt_ffmpeg_shared = 'ffmpeg-4.2.1-win64-shared'
-prebuilt_ffmpeg_dev = 'ffmpeg-4.2.1-win64-dev'
-prebuilt_sdl2 = 'SDL2-2.0.10/x86_64-w64-mingw32'
+prebuilt_ffmpeg_shared = 'ffmpeg-4.2.2-win64-shared'
+prebuilt_ffmpeg_dev = 'ffmpeg-4.2.2-win64-dev'
+prebuilt_sdl2 = 'SDL2-2.0.12/x86_64-w64-mingw32'
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('scrcpy', 'c',
-        version: '1.12.1',
-        meson_version: '>= 0.37',
+        version: '1.13',
+        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
            'warning_level=2',
--- a/prebuilt-deps/Makefile
+++ b/prebuilt-deps/Makefile
@@ -10,29 +10,29 @@ prepare-win32: prepare-sdl2 prepare-ffmpeg-shared-win32 prepare-ffmpeg-dev-win32
 prepare-win64: prepare-sdl2 prepare-ffmpeg-shared-win64 prepare-ffmpeg-dev-win64 prepare-adb

 prepare-ffmpeg-shared-win32:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.1-win32-shared.zip \
-		9208255f409410d95147151d7e829b5699bf8d91bfe1e81c3f470f47c2fa66d2 \
-		ffmpeg-4.2.1-win32-shared
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.2-win32-shared.zip \
+		ab5d603aaa54de360db2c2ffe378c82376b9343ea1175421dd644639aa07ee31 \
+		ffmpeg-4.2.2-win32-shared

 prepare-ffmpeg-dev-win32:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.2.1-win32-dev.zip \
-		c3469e6c5f031cbcc8cba88dee92d6548c5c6b6ff14f4097f18f72a92d0d70c4 \
-		ffmpeg-4.2.1-win32-dev
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.2.2-win32-dev.zip \
+		8d224be567a2950cad4be86f4aabdd045bfa52ad758e87c72cedd278613bc6c8 \
+		ffmpeg-4.2.2-win32-dev

 prepare-ffmpeg-shared-win64:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip \
-		55063d3cf750a75485c7bf196031773d81a1b25d0980c7db48ecfc7701a42331 \
-		ffmpeg-4.2.1-win64-shared
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.2-win64-shared.zip \
+		5aedf268952b7d9f6541dbfcb47cd86a7e7881a3b7ba482fd3bc4ca33bda7bf5 \
+		ffmpeg-4.2.2-win64-shared

 prepare-ffmpeg-dev-win64:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.1-win64-dev.zip \
-		5af393be5f25c0a71aa29efce768e477c35347f7f8e0d9696767d5b9d405b74e \
-		ffmpeg-4.2.1-win64-dev
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.2-win64-dev.zip \
+		f4885f859c5b0d6663c2a0a4c1cf035b1c60b146402790b796bd3ad84f4f3ca2 \
+		ffmpeg-4.2.2-win64-dev

 prepare-sdl2:
-	@./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.10-mingw.tar.gz \
-		a90a7cddaec4996f4d7be6d80c57ec69b062e132bffc513965f99217f603274a \
-		SDL2-2.0.10
+	@./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.12-mingw.tar.gz \
+		e614a60f797e35ef9f3f96aef3dc6a1d786de3cc7ca6216f97e435c0b6aafc46 \
+		SDL2-2.0.12

 prepare-adb:
 	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r29.0.5-windows.zip \
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -6,8 +6,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 14
-        versionName "1.12.1"
+        versionCode 15
+        versionName "1.13"
        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=1.12.1
+SCRCPY_VERSION_NAME=1.13

 PLATFORM=${ANDROID_PLATFORM:-29}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-29.0.2}
--- a/server/meson.build
+++ b/server/meson.build
@@ -3,7 +3,9 @@
 prebuilt_server = get_option('prebuilt_server')
 if prebuilt_server == ''
    custom_target('scrcpy-server',
-                  build_always: true,  # gradle is responsible for tracking source changes
+                  # gradle is responsible for tracking source changes
+                  build_by_default: true,
+                  build_always_stale: true,
                  output: 'scrcpy-server',
                  command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
                  console: true,
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -0,0 +1,77 @@
+package com.genymobile.scrcpy;
+
+import com.genymobile.scrcpy.wrappers.ContentProvider;
+import com.genymobile.scrcpy.wrappers.ServiceManager;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Handle the cleanup of scrcpy, even if the main process is killed.
+ * <p>
+ * This is useful to restore some state when scrcpy is closed, even on device disconnection (which kills the scrcpy process).
+ */
+public final class CleanUp {
+
+    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
+
+    private CleanUp() {
+        // not instantiable
+    }
+
+    public static void configure(boolean disableShowTouches, int restoreStayOn) throws IOException {
+        boolean needProcess = disableShowTouches || restoreStayOn != -1;
+        if (needProcess) {
+            startProcess(disableShowTouches, restoreStayOn);
+        } else {
+            // There is no additional clean up to do when scrcpy dies
+            unlinkSelf();
+        }
+    }
+
+    private static void startProcess(boolean disableShowTouches, int restoreStayOn) throws IOException {
+        String[] cmd = {"app_process", "/", CleanUp.class.getName(), String.valueOf(disableShowTouches), String.valueOf(restoreStayOn)};
+
+        ProcessBuilder builder = new ProcessBuilder(cmd);
+        builder.environment().put("CLASSPATH", SERVER_PATH);
+        builder.start();
+    }
+
+    private static void unlinkSelf() {
+        try {
+            new File(SERVER_PATH).delete();
+        } catch (Exception e) {
+            Ln.e("Could not unlink server", e);
+        }
+    }
+
+    public static void main(String... args) {
+        unlinkSelf();
+
+        try {
+            // Wait for the server to die
+            System.in.read();
+        } catch (IOException e) {
+            // Expected when the server is dead
+        }
+
+        Ln.i("Cleaning up");
+
+        boolean disableShowTouches = Boolean.parseBoolean(args[0]);
+        int restoreStayOn = Integer.parseInt(args[1]);
+
+        if (disableShowTouches || restoreStayOn != -1) {
+            ServiceManager serviceManager = new ServiceManager();
+            try (ContentProvider settings = serviceManager.getActivityManager().createSettingsProvider()) {
+                if (disableShowTouches) {
+                    Ln.i("Disabling \"show touches\"");
+                    settings.putValue(ContentProvider.TABLE_SYSTEM, "show_touches", "0");
+                }
+                if (restoreStayOn != -1) {
+                    Ln.i("Restoring \"stay awake\"");
+                    settings.putValue(ContentProvider.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(restoreStayOn));
+                }
+            }
+        }
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
@@ -0,0 +1,112 @@
+package com.genymobile.scrcpy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CodecOption {
+    private String key;
+    private Object value;
+
+    public CodecOption(String key, Object value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public static List<CodecOption> parse(String codecOptions) {
+        if ("-".equals(codecOptions)) {
+            return null;
+        }
+
+        List<CodecOption> result = new ArrayList<>();
+
+        boolean escape = false;
+        StringBuilder buf = new StringBuilder();
+
+        for (char c : codecOptions.toCharArray()) {
+            switch (c) {
+                case '\\':
+                    if (escape) {
+                        buf.append('\\');
+                        escape = false;
+                    } else {
+                        escape = true;
+                    }
+                    break;
+                case ',':
+                    if (escape) {
+                        buf.append(',');
+                        escape = false;
+                    } else {
+                        // This comma is a separator between codec options
+                        String codecOption = buf.toString();
+                        result.add(parseOption(codecOption));
+                        // Clear buf
+                        buf.setLength(0);
+                    }
+                    break;
+                default:
+                    buf.append(c);
+                    break;
+            }
+        }
+
+        if (buf.length() > 0) {
+            String codecOption = buf.toString();
+            result.add(parseOption(codecOption));
+        }
+
+        return result;
+    }
+
+    private static CodecOption parseOption(String option) {
+        int equalSignIndex = option.indexOf('=');
+        if (equalSignIndex == -1) {
+            throw new IllegalArgumentException("'=' expected");
+        }
+        String keyAndType = option.substring(0, equalSignIndex);
+        if (keyAndType.length() == 0) {
+            throw new IllegalArgumentException("Key may not be null");
+        }
+
+        String key;
+        String type;
+
+        int colonIndex = keyAndType.indexOf(':');
+        if (colonIndex != -1) {
+            key = keyAndType.substring(0, colonIndex);
+            type = keyAndType.substring(colonIndex + 1);
+        } else {
+            key = keyAndType;
+            type = "int"; // assume int by default
+        }
+
+        Object value;
+        String valueString = option.substring(equalSignIndex + 1);
+        switch (type) {
+            case "int":
+                value = Integer.parseInt(valueString);
+                break;
+            case "long":
+                value = Long.parseLong(valueString);
+                break;
+            case "float":
+                value = Float.parseFloat(valueString);
+                break;
+            case "string":
+                value = valueString;
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid codec option type (int, long, float, str): " + type);
+        }
+
+        return new CodecOption(key, value);
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -13,8 +13,8 @@ public class ControlMessageReader {
    static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
    static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;

-    public static final int TEXT_MAX_LENGTH = 300;
    public static final int CLIPBOARD_TEXT_MAX_LENGTH = 4093;
+    public static final int INJECT_TEXT_MAX_LENGTH = 300;
    private static final int RAW_BUFFER_SIZE = 1024;

    private final byte[] rawBuffer = new byte[RAW_BUFFER_SIZE];
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -1,5 +1,6 @@
 package com.genymobile.scrcpy;

+import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
@@ -36,10 +37,7 @@ public final class Device {
     */
    private final int layerStack;

-    /**
-     * The FLAG_PRESENTATION from the DisplayInfo
-     */
-    private final boolean isPresentationDisplay;
+    private final boolean supportsInputEvents;

    public Device(Options options) {
        displayId = options.getDisplayId();
@@ -53,7 +51,6 @@ public final class Device {

        screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
        layerStack = displayInfo.getLayerStack();
-        isPresentationDisplay = (displayInfoFlags & DisplayInfo.FLAG_PRESENTATION) != 0;

        registerRotationWatcher(new IRotationWatcher.Stub() {
            @Override
@@ -73,8 +70,10 @@ public final class Device {
            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
        }

-        if (!supportsInputEvents()) {
-            Ln.w("Input events are not supported for displays with FLAG_PRESENTATION enabled for devices with API lower than 29");
+        // main display or any display on Android >= Q
+        supportsInputEvents = displayId == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
+        if (!supportsInputEvents) {
+            Ln.w("Input events are not supported for secondary displays before Android 10");
        }
    }

@@ -116,10 +115,7 @@ public final class Device {
    }

    public boolean supportsInputEvents() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return true;
-        }
-        return !isPresentationDisplay;
+        return supportsInputEvents;
    }

    public boolean injectInputEvent(InputEvent inputEvent, int mode) {
@@ -204,4 +200,8 @@ public final class Device {
            wm.thawRotation();
        }
    }
+
+    public ContentProvider createSettingsProvider() {
+        return serviceManager.getActivityManager().createSettingsProvider();
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java
@@ -8,7 +8,6 @@ public final class DisplayInfo {
    private final int flags;

    public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 0x00000001;
-    public static final int FLAG_PRESENTATION = 0x00000008;

    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags) {
        this.displayId = displayId;
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -12,6 +12,9 @@ public class Options {
    private boolean sendFrameMeta; // send PTS so that the client may record properly
    private boolean control;
    private int displayId;
+    private boolean showTouches;
+    private boolean stayAwake;
+    private String codecOptions;

    public int getMaxSize() {
        return maxSize;
@@ -84,4 +87,28 @@ public class Options {
    public void setDisplayId(int displayId) {
        this.displayId = displayId;
    }
+
+    public boolean getShowTouches() {
+        return showTouches;
+    }
+
+    public void setShowTouches(boolean showTouches) {
+        this.showTouches = showTouches;
+    }
+
+    public boolean getStayAwake() {
+        return stayAwake;
+    }
+
+    public void setStayAwake(boolean stayAwake) {
+        this.stayAwake = stayAwake;
+    }
+
+    public String getCodecOptions() {
+        return codecOptions;
+    }
+
+    public void setCodecOptions(String codecOptions) {
+        this.codecOptions = codecOptions;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -12,6 +12,7 @@ import android.view.Surface;
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

 public class ScreenEncoder implements Device.RotationListener {
@@ -25,15 +26,17 @@ public class ScreenEncoder implements Device.RotationListener {
    private final AtomicBoolean rotationChanged = new AtomicBoolean();
    private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);

+    private List<CodecOption> codecOptions;
    private int bitRate;
    private int maxFps;
    private boolean sendFrameMeta;
    private long ptsOrigin;

-    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps) {
+    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps, List<CodecOption> codecOptions) {
        this.sendFrameMeta = sendFrameMeta;
        this.bitRate = bitRate;
        this.maxFps = maxFps;
+        this.codecOptions = codecOptions;
    }

    @Override
@@ -47,9 +50,21 @@ public class ScreenEncoder implements Device.RotationListener {

    public void streamScreen(Device device, FileDescriptor fd) throws IOException {
        Workarounds.prepareMainLooper();
-        Workarounds.fillAppInfo();

-        MediaFormat format = createFormat(bitRate, maxFps, DEFAULT_I_FRAME_INTERVAL);
+        try {
+            internalStreamScreen(device, fd);
+        } catch (NullPointerException e) {
+            // Retry with workarounds enabled:
+            // <https://github.com/Genymobile/scrcpy/issues/365>
+            // <https://github.com/Genymobile/scrcpy/issues/940>
+            Ln.d("Applying workarounds to avoid NullPointerException");
+            Workarounds.fillAppInfo();
+            internalStreamScreen(device, fd);
+        }
+    }
+
+    private void internalStreamScreen(Device device, FileDescriptor fd) throws IOException {
+        MediaFormat format = createFormat(bitRate, maxFps, DEFAULT_I_FRAME_INTERVAL, codecOptions);
        device.setRotationListener(this);
        boolean alive;
        try {
@@ -136,12 +151,29 @@ public class ScreenEncoder implements Device.RotationListener {
    }

    private static MediaCodec createCodec() throws IOException {
-        return MediaCodec.createEncoderByType("video/avc");
+        return MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_VIDEO_AVC);
    }

-    private static MediaFormat createFormat(int bitRate, int maxFps, int iFrameInterval) {
+    private static void setCodecOption(MediaFormat format, CodecOption codecOption) {
+        String key = codecOption.getKey();
+        Object value = codecOption.getValue();
+
+        if (value instanceof Integer) {
+            format.setInteger(key, (Integer) value);
+        } else if (value instanceof Long) {
+            format.setLong(key, (Long) value);
+        } else if (value instanceof Float) {
+            format.setFloat(key, (Float) value);
+        } else if (value instanceof String) {
+            format.setString(key, (String) value);
+        }
+
+        Ln.d("Codec option set: " + key + " (" + value.getClass().getSimpleName() + ") = " + value);
+    }
+
+    private static MediaFormat createFormat(int bitRate, int maxFps, int iFrameInterval, List<CodecOption> codecOptions) {
        MediaFormat format = new MediaFormat();
-        format.setString(MediaFormat.KEY_MIME, "video/avc");
+        format.setString(MediaFormat.KEY_MIME, MediaFormat.MIMETYPE_VIDEO_AVC);
        format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
        // must be present to configure the encoder, but does not impact the actual frame rate, which is variable
        format.setInteger(MediaFormat.KEY_FRAME_RATE, 60);
@@ -155,6 +187,13 @@ public class ScreenEncoder implements Device.RotationListener {
            // <https://github.com/Genymobile/scrcpy/issues/488#issuecomment-567321437>
            format.setFloat(KEY_MAX_FPS_TO_ENCODER, maxFps);
        }
+
+        if (codecOptions != null) {
+            for (CodecOption option : codecOptions) {
+                setCodecOption(format, option);
+            }
+        }
+
        return format;
    }

--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -1,15 +1,17 @@
 package com.genymobile.scrcpy;

+import com.genymobile.scrcpy.wrappers.ContentProvider;
+
 import android.graphics.Rect;
 import android.media.MediaCodec;
+import android.os.BatteryManager;
 import android.os.Build;

-import java.io.File;
 import java.io.IOException;
+import java.util.List;

 public final class Server {

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

    private Server() {
        // not instantiable
@@ -18,9 +20,40 @@ public final class Server {
    private static void scrcpy(Options options) throws IOException {
        Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
        final Device device = new Device(options);
+        List<CodecOption> codecOptions = CodecOption.parse(options.getCodecOptions());
+
+        boolean mustDisableShowTouchesOnCleanUp = false;
+        int restoreStayOn = -1;
+        if (options.getShowTouches() || options.getStayAwake()) {
+            try (ContentProvider settings = device.createSettingsProvider()) {
+                if (options.getShowTouches()) {
+                    String oldValue = settings.getAndPutValue(ContentProvider.TABLE_SYSTEM, "show_touches", "1");
+                    // If "show touches" was disabled, it must be disabled back on clean up
+                    mustDisableShowTouchesOnCleanUp = !"1".equals(oldValue);
+                }
+
+                if (options.getStayAwake()) {
+                    int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
+                    String oldValue = settings.getAndPutValue(ContentProvider.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
+                    try {
+                        restoreStayOn = Integer.parseInt(oldValue);
+                        if (restoreStayOn == stayOn) {
+                            // No need to restore
+                            restoreStayOn = -1;
+                        }
+                    } catch (NumberFormatException e) {
+                        restoreStayOn = 0;
+                    }
+                }
+            }
+        }
+
+        CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn);
+
        boolean tunnelForward = options.isTunnelForward();
+
        try (DesktopConnection connection = DesktopConnection.open(device, tunnelForward)) {
-            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps());
+            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps(), codecOptions);

            if (options.getControl()) {
                Controller controller = new Controller(device, connection);
@@ -79,8 +112,9 @@ public final class Server {
                    "The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
        }

-        if (args.length != 10) {
-            throw new IllegalArgumentException("Expecting 10 parameters");
+        final int expectedParameters = 13;
+        if (args.length != expectedParameters) {
+            throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");
        }

        Options options = new Options();
@@ -113,6 +147,15 @@ public final class Server {
        int displayId = Integer.parseInt(args[9]);
        options.setDisplayId(displayId);

+        boolean showTouches = Boolean.parseBoolean(args[10]);
+        options.setShowTouches(showTouches);
+
+        boolean stayAwake = Boolean.parseBoolean(args[11]);
+        options.setStayAwake(stayAwake);
+
+        String codecOptions = args[12];
+        options.setCodecOptions(codecOptions);
+
        return options;
    }

@@ -132,14 +175,6 @@ public final class Server {
        return new Rect(x, y, x + width, y + height);
    }

-    private static void unlinkSelf() {
-        try {
-            new File(SERVER_PATH).delete();
-        } catch (Exception e) {
-            Ln.e("Could not unlink server", e);
-        }
-    }
-
    private static void suggestFix(Throwable e) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            if (e instanceof MediaCodec.CodecException) {
@@ -172,7 +207,6 @@ public final class Server {
            }
        });

-        unlinkSelf();
        Options options = createOptions(args);
        scrcpy(options);
    }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
@@ -0,0 +1,87 @@
+package com.genymobile.scrcpy.wrappers;
+
+import com.genymobile.scrcpy.Ln;
+
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.IInterface;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class ActivityManager {
+
+    private final IInterface manager;
+    private Method getContentProviderExternalMethod;
+    private boolean getContentProviderExternalMethodLegacy;
+    private Method removeContentProviderExternalMethod;
+
+    public ActivityManager(IInterface manager) {
+        this.manager = manager;
+    }
+
+    private Method getGetContentProviderExternalMethod() throws NoSuchMethodException {
+        if (getContentProviderExternalMethod == null) {
+            try {
+                getContentProviderExternalMethod = manager.getClass()
+                        .getMethod("getContentProviderExternal", String.class, int.class, IBinder.class, String.class);
+            } catch (NoSuchMethodException e) {
+                // old version
+                getContentProviderExternalMethod = manager.getClass().getMethod("getContentProviderExternal", String.class, int.class, IBinder.class);
+                getContentProviderExternalMethodLegacy = true;
+            }
+        }
+        return getContentProviderExternalMethod;
+    }
+
+    private Method getRemoveContentProviderExternalMethod() throws NoSuchMethodException {
+        if (removeContentProviderExternalMethod == null) {
+            removeContentProviderExternalMethod = manager.getClass().getMethod("removeContentProviderExternal", String.class, IBinder.class);
+        }
+        return removeContentProviderExternalMethod;
+    }
+
+    private ContentProvider getContentProviderExternal(String name, IBinder token) {
+        try {
+            Method method = getGetContentProviderExternalMethod();
+            Object[] args;
+            if (!getContentProviderExternalMethodLegacy) {
+                // new version
+                args = new Object[]{name, ServiceManager.USER_ID, token, null};
+            } else {
+                // old version
+                args = new Object[]{name, ServiceManager.USER_ID, token};
+            }
+            // ContentProviderHolder providerHolder = getContentProviderExternal(...);
+            Object providerHolder = method.invoke(manager, args);
+            if (providerHolder == null) {
+                return null;
+            }
+            // IContentProvider provider = providerHolder.provider;
+            Field providerField = providerHolder.getClass().getDeclaredField("provider");
+            providerField.setAccessible(true);
+            Object provider = providerField.get(providerHolder);
+            if (provider == null) {
+                return null;
+            }
+            return new ContentProvider(this, provider, name, token);
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException | NoSuchFieldException e) {
+            Ln.e("Could not invoke method", e);
+            return null;
+        }
+    }
+
+    void removeContentProviderExternal(String name, IBinder token) {
+        try {
+            Method method = getRemoveContentProviderExternalMethod();
+            method.invoke(manager, name, token);
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            Ln.e("Could not invoke method", e);
+        }
+    }
+
+    public ContentProvider createSettingsProvider() {
+        return getContentProviderExternal("settings", new Binder());
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -10,10 +10,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

 public class ClipboardManager {
-
-    private static final String PACKAGE_NAME = "com.android.shell";
-    private static final int USER_ID = 0;
-
    private final IInterface manager;
    private Method getPrimaryClipMethod;
    private Method setPrimaryClipMethod;
@@ -46,17 +42,17 @@ public class ClipboardManager {

    private static ClipData getPrimaryClip(Method method, IInterface manager) throws InvocationTargetException, IllegalAccessException {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            return (ClipData) method.invoke(manager, PACKAGE_NAME);
+            return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME);
        }
-        return (ClipData) method.invoke(manager, PACKAGE_NAME, USER_ID);
+        return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
    }

    private static void setPrimaryClip(Method method, IInterface manager, ClipData clipData)
            throws InvocationTargetException, IllegalAccessException {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-            method.invoke(manager, clipData, PACKAGE_NAME);
+            method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME);
        } else {
-            method.invoke(manager, clipData, PACKAGE_NAME, USER_ID);
+            method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);
        }
    }

--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
@@ -0,0 +1,132 @@
+package com.genymobile.scrcpy.wrappers;
+
+import com.genymobile.scrcpy.Ln;
+
+import android.os.Bundle;
+import android.os.IBinder;
+
+import java.io.Closeable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class ContentProvider implements Closeable {
+
+    public static final String TABLE_SYSTEM = "system";
+    public static final String TABLE_SECURE = "secure";
+    public static final String TABLE_GLOBAL = "global";
+
+    // See android/providerHolder/Settings.java
+    private static final String CALL_METHOD_GET_SYSTEM = "GET_system";
+    private static final String CALL_METHOD_GET_SECURE = "GET_secure";
+    private static final String CALL_METHOD_GET_GLOBAL = "GET_global";
+
+    private static final String CALL_METHOD_PUT_SYSTEM = "PUT_system";
+    private static final String CALL_METHOD_PUT_SECURE = "PUT_secure";
+    private static final String CALL_METHOD_PUT_GLOBAL = "PUT_global";
+
+    private static final String CALL_METHOD_USER_KEY = "_user";
+
+    private static final String NAME_VALUE_TABLE_VALUE = "value";
+
+    private final ActivityManager manager;
+    // android.content.IContentProvider
+    private final Object provider;
+    private final String name;
+    private final IBinder token;
+
+    private Method callMethod;
+    private boolean callMethodLegacy;
+
+    ContentProvider(ActivityManager manager, Object provider, String name, IBinder token) {
+        this.manager = manager;
+        this.provider = provider;
+        this.name = name;
+        this.token = token;
+    }
+
+    private Method getCallMethod() throws NoSuchMethodException {
+        if (callMethod == null) {
+            try {
+                callMethod = provider.getClass().getMethod("call", String.class, String.class, String.class, String.class, Bundle.class);
+            } catch (NoSuchMethodException e) {
+                // old version
+                callMethod = provider.getClass().getMethod("call", String.class, String.class, String.class, Bundle.class);
+                callMethodLegacy = true;
+            }
+        }
+        return callMethod;
+    }
+
+    private Bundle call(String callMethod, String arg, Bundle extras) {
+        try {
+            Method method = getCallMethod();
+            Object[] args;
+            if (!callMethodLegacy) {
+                args = new Object[]{ServiceManager.PACKAGE_NAME, "settings", callMethod, arg, extras};
+            } else {
+                args = new Object[]{ServiceManager.PACKAGE_NAME, callMethod, arg, extras};
+            }
+            return (Bundle) method.invoke(provider, args);
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            Ln.e("Could not invoke method", e);
+            return null;
+        }
+    }
+
+    public void close() {
+        manager.removeContentProviderExternal(name, token);
+    }
+
+    private static String getGetMethod(String table) {
+        switch (table) {
+            case TABLE_SECURE:
+                return CALL_METHOD_GET_SECURE;
+            case TABLE_SYSTEM:
+                return CALL_METHOD_GET_SYSTEM;
+            case TABLE_GLOBAL:
+                return CALL_METHOD_GET_GLOBAL;
+            default:
+                throw new IllegalArgumentException("Invalid table: " + table);
+        }
+    }
+
+    private static String getPutMethod(String table) {
+        switch (table) {
+            case TABLE_SECURE:
+                return CALL_METHOD_PUT_SECURE;
+            case TABLE_SYSTEM:
+                return CALL_METHOD_PUT_SYSTEM;
+            case TABLE_GLOBAL:
+                return CALL_METHOD_PUT_GLOBAL;
+            default:
+                throw new IllegalArgumentException("Invalid table: " + table);
+        }
+    }
+
+    public String getValue(String table, String key) {
+        String method = getGetMethod(table);
+        Bundle arg = new Bundle();
+        arg.putInt(CALL_METHOD_USER_KEY, ServiceManager.USER_ID);
+        Bundle bundle = call(method, key, arg);
+        if (bundle == null) {
+            return null;
+        }
+        return bundle.getString("value");
+    }
+
+    public void putValue(String table, String key, String value) {
+        String method = getPutMethod(table);
+        Bundle arg = new Bundle();
+        arg.putInt(CALL_METHOD_USER_KEY, ServiceManager.USER_ID);
+        arg.putString(NAME_VALUE_TABLE_VALUE, value);
+        call(method, key, arg);
+    }
+
+    public String getAndPutValue(String table, String key, String value) {
+        String oldValue = getValue(table, key);
+        if (!value.equals(oldValue)) {
+            putValue(table, key, value);
+        }
+        return oldValue;
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
@@ -53,8 +53,7 @@ public final class InputManager {
            method.invoke(inputEvent, displayId);
            return true;
        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            // just a warning, it might happen on old devices
-            Ln.w("Cannot associate a display id to the input event");
+            Ln.e("Cannot associate a display id to the input event", e);
            return false;
        }
    }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
@@ -8,6 +8,10 @@ import java.lang.reflect.Method;

@SuppressLint("PrivateApi,DiscouragedPrivateApi")
 public final class ServiceManager {
+
+    public static final String PACKAGE_NAME = "com.android.shell";
+    public static final int USER_ID = 0;
+
    private final Method getServiceMethod;

    private WindowManager windowManager;
@@ -16,6 +20,7 @@ public final class ServiceManager {
    private PowerManager powerManager;
    private StatusBarManager statusBarManager;
    private ClipboardManager clipboardManager;
+    private ActivityManager activityManager;

    public ServiceManager() {
        try {
@@ -76,4 +81,21 @@ public final class ServiceManager {
        }
        return clipboardManager;
    }
+
+    public ActivityManager getActivityManager() {
+        if (activityManager == null) {
+            try {
+                // On old Android versions, the ActivityManager is not exposed via AIDL,
+                // so use ActivityManagerNative.getDefault()
+                Class<?> cls = Class.forName("android.app.ActivityManagerNative");
+                Method getDefaultMethod = cls.getDeclaredMethod("getDefault");
+                IInterface am = (IInterface) getDefaultMethod.invoke(null);
+                activityManager = new ActivityManager(am);
+            } catch (Exception e) {
+                throw new AssertionError(e);
+            }
+        }
+
+        return activityManager;
+    }
 }
--- a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java
@@ -0,0 +1,114 @@
+package com.genymobile.scrcpy;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CodecOptionsTest {
+
+    @Test
+    public void testIntegerImplicit() {
+        List<CodecOption> codecOptions = CodecOption.parse("some_key=5");
+
+        Assert.assertEquals(1, codecOptions.size());
+
+        CodecOption option = codecOptions.get(0);
+        Assert.assertEquals("some_key", option.getKey());
+        Assert.assertEquals(5, option.getValue());
+    }
+
+    @Test
+    public void testInteger() {
+        List<CodecOption> codecOptions = CodecOption.parse("some_key:int=5");
+
+        Assert.assertEquals(1, codecOptions.size());
+
+        CodecOption option = codecOptions.get(0);
+        Assert.assertEquals("some_key", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Integer);
+        Assert.assertEquals(5, option.getValue());
+    }
+
+    @Test
+    public void testLong() {
+        List<CodecOption> codecOptions = CodecOption.parse("some_key:long=5");
+
+        Assert.assertEquals(1, codecOptions.size());
+
+        CodecOption option = codecOptions.get(0);
+        Assert.assertEquals("some_key", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Long);
+        Assert.assertEquals(5L, option.getValue());
+    }
+
+    @Test
+    public void testFloat() {
+        List<CodecOption> codecOptions = CodecOption.parse("some_key:float=4.5");
+
+        Assert.assertEquals(1, codecOptions.size());
+
+        CodecOption option = codecOptions.get(0);
+        Assert.assertEquals("some_key", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Float);
+        Assert.assertEquals(4.5f, option.getValue());
+    }
+
+    @Test
+    public void testString() {
+        List<CodecOption> codecOptions = CodecOption.parse("some_key:string=some_value");
+
+        Assert.assertEquals(1, codecOptions.size());
+
+        CodecOption option = codecOptions.get(0);
+        Assert.assertEquals("some_key", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof String);
+        Assert.assertEquals("some_value", option.getValue());
+    }
+
+    @Test
+    public void testStringEscaped() {
+        List<CodecOption> codecOptions = CodecOption.parse("some_key:string=warning\\,this_is_not=a_new_key");
+
+        Assert.assertEquals(1, codecOptions.size());
+
+        CodecOption option = codecOptions.get(0);
+        Assert.assertEquals("some_key", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof String);
+        Assert.assertEquals("warning,this_is_not=a_new_key", option.getValue());
+    }
+
+    @Test
+    public void testList() {
+        List<CodecOption> codecOptions = CodecOption.parse("a=1,b:int=2,c:long=3,d:float=4.5,e:string=a\\,b=c");
+
+        Assert.assertEquals(5, codecOptions.size());
+
+        CodecOption option;
+
+        option = codecOptions.get(0);
+        Assert.assertEquals("a", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Integer);
+        Assert.assertEquals(1, option.getValue());
+
+        option = codecOptions.get(1);
+        Assert.assertEquals("b", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Integer);
+        Assert.assertEquals(2, option.getValue());
+
+        option = codecOptions.get(2);
+        Assert.assertEquals("c", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Long);
+        Assert.assertEquals(3L, option.getValue());
+
+        option = codecOptions.get(3);
+        Assert.assertEquals("d", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof Float);
+        Assert.assertEquals(4.5f, option.getValue());
+
+        option = codecOptions.get(4);
+        Assert.assertEquals("e", option.getKey());
+        Assert.assertTrue(option.getValue() instanceof String);
+        Assert.assertEquals("a,b=c", option.getValue());
+    }
+}
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@@ -66,7 +66,7 @@ public class ControlMessageReaderTest {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_INJECT_TEXT);
-        byte[] text = new byte[ControlMessageReader.TEXT_MAX_LENGTH];
+        byte[] text = new byte[ControlMessageReader.INJECT_TEXT_MAX_LENGTH];
        Arrays.fill(text, (byte) 'a');
        dos.writeShort(text.length);
        dos.write(text);
Author	SHA1	Message	Date
Tzah Mazuz	ad3632f1ff	Add --codec-options Co-authored-by: Romain Vimont <rom@rom1v.com>	2020-05-04 01:17:02 +02:00
Romain Vimont	c77024314d	Add an option to keep the device awake Add an option to prevent the device to sleep: scrcpy --stay-awake scrcpy -w The initial state is restored on exit. Fixes #631 <https://github.com/Genymobile/scrcpy/issues/631>	2020-05-02 02:14:25 +02:00
Romain Vimont	828327365a	Reorder options in alphabetical order	2020-05-02 01:55:32 +02:00
Romain Vimont	4668638ee1	Handle "show touches" on the device-side Now that the server can access the Android settings and clean up properly, handle the "show touches" option from the server. The initial state is now correctly restored, even on device disconnection.	2020-05-02 01:55:30 +02:00
Romain Vimont	dbb0df607c	Move constants to ServiceManager PACKAGE_NAME and USER_ID could be use by several "managers", so move them to the service manager.	2020-05-02 01:22:18 +02:00
Romain Vimont	2f74ec2518	Add a clean up process on the device In order to clean up on close, use a separate process which is not killed when the device is disconnected (even if the main process itself is killed).	2020-05-02 01:22:18 +02:00
Romain Vimont	8c6799297b	Implement access to settings without Context Expose methods to access the Android settings using private APIs. This allows to read and write settings values immediately without starting a new process to call "settings".	2020-05-02 01:22:10 +02:00
Romain Vimont	62c0c1321f	Apply workarounds only on error To avoid NullPointerException on some devices, workarounds have been implemented. But these workaround produce (harmless) internal errors causing exceptions to be printed in the console. To avoid this problem, apply the workarounds only if it fails without them. Fixes #994 <https://github.com/Genymobile/scrcpy/issues/994> Refs #365 <https://github.com/Genymobile/scrcpy/issues/365> Refs #940 <https://github.com/Genymobile/scrcpy/issues/940>	2020-05-01 19:42:31 +02:00
antoninsmetana	d4eeb1c84d	Fix AutoAdb url PR #1344 <https://github.com/Genymobile/scrcpy/pull/1344> Signed-off-by: Romain Vimont <rom@rom1v.com>	2020-05-01 19:34:08 +02:00
Romain Vimont	4e9e712312	Update links to v1.13 in README and BUILD	2020-04-29 22:56:26 +02:00
Romain Vimont	9babe26805	Bump version to 1.13	2020-04-29 22:24:08 +02:00
Romain Vimont	76567e684a	Upgrade SDL (2.0.12) for Windows Include the latest version of SDL in Windows releases.	2020-04-27 21:45:15 +02:00
Romain Vimont	b55ca127f8	Upgrade FFmpeg (4.2.2) for Windows Include the latest version of FFmpeg in Windows releases.	2020-04-27 21:45:15 +02:00
Romain Vimont	a12b938234	Merge branch 'master' into dev	2020-04-27 21:44:59 +02:00
Romain Vimont	a14840a515	Fix typo in comments	2020-04-24 23:01:58 +02:00
Romain Vimont	8581d6850b	Stabilize auto-resize The window dimensions are integers, so resizing to fit the content may not be exact. When computing the optimal size, it could cause to reduce alternatively the width and height by few pixels, making the "optimal size" unstable. To avoid this problem, check if the optimal size is already correct either by keeping the width or the height.	2020-04-24 22:52:02 +02:00
Romain Vimont	92cb3a6661	Improve resizing workaround Call the same method as when the event is received on the event loop, so that the behavior is the same in both cases.	2020-04-24 21:36:25 +02:00
Romain Vimont	561ede444e	Mention Ubuntu 20.04 package Ubuntu 20.04 has been released today, and scrcpy is available in their repositories: <https://packages.ubuntu.com/focal/scrcpy>	2020-04-23 16:36:48 +02:00
Romain Vimont	3c9ae99dda	Move rotation coordinates to screen Move the window-to-frame coordinates conversion from the input manager to the screen. This will allow to apply more screen-related transformations without impacting the input manager.	2020-04-18 02:15:22 +02:00
Romain Vimont	44f720e4a4	Log new size on auto-resize request On "resize to fit" and "resize to pixel-perfect", log the new size.	2020-04-18 02:15:22 +02:00
Tzah Mazuz	125c5561e8	Use MediaFormat constant for MIME type Replace "video/avc" by MIMETYPE_VIDEO_AVC. Signed-off-by: Romain Vimont <rom@rom1v.com>	2020-04-18 02:14:42 +02:00
Romain Vimont	14ead499fd	Fix touch coordinates on rotated display The touch coordinates were not rotated.	2020-04-17 18:17:12 +02:00
Romain Vimont	94a7f1a0f8	Disable input events when necessary Disable input events on secondary displays before Android 10, even if FLAG_PRESENTATION is not set. Refs #1288 <https://github.com/Genymobile/scrcpy/issues/1288>	2020-04-16 20:54:00 +02:00
Romain Vimont	cc22f4622a	Mention mipmapping in FAQ	2020-04-15 17:39:51 +02:00
Romain Vimont	11a61b2cb3	Add option --no-mipmaps Add an option to disable trilinear filtering even if mipmapping is available.	2020-04-15 17:39:51 +02:00
Romain Vimont	bea7658807	Enable trilinear filtering for OpenGL Improve downscaling quality if mipmapping is available. Suggested-by: Giumo Clanjor (哆啦比猫/兰威举) <cjxgm2@gmail.com> Fixes #40 <https://github.com/Genymobile/scrcpy/issues/40> Ref: <https://github.com/Genymobile/scrcpy/issues/40#issuecomment-591917787>	2020-04-15 17:39:51 +02:00
Romain Vimont	8a9b20b27e	Add --render-driver command-line option Add an option to set a render driver hint (SDL_HINT_RENDER_DRIVER).	2020-04-15 17:39:51 +02:00
Romain Vimont	d62eb2b11c	Fix typo in README	2020-04-15 09:57:59 +02:00
Romain Vimont	eb8f7a1f28	Require Meson 0.48 to get rid of warnings Debian buster (stable) provides Meson 0.49, which is also available in stretch (oldstable) backports. It's time to abandon Meson 0.37. Ref: `20b3f101a4`	2020-04-13 22:47:03 +02:00
Romain Vimont	270d0bf639	Rename max length constant for text injection To avoid confusion with the max text size for clipboard, rename the constant limiting the text injection length.	2020-04-13 19:38:43 +02:00