pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
703 Commits 434 Branches 35 Tags
dfd0707a2925e9569aaa2ae6b88b161a12376a49
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Vimont dfd0707a29 Move utilities to util/ 2019-11-24 11:53:23 +01:00
Romain Vimont 83ace84280 Restore the .jar extension on the device side 
Commit 3da95b52bd renamed
'scrcpy-server.jar' to 'scrcpy-server' to avoid issues on the client
side.

However, removing the extension may cause issues with app_process, so
restore the extension only on the device side.

Fixes <https://github.com/Genymobile/scrcpy/issues/944>
 2019-11-22 15:23:57 +01:00
Romain Vimont c9d886f38b Use the existing constants for device server path 2019-11-22 15:16:00 +01:00
Romain Vimont 40c3c57613 Update links to v1.11 in README and BUILD 2019-11-19 23:39:30 +01:00
Romain Vimont 2aa65015bc Bump version to 1.11 2019-11-19 23:05:39 +01:00
Romain Vimont 4906aff454 Upgrade platform-tools (29.0.5) for Windows 
Include the latest version of adb in Windows releases.
 2019-11-19 23:05:39 +01:00
Romain Vimont cb6b300483 Upgrade FFmpeg (4.2.1) for Windows 
Include the latest version of FFmpeg in Windows releases.
 2019-11-19 23:05:39 +01:00
Romain Vimont c2116082ab Remove deprecated options from help and manpage 
Ref: ff061b4f30
 2019-11-19 23:05:39 +01:00
Romain Vimont 3599fcaae5 Fix help for --window-width and --window-height 
The default value is 0 (automatic), not -1.
 2019-11-19 22:58:18 +01:00
Romain Vimont c610a6b3c7 Document scrcpy via SSH tunnel in README 2019-11-19 22:23:08 +01:00
Romain Vimont 704c0ff4dd Document copy-paste and --prefer-text in README 2019-11-19 22:23:08 +01:00
Romain Vimont b145b8d5f4 Reorganize features in README 2019-11-19 22:23:08 +01:00
Romain Vimont 213c468c20 Move workarounds to a separate class 
Extract workarounds (currently only one) to a separate class to avoid
polluting the main code.
 2019-11-19 22:23:08 +01:00
Romain Vimont 18f2e33a8b Fix noconsole.exe 
The linker flag "-mwindows" has no effect on my current MinGW.

Instead, passing "-Wl,--subsystem,windows" works.

Fixes <https://github.com/Genymobile/scrcpy/issues/691>
 2019-11-19 12:22:11 +01:00
Romain Vimont 601b0fecdd Extract DEBUG flag in build_without_gradle.sh 2019-11-18 14:33:14 +01:00
Romain Vimont 7fd800d583 Generate VERSION_NAME in build_without_gradle.sh 
Since commit b963a3b9d5, the server uses
BuildConfig.VERSION_NAME.

Generate this field manually for building without gradle.
 2019-11-18 14:32:07 +01:00
Romain Vimont 1d97d7213d Add option --max-fps 
Add an option to limit the capture frame rate. It only works for devices
with Android >= 10.

Fixes <https://github.com/Genymobile/scrcpy/issues/488>
 2019-11-17 22:10:39 +01:00
Romain Vimont fb976816f9 Do not expose frame rate in ScreenEncoder 
The KEY_FRAME_RATE parameter value is necessary for the configuration of
the encoder, but its actual value does not impact the frame rate (only
resources used by the encoder).

Therefore, it's an internal detail and should not be exposed by the
ScreenEncoder class.
 2019-11-17 22:10:33 +01:00
Romain Vimont 1b78a77962 Fix error message 2019-11-17 22:08:34 +01:00
Romain Vimont 59073223aa Update manpage for --window-borderless option 2019-11-15 18:59:47 +01:00
Romain Vimont 9fd7a80a89 Add option to specify the initial window size 
Add --window-width and --window-height parameters.

If only one is provided, the other is computed so that the aspect ratio
is preserved.
 2019-11-15 18:52:58 +01:00
Romain Vimont b6e2f8ae00 Update manpage for --window-{x,y} options 2019-11-15 18:50:49 +01:00
Romain Vimont 771bd8404d Do not write invalid packet duration 
Configuration packets have no PTS. Do not compute a packet duration from
their PTS.

