Commit Graph

1339 Commits

Author SHA1 Message Date
Romain Vimont
d939b99dde Warn on ignored audio options
For raw audio codec, some audio options are ignored.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:59:36 +01:00
Romain Vimont
bac8119d17 Make --audio-codec=raw the default
Encoding and decoding the audio stream adds latency, which is not ideal
for real-time mirroring.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:47:49 +01:00
Romain Vimont
29e47bdcdc Add --audio-codec=raw option
Add support for raw (PCM S16 LE) audio codec (a decoder is included in
FFmpeg).

Even if it consumes more bandwidth, it provides a lower latency.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:47:49 +01:00
Romain Vimont
14c27d1756 Stop on decoder frame push error
On push, frame sinks report downstream errors to stop upstream
components. Do not ignore the error.
2023-03-03 21:47:20 +01:00
Romain Vimont
501b5bceff Add --audio-buffer
Expose an option to add a buffering delay (in milliseconds) before
playing audio.

This is similar to the options --display-buffer and --v4l2-buffer for
video frames.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:47:18 +01:00
Romain Vimont
e7905e2069 Optionally do not delay the first frame
A delay buffer delayed all the frames except the first one, to open the
scrcpy window immediately and get a picture.

Make this feature optional, so that the delay buffer might also be used
for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:47:15 +01:00
Romain Vimont
446b76bb92 Accept clock estimation with a single point
If there is only one point, assume the slope is 1.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:47:13 +01:00
Romain Vimont
93bbcd53cd Use delay buffer as a frame source/sink
The components needing delayed frames (sc_screen and sc_v4l2_sink)
managed a sc_video_buffer instance, which itself embedded a
sc_frame_buffer instance (to keep only the most recent frame).

In theory, these components should not be aware of delaying: they should
just receive AVFrames later, and only handle a sc_frame_buffer.

Therefore, refactor sc_delay_buffer as a frame source (it consumes)
frames) and a frame sink (it produces frames, after some delay), and
plug an instance in the pipeline only when a delay is requested.

This also removes the need for a specific sc_video_buffer.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:47:10 +01:00
Romain Vimont
d19c03d015 Use frame source trait in decoder 2023-03-03 21:47:10 +01:00
Romain Vimont
8dac37fff0 Introduce frame source trait
There was a frame sink trait, implemented by components able to receive
AVFrames, but each frame source had to manually send to frame sinks.

In order to mutualise sink management, add a frame sink trait.
2023-03-03 21:47:10 +01:00
Romain Vimont
0f5205ad7b Use packet source trait in demuxer 2023-03-03 21:47:10 +01:00
Romain Vimont
94ec920eff 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-03 21:47:10 +01:00
Romain Vimont
9ac466ad84 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-03 21:47:10 +01:00
Romain Vimont
9c0f8c7d2f Report video buffer downstream errors
Make the video buffer stop if its consumer could not receive a frame.
2023-03-03 21:47:10 +01:00
Romain Vimont
099445a77a 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-03 21:47:10 +01:00
Romain Vimont
ecc2f3f25c 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-03 21:47:10 +01:00
Romain Vimont
7e4c1328e3 Remove sc_queue
All uses have been replaced by VecDeque.
2023-03-03 21:47:10 +01:00
Romain Vimont
da8fb85c29 Remove cbuf
All uses have been replaced by VecDeque.
2023-03-03 21:47:10 +01:00
Romain Vimont
c2c0910a19 Use VecDeque in aoa_hid
Replace cbuf by VecDeque in aoa_hid
2023-03-03 21:47:10 +01:00
Romain Vimont
4eb8263068 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-03 21:47:10 +01:00
Romain Vimont
4dbd665796 Use VecDeque in controller
Replace cbuf by VecDeque in controller.
2023-03-03 21:47:10 +01:00
Romain Vimont
4daf4c1161 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-03 21:47:10 +01:00
Romain Vimont
fc4ece9d6a 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-03 21:47:10 +01:00
Romain Vimont
abeaa9ae07 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-03 21:47:10 +01:00
Romain Vimont
e9b98ed367 Add sc_allocarray() util
Add a function to allocate an array, which fails safely in the case
where the multiplication would overflow.
2023-03-03 21:47:10 +01:00
Romain Vimont
2e1cdf204a Use reallocarray() in sc_vector
This fails safely in case of overflow.
2023-03-03 21:47:10 +01:00
Romain Vimont
6bb37abd4b Add compat for reallocarray()
This function fails safely in the case where the multiplication would
overflow.
2023-03-03 21:47:10 +01:00
Romain Vimont
7ae7543de2 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-03 21:47:10 +01:00
Romain Vimont
fd0a82ba93 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-03 21:47:07 +01:00
Romain Vimont
81fb51e625 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-03 21:47:04 +01:00
Romain Vimont
5105824d59 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-03 21:46:29 +01:00
Romain Vimont
1fc03c73b1 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-03 21:46:24 +01:00
Romain Vimont
45b17282e1 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-03 21:46:22 +01:00
Romain Vimont
ac0724b388 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-03 21:46:17 +01:00
Romain Vimont
92537b9d7c Add an audio decoder
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:46:01 +01:00
Romain Vimont
d661d39765 Give a name to decoder instances
This will be useful in logs.

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

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:45:20 +01:00
Romain Vimont
0eeca46d5c Add --list-device-displays 2023-03-03 21:45:20 +01:00
Romain Vimont
771a63f9d4 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-03 21:45:17 +01:00
Romain Vimont
4b8c200e7e Add --list-encoders
Add an option to list the device encoders properly.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:45:16 +01:00
Romain Vimont
0134786ce7 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-03 21:45:14 +01:00
Romain Vimont
5275d4fa16 Add --audio-encoder
Similar to --video-encoder, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:45:12 +01:00
Romain Vimont
de3e1cc77a Add --audio-codec-options
Similar to --video-codec-options, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:45:08 +01:00
Romain Vimont
5dbd6a3971 Add support for AAC audio codec
Add option --audio-codec=aac.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:45:04 +01:00
Romain Vimont
07388d8509 Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:45:02 +01:00
Romain Vimont
ebabae2045 Add --audio-bit-rate
Add an option to configure the audio bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:44:59 +01:00
Romain Vimont
c3dd91cf72 Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:44:54 +01:00
Romain Vimont
f40d7b78c2 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-03 21:44:52 +01:00
Romain Vimont
30622c169a 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-03 21:44:49 +01:00
Romain Vimont
1feaeed8ea Rename --codec to --video-codec
This prepares the introduction of --audio-codec.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-03 21:44:47 +01:00