Commit Graph

2044 Commits

Author SHA1 Message Date
Romain Vimont
9e9ba1527f Add --audio-codec=raw option
Add support for raw (PCM S16 LE) audio codec (a raw decoder is included
in FFmpeg).

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:35:15 +01:00
Romain Vimont
1e7eb4e009 Add raw audio recorder
Add an alternative AudioRecorder to stream raw packets without encoding.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:26 +01:00
Romain Vimont
09d3a06723 Extract audio recorder interface
In order to support both encoded and raw audio stream, extract a
interface (very minimal, but sufficient to just start and stop).

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
f7dec2a0a2 Extract audio capture
The audio capture was implemented in AudioEncoder.

In order to reuse it without encoding, extract it to a separate class.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
b50c6e23f3 Stop on decoder frame push error
On push, frame sinks report downstream errors to stop upstream
components. Do not ignore the error.
2023-03-05 18:13:25 +01:00
Romain Vimont
dc416bc381 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-05 18:13:25 +01:00
Romain Vimont
d5cf1bde78 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-05 18:13:25 +01:00
Romain Vimont
bf19f105b6 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-05 18:13:25 +01:00
Romain Vimont
50fe1d0b44 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-05 18:13:25 +01:00
Romain Vimont
32d4f9ae01 Use frame source trait in decoder 2023-03-05 18:13:25 +01:00
Romain Vimont
99fd56bca1 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-05 18:13:25 +01:00
Romain Vimont
1e15646257 Use packet source trait in demuxer 2023-03-05 18:13:25 +01:00
Romain Vimont
fdfe1e7776 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-05 18:13:25 +01:00
Romain Vimont
57192b4a2f 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-05 18:13:25 +01:00
Romain Vimont
4ebde4b4d1 Report video buffer downstream errors
Make the video buffer stop if its consumer could not receive a frame.
2023-03-05 18:13:25 +01:00
Romain Vimont
a88fdecba0 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-05 18:13:25 +01:00
Romain Vimont
09317f57b9 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-05 18:13:25 +01:00
Romain Vimont
931c13edf4 Remove sc_queue
All uses have been replaced by VecDeque.
2023-03-05 18:13:25 +01:00
Romain Vimont
e1d32d2d62 Remove cbuf
All uses have been replaced by VecDeque.
2023-03-05 18:13:25 +01:00
Romain Vimont
0d74e87b7c Use VecDeque in aoa_hid
Replace cbuf by VecDeque in aoa_hid
2023-03-05 18:13:25 +01:00
Romain Vimont
8114421852 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-05 18:13:25 +01:00
Romain Vimont
c7f252ee2b Use VecDeque in controller
Replace cbuf by VecDeque in controller.
2023-03-05 18:13:25 +01:00
Romain Vimont
72fd315ef0 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-05 18:13:25 +01:00
Romain Vimont
90f85d0d4c 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-05 18:13:25 +01:00
Romain Vimont
674375ca27 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-05 18:13:25 +01:00
Romain Vimont
b36e7d7104 Add sc_allocarray() util
Add a function to allocate an array, which fails safely in the case
where the multiplication would overflow.
2023-03-05 18:13:25 +01:00
Romain Vimont
28b7644ad7 Use reallocarray() in sc_vector
This fails safely in case of overflow.
2023-03-05 18:13:25 +01:00
Romain Vimont
31865bbc08 Add compat for reallocarray()
This function fails safely in the case where the multiplication would
overflow.
2023-03-05 18:13:25 +01:00
Romain Vimont
6fc9365074 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-05 18:13:25 +01:00
Romain Vimont
40313f9c1b 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-05 18:13:25 +01:00
Romain Vimont
13b1b020cb 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-05 18:13:25 +01:00
Simon Chan
517de10ac3 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-05 18:13:25 +01:00
Romain Vimont
f79079251a 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-05 18:13:25 +01:00
Romain Vimont
9a914f29d1 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-05 18:13:25 +01:00
Romain Vimont
3c618a3700 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-05 18:13:25 +01:00
Romain Vimont
134112265f 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-05 18:13:25 +01:00
Romain Vimont
5fca9d716d Add an audio decoder
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
8c37e61edc Give a name to decoder instances
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
82640246df Rename decoder to video_decoder
This prepares the introduction of audio_decoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
6e7c4a1b40 Log display sizes in display list
This is more convenient than just the display id alone.
2023-03-05 18:13:25 +01:00
Romain Vimont
1dc472221d Add --list-displays 2023-03-05 18:13:25 +01:00
Romain Vimont
43fa49b614 Move log message helpers to LogUtils
This class will also contain other log helpers.
2023-03-05 18:13:25 +01:00
Romain Vimont
0f25469bfb 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-05 18:13:25 +01:00
Romain Vimont
a02a82b3ec Add --list-encoders
Add an option to list the device encoders properly.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
fc39d68f83 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-05 18:13:25 +01:00
Romain Vimont
33329aa1ed Add --audio-encoder
Similar to --video-encoder, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
2cddc51b80 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-05 18:13:25 +01:00
Romain Vimont
b7d7ab2f05 Add --audio-codec-options
Similar to --video-codec-options, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00
Romain Vimont
07bfc5f898 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-05 18:13:25 +01:00
Romain Vimont
71c9a90219 Add support for AAC audio codec
Add option --audio-codec=aac.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
2023-03-05 18:13:25 +01:00