Fixes recording to mp4 on device rotation.
 2019-11-13 16:14:46 +01:00
Romain Vimont af3027a85b Merge pull request #920 into dev 
Compare server and client version at the start of scrcpy
 2019-11-13 12:01:02 +01:00
Romain Vimont aa0f77c898 Accept resize shortcuts on maximized window 
Allow "resize to fit" and "resize to pixel-perfect" on maximized window:
restore the window to normal size then resize.
 2019-11-11 21:49:23 +01:00
Romain Vimont 35c05bb3ce Fix rotation while the window is maximized 
Keep the windowed window size to handle maximized window the same way as
fullscreen window.

Fixes <https://github.com/Genymobile/scrcpy/issues/750>
 2019-11-11 21:49:23 +01:00
Romain Vimont f6f2868868 Handle window events from screen.c 
Only the screen knows what to do on window events.

This paves the way to handle more window events.
 2019-11-11 15:02:26 +01:00
Romain Vimont 6996cbf5d3 Log device disconnection 
If scrcpy closes due to socket disconnection, log a warning.
 2019-11-09 21:17:03 +01:00
Romain Vimont b08a98324d Fix segfault on empty file recorded 
Write the file trailer only if the file header have been written, to
avoid a segfault in libav.

Fixes <https://github.com/Genymobile/scrcpy/issues/918>.
 2019-11-07 21:58:57 +01:00
Romain Vimont c916af0984 Add --prefer-text option 
Expose an option to configure how key/text events are forwarded to the
Android device.

Enabling the option avoids issues when combining multiple keys to enter
special characters, but breaks the expected behavior of alpha keys in
games (typically WASD).

Fixes <https://github.com/Genymobile/scrcpy/issues/650>
 2019-11-07 19:01:35 +01:00
Romain Vimont ff061b4f30 Deprecate short options for advanced features 
The short options will be removed in the future (and may be reused for
other features).
 2019-11-07 10:01:59 +01:00
Romain Vimont 157c60feb4 Fix indentation 2019-11-07 09:48:48 +01:00
Romain Vimont 2d90e1befd Fix include recorder.h 2019-11-06 22:22:46 +01:00
Romain Vimont 0e301ddf19 Factorize scrcpy options and command-line args 
Do not duplicate all scrcpy options fields in the structure storing the
parsed command-line arguments.
 2019-11-06 22:06:54 +01:00
Romain Vimont c42ff75b74 Pass screen to mouse event converters 
Mouse events coordinates depend on the screen size and location, so the
converter need to access the screen.

The fact that it needs the position or the size is an internal detail,
so pass a pointer to the whole screen structure.
 2019-11-06 21:24:36 +01:00
Romain Vimont b0db1178d1 Move event conversion to input_manager 
Only keep helper functions separated.

This will help to convert coordinates internally when necessary.
 2019-11-06 21:24:36 +01:00
Romain Vimont 8d601d3210 Rename "input_manager" variables to "im" 
It is used a lot, a short name improves readability.
 2019-11-06 21:24:36 +01:00
Romain Vimont 683f7ca848 Document how to attach a debugger to the server 2019-11-03 19:42:37 +01:00
Romain Vimont 120f08ee96 Fix manpage option parameter format 
The parameter for --window-title was not underlined the same way as
others.
 2019-11-03 16:51:47 +01:00
Romain Vimont 0415672a75 Merge branch 'master' into dev 2019-11-03 15:56:10 +01:00
Romain Vimont 3ea4742321 Call ninja without changing directory 
In build instructions, use:

    ninja -Cx ...

instead of:

    cd x
    ninja ...
 2019-10-31 21:05:04 +01:00
Romain Vimont 95fd64b5de Add scrcpy version in recorded video metadata 
It might help to understand problems in recorded videos.
 2019-10-31 20:57:57 +01:00
Romain Vimont ab205084dc Merge pull request #896 from yangfl/upstream 
Add manpage for scrcpy
 2019-10-31 13:44:01 +01:00
