pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,999 Commits 434 Branches 35 Tags
b856db72396d67a49d4e6dcb3a2fa39ca8da7532
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Vimont b856db7239 Give a name to decoder instances 
This will be useful in logs.
 2023-02-27 20:53:14 +01:00
Romain Vimont b70cb2ff7c Rename decoder to video_decoder 2023-02-27 20:53:14 +01:00
Romain Vimont e4260dc5d5 Log display sizes in display list 
This is more convenient than just the display id alone.
 2023-02-27 20:53:14 +01:00
Romain Vimont a7af7d9844 Add --list-device-displays 2023-02-27 20:53:14 +01:00
Romain Vimont b05004cdd8 Move log message helpers to LogUtils 
This class will also contain other log helpers.
 2023-02-27 20:53:14 +01:00
Romain Vimont bbf9df265e Quit on audio configuration failure 
When audio capture fails on the device, scrcpy continue mirroring the
video stream. This allows to enable audio by default only when
supported.

However, if an audio configuration occurs (for example the user
explicitly selected an unknown audio encoder), this must be treated as
an error and scrcpy must exit.
 2023-02-27 20:53:14 +01:00
Romain Vimont 001b62917e Add --list-encoders 
Add an option to list the device encoders properly.
 2023-02-27 20:53:14 +01:00
Romain Vimont cbc0cef95d Move await_for_server() logs 
Print the logs on the caller side. This will allow to call the function
in another context without printing the logs.
 2023-02-27 20:53:14 +01:00
Romain Vimont 754b3aff14 Add --audio-encoder 
Similar to --video-encoder, but for audio.
 2023-02-27 20:53:14 +01:00
Romain Vimont 07a4293524 Extract unknown encoder error message 
This will allow to reuse the same code for audio encoder selection.
 2023-02-27 20:53:14 +01:00
Romain Vimont 160e00ff43 Add --audio-codec-options 
Similar to --video-codec-options, but for audio.
 2023-02-27 20:53:14 +01:00
Romain Vimont 1fd9a7a5c6 Extract application of codec options 
This will allow to reuse the same code for audio codec options.
 2023-02-27 20:53:14 +01:00
Romain Vimont 6f5326a4bf Add support for AAC audio codec 
Add option --audio-codec=aac.
 2023-02-27 20:53:14 +01:00
Romain Vimont 9da5285561 Add --audio-codec 
Introduce the selection mechanism. Alternative codecs will be added
later.
 2023-02-27 20:53:14 +01:00
Romain Vimont 1966c4df4b Add --audio-bit-rate 
Add an option to configure the audio bit-rate.
 2023-02-27 20:53:14 +01:00
Romain Vimont 96434f999c Disable MethodLength checkstyle on createOptions() 
This method will grow as needed to initialize options.
 2023-02-27 20:53:14 +01:00
Romain Vimont b3586f32f7 Rename --encoder to --video-encoder 
This prepares the introduction of --audio-encoder.
 2023-02-27 20:53:14 +01:00
Romain Vimont 38a7dcd83c Rename --codec-options to --video-codec-options 
This prepares the introduction of --audio-codec-options.
 2023-02-27 20:53:14 +01:00
Romain Vimont 0c2e2b998d Rename --bit-rate to --video-bit-rate 
This prepares the introduction of --audio-bit-rate.
 2023-02-27 20:53:14 +01:00
Romain Vimont 3513fc7809 Rename --codec to --video-codec 
This prepares the introduction of --audio-codec.
 2023-02-27 20:53:14 +01:00
Romain Vimont fef75277bc Remove default bit-rate on client side 
If no bit-rate is passed, let the server use the default value (8Mbps).

This avoids to define a default value on both sides, and to pass the
default bit-rate as an argument when starting the server.
 2023-02-27 20:53:14 +01:00
Romain Vimont 5192891fc8 Record at least video packets on stop 
If the recorder is stopped while it has not received any audio packet
yet, make sure the video stream is correctly recorded.
 2023-02-27 20:53:14 +01:00
Romain Vimont 079fd1ea47 Disable audio before Android 11 
The permission "android.permission.RECORD_AUDIO" has been added for
shell in Android 11.

Moreover, on lower versions, it may make the server segfault on the
device (happened on a Nexus 5 with Android 6.0.1).

Refs <https://android.googlesource.com/platform/frameworks/base/+/4feeee88911503cc365b223a712437abcd91c94f%5E%21/>
 2023-02-27 20:53:14 +01:00
Romain Vimont b814ca84df Disable audio on initialization error 
By default, audio is enabled (--no-audio must be explicitly passed to
disable it).

However, some devices may not support audio capture (typically devices
below Android 11, or Android 11 when the shell application is not
foreground on start).

In that case, make the server notify the client to dynamically disable
audio forwarding so that it does not wait indefinitely for an audio
stream.

Also disable audio on unknown codec or missing decoder on the
client-side, for the same reasons.
 2023-02-27 20:53:14 +01:00
Romain Vimont f095f61d65 Add record audio support 
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
 2023-02-27 20:53:14 +01:00
Romain Vimont 69ebf8a578 Rename video-specific variables in recorder 
This paves the way to add audio-specific variables.
 2023-02-27 20:53:14 +01:00
Romain Vimont 067cea8674 Do not merge config audio packets 
For video streams (at least H.264 and H.265), the config packet
containing SPS/PPS must be prepended to the next packet (the following
keyframe).

For audio streams (at least OPUS), they must not be merged.
 2023-02-27 20:53:14 +01:00
Romain Vimont 59ffc76d4e Add an audio demuxer 
Add a demuxer which will read the stream from the audio socket.
 2023-02-27 20:53:14 +01:00
Romain Vimont 3c702afdb0 Give a name to demuxer instances 
This will be useful in logs.
 2023-02-27 20:53:14 +01:00
Romain Vimont d652e49001 Rename demuxer to video_demuxer 
There will be another demuxer instance for audio.
 2023-02-27 20:53:14 +01:00
Romain Vimont 7f079333dc Extract OPUS extradata 
For OPUS codec, FFmpeg expects the raw extradata, but MediaCodec wraps
it in some structure.

Fix the config packet to send only the raw extradata.
 2023-02-27 20:53:14 +01:00
Romain Vimont 623585c359 Use a streamer to send the audio stream 
Send each encoded audio packet using a streamer.
 2023-02-27 20:53:14 +01:00
Romain Vimont f0f92d9f08 Encode recorded audio on the device 
For now, the encoded packets are just logged into the console.
 2023-02-27 20:53:14 +01:00
Romain Vimont e0c0383ab8 Use FakeContext for Application instance 
This will expose the correct package name and UID to the application
context.
 2023-02-27 20:53:14 +01:00
Romain Vimont 27366ba158 Use shell package name for workarounds 
For consistency.
 2023-02-27 20:53:14 +01:00
Romain Vimont 071e002d6c Use ROOT_UID from FakeContext 
Remove USER_ID from ServiceManager, and replace it by a constant in
FakeContext.

This is the same as android.os.Process.ROOT_UID, but this constant has
been introduced in API 29.
 2023-02-27 20:53:14 +01:00
Romain Vimont f6e7512c53 Use PACKAGE_NAME from FakeContext 
Remove duplicated constant.
 2023-02-27 20:53:14 +01:00
Romain VimontandSimon Chan dd308b1634 Use AttributionSource from FakeContext 
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
 2023-02-27 20:53:14 +01:00
Romain Vimont eff48a9c39 Improve error message for unknown encoder 
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
 2023-02-27 20:53:14 +01:00
Romain Vimont 8fb6f86021 Rename "codec" variable to "mediaCodec" 
This will allow to use "codec" for the Codec type.
 2023-02-27 20:53:14 +01:00
Romain Vimont 57d68886f4 Make streamer independent of codec type 
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
 2023-02-27 20:53:14 +01:00
Romain Vimont 440eda15e1 Pass all args to ScreenEncoder constructor 
There is no good reason to pass some of them in the constructor and some
others as parameters of the streamScreen() method.
 2023-02-27 20:53:14 +01:00
Romain Vimont 78efbb3a71 Move screen encoder initialization 
This prepares further refactors.
 2023-02-27 20:53:14 +01:00
Romain Vimont ceab2b2d6f Write streamer header from ScreenEncoder 
The screen encoder is responsible to write data to the video streamer.
 2023-02-27 20:53:14 +01:00
Romain Vimont 576f0b512f Use VideoStreamer directly from ScreenEncoder 
The Callbacks interface notifies new packets. But in addition, the
screen encoder will need to write headers on start.

We could add a function onStart(), but for simplicity, just remove the
interface, which brings no value, and call the streamer directly.

Refs 87972e2022
 2023-02-27 20:53:14 +01:00
Romain Vimont 7492f5e807 Simplify error handling on socket creation 
On any error, all previously opened sockets must be closed.

Handle these errors in a single catch-block. Currently, there are only 2
sockets, but this will simplify even more with more sockets.

Note: this commit is better displayed with --ignore-space-change (-b).
 2023-02-27 20:53:14 +01:00
Romain Vimont 0075b97976 Reorder initialization 
Initialize components in the pipeline order: demuxer first, decoder and
recorder second.
 2023-02-27 20:53:14 +01:00
Romain Vimont a3f8239da7 Refactor recorder logic 
Process the initial config packet (necessary to write the header)
separately.
 2023-02-27 20:53:14 +01:00
Romain Vimont 6d5806ef5c Move last packet recording 
Write the last packet at the end.
 2023-02-27 20:53:14 +01:00
Romain Vimont 3a5e065a08 Add start() function for recorder 
For consistency with the other components, do not start the internal
thread from an init() function.
 2023-02-27 20:53:14 +01:00
Romain Vimont 620cd7b19a Open recording file from the recorder thread 
The recorder opened the target file from the packet sink open()
callback, called by the demuxer. Only then the recorder thread was
started.

One golden rule for the recorder is to never block the demuxer for I/O,
because it would impact mirroring. This rule is respected on recording
packets, but not for the initial recorder opening.

Therefore, start the recorder thread from sc_recorder_init(), open the
file immediately from the recorder thread, then make it wait for the
stream to start (on packet sink open()).

Now that the recorder can report errors directly (rather than making the
demuxer call fail), it is possible to report file opening error even
before the packet sink is open.
 2023-02-27 20:53:14 +01:00
Romain Vimont 099b83484c Inline packet_sink impl in recorder 
Remove useless wrappers.
 2023-02-27 20:53:14 +01:00
Romain Vimont dceef8f279 Initialize recorder fields from init() 
The recorder has two initialization phases: one to initialize the
concrete recorder object, and one to open its packet_sink trait.

Initialize mutex and condvar as part of the object initialization.

If there were several packet_sink traits, the mutex and condvar would
still be initialized only once.
 2023-02-27 20:53:14 +01:00
Romain Vimont e26ed27575 Report recorder errors 
Stop scrcpy on recorder errors.

It was previously indirectly stopped by the demuxer, which failed to
push packets to a recorder in error. Report it directly instead:
 - it avoids to wait for the next demuxer call;
 - it will allow to open the target file from a separate thread and stop
   immediately on any I/O error.
 2023-02-27 20:53:14 +01:00
Romain Vimont de796552bd Move previous packet to a local variable 
It is only used from run_recorder().
 2023-02-27 20:53:14 +01:00
Romain Vimont 1330f58689 Move pts_origin to a local variable 
It is only used from run_recorder().
 2023-02-27 20:53:14 +01:00
Romain Vimont a55c177e7d Change PTS origin type from uint64_t to int64_t 
It is initialized from AVPacket.pts, which is an int64_t.
 2023-02-27 20:53:14 +01:00
Romain Vimont 3e5cf55dd8 Fix --encoder documentation 
Mention that it depends on the codec provided by --codec (which is not
necessarily H264 anymore).
 2023-02-27 20:53:14 +01:00
Romain Vimont 6840a6939a Do not print stacktraces when unnecessary 
User-friendly error messages are printed on specific configuration
exceptions. In that case, do not print the stacktrace.

Also handle the user-friendly error message directly where the error
occurs, and print multiline messages in a single log call, to avoid
confusing interleaving.
 2023-02-27 20:53:14 +01:00
Romain Vimont a51e500584 Fix --no-clipboard-autosync bash completion 
Fix typo.
 2023-02-27 20:53:14 +01:00
Romain Vimont eac38013f7 Split server stop() and join() 
For consistency with the other components, call stop() and join()
separately.

This allows to stop all components, then join them all.
 2023-02-27 20:53:14 +01:00
Romain Vimont dad8ab02bd Print FFmpeg logs 
FFmpeg logs are redirected to a specific SDL log category.

Initialize the log level for this category to print them as expected.
 2023-02-27 20:53:14 +01:00
Romain Vimont 0c8144a5cd Move FFmpeg callback initialization 
Configure FFmpeg log redirection on start from a log helper.
 2023-02-27 20:53:14 +01:00
Romain Vimont b3a1262fb8 Silence lint warning about constant in API 29 
MediaFormat.MIMETYPE_VIDEO_AV1 has been added in API 29, but it is not
a problem to inline the constant in older versions.
 2023-02-27 20:53:14 +01:00
Romain Vimont 7fcfe6945a Remove manifest package name 
As reported by gradle:

> Setting the namespace via a source AndroidManifest.xml's package
> attribute is deprecated.
>
> Please instead set the namespace (or testNamespace) in the module's
> build.gradle file, as described here:
> https://developer.android.com/studio/build/configure-app-module#set-namespace
 2023-02-27 20:53:14 +01:00
Romain Vimont a983b68ce6 Upgrade gradle build tools to 7.4.0 
Plugin version 7.4.0.
Gradle version 7.5.

Refs <https://developer.android.com/studio/releases/gradle-plugin#updating-gradle>
 2023-02-27 20:53:14 +01:00
Romain Vimont 6b422e21bf Fix error message on icon loading failure 2023-02-27 20:51:54 +01:00
Romain Vimont 8e8b039a63 Do not use avformat network 
Scrcpy does not use FFmpeg network features. Initialize network locally
instead (useful only for Windows).

The include block has been moved to fix the following warning:

    Please include winsock2.h before windows.h
 2023-02-27 20:51:54 +01:00
Romain Vimont 0702be86d8 Accept Windows Sockets from version 1.1 
Version 2.2 is probably not necessary (1.1 is the version required by
FFmpeg when network is enabled).

Refs <https://github.com/FFmpeg/FFmpeg/blob/891ed24f77da99c6d41bb7c116ba5925e3206ce2/libavformat/network.c#L63>
Refs <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-wsastartup>
 2023-02-27 20:51:54 +01:00
Romain Vimont 0cea7fb24c Fix WSAStartup() error check on Windows 2023-02-27 20:51:35 +01:00
Romain Vimont 3d10fbd9b4 Fix --bit-rate option in bash completion script 
The option is --bit-rate, not --bitrate.
 2023-02-21 19:50:01 +01:00
Romain Vimont 3e3756a323 Add auto-completion for --codec option 
Add missing command to bash and zsh completion scripts.
 2023-02-21 19:48:28 +01:00
Romain Vimont 5d6bcc5966 Use enum for long options constants 
This avoids to manually assign values.
 2023-02-21 19:47:27 +01:00
Romain Vimont 5973d4cdd7 Initialize mouse_input_mode explicitly 
The explicit initialization was missing. It had no consequences because
SC_MOUSE_INPUT_MODE_INJECT == 0.

Fixes #3749 <https://github.com/Genymobile/scrcpy/issues/3749>
 2023-02-21 12:11:39 +01:00
Romain Vimont 0a151b96fe Accept muxing AV1 into MP4 container 
MP4 supports AV1.

Refs d2dce51038
 2023-02-20 20:49:56 +01:00
Romain Vimont ebecbe6bc6 Fix inconsistent quotes 
The encoder name started with a simple quote but ended with a
double quote. Use a single quote for both.
 2023-02-19 16:18:19 +01:00
Romain Vimont d5dff239c8 Suggest commands with an explicit '=' 2023-02-19 16:18:19 +01:00
Romain Vimont 5cf86ef7ff Move finally-block to fix deadlock on stop 
DesktopConnection implements Closeable, so it is implicitly closed after
its try-with-resources block. Closing the DesktopConnection shutdowns
the sockets, so it is necessary in particular to wake up blocking read()
calls from the controller.

But the controller thread was joined before the DesktopConnection was
closed, causing a deadlock. To fix the problem, join the controller
thread only after the DesktopConnection is closed.

Refs 400a1c69b1
 2023-02-19 15:59:05 +01:00
Romain Vimont e02f30f895 Remove unnecessary error logs 
When a call to a packet or frame sink fails, do not log the error on the
caller side: either the "failure" is expected (explicitly stopped) or it
must be logged by the packet or frame sink implementation.
 2023-02-19 02:10:14 +01:00
Romain Vimont 25e2eb7d7c Document default video codec 
Mention the default option value, like for other commands.
 2023-02-18 19:10:25 +01:00
Romain Vimont 280a9afda8 Fix command-line help typo 2023-02-18 18:11:34 +01:00
Romain Vimont e91618586c Prefix receiver by sc_ 
Like all other components in scrcpy.
 2023-02-18 09:37:31 +01:00
Romain Vimont 680ddf64be Fix demuxer error message 
Now that there are several possible codecs, do not hardcode H.264 in the
error message.

Refs 3e517cd40e
 2023-02-18 09:31:06 +01:00
Romain Vimont f4e7085c34 Log non-EPIPE I/O exceptions 
On close, the client closes the socket. This wakes up socket blocking
calls on the server-side, by throwing an exception. Since this exception
is expected, it was not logged.

However, other IOExceptions might occur, which must not be ignored. For
that purpose, log only IOException when they are not caused by an EPIPE
error.
 2023-02-17 08:33:16 +01:00
Romain Vimont 439a1fd4ed Rename 'uid' to 'scid' 
A random identifier is generated to differentiate multiple running
scrcpy instances. Rename it from 'uid' to 'scid' (scrcpy id) not to
confuse it with Linux UID.

Fixes #3729 <https://github.com/Genymobile/scrcpy/issues/3729>
Refs 4315be1648
 2023-02-11 09:58:40 +01:00
Romain Vimont 49eb326ce9 Extract packet merging 
Config packets must be prepended to the next media packet. Extract the
logic to a new sc_packet_merger helper to simplify the demuxer code.
 2023-02-11 09:44:33 +01:00
Romain Vimont f03f32267e Remove unused parser 
Since 1c02b58412, the parser is not used
anymore.
 2023-02-10 23:18:11 +01:00
Romain Vimont 45b2e6db5c Log component stopped in finally clause 
The message must be logged even when no exception occurs.
 2023-02-10 19:06:17 +01:00
Romain Vimont 400a1c69b1 Join all threads before end of main 
Some calls from separate threads may throw exceptions once the main()
method has returned.
 2023-02-10 19:04:56 +01:00
Romain Vimont 730eb1086a Properly report demuxer errors 
All demuxer errors were reported as "device disconnected", even if the
failure was not related to device socket read.
 2023-02-10 18:55:43 +01:00
Romain Vimont 4f9e9c6619 Prefix UI events constants by SC_ 2023-02-10 18:55:43 +01:00
Romain Vimont 953edfd1df Split codec_id reading 
Receive codec id and convert it to AVCodecID separately.

This will allow the caller to distinguish between EOS and unknown codec
id.
 2023-02-10 18:55:43 +01:00
Romain Vimont 230b8274b9 Fix error return value 
The function returns an enum AVCodecID, not a bool.
 2023-02-10 18:55:43 +01:00
Romain Vimont 40866ddc10 Fix demuxer error message 
The message applies to all packets, not only config packets.
 2023-02-10 18:55:39 +01:00
Romain Vimont bd56c0abf7 Remove unused codec context 
The demuxer does not need any codec context.
 2023-02-10 18:46:01 +01:00
Romain Vimont 6524e90c68 Remove unused constant 
This line was committed by error.

Refs 3e517cd40e
 2023-02-07 23:11:42 +01:00
Romain Vimont f2dee20a20 Set power mode on all physical displays 
Android 10 and above support multiple physical displays. Apply power
mode to all of them.

Fixes #3716 <https://github.com/Genymobile/scrcpy/issues/3716>
 2023-02-06 11:07:14 +01:00
Romain Vimont d2dce51038 Add support for AV1 
Add option --codec=av1.

PR #3713 <https://github.com/Genymobile/scrcpy/pull/3713>
 2023-02-06 11:00:49 +01:00
Romain Vimont 4342c5637d Add support for H265 
Add option --codec=h265.

PR #3713 <https://github.com/Genymobile/scrcpy/pull/3713>
Fixes #3092 <https://github.com/Genymobile/scrcpy/issues/3092>
 2023-02-06 11:00:49 +01:00
Romain Vimont 3e517cd40e Add option to select video codec 
Introduce the selection mechanism. Alternative codecs will be added in
further commits.

PR #3713 <https://github.com/Genymobile/scrcpy/pull/3713>
 2023-02-06 10:58:45 +01:00