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

225 commits

Author SHA1 Message Date
Romain Vimont
5c2cf88a1d Rename THRESHOLD to threshold 
Since the field is not final anymore, lint expects the name not to be
capitalized.
 2020-05-25 03:22:07 +02:00
Romain Vimont
3df63c579d Configure server verbosity from the client 
Send the requested log level from the client.

This paves the way to configure it via a command-line argument.
 2020-05-24 21:14:25 +02:00
Tzah Mazuz
080a4ee365 Add --codec-options 
Add a command-line parameter to pass custom options to the device
encoder (as a comma-separated list of "key[:type]=value").

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

PR #1325 <https://github.com/Genymobile/scrcpy/pull/1325>
Refs #1226 <https://github.com/Genymobile/scrcpy/pull/1226>

Co-authored-by: Romain Vimont <rom@rom1v.com>
 2020-05-24 14:54:34 +02:00
Romain Vimont
c7155a1954 Add unit test for big "set clipboard" event 
Add a unit test to avoid regressions.

Refs #1425 <https://github.com/Genymobile/scrcpy/issues/1425>
 2020-05-24 14:33:43 +02:00
Romain Vimont
517dbd9c85 Increase buffer size to fix "set clipboard" event 
The buffer size must be greater than any event message.

Clipboard events may take up to 4096 bytes, so increase the buffer size.

Fixes #1425 <https://github.com/Genymobile/scrcpy/issues/1425>
 2020-05-24 14:33:23 +02:00
Romain Vimont
acc4ef31df Synchronize device clipboard to computer 
Automatically synchronize the device clipboard to the computer any time
it changes.

This allows seamless copy-paste from Android to the computer.

Fixes #1056 <https://github.com/Genymobile/scrcpy/issues/1056#issuecomment-631363684>
PR #1423 <https://github.com/Genymobile/scrcpy/pull/1423>
 2020-05-24 14:31:49 +02:00
Romain Vimont
73e722784d Remove useless exception declaration 
The interface declares it can throw a RemoteException, but the
implementation never throws such exception.
 2020-05-23 18:21:54 +02:00
Romain Vimont
e1cd75792c Simplify rotation watcher call 
Remove unnecessary private method (which was wrongly public).
 2020-05-23 14:39:09 +02:00
Romain Vimont
e2d5f0e7fc Send scroll events as a touchscreen 
Scroll events were sent with a mouse input device. When scrolling on a
list, this could cause the whole list to be focused, and drawn with the
focus color as background.

Send scroll events with a touchscreen input device instead (like motion
events).

Fixes #1362 <https://github.com/Genymobile/scrcpy/issues/1362>
 2020-05-07 15:08:11 +02:00
Romain Vimont
74ece9b45b Simplify ScreenEncoder more 
Commit 927d655ff6 removed the
iFrameInternal field and constructor argument.

Also remove it from createFormat() arguments.
 2020-05-05 19:01:44 +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
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
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
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
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
Romain Vimont
927d655ff6 Simplify ScreenEncoder 
Do not handle iFrameInterval field and parameter, it is never used
dynamically.
 2020-04-12 02:09:28 +02:00
Romain Vimont
ee2894779a Remove unused lockedVideoOrientation field 
During PR #1151, this field has been moved to ScreenInfo, but has not
been removed from ScreenEncoder.
 2020-04-12 02:08:16 +02:00
Kostiantyn Luzan
c1ebea26e6 Register rotation watcher on selected display 
PR #1275 <https://github.com/Genymobile/scrcpy/pull/1275>

Signed-off-by: Kostiantyn Luzan <vblack2006@gmail.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-04-08 12:09:24 +02:00
Romain Vimont
f07d21f050 Suppress DiscouragedPrivateApi lint warning 2020-04-08 12:09:24 +02:00
Romain Vimont
bea1c11f8e Do not log success on failure 
If calling the private API does not work, an exception is printed. In
that case, do not log that the action succeeded.
 2020-04-02 21:05:26 +02:00
e_vigurskiy
4150eedcdf Add display id parameter 
Add --display command line parameter to specify a display id.

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

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-04-02 21:02:52 +02:00
Romain Vimont
5031b2c8ff Remove MagicNumber checkstyle 
There are a lot of "magic numbers" that we really don't want to extract
as a constant.