Romain Vimont 3da95b52bd Rename scrcpy-server.jar to scrcpy-server 
The server name ending with .jar has several drawbacks:
 - meson requires the jar executable to attempt to modify it:
     <https://github.com/Genymobile/scrcpy/issues/404#issuecomment-456065923>
     <https://github.com/mesonbuild/meson/issues/4844>
 - meson warns during "ninja install"
     <https://github.com/Genymobile/scrcpy/issues/458>
 - some users try to execute it on the computer as a java executable

Removing the extension solves all these problems.
 2019-10-31 10:54:29 +01:00
Romain Vimont c72f677435 Merge branch 'master' into dev 2019-10-30 23:29:44 +01:00
Romain Vimont 1380f6e00f Fix help for --record-format 
Record format requires a parameter.
 2019-10-30 22:51:40 +01:00
Romain Vimont d841718956 Add a script to build the server without gradle 
Gradle versions may sometimes cause problems. This script offers an
alternative.
 2019-10-30 21:47:20 +01:00
Romain Vimont 17d53be3ef Fix mouse events conversion 
The conversion from SDL mouse state to Android mouse state used wrong
constants as mask.

Fixes <https://github.com/Genymobile/scrcpy/issues/635>
 2019-10-25 11:09:06 +02:00
Romain Vimont f9938dbf88 Inject button state for touch/mouse events 
The buttons state was forwarded, but ignored by the server.
 2019-10-25 11:04:04 +02:00
Romain Vimont f6c8460ebb Rename window size functions for clarity 
Now, get_window_size() returns the current window size (fullscreen or
not), while get_windowed_window_size() always returned the windowed size
(the size when fullscreen is disabled).
 2019-10-20 16:08:16 +02:00
Romain Vimont c33a147fd0 Fix "turn screen off" on Android Q 
Call getInternalDisplayToken(), which retrieve the id of the first
physical display (which is not necessarily 0 anymore).

Fixes <https://github.com/Genymobile/scrcpy/issues/835>
 2019-10-17 23:25:00 +02:00
Romain Vimont 8b33c6c108 Adapt copy-paste methods for Android 10 
The methods getPrimaryClip() and setPrimaryClip() expect an additional
parameter since Android 10.

Fixes <https://github.com/Genymobile/scrcpy/issues/796>.
 2019-10-17 22:21:47 +02:00
Romain Vimont 5b7a0cd8e9 Extract String literal to static constant 2019-10-17 22:11:39 +02:00
Romain Vimont bab9361948 Do not crash on control error 
Some devices do not have some methods that we invoke via reflection, or
their call do not return the expected value. In that case, do not crash
the whole controller.
 2019-10-17 22:09:54 +02:00
Romain Vimont 6220456def Merge mouse and touch events 
Both are handled the very same way on the device.
 2019-10-03 20:37:49 +02:00
Romain Vimont 7e1d52c119 Rename "touch pointer" to "pointer" 
There are only touch pointers now, mouse pointers have been removed.
 2019-10-03 20:27:28 +02:00
Romain Vimont 280d5b718c Use common pointers for mouse and touch 
The mouse is a pointer like any other.
 2019-10-03 20:05:29 +02:00
Romain Vimont 30168f0428 Ignore duplicate mouse events 
In SDL, a touch event may simulate an identical mouse event. Since we
already handle touch event, ignore these duplicates.
 2019-10-03 20:05:29 +02:00
Romain Vimont b5a2d99bc2 Send touch events from the client 
On SDL touch events, send control messages to the server.
 2019-10-03 20:05:29 +02:00
Romain Vimont f765aae352 Inject touch events on the server 
On receiving an "inject touch" control message, update the local
pointers state and inject touches.
 2019-10-03 20:05:29 +02:00
Romain Vimont 77f876e29c Add "inject touch" control message 
Add a control message type in the protocol to forward touch events to
the device.
 2019-10-03 20:05:27 +02:00
Romain Vimont d90549d1e6 Rename "pointer" to "mouse pointer" 
This will help to distinguish them from "touch pointers".
 2019-10-02 21:40:26 +02:00
Romain Vimont 810ff80ba7 Add buffer_write64be() 
Add a function to write 64 bits in big-endian from a uint64_t.
 2019-10-02 21:40:26 +02:00
Romain Vimont 1f8ba1ca79 Include config.h everywhere 
Ref: <https://github.com/Genymobile/scrcpy/issues/829>

