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

2170 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Romain Vimont
e926bf1fe8 Delay window resize when minimized 
On some window managers (e.g. on Windows), performing a resize while the
window is minimized does nothing (the restored window keeps its old
size).

Therefore, like for maximized and fullscreen states, wait for the window
to be restored to apply a resize.

Refs #3947 <https://github.com/Genymobile/scrcpy/issues/3947>
 2023-05-22 18:22:45 +02:00
Romain Vimont
6298ef095f Accept texture failures 
When the scrcpy window is minimized on Windows with D3D9, texture
creation and update fail.

In that case, do not terminate scrcpy. Instead, store the pending size
or frame to update, to attempt again during the next update or
rendering.

Fixes #3947 <https://github.com/Genymobile/scrcpy/issues/3947>
 2023-05-22 18:21:10 +02:00
Romain Vimont
7d33798b40 Upgrade FFmpeg build to 6.0-scrcpy-4 
Use FFmpeg DLLs which do not depend on zlib1.dll.
 2023-05-15 21:55:22 +02:00
Romain Vimont
d500550212 Update audio recording documentation 
Document how to record audio-only to .opus and .aac files.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-15 14:28:55 +02:00
Romain Vimont
a166eee909 Upgrade FFmpeg build to 6.0-scrcpy-3 
Use a build which includes the opus muxer, to support recording to .opus
files.

Refs <https://github.com/rom1v/scrcpy-deps/commits/6.0-scrcpy-3>
PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-15 14:28:53 +02:00
Romain Vimont
b11b363e8e Add recording to aac file 
It is just an alias for mp4.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
7321db6f28 Add recording to opus file 
Use the FFmpeg opus muxer to record an opus file.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
d6bcde565f Accept .m4a and .mka 
These are just aliases for mp4 and mkv when there is no video stream.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
98f4f4e68a Refactor command line checks 
Several checks are performed when opts->record_filename is not NULL.
Group them in a single block.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
be86e14e05 Factorize record format parsing 
Convert either the filename extension or the explicit record format
to a sc_record_format using the same function.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
8c650e53cd Add --no-video 
Similar to --no-audio, add --no-video to play audio only.

Fixes #3842 <https://github.com/Genymobile/scrcpy/issues/3842>
PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 17:11:34 +02:00
Romain Vimont
e89e772c7c Remove unnecessary 'else' 
Some server parameters may depend on one another. For example,
audio_bit_rate is meaningless if audio is false.

But it is inconsistent to disable some parameters based on these
dependencies checks, but not others. Handling all dependencies between
parameters would add too much complexity for no benefit.

So just pass individual parameters independently.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:41:12 +02:00
Romain Vimont
feab87053a Convert screen encoder to async processor 
Contrary to the other tasks (controller and audio capture/encoding), the
screen encoder was executed synchronously. As a consequence,
scrcpy-server could not terminate until the screen encoder returned.

Convert it to an async processor. This allows to terminate on controller
error, and this paves the way to disable video mirroring.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:41:09 +02:00
Romain Vimont
751a3653a0 Add missing @Override annotations 
PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:41:06 +02:00
Romain Vimont
9c08eb79cb Close connection at the end of finally-block 
The async processors use the socket file descriptors from the
connection. Therefore, the connection must not be closed before all
async processor threads are joined.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:41:04 +02:00
Romain Vimont
92483fe11b Disable controls on --no-mirror 
If mirroring is disabled, control must also be disabled.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:41:01 +02:00
Romain Vimont
6928acdeac Rename --no-display to --no-mirror 
The option impacts both video and audio playback, so "no display" is not
an appropriate name.

PR #3978 <https://github.com/Genymobile/scrcpy/pull/3978>
 2023-05-08 16:40:58 +02:00
Romain Vimont
0f3af2d20b Fix build for FFmpeg < 3.3 
The constant AV_CODEC_ID_AV1 was introduced in FFmpeg 3.3. Add an ifdef
to support older versions.

Fixes #3939 <https://github.com/Genymobile/scrcpy/issues/3939>
 2023-04-23 12:26:46 +02:00