Commit graph

2033 commits

Author SHA1 Message Date
Romain Vimont
0784f266a8 Introduce packet source trait
There was a packet sink trait, implemented by components able to
receive AVPackets, but each packet source had to manually send to packet
sinks.

In order to mutualise sink management, add a packet source trait.
2023-03-06 09:26:29 +01:00
Romain Vimont
6c11c9510d Extract sc_delay_buffer
A video buffer had 2 responsibilities:
 - handle the frame delaying mechanism (queuing packets and pushing them
   after the expected delay);
 - keep only the most recent frame (using a sc_frame_buffer).

In order to reuse only the frame delaying mechanism, extract it to a
separate component, sc_delay_buffer.
2023-03-06 09:26:29 +01:00
Romain Vimont
1ebfe0efce Report video buffer downstream errors
Make the video buffer stop if its consumer could not receive a frame.
2023-03-06 09:26:29 +01:00
Romain Vimont
631dc6f357 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:26:29 +01:00
Romain Vimont
e9984266fa 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:26:29 +01:00
Romain Vimont
5f2cf1e8c0 Remove sc_queue
All uses have been replaced by VecDeque.
2023-03-06 09:26:29 +01:00
Romain Vimont
6e00a55f03 Remove cbuf
All uses have been replaced by VecDeque.
2023-03-06 09:26:29 +01:00
Romain Vimont
92ca8c83d6 Use VecDeque in aoa_hid
Replace cbuf by VecDeque in aoa_hid
2023-03-06 09:26:29 +01:00
Romain Vimont
b2997fe398 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:26:29 +01:00
Romain Vimont
92f17f1e53 Use VecDeque in controller
Replace cbuf by VecDeque in controller.
2023-03-06 09:26:29 +01:00
Romain Vimont
4b18089c6c 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:26:29 +01:00
Romain Vimont
4cfd04adf7 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:26:29 +01:00
Romain Vimont
faa2f22cd6 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:26:29 +01:00
Romain Vimont
cef9bf51a9 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:26:29 +01:00
Romain Vimont
c30bb893f8 Use reallocarray() in sc_vector
This fails safely in case of overflow.
2023-03-06 09:26:29 +01:00
Romain Vimont
35debac4d1 Add compat for reallocarray()
This function fails safely in the case where the multiplication would
overflow.
2023-03-06 09:26:29 +01:00
Romain Vimont
2dd75bf88a 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:26:29 +01:00
Romain Vimont
a8895b06d2 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:26:29 +01:00
Romain Vimont
427245ee20 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:26:29 +01:00
Simon Chan
2a6df62ce9 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:26:29 +01:00
Romain Vimont
30d1244962 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:26:29 +01:00
Romain Vimont
4e6941e632 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:26:29 +01:00
Romain Vimont
85f069b39b 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:26:29 +01:00
Romain Vimont
77eb14f6e1 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:26:29 +01:00
Romain Vimont
8025238654 Add an audio decoder
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-06 09:26:29 +01:00
Romain Vimont
f57b62c286 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:26:29 +01:00
Romain Vimont
b994288afa 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:26:29 +01:00
Romain Vimont
fe396544a6 Log display sizes in display list
This is more convenient than just the display id alone.
2023-03-06 09:26:29 +01:00
Romain Vimont
e5a5d4b9cc Add --list-displays 2023-03-06 09:26:29 +01:00
Romain Vimont
5c7af685a4 Move log message helpers to LogUtils
This class will also contain other log helpers.
2023-03-06 09:26:29 +01:00
Romain Vimont
b93a8b911b 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:26:29 +01:00
Romain Vimont
afbeeeb678 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:26:29 +01:00
Romain Vimont
f5f2edd4b9 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:26:29 +01:00
Romain Vimont
dce8cf5108 Add --audio-encoder
Similar to --video-encoder, but for audio.

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