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

2200 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
744312ec64 Merge branch 'master' into release 2023-06-22 01:15:39 +02:00
Romain Vimont
b9315620e2 Fix adb forward initialization 
In forward mode, the dummy byte must be written immediately after the
first accept(), otherwise the client will wait indefinitely, causing a
deadlock (or a timeout).

Regression introduced by 8c650e53cd.
 2023-06-22 01:13:53 +02:00
Romain Vimont
ea59d525bd Fix code style 
The code should fit in 80 columns.
 2023-06-22 01:07:09 +02:00
Romain Vimont
0ffcfa0f5c Accept failure in rotation or fold registration 
Do not make scrcpy fail if rotation or display fold listeners could not
be registered.
 2023-06-22 00:52:54 +02:00
Romain Vimont
c0f3c080b6 Register DisplayFoldListener only for Android 10+ 
This listener does not exist on Android < 10, and it makes scrcpy fail.
 2023-06-22 00:49:11 +02:00
Romain Vimont
d046678f85 Upgrade platform-tools (34.0.3) for Windows 
Include the latest version of adb in Windows releases.
 2023-06-22 00:10:37 +02:00
Romain Vimont
fae3fbc934 Update developer documentation 2023-06-22 00:03:26 +02:00
Romain Vimont
5061b7e02c Fix build without gradle 
Add missing class generation from IDisplayFoldListener.aidl.

Refs 24999d0d32
 2023-06-22 00:03:26 +02:00
Romain Vimont
09009c2aa7 Upgrade SDL (2.28.0) for Windows 
Include the latest version of SDL in Windows releases.

Fixes #3825 <https://github.com/Genymobile/scrcpy/issues/3825>
Refs libsdl/#7478 <https://github.com/libsdl-org/SDL/issues/7478>
 2023-06-20 21:45:14 +02:00
Romain Vimont
fb21bbf763 Add workarounds for Honor devices 
Audio did not work on Honor devices.

To make it work, a system context must be set as a base context of
FakeContext (so that a PackageManager is available), and a current
Application and ActivityThread must be set.

These workarounds must not be applied for all devices, because they
might cause other issues.

Fixes #4015 <https://github.com/Genymobile/scrcpy/issues/4015>
Refs #3085 <https://github.com/Genymobile/scrcpy/issues/3805>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
 2023-06-19 18:45:40 +02:00
Romain Vimont
0f1afff7a6 Move workarounds execution 
Expose a single public static method in the Workarounds class to apply
all necessary workarounds.
 2023-06-19 18:45:11 +02:00
Romain Vimont
48a00fb481 Log device BRAND 
The BRAND value is not always the same as the MANUFACTURER value.
 2023-06-17 00:25:01 +02:00
Romain Vimont
3b7e2ca9c8 Fix lint warning 
Suppress lint "DiscouragedPrivateApi" in Workarounds.java.
 2023-06-16 23:24:08 +02:00
wuderek
5bd7514871 Add InputManagerGlobal for Android 14 beta 3 
Parts of the InputManager class have been moved to a new
InputManagerGlobal class in Android 14 preview.

Fixes #4074 <https://github.com/Genymobile/scrcpy/issues/4074>
PR #4075 <https://github.com/Genymobile/scrcpy/pull/4075>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-06-13 15:19:24 +02:00
Romain Vimont
d3c2955fb9 Add --time-limit 
Add an option to stop scrcpy automatically after a given delay.

PR #4052 <https://github.com/Genymobile/scrcpy/pull/4052>
Fixes #3752 <https://github.com/Genymobile/scrcpy/issues/3752>
 2023-06-10 16:04:51 +02:00
Romain Vimont
5042f8de93 Improve recording documentation 2023-06-10 16:03:27 +02:00
Romain Vimont
7536f95d1c Rename raw_video_stream to raw_stream 
This server-specific option impacts both the video and audio streams.
 2023-06-10 12:09:43 +02:00
Romain Vimont
6832e8d629 Remove spurious empty line 2023-06-10 12:07:35 +02:00
Romain Vimont
28313631e5 Reformat Java code 
Fix code style.
 2023-06-09 22:28:01 +02:00
Romain Vimont
fdbc9397a7 Name Java threads 
Give a user-friendly name to Java threads created by the server.
 2023-06-09 22:27:35 +02:00
Romain Vimont
4ad7479425 Add missing shortcut in documentation 
MOD+Backspace also triggers BACK.
 2023-06-08 08:52:21 +02:00
Romain Vimont
a3cdf1a6b8 Add option to kill adb on close 
Killing adb on close by default would be incorrect, since it would break
any other usage of adb in parallel.

It could be easily done manually by calling "adb kill-server" once
scrcpy terminates, but add an option --kill-adb-on-close for
convenience.

Fixes #205 <https://github.com/Genymobile/scrcpy/issues/205>
Fixes #2580 <https://github.com/Genymobile/scrcpy/issues/2580>
Fixes #4049 <https://github.com/Genymobile/scrcpy/issues/4049>
 2023-06-05 19:48:21 +02:00
Romain Vimont
b16d4d1835 Fix adb server vs adb daemon confusion 
The adb daemon runs on the device, the adb server runs as a background
process on the computer.
 2023-06-05 19:45:20 +02:00
Romain Vimont
b8d43866d2 Fix options alphabetical order 
Commit fc52b24503 missed this one.
 2023-06-05 19:44:15 +02:00
Romain Vimont
2d79aeb117 Simplify command in documentation 
If --no-video is passed, --no-playback is equivalent to
--no-audio-playback.
 2023-06-04 18:43:35 +02:00
Romain Vimont
888a5aae7d Fix typo in recording documentation 
The option is --record, not --record-file.
 2023-06-04 18:40:55 +02:00
Romain Vimont
323ea2f1d9 Fix PTS when not monotonically increasing 
Some decoders fail to guarantee that PTS is strictly monotonically
increasing. Fix the (rescaled) PTS when it does not respect this
constraint.

Fixes #4054 <https://github.com/Genymobile/scrcpy/issues/4054>
 2023-06-03 18:50:28 +02:00
Romain Vimont
9ca554ca41 Extract stream-specific structure in recorder 
For now, it only contains the stream index, but more fields will be
added.
 2023-06-03 18:48:01 +02:00
Romain Vimont
9d3c656414 Fix recorder waiting when stream disabled 
In the recorder, if the video or audio stream is disabled, do not wait
for its initialization (it will never happen) to process the header.

In that case (scrcpy --no-audio --record=file.mp4), this caused the
whole content to be buffered in memory, and written only on exit.
 2023-06-03 18:46:39 +02:00
Romain Vimont
379caf8551 Use a single condvar in recorder 
The sc_cond_wait() in sc_recorder_process_header() needs to be notified
of changes to video_init/audio_init (protected by stream_cond) and
video_queue/audio_queue (protected by queue_cond).

Use only one condition variable to simplify.
 2023-06-03 15:10:42 +02:00
Romain Vimont
2aec7b4c9d Mention how to interrupt scrcpy without video 
There is no window to close if video playback is disabled.
 2023-06-02 09:00:33 +02:00
Romain Vimont
fc52b24503 Reorder options in alphabetical order 
Fix the options order, using the short option as key first (if any) in
all cases for consistency.
 2023-06-01 12:52:48 +02:00
Romain Vimont
ff5ffc892f Add option to select audio source 
Pass --audio-source=mic to capture the microphone instead of the device
audio output.
 2023-06-01 09:21:09 +02:00
Romain Vimont
360f2fea1e Extract AudioCapture creation 
This will allow to pass capture options without code duplication.
 2023-06-01 09:21:09 +02:00
Adonis Najimi
24999d0d32 Reset video capture on folding event 
Handle folding event the same way as rotation events.

Fixes #3960 <https://github.com/Genymobile/scrcpy/issues/3960>
PR #3979 <https://github.com/Genymobile/scrcpy/pull/3979>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-06-01 09:20:00 +02:00
Romain Vimont
8e2c0d6407 Rename rotationChanged to resetCapture 
The flag is used to reset the capture (restart the encoding) on rotation
change. It will also be used for other events (on folding change), so
rename it.

PR #3979 <https://github.com/Genymobile/scrcpy/pull/3979>
 2023-06-01 09:20:00 +02:00
Romain Vimont
9a2abba098 Update demuxer comment 
The comment was outdated:
 - the "meta" header is now always present (not only when recording is
   enabled);
 - it is not only used for the video stream, but also for the audio
   stream.
 2023-06-01 09:04:00 +02:00
shuax
b2d860382f Fix stream offset on audio buffer underflow 
The `read` variable is in number of samples, while the offset must be in
bytes.

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

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-05-31 10:09:56 +02:00
Romain Vimont
4c4a03ebe1 Reorder options to maintain alphabetical order 2023-05-30 21:36:48 +02:00
Yan
798dfd240e Turn device screen off after set up 
Sometimes it can take quite a while for everything to get set up and
the screen to appear.

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

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-05-27 10:11:42 +02:00
Romain Vimont
c4caa6b81d Document --no-{video,audio}-playback 
PR #4033 <https://github.com/Genymobile/scrcpy/pull/4033>
 2023-05-27 10:08:10 +02:00
Romain Vimont
1efbfe1175 Add separate video and audio playback options 
Add --no-video-playback and --no-audio-playback. The option
--no-playback is now an alias for both.

PR #4033 <https://github.com/Genymobile/scrcpy/pull/4033>
 2023-05-27 10:08:10 +02:00
Romain Vimont
751c09f47a Simplify V4L2/USB ifdefs 
Define local variables whose value depends on ifdefs, to avoid
cluttering all conditions with ifdefs.
 2023-05-27 09:55:49 +02:00
Romain Vimont
6ad46d70b8 Define v4l2_buffer only if HAVE_V4L2 
If V4L2 support is disabled, there is no v4l2 buffer option.
 2023-05-27 09:55:49 +02:00
Romain Vimont
f46758d1c5 Fix V4L2 error message when disabled 
For consistency, use the same error message for --v4l2-sink and
--v4l2-buffer.
 2023-05-27 09:55:49 +02:00
Romain Vimont
e71f5358b3 Reorder command line options checks 
Perform checks that impact the options first.
 2023-05-27 09:55:49 +02:00
Romain Vimont
a2c8910006 Rename --no-mirror to --no-playback 
This option impacts video and audio _playback_. For example, if we use
V4L2, the device is still "mirrored" (via V4L2), even if playback is
disabled. Therefore, "playback" is more approriate than "mirror".

The initial option --no-display option was renamed to --no-mirror by
commit 6928acdeac, but this has never been
released, so it is ok to rename it one more time.

Refs #3978 <https://github.com/Genymobile/scrcpy/pull/3978#issuecomment-1549420103>
PR #4033 <https://github.com/Genymobile/scrcpy/pull/4033>
 2023-05-27 09:55:38 +02:00
Simon Chan
cab354102d Create AudioRecord by reflection as a fallback 
Some devices (Vivo phones) fail to create an AudioRecord from an
AudioRecord.Builder (which throws a NullPointerException).

In that case, create an AudioRecord instance directly by reflection.

The AOSP version of AudioRecord constructor code can be found at:
 - Android 11 (R):
   <https://cs.android.com/android/platform/superproject/+/android-11.0.0_r1:frameworks/base/media/java/android/media/AudioRecord.java;l=335;drc=64ed2ec38a511bbbd048985fe413268335e072f8>
 - Android 12 (S):
   <https://cs.android.com/android/platform/superproject/+/android-12.0.0_r1:frameworks/base/media/java/android/media/AudioRecord.java;l=388;drc=2eebf929650e0d320a21f0d13677a27d7ab278e9>
 - Android 13 (T, functionally identical to Android 12):
   <https://cs.android.com/android/platform/superproject/+/android-13.0.0_r1:frameworks/base/media/java/android/media/AudioRecord.java;l=382;drc=ed242da52f975a1dd18671afb346b18853d729f2>
 - Android 14 (U): Not released, but expected to change

PR #3862 <https://github.com/Genymobile/scrcpy/pull/3862>
Fixes #3805 <https://github.com/Genymobile/scrcpy/issues/3805>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-05-26 18:56:43 +02:00
Romain Vimont
597d2ccc01 Rename FORMAT to ENCODING 
The AudioFormat contains several properties. This specific value is
named "encoding".
 2023-05-24 22:13:09 +02:00
Romain Vimont
38900d7730 Extract audio source to a static constant 
For consistency with the other parameters.
 2023-05-24 22:13:09 +02:00