Until now, many @SuppressWarnings annotations were added, but it makes
no sense to check for magic number if we silent the warnings everywhere.
 2020-03-28 22:08:16 +01:00
Romain Vimont
4adf5fde6d Log device details on server start 2020-03-28 15:52:02 +01:00
Romain Vimont
3504c0016b Add tests for control message length 
This will avoid regressions for #1245.

<https://github.com/Genymobile/scrcpy/issues/1245>
 2020-03-26 22:48:01 +01:00
Romain Vimont
89d1602185 Fix expected message length for touch events 
The expected length for a touch event control message was incorrect. As
a consequence, a BufferUnderflowException could occur.

Fixes #1245 <https://github.com/Genymobile/scrcpy/issues/1245>
 2020-03-26 22:45:43 +01:00
Romain Vimont
566ba766af Remove unused constant 
It has not been removed when mouse and touch events have been merged.
 2020-03-26 22:43:53 +01:00
Tzah Mazuz
a0af402d96 Fix the printed versions (were opposite) 
PR #1224 <https://github.com/Genymobile/scrcpy/pull/1224>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-03-19 19:28:57 +01:00
Romain Vimont
ae2d094362 Handle locked video orientation from ScreenInfo 
Centralize video size management in ScreenInfo.

This allows to always send the correct initial video size to the client
if the video orientation is locked.
 2020-03-08 10:38:31 +01:00
Romain Vimont
c5f5d1e456 Rename "rotation" to "device rotation" 
This paves the way to reduce confusion in ScreenInfo when it will handle
locked video orientation.
 2020-03-04 22:15:10 +01:00
Romain Vimont
63286424bb Compute all screen info from ScreenInfo 
Screen information was partially initialized from Device. Move this
initialization to ScreenInfo.
 2020-03-04 22:15:10 +01:00
Romain Vimont
da18c9cdab Remove useles import 2020-03-04 22:15:10 +01:00
George Stamoulis
1982bc439b Add option to lock video orientation 
PR #1151 <https://github.com/Genymobile/scrcpy/pull/1151>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-02-27 21:24:37 +01:00
Romain Vimont
ef56cc6ff7 Retrieve screen info once 
The method getScreenInfo() is synchronized, and the result may change
between calls.

Call it once and store the result in a local variable.
 2020-02-27 21:24:37 +01:00
Romain Vimont
96bd2c974d Do not report workarounds errors 
Some workarounds are needed on some devices. But applying them may cause
exceptions on other devices, where they are not necessary anyway.

Do not report these errors in release builds.

Closes #994 <https://github.com/Genymobile/scrcpy/issues/994>
 2020-01-19 15:52:24 +01:00
Romain Vimont
83d48267a7 Accept --max-fps before Android 10 
KEY_MAX_FPS_TO_ENCODER existed privately before Android 10:
<https://github.com/Genymobile/scrcpy/issues/488#issuecomment-567321437>
 2019-12-19 11:52:09 +01:00
Romain Vimont
e0b117de13 Fix checkstyle warning 2019-12-05 21:05:45 +01:00
Romain Vimont
eb0f339271 Add shortcut to rotate screen 
On Ctrl+r, disable auto-rotation (if enabled), set the screen rotation
and re-enable auto-rotation (if it was enabled).

Closes #11 <https://github.com/Genymobile/scrcpy/issues/11>
 2019-12-04 22:03:25 +01:00
Romain Vimont
bdd05b4a16 Refactor wrappers for Android SDK classes 
Internally, a failure to invoke a method via reflection was partially
managed using exceptions, partially using a null return value.

Handle all errors at the same place, by not catching
NoSuchMethodException too early.
 2019-12-04 19:34:20 +01:00
Romain Vimont
525d6d4a75 Try new methods before legacy ones 
Use the legacy methods when the new ones do not exist.
 2019-12-04 19:32:38 +01:00
Romain Vimont
8a694a9785 Suggest workaround for error 0xfffffc0e 
When the hardware encoder is not able to encode at the given definition,
it fails with an error 0xfffffc0e.

It is documented in the FAQ:
<https://github.com/Genymobile/scrcpy/blob/master/FAQ.md#i-get-an-error-could-not-open-video-stream>

But it is better to directly suggest the workaround in the console.
 2019-11-30 10:46:22 +01:00
Romain Vimont
26529d377f Use virtual device id to avoid NPE 
Inject mouse events using id -1 (virtual device) instead of 0 which
does not exist (and causes the InputDevice to be null).

Fixes <https://github.com/Genymobile/scrcpy/issues/962>
 2019-11-29 14:31:19 +01:00
Romain Vimont
6abb8fd0cd Reformat Java code 
Reformated by Android studio to match the 150 characters column defined
in checkstyle.
 2019-11-25 17:33:42 +01:00
Romain Vimont
2b845680b0 Initialize Application object to avoid NPE 
When an ApplicationInfo is set (commit
90293240cc), some devices (Nvidia Shield
TV) attempt to access the Application object, causing a
NullPointerException.

As a workaround, initialize an Application object.

Fixes <https://github.com/Genymobile/scrcpy/issues/940>
 2019-11-24 11:58:40 +01:00
Romain Vimont
ebdc2ee8b5 Rename variable for consistency 
Use suffix "Field" for fields variables.
 2019-11-24 11:55:42 +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
act262
90293240cc Fix meizu 16th NPE 
Fill AppInfo to avoid NullPointerException on some devices.

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

Signed-off-by: Romain Vimont <rom@rom1v.com>
 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
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
Yu-Chen Lin
b963a3b9d5 Check client and server mismatch 
Send client version as first parameter and check it at server start.

Signed-off-by: Yu-Chen Lin <npes87184@gmail.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2019-11-13 12:00:50 +01:00
olbb
e282100d0b Call Looper.prepareMainLooper() to avoid exception 
Some devices internally create a Handler when creating an input Surface,
causing an exception:

> Surface: java.lang.RuntimeException: Can't create handler inside
> thread that has not called Looper.prepare()

As a workaround, call Looper.prepareMainLooper() beforehand.

Fixes:
 - <https://github.com/Genymobile/scrcpy/issues/240>
 - <https://github.com/Genymobile/scrcpy/issues/921>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2019-11-09 20:31:57 +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
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
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
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
7d1932b907 Fix gradle warnings in tests 2019-09-28 12:23:54 +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
toddsierens
27eacc3c11
Update WindowManager.java 2019-08-08 17:17:48 -04: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
056e47e752 Replace "cannot" by "could not" 2019-06-23 20:52:03 +02:00
Romain Vimont
439b009a79 Fix expected parameters count in error message 2019-06-23 20:47:21 +02:00
Romain Vimont
4940746bcb Remove useless else 
The if-block ends with a return.
 2019-06-14 10:15:53 +02:00
Romain Vimont
fe758e6e15 Improve comment 
Rephrase to simplify and add a link to the issue.
 2019-06-14 10:11:15 +02:00
Arne Schwabe
b769083a5b Use getPhysicalDisplayToken on Anroid Q+ instead of getBuiltInDisplay 
This makes the -S (screen off) parameter work on Android Q beta 4

Closes #586
 2019-06-13 13:30:54 +02:00
Romain Vimont
1afe9ce2ee Fix deprecation warning in Java unit test 2019-06-11 21:48:58 +02:00
Romain Vimont
273cec8a92 Fix typo in test name 2019-06-11 21:47:31 +02:00
Romain Vimont
8604f16b30 Truncate device name at UTF-8 code point boundary 
Just in case.
 2019-06-07 17:45:03 +02:00
Romain Vimont
8e66b33000 Add option to turn device screen off 
In addition to the shortcut (Ctrl+o) to turn the device screen off, add
a command-line argument to turn it off on start.
 2019-06-05 00:55:46 +02:00
Romain Vimont
acc4dcd520 Disable server controller if --no-control 
If --no-control is disabled, there is no need for a controller.

It also avoids to power on the device on start if control is disabled.
 2019-06-05 00:25:57 +02:00
Romain Vimont
e572d81fa2 Rename function to "power on" 
This will reduce confusion between "power on" when the device is off and
"turn device screen off" while mirroring.
 2019-06-02 20:34:52 +02:00
Romain Vimont
0792998cc2 Remove unused import 
Introduced by the previous commit.
 2019-05-31 23:31:53 +02:00
Romain Vimont
12a3bb25d3 Implement device screen off while mirroring 
Add two shortcuts:
 - Ctrl+o to turn the device screen off while mirroring
 - Ctrl+Shift+o to turn it back on

On power on (either via the POWER key or BACK while screen is off), both
the device screen and the mirror are turned on.

<https://github.com/Genymobile/scrcpy/issues/175>
 2019-05-31 23:07:23 +02:00
Romain Vimont
6537c2ef01 Add clipboard logs 
Synchronizing local and device clipboards in invisible. Add INFO logs
on success.
 2019-05-31 16:18:00 +02:00
Romain Vimont
ad55a9addc Prefix server logs 
Sometimes, it is not obvious whether a log is generated by the server or
by the client. Prefix server logs for clarity.
 2019-05-31 16:18:00 +02:00
Romain Vimont
28980bbc90 Rename "event" to "message" 
After the recent refactorings, a "control event" is not necessarily an
"event" (it may be a "command"). Similarly, the unique "device event"
used to send the device clipboard content is more a "reponse" to the
request from the client than an "event".

Rename both to "message", and rename the message types to better
describe their intent.
 2019-05-31 16:18:00 +02:00
Romain Vimont
c13a24389c Implement computer-to-device clipboard copy 
It was already possible to _paste_ (with Ctrl+v) the content of the
computer clipboard on the device. Technically, it injects a sequence of
events to generate the text.

Add a new feature (Ctrl+Shift+v) to copy to the device clipboard
instead, without injecting the content. Contrary to events injection,
this preserves the UTF-8 content exactly, so the text is not broken by
special characters.

<https://github.com/Genymobile/scrcpy/issues/413>
 2019-05-30 22:46:52 +02:00
Romain Vimont
2322069656 Extract control event String parsing 
Parsing a String from a serialized control event, encoded as length (2
bytes) + data, will be necessary in several events.

Extract it to a separate method.
 2019-05-30 22:46:52 +02:00
Romain Vimont
61f5f96b42 Fix control event String parsing 
At least 2 bytes must be available to read the length of the String.
 2019-05-30 22:46:52 +02:00
Romain Vimont
63c078ee6c Implement device-to-computer clipboard copy 
On Ctrl+C:
 - the client sends a GET_CLIPBOARD command to the device;
 - the device retrieve its current clipboard text and sends it in a
   GET_CLIPBOARD device event;
 - the client sets this text as the system clipboard text, so that it
   can be pasted in another application.

Fixes <https://github.com/Genymobile/scrcpy/issues/145>
 2019-05-30 22:46:52 +02:00
Romain Vimont
3149e2cf4a Add device event sender 
Create a separate component to send device events, managed by the
controller.
 2019-05-30 22:46:52 +02:00
Romain Vimont
f9d2d99166 Add GET_CLIPBOARD device event 
Add the first device event, used to forward the device clipboard to the
computer.
 2019-05-30 22:36:22 +02:00
Romain Vimont
ec71a3f66a Use two sockets for video and control 
The socket used the device-to-computer direction to stream the video and
the computer-to-device direction to send control events.

Some features, like copy-paste from device to computer, require to send
non-video data from the device to the computer.

To make them possible, use two sockets:
 - one for streaming the video from the device to the client;
 - one for control/events in both directions.
 2019-05-30 22:35:41 +02:00
Romain Vimont
0a7fe7ad57 Add helpers to truncate UTF-8 at code points 
This will help to avoid truncating a UTF-8 string in the middle of a
code point, producing an invalid UTF-8 result.
 2019-05-30 22:30:18 +02:00
Romain Vimont
3aa5426cad Add unit tests for control events serialization 
Add missing tests for serialization and deserialization of control
events.
 2019-05-30 22:30:18 +02:00
Romain Vimont
ad4c061cd2 Use custom class Point 
The framework class android.graphics.Point cannot be used in unit tests.
Implement our own Point.
 2019-05-30 22:30:18 +02:00
Romain Vimont
63909fd10d Merge commands with other control events 
Several commands were grouped under the same event type "command", with
a separate field to indicate the actual command.

Move these commands at the same level as other control events. It will
allow to implement commands with arguments.
 2019-05-30 22:30:18 +02:00
Romain Vimont
7ed976967f Fix checkstyle warning 
Checkstyle wants a specific order of imports.
 2019-05-30 00:22:05 +02:00