Suggested-by: Louis Kruger <louisk@gmail.com>
 2019-09-29 22:39:53 +02:00
Romain Vimont f510f1de1c Remove "make" from build dependencies 
The project is built with meson+ninja.
 2019-09-28 14:46:44 +02:00
Romain Vimont 7d1932b907 Fix gradle warnings in tests 2019-09-28 12:23:54 +02:00
Romain Vimont ffdbf5990b Rename event converter functions 
Rename "XXX_from_sdl_to_android" to "convert_XXX", to avoid huge
function names.
 2019-09-15 17:29:03 +02:00
Romain Vimont 9463850c24 Rename "convert.h" to "event_converter.h" 
The filename gave no hint about what was converted.
 2019-09-15 17:29:03 +02:00
Romain Vimont 6e38e0cbfe Rename variable names "event" to "msg" 
Some variable names had not been renamed when "event" was renamed to
"message" (28980bbc90).
 2019-09-15 17:29:03 +02:00
Romain Vimont 7040e8abc4 Fix control message reader test 
The mouse event test actually tested a key event control message.
 2019-09-15 17:29:03 +02:00
Romain Vimont da5b0ec0d5 Improve FAQ 2019-08-14 22:32:46 +02:00
Romain Vimont a9c8fa305d Fix segfault on recording with old FFmpeg 
The AVPacket fields side_data and side_data_elems were not initialized
by av_packet_ref() in old FFmpeg versions (prior to [1]).

As a consequence, on av_packet_unref(), side_data was freed, causing a
segfault.

Fixes <https://github.com/Genymobile/scrcpy/issues/707>

[1]: <http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commitdiff;h=3b4026e15110547892d5d770b6b43c9e34df458f>
 2019-08-13 18:58:36 +02:00
Romain Vimont 20b3f101a4 Print gradle output on compiling 
Enable the attribute "console" of custom_target() introduced in meson
0.48. This allows to get a feedback of what gradle does (which can takes
a very long time).

This produces warnings because we declare to support meson >= 0.37, but
we don't want to stop supporting older versions for that. Older versions
just ignore the option:

> WARNING: Unknown keyword arguments in target scrcpy-server: console

Newer meson versions use it, but warn because we declare supporting
older versions:

> WARNING: Project targetting '>= 0.37' but tried to use feature
> introduced in '0.48.0': console arg in custom_target

Meson does not support conditional branches to suppress such warnings,
so just keep the warnings.
 2019-08-09 15:15:28 +02:00
Romain Vimont 686733023b Merge pull request #708 from toddsierens/patch-1 
Update WindowManager.java
 2019-08-08 23:24:47 +02:00
Romain Vimont 8507fea271 Record a packet with its duration 
Record a packet only once the following has been received, so that we
can set its duration before muxing it.

Fixes <https://github.com/Genymobile/scrcpy/issues/702>
 2019-08-08 18:57:52 +02:00
Romain Vimont 8a08ca0f3d Merge pull request #692 from msfjarvis/msf/uprev-dependencies 
Upgrade build dependencies
 2019-08-07 23:42:06 +02:00
Romain Vimont 9a50b65b33 Merge pull request #695 from schwabe/schwabe/fix_null_queue 
Fix building on OS X (missing NULL in queue.h)
 2019-08-05 15:26:06 +02:00
Romain Vimont 9bcee4ea42 Update links to v1.10 in README and BUILD 2019-08-04 22:03:45 +02:00
Romain Vimont c28619e4e8 Bump version to 1.10 2019-08-04 16:41:04 +02:00
Romain Vimont 8969444ff2 List scrcpy characteristics in README 
They were listed in the blog post introducing scrcpy:
<https://blog.rom1v.com/2018/03/introducing-scrcpy/>
 2019-08-04 16:23:42 +02:00
Romain Vimont b54f0bfe48 Upgrade SDL (2.0.10) for Windows 
Include the latest version of SDL in Windows releases.
 2019-08-04 16:23:42 +02:00
Romain Vimont 0aec1e502e Update platform-tools (29.0.2) for Windows 
Include the latest version of adb in Windows releases.
 2019-08-04 16:23:42 +02:00
Romain Vimont c3a58ad10f Upgrade FFmpeg (4.1.4) for Windows 
Include the latest version of FFmpeg in Windows releases.
 2019-08-04 16:23:42 +02:00
Romain Vimont b0184f2869 Initialize queue "last" field 
The compiler is not always able to see that "last" is always initialized
before being used, so always initialize it.
 2019-08-04 16:22:39 +02:00
Romain Vimont e2ac996183 Use Cmd instead of Ctrl on macOS when possible 
Fixes <https://github.com/Genymobile/scrcpy/issues/642>
 2019-08-03 23:13:44 +02:00
Romain Vimont 5e4ccfd832 Use generic FIFO queue for recording 
Replace the specific recording queue by the new generic FIFO queue
implementation.
 2019-08-01 23:15:47 +02:00
Romain Vimont 53b6ee2cf4 Add generic intrusive FIFO queue 
We need several FIFO queues (a queue of packets, a queue of messages,
etc.).

Some of them are implemented using cbuf, a generic circular buffer. But
for recording, we need to store the packets in an unbounded queue until
they are written, so the queue was implemented manually.

Create a generic implementation (using macros) to avoid reimplementing
it every time.
 2019-08-01 23:14:50 +02:00
Romain Vimont 26213f1031 Fix cbuf documentation 2019-08-01 22:50:03 +02:00
Romain Vimont 96b5067cbf Remove unnecessary backslash in cbuf 2019-08-01 22:08:34 +02:00
Romain Vimont 421e4be399 Remove root directory from Windows zip releases 
Put the scrcpy files at the root of the zip archive. This avoids an
unnecessary level of directories when extracting.
 2019-07-31 16:35:14 +02:00
Romain Vimont 6abb4902c6 Log recording failure 
If recording fails, log "recording failed" instead of "recording
complete".
 2019-07-31 11:04:38 +02:00
Romain Vimont d4ed8b6f26 Log scrcpy version and URL on start 
Keep --version which also print the version of dependencies.
 2019-07-31 01:55:43 +02:00
Romain Vimont 35d9185f6c Record asynchronously 
The record file was written from the stream thread. As a consequence,
any blocking I/O to write the file delayed the decoder.

For maximum performance even when recording is enabled, send
(refcounted) packets to a separate recording thread.
 2019-07-31 01:55:40 +02:00
Romain Vimont 63af7fbafe Reduce latency by 1 frame 
To packetize the H.264 raw stream, av_parser_parse2() (called by
av_read_frame()) knows that it has received a full frame only after it
has received some data for the next frame. As a consequence, the client
always waited until the next frame before sending the current frame to
the decoder!

On the device side, we know packets boundaries. To reduce latency,
make the device always transmit the "frame meta" to packetize the stream
manually (it was already implemented to send PTS, but only enabled on
recording).

On the client side, replace av_read_frame() by manual packetizing and
parsing.

<https://stackoverflow.com/questions/50682518/replacing-av-read-frame-to-reduce-delay>
<https://trac.ffmpeg.org/ticket/3354>
 2019-07-31 01:55:32 +02:00
Romain Vimont a90ccbdf3b Add option to change the push target 
A drag & drop always pushed the file to /sdcard/.

Add an option to customize the target directory.

Fixes <https://github.com/Genymobile/scrcpy/issues/659>
 2019-07-31 01:53:16 +02:00
Romain Vimont ca970e8aa6 Merge branch 'master' into dev 2019-07-31 00:14:17 +02:00
Romain Vimont 6b3d9e3eab Add unit test for device message serialization 
There was a test for the deserialization, but not for the serialization.
 2019-07-30 12:17:33 +02:00
Romain Vimont 02692ffa42 Rename "build_" to "compile_" 
Recent versions of meson complain about an option having name starting
with "build_":

> DEPRECATION: Option uses prefix "build_", which is reserved for Meson.
> This will become an error in the future.

Use "compile_" instead.
 2019-07-29 15:19:07 +02:00
Romain Vimont 9dea6d2384 Add me as copyright owner 2019-07-29 14:59:44 +02:00
Romain Vimont 3c55d0c69b Fix double-free on error 
If writing the recording header fails, do not clean the resources
immediately to avoid double-free.
 2019-07-12 21:07:06 +02:00