Commit graph

2030 commits

Author SHA1 Message Date
Romain Vimont
16eece8093 Stop the video buffer on error
If an error occurs from the video buffer thread (typically an
out-of-memory error), then stop.
2023-03-06 09:58:02 +01:00
Romain Vimont
a4f9cca08c Fix possible race condition on video_buffer end
The video_buffer thread clears the queue once it is stopped, but new
frames might still be pushed asynchronously.

To avoid the problem, do not push any frame once the video_buffer is
stopped.
2023-03-06 09:58:02 +01:00
Romain Vimont
c5cca0302d Remove sc_queue
All uses have been replaced by VecDeque.
2023-03-06 09:58:02 +01:00
Romain Vimont
c92a037029 Remove cbuf
All uses have been replaced by VecDeque.
2023-03-06 09:58:02 +01:00
Romain Vimont
a47debe016 Use VecDeque in aoa_hid
Replace cbuf by VecDeque in aoa_hid
2023-03-06 09:58:02 +01:00
Romain Vimont
ba44947066 Use VecDeque in file_pusher
Replace cbuf by VecDeque in file_pusher.

As a side-effect, the new implementation does not limit the queue to an
arbitrary value.
2023-03-06 09:58:02 +01:00
Romain Vimont
b65bd2b87c Use VecDeque in controller
Replace cbuf by VecDeque in controller.
2023-03-06 09:58:02 +01:00
Romain Vimont
9bb7d0f3d6 Use VecDeque in video_buffer
The packets queued for buffering were wrapped in a dynamically allocated
structure with a "next" field.

To avoid this additional layer of allocation and indirection, use a
VecDeque.
2023-03-06 09:58:02 +01:00
Romain Vimont
9389b6fc65 Use VecDeque in recorder
The packets queued for recording were wrapped in a dynamically allocated
structure with a "next" field.

To avoid this additional layer of allocation and indirection, use a
VecDeque.
2023-03-06 09:58:02 +01:00
Romain Vimont
2e041db876 Introduce VecDeque
Introduce a double-ended queue implemented with a growable ring buffer.

Inspired from the Rust VecDeque type:
<https://doc.rust-lang.org/std/collections/struct.VecDeque.html>
2023-03-06 09:58:02 +01:00
Romain Vimont
0b39c613a8 Add sc_allocarray() util
Add a function to allocate an array, which fails safely in the case
where the multiplication would overflow.
2023-03-06 09:58:02 +01:00
Romain Vimont
7e725ae55f Use reallocarray() in sc_vector
This fails safely in case of overflow.
2023-03-06 09:58:02 +01:00
Romain Vimont
cd99f1b643 Add compat for reallocarray()
This function fails safely in the case where the multiplication would
overflow.
2023-03-06 09:58:02 +01:00
Romain Vimont
e4cfad2cd2 Call avcodec_receive_frame() in a loop
Since in scrcpy a video packet passed to avcodec_send_packet() is always
a complete video frame, it is sufficient to call avcodec_receive_frame()
exactly once.

In practice, it also works for audio packets: the decoder produces
exactly 1 frame for 1 input packet.

In theory, it is an implementation detail though, so
avcodec_receive_frame() should be called in a loop.
2023-03-06 09:58:02 +01:00
Romain Vimont
aeea39e589 Add --require-audio
By default, scrcpy mirrors only the video when audio capture fails on
the device. Add a flag to force scrcpy to fail if audio is enabled but
does not work.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
af577f23fe Add compat support for FFmpeg < 5.1
The new chlayout API has been introduced in FFmpeg 5.1. Use the old
channel_layout API on older versions.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Simon Chan
0af893fd73 Add workaround to capture audio on Android 11
On Android 11, it is possible to start the capture only when the running
app is in foreground. But scrcpy is not an app, it's a Java application
started from shell.

As a workaround, start an existing Android shell existing activity just
to start the capture, then close it immediately.

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

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-03-06 09:58:02 +01:00
Romain Vimont
047b54b9fe Add audio player
Play the decoded audio using SDL.

The audio player frame sink receives the audio frames, resample them
and write them to a byte buffer (introduced by this commit).

On SDL audio callback (from an internal SDL thread), copy samples from
this byte buffer to the SDL audio buffer.

The byte buffer is protected by the SDL_AudioDeviceLock(), but it has
been designed so that the producer and the consumer may write and read
in parallel, provided that they don't access the same slices of the
ring-buffer buffer.

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

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-03-06 09:58:02 +01:00
Romain Vimont
a01a257ddb Add two-step write feature to bytebuf
If there is exactly one producer, then it can assume that the remaining
space in the buffer will only increase until it write something.

This assumption may allow the producer to write to the buffer (up to a
known safe size) without any synchronization mechanism, thus allowing
to read and write different parts of the buffer in parallel.

The producer can then commit the write with lock held, and update its
knowledge of the safe empty remaining space.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
8bf9f200cc Introduce bytebuf util
Add a ring-buffer for bytes. It will be useful for buffering audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
134f48534a Pass AVCodecContext to frame sinks
Frame consumers may need details about the frame format.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
37e01e331f Add an audio decoder
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
59fc45b7cc Give a name to decoder instances
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
84755698fd Rename decoder to video_decoder
This prepares the introduction of audio_decoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
cfdb85de1b Log display sizes in display list
This is more convenient than just the display id alone.
2023-03-06 09:58:02 +01:00
Romain Vimont
04b662b2f0 Add --list-displays 2023-03-06 09:58:02 +01:00
Romain Vimont
b00c393cd0 Move log message helpers to LogUtils
This class will also contain other log helpers.
2023-03-06 09:58:02 +01:00
Romain Vimont
94fef53781 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
9670645818 Add --list-encoders
Add an option to list the device encoders properly.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
42aa59f2c2 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:02 +01:00
Romain Vimont
ea35c23b6b Add --audio-encoder
Similar to --video-encoder, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:58:01 +01:00
Romain Vimont
aa9860a9f9 Extract unknown encoder error message
This will allow to reuse the same code for audio encoder selection.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:57:42 +01:00
Romain Vimont
400173c280 Add --audio-codec-options
Similar to --video-codec-options, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:57:36 +01:00
Romain Vimont
3cd76e0bac Extract application of codec options
This will allow to reuse the same code for audio codec options.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
0cd6e4d5dd Add support for AAC audio codec
Add option --audio-codec=aac.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
56c65bd4c6 Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
78dcc01dcf Add --audio-bit-rate
Add an option to configure the audio bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
b9e0803806 Disable MethodLength checkstyle on createOptions()
This method will grow as needed to initialize options.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
879f086e6a Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
0828631b16 Rename --codec-options to --video-codec-options
This prepares the introduction of --audio-codec-options.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
7653158e5a Rename --bit-rate to --video-bit-rate
This prepares the introduction of --audio-bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
42082f622f Rename --codec to --video-codec
This prepares the introduction of --audio-codec.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
5a02005fc3 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
8c680d391d 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
a9ea8b7c1f 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/>
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
4be7925667 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
43d6d0d4bc Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
7a4fe1e8f6 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
75cd0ea3b5 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
1f9523dd67 Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00