mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-11 18:50:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1942 commits 591 branches 57 tags 36 MiB
Commit graph

1942 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
0d5e3afdf5 Reorder initialization 
Initialize components in the pipeline order: demuxer first, decoder and
recorder second.
 2023-02-24 21:29:30 +01:00
Romain Vimont
947df80a01 Refactor recorder logic 
Process the initial config packet (necessary to write the header)
separately.
 2023-02-24 21:29:30 +01:00
Romain Vimont
9e47989d86 Move last packet recording 
Write the last packet at the end.
 2023-02-24 21:29:30 +01:00
Romain Vimont
2b6642807e Add start() function for recorder 
For consistency with the other components, do not start the internal
thread from an init() function.
 2023-02-24 21:29:30 +01:00
Romain Vimont
9c72cecfef 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-24 21:29:30 +01:00
Romain Vimont
4dc76e58bc Inline packet_sink impl in recorder 
Remove useless wrappers.
 2023-02-24 21:29:30 +01:00
Romain Vimont
9e455b803d 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-24 21:29:30 +01:00
Romain Vimont
4f992519a5 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-24 21:29:28 +01:00
Romain Vimont
359a8cbed5 Move previous packet to a local variable 
It is only used from run_recorder().
 2023-02-23 13:27:34 +01:00
Romain Vimont
3910033e36 Move pts_origin to a local variable 
It is only used from run_recorder().
 2023-02-23 13:27:34 +01:00
Romain Vimont
94be1730f2 Change PTS origin type from uint64_t to int64_t 
It is initialized from AVPacket.pts, which is an int64_t.
 2023-02-23 13:27:34 +01:00
Romain Vimont
d0cd5e536e Fix --encoder documentation 
Mention that it depends on the codec provided by --codec (which is not
necessarily H264 anymore).
 2023-02-23 13:27:34 +01:00
Romain Vimont
bdfb8ae725 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-23 13:27:34 +01:00
Romain Vimont
2b69eecc90 Fix --no-clipboard-autosync bash completion 
Fix typo.
 2023-02-23 13:27:34 +01:00
Romain Vimont
97bbbb81ad 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-23 13:27:34 +01:00
Romain Vimont
ca24b3a8c8 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-23 13:26:36 +01:00
Romain Vimont
5563676946 Move FFmpeg callback initialization 
Configure FFmpeg log redirection on start from a log helper.
 2023-02-23 13:07:13 +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
Romain Vimont
f70f6cdd3e Simplify server info initialization 
Use sc_read16be() to read 16-bit integer fields.
 2023-02-03 12:31:28 +01:00
Romain Vimont
87972e2022 Extract video streaming to a separate class 
ScreenEncoder handled both capture/encoding and sending over the
network.

Move the streaming part to a separate VideoStreamer.
 2023-02-03 12:31:28 +01:00
Romain Vimont
3aac74e9e9 Move variable assignment 
Computing eof flag is not necessary if rotation changed.
 2023-02-03 12:31:28 +01:00