Commit Graph

1287 Commits

Author SHA1 Message Date
Romain Vimont
1787972fad 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 12:24:49 +01:00
Romain Vimont
ea1fd8c84d Add --audio-encoder
Similar to --video-encoder, but for audio.
2023-02-27 12:24:49 +01:00
Romain Vimont
c1df742b37 Add --audio-codec-options
Similar to --video-codec-options, but for audio.
2023-02-27 12:24:49 +01:00
Romain Vimont
efb32e352b Add support for AAC audio codec
Add option --audio-codec=aac.
2023-02-27 12:24:49 +01:00
Romain Vimont
29992078d9 Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-02-27 12:24:49 +01:00
Romain Vimont
3f6911d20b Add --audio-bit-rate
Add an option to configure the audio bit-rate.
2023-02-27 12:24:49 +01:00
Romain Vimont
dc99458cf1 Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.
2023-02-27 12:24:49 +01:00
Romain Vimont
ceaa83a8cd Rename --codec-options to --video-codec-options
This prepares the introduction of --audio-codec-options.
2023-02-27 12:24:49 +01:00
Romain Vimont
f3a50cc046 Rename --bit-rate to --video-bit-rate
This prepares the introduction of --audio-bit-rate.
2023-02-27 12:24:49 +01:00
Romain Vimont
aabd2ea12b Rename --codec to --video-codec
This prepares the introduction of --audio-codec.
2023-02-27 12:24:49 +01:00
Romain Vimont
d2d64c9fa3 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 12:24:49 +01:00
Romain Vimont
edaca6f72d 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 12:24:49 +01:00
Romain Vimont
3bd4ce1a11 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 12:24:49 +01:00
Romain Vimont
8438a76aa0 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-27 12:24:49 +01:00
Romain Vimont
2f273b2298 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-27 12:24:49 +01:00
Romain Vimont
7a2ebfae07 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 12:24:49 +01:00
Romain Vimont
0263d8bbef Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-27 12:24:49 +01:00
Romain Vimont
4aaa4580e6 Give a name to demuxer instances
This will be useful in logs.
2023-02-27 12:24:49 +01:00
Romain Vimont
51f4d0efae Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-27 12:24:49 +01:00
Simon Chan
953e9065c9 Add a new socket for audio stream
When audio is enabled, open a new socket to send the audio stream from
the device to the client.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-27 12:24:49 +01:00
Simon Chan
15fb00df85 Add --no-audio option
Audio will be enabled by default (when supported). Add an option to
disable it.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-27 12:24:49 +01:00
Romain Vimont
e1a2ba6185 Reorder initialization
Initialize components in the pipeline order: demuxer first, decoder and
recorder second.
2023-02-27 12:24:49 +01:00
Romain Vimont
cd2c4d3b0f Refactor recorder logic
Process the initial config packet (necessary to write the header)
separately.
2023-02-27 12:24:49 +01:00
Romain Vimont
7d22c0d354 Move last packet recording
Write the last packet at the end.
2023-02-27 12:24:49 +01:00
Romain Vimont
4d1d97d058 Add start() function for recorder
For consistency with the other components, do not start the internal
thread from an init() function.
2023-02-27 12:24:49 +01:00
Romain Vimont
2a41948fb6 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 12:24:49 +01:00
Romain Vimont
cbded6f74f Inline packet_sink impl in recorder
Remove useless wrappers.
2023-02-27 12:24:49 +01:00
Romain Vimont
2318ef4382 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 12:24:49 +01:00
Romain Vimont
863d446398 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 12:24:49 +01:00
Romain Vimont
6a159b0b0b Move previous packet to a local variable
It is only used from run_recorder().
2023-02-27 12:24:49 +01:00
Romain Vimont
c4dcf5159e Move pts_origin to a local variable
It is only used from run_recorder().
2023-02-27 12:24:49 +01:00
Romain Vimont
3add9c42dc Change PTS origin type from uint64_t to int64_t
It is initialized from AVPacket.pts, which is an int64_t.
2023-02-27 12:24:49 +01:00
Romain Vimont
71b61c388a Fix --encoder documentation
Mention that it depends on the codec provided by --codec (which is not
necessarily H264 anymore).
2023-02-27 12:24:49 +01:00
Romain Vimont
cfa23c2a8f Fix --no-clipboard-autosync bash completion
Fix typo.
2023-02-27 12:24:49 +01:00
Romain Vimont
fa6ac8d44f 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 12:24:49 +01:00
Romain Vimont
3dc2a05ea7 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 12:24:49 +01:00
Romain Vimont
39ba9b3db6 Move FFmpeg callback initialization
Configure FFmpeg log redirection on start from a log helper.
2023-02-27 12:24:49 +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
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
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