Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity
1508 commits 2 branches 1 tag 4.1 MiB
Commit graph

1508 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
ba547e3895 Configure feature test macros in meson 
Refs #2807 <https://github.com/Genymobile/scrcpy/pull/2807>

Co-authored-by: RipleyTom <RipleyTom@users.noreply.github.com>
 2021-11-21 00:20:11 +01:00
Romain Vimont
226f3b2c91 Add missing include config.h 2021-11-21 00:13:25 +01:00
Romain Vimont
2d6a96776c Improve SSH tunnel documentation in README 2021-11-19 21:03:29 +01:00
Romain Vimont
6da6d905c2 Print scrcpy header first 
Inconditionnally print the scrcpy version first, without using LOGI().

The log level is configured only after parsing the command line
parameters (it may be changed via -V), and command line parsing logs
should not appear before the scrcpy version.
 2021-11-19 09:45:02 +01:00
Romain Vimont
b25404ee4b Print help to stdout 
The output of -h/--help was printed on stderr, although it is not an
error.

Printing on stdout allows to pipe the result directly:

    scrcpy --help | less

Instead of (in bash):

    scrcpy --help |& less
 2021-11-19 08:18:13 +01:00
Romain Vimont
4cfc1cd70a Assert that long options are correctly set 2021-11-19 08:06:23 +01:00
Romain Vimont
2fc80eae2d Simplify adb_tunnel 
With the new adb functions, the static adb_tunnel functions become
unnecessary.
 2021-11-19 07:25:03 +01:00
Romain Vimont
3fdbd994e0 Privatize low-level adb functions 
Only expose the interruptible user-friendly API.
 2021-11-19 07:25:03 +01:00
Romain Vimont
ce225f019a Use new user-friendly adb API 
Replace the adb_exec_*() calls by the new adb functions to simplify.
 2021-11-18 22:11:19 +01:00
Romain Vimont
b7559744a7 Expose new user-friendly adb functions 
Expose interruptible adb functions which return the expected result
directly, without exposing the process (sc_pid) to the caller.
 2021-11-18 22:08:15 +01:00
Romain Vimont
afb5a5e80f Rename adb functions to adb_exec_* 
This paves the way to replace them by more user-friendly functions that
will call them internally.
 2021-11-18 21:47:17 +01:00
Romain Vimont
84334cf7db Use sc_intr in file_handler 
Replace manual interruption handling by the recent sc_intr mechanism.
 2021-11-18 21:33:25 +01:00
Romain Vimont
0ba2686e1d Simplify file_handler 
Call the target functions directly.
 2021-11-18 19:46:47 +01:00
Romain Vimont
55648d4d64 Improve file_handler readability 
Use local variables as short name aliases.
 2021-11-18 19:46:40 +01:00
Romain Vimont
13fd693b50 Simplify adb_execute_p() 
Only pass the stdout pipe as parameter, scrcpy never writes to stdin or
reads from stderr of an adb process.
 2021-11-18 19:43:10 +01:00
Romain Vimont
0426ae885c Make "adb get-serialno" interruptible 
All process executions must be interruptible, so that Ctrl+c reacts
immediately.
 2021-11-18 19:41:41 +01:00
Romain Vimont
ea454e9cee Add interruptible function to read from pipe 
This will avoid to block Ctrl+c if the process the pipe is read from
takes too much time.
 2021-11-18 19:39:11 +01:00
Romain Vimont
cb65531533 Simplify sc_str_truncate() 
Use strcspn() to get the prefix length directly.
 2021-11-18 19:37:53 +01:00
Romain Vimont
9619ade706 Generalize string trunctation util function 
Add an additional argument to let the client pass the possible end
chars.
 2021-11-18 18:48:16 +01:00
Romain Vimont
f2781a8b6d Expose util function to truncate first line 
Move the local implementation from adb functions to the string util
functions.
 2021-11-18 18:48:16 +01:00
Romain Vimont
443cb14d6e Assume non-NULL serial in file_handler 
The previous commit guarantees to always initialize the serial, so the
file_handle may assume it is never NULL.
 2021-11-18 18:48:11 +01:00
Romain Vimont
b30c3a429f Always retrieve device serial 
This allows to execute all adb commands with the specific -s parameter,
even if it is not provided by the user.

In practice, calling adb without -s works if there is exactly one device
connected. But some adb commands (for example "adb push" on drag & drop)
could be executed after another device is connected, so the actual
device serial must be known.
 2021-11-18 18:32:15 +01:00
Romain Vimont
632bd5697b Add missing error handling 
If "adb get-serialno" fails, attempting to read from the uninitialized
pipe is incorrect.
 2021-11-18 18:32:15 +01:00
Romain Vimont
de50846905 Close process on check success 
The interruptible version of the function to check process success
(sc_process_check_success_intr()) did not accept a close parameter to
avoid a race condition. But as the result, the processes were not closed
at all.

Add a close parameter, and close the process separately to avoid the
race condition.
 2021-11-18 18:31:36 +01:00
Romain Vimont
ee93d2aac1 Configure init and cleanup asynchronously 
Accessing the settings (like --show-touches) on start should not delay
screen mirroring.

PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:37:32 +01:00
Romain Vimont
c29a0bf675 Do not quit on cleanup configuration failure 
Cleanup is used for some options like --show-touches to restore the
state on exit.

If the configuration fails, do not crash the whole process. Just log an
error.

PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:37:28 +01:00
Romain Vimont
411bb0d18e Move init and cleanup to a separate method 
PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:37:26 +01:00
Romain Vimont
cc0902b13c Read/write settings via command on Android >= 12 
Before Android 8, executing the "settings" command from a shell was
very slow (~1 second), because it spawned a new app_process to execute
Java code. Therefore, to access settings without performance issues,
scrcpy used private APIs to read from and write to settings.

However, since Android 12, this is not possible anymore, due to
permissions changes.

To make it work again, execute the "settings" command on Android 12 (or
on previous version if the other method failed). This method is faster
than before Android 8 (~100ms).

Fixes #2671 <https://github.com/Genymobile/scrcpy/issues/2671>
Fixes #2788 <https://github.com/Genymobile/scrcpy/issues/2788>
PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:37:22 +01:00
Romain Vimont
48b572c272 Add throwable parameter to Log.w() 
When an exception occurs, we might want to log a warning instead of an
error.

PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:37:18 +01:00
Romain Vimont
94feae71f2 Report settings errors via Exceptions 
Settings read/write errors were silently ignored. Report them via a
SettingsException so that the caller can handle them.

This allows to log a proper error message, and will also allow to
fallback to a different settings method in case of failure.

PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:37:02 +01:00
Romain Vimont
67170437f1 Wrap settings management into a Settings class 
Until now, the code that needed to read/write the Android settings had
to explicitly open and close a ContentProvider.

Wrap these details into a Settings class.

This paves the way to provide an alternative implementation of settings
read/write for Android >= 12.

PR #2802 <https://github.com/Genymobile/scrcpy/pull/2802>
 2021-11-18 08:36:48 +01:00
LuXu
57fb08e443 Update Simplified Chinese README to 1.20 
PR #2786 <https://github.com/Genymobile/scrcpy/pull/2786>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2021-11-17 19:14:32 +01:00
Alex Burdusel
02ae0db6cd Fix wrong package to install for Ubuntu/Debian 
Without this package, meson fails:

    Run-time dependency libusb-1.0 found: NO (tried pkgconfig and cmake)
    app/meson.build:88:8: ERROR: Dependency "libusb-1.0" not found, tried pkgconfig and cmake

PR #2790 <https://github.com/Genymobile/scrcpy/pull/2790>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2021-11-15 22:42:08 +01:00
Romain Vimont
9cb14b5166 Inherit only specific handles on Windows 
To be able to communicate with a child process via stdin, stdout and
stderr, the CreateProcess() parameter bInheritHandles must be set to
TRUE. But this causes *all* handles to be inherited, including sockets.

As a result, the server socket was inherited by the process running adb
to execute the server on the device, so it could not be closed properly,
causing other scrcpy instances to fail.

To fix the issue, use an extended API to explicitly set the HANDLEs to
inherit:
 - <https://stackoverflow.com/a/28185363/1987178>
 - <https://devblogs.microsoft.com/oldnewthing/20111216-00/?p=8873>

Fixes #2779 <https://github.com/Genymobile/scrcpy/issues/2779>
PR #2783 <https://github.com/Genymobile/scrcpy/pull/2783>
 2021-11-15 10:13:30 +01:00
Romain Vimont
9cb8766220 Factorize resource release after CreateProcess() 
Free the wide characters string in all cases before checking for errors.
 2021-11-15 07:49:01 +01:00
Romain Vimont
fd4ec784e0 Remove useless assignments on error 
Leave the output parameter untouched on error.
 2021-11-14 22:53:49 +01:00
Romain Vimont
52cebe1597 Fix Windows sc_pipe function names 
The implementation name was incorrect (it was harmless, because they are
not used on Windows).
 2021-11-14 22:41:38 +01:00
Romain Vimont
6a27062f48 Stop connection attempts if interrupted 
If the interruptor is interrupted, every network call will fail, but the
retry-on-error mechanism must also be stopped.
 2021-11-14 15:40:59 +01:00
Romain Vimont
739ff9dce0 Fix compilation errors with old SDL versions 
SDL_PixelFormatEnum has been introduced in SDL 2.0.10:
<cc6a8ac87e>

SDL_PIXELFORMAT_BGR444 has been introduced in SDL 2.0.12:
<a1c11854f2>

Fixes #2777 <https://github.com/Genymobile/scrcpy/issues/2777>
PR #2781 <https://github.com/Genymobile/scrcpy/pull/2781>

Reviewed-by: Yu-Chen Lin <npes87184@gmail.com>
 2021-11-14 15:37:30 +01:00
Romain Vimont
65b023ac6d Update links to v1.20 2021-11-14 01:51:32 +01:00
Romain Vimont
a045e28df8 Bump version to 1.20 2021-11-14 01:25:24 +01:00
Romain Vimont
52138fd921 Update script to build without gradle to SDK 31 
Build tools 31.x.x do not ship dx anymore. Use d8 instead.

Refs 8bf28e9f53
 2021-11-14 01:25:24 +01:00
Romain Vimont
1bb0df5da1 Extract ANDROID_JAR path in build script 
This will allow to reuse it.
 2021-11-14 01:25:24 +01:00
Romain Vimont
562ec6e9b3 Merge branch 'master' into dev 2021-11-14 01:25:00 +01:00
Romain Vimont
1be5daf999 Fix word order in README 2021-11-14 01:23:06 +01:00
Romain Vimont
57387fa707 Mention crash on Android 12 on old scrcpy in FAQ 2021-11-14 01:23:06 +01:00
Romain Vimont
4e811a4a68 Adapt icon in README 
Use SVG format, align to the right, and reduce its size.
 2021-11-14 01:23:06 +01:00
Romain Vimont
99a4a48477 Replace "connected on" to "connected via" 
I'm not sure "connected on USB" is correct.
 2021-11-14 01:23:06 +01:00
Romain Vimont
1d97d77032 Improve scrcpy presentation in README 2021-11-14 01:23:06 +01:00
Romain Vimont
45b0f8123a Increase delay to inject HID on Ctrl+v 
2 milliseconds turn out to be insufficient sometimes. It seems that 5
milliseconds is enough (and still not noticeable).
 2021-11-14 01:23:06 +01:00