Commit graph

1297 commits

Author SHA1 Message Date
Romain Vimont
ccf4ad9013 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.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-26 18:47:12 +01:00
Romain Vimont
9946350df8 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.
2023-02-26 18:47:12 +01:00
Romain Vimont
b9e941b768 Introduce bytebuf util
Add a ring-buffer for bytes. It will be useful for buffering audio.
2023-02-26 18:47:12 +01:00
Romain Vimont
2e650fa39d Pass AVCodecContext to frame sinks
Frame consumers may need details about the frame format.
2023-02-26 18:47:12 +01:00
Romain Vimont
3ac7e7d412 Add an audio decoder 2023-02-26 18:47:12 +01:00
Romain Vimont
d199117b43 Give a name to decoder instances
This will be useful in logs.
2023-02-26 18:47:12 +01:00
Romain Vimont
940f40444f Rename decoder to video_decoder 2023-02-26 18:47:12 +01:00
Romain Vimont
4acae87db4 Add --list-device-displays 2023-02-26 18:47:12 +01:00
Romain Vimont
4844d975d4 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.
2023-02-26 18:47:12 +01:00
Romain Vimont
b696846f6c Add --list-encoders
Add an option to list the device encoders properly.
2023-02-26 18:47:12 +01:00
Romain Vimont
e8df8242e6 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-26 18:47:12 +01:00
Romain Vimont
e5b7280a06 Add --audio-encoder
Similar to --video-encoder, but for audio.
2023-02-26 18:47:11 +01:00
Romain Vimont
426a796066 Add --audio-codec-options
Similar to --video-codec-options, but for audio.
2023-02-26 18:46:50 +01:00
Romain Vimont
a1edaab9fd Add support for AAC audio codec
Add option --audio-codec=aac.
2023-02-26 18:46:50 +01:00
Romain Vimont
295c0320c8 Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-02-26 18:46:50 +01:00
Romain Vimont
f3c81f18a8 Add --audio-bit-rate
Add an option to configure the audio bit-rate.
2023-02-26 18:46:24 +01:00
Romain Vimont
7ba2da9662 Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.
2023-02-26 18:46:24 +01:00
Romain Vimont
802f380768 Rename --codec-options to --video-codec-options
This prepares the introduction of --audio-codec-options.
2023-02-26 18:46:24 +01:00
Romain Vimont
f0c74a7670 Rename --bit-rate to --video-bit-rate
This prepares the introduction of --audio-bit-rate.
2023-02-26 18:46:24 +01:00
Romain Vimont
e40eb28970 Rename --codec to --video-codec
This prepares the introduction of --audio-codec.
2023-02-26 18:46:24 +01:00
Romain Vimont
33847be76d 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-26 18:46:24 +01:00
Romain Vimont
bb7f45c36e 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-26 18:46:24 +01:00
Romain Vimont
51ad6af3e2 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-26 18:46:24 +01:00
Romain Vimont
1cb6b42e56 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-26 18:46:24 +01:00
Romain Vimont
78083f2368 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-26 18:46:24 +01:00
Romain Vimont
a5f9fe79af 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-26 18:46:24 +01:00
Romain Vimont
f32a59be56 Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-26 18:46:24 +01:00
Romain Vimont
cf15d7ade8 Give a name to demuxer instances
This will be useful in logs.
2023-02-26 18:46:24 +01:00
Romain Vimont
c980d4c1bd Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-26 18:46:24 +01:00
Simon Chan
114e226164 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-24 21:29:30 +01:00
Simon Chan
241d41b683 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-24 21:29:30 +01:00
Romain Vimont
0d5e3afdf5 Reorder initialization
Initialize components in the pipeline order: demuxer first, decoder and
recorder second.
2023-02-24 21:29:30 +01:00
Romain Vimont
947df80a01 Refactor recorder logic
Process the initial config packet (necessary to write the header)
separately.
2023-02-24 21:29:30 +01:00
Romain Vimont
9e47989d86 Move last packet recording
Write the last packet at the end.
2023-02-24 21:29:30 +01:00
Romain Vimont
2b6642807e Add start() function for recorder
For consistency with the other components, do not start the internal
thread from an init() function.
2023-02-24 21:29:30 +01:00
Romain Vimont
9c72cecfef 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-24 21:29:30 +01:00
Romain Vimont
4dc76e58bc Inline packet_sink impl in recorder
Remove useless wrappers.
2023-02-24 21:29:30 +01:00
Romain Vimont
9e455b803d 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-24 21:29:30 +01:00
Romain Vimont
4f992519a5 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-24 21:29:28 +01:00
Romain Vimont
359a8cbed5 Move previous packet to a local variable
It is only used from run_recorder().
2023-02-23 13:27:34 +01:00
Romain Vimont
3910033e36 Move pts_origin to a local variable
It is only used from run_recorder().
2023-02-23 13:27:34 +01:00
Romain Vimont
94be1730f2 Change PTS origin type from uint64_t to int64_t
It is initialized from AVPacket.pts, which is an int64_t.
2023-02-23 13:27:34 +01:00
Romain Vimont
d0cd5e536e Fix --encoder documentation
Mention that it depends on the codec provided by --codec (which is not
necessarily H264 anymore).
2023-02-23 13:27:34 +01:00
Romain Vimont
2b69eecc90 Fix --no-clipboard-autosync bash completion
Fix typo.
2023-02-23 13:27:34 +01:00
Romain Vimont
97bbbb81ad 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-23 13:27:34 +01:00
Romain Vimont
ca24b3a8c8 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-23 13:26:36 +01:00
Romain Vimont
5563676946 Move FFmpeg callback initialization
Configure FFmpeg log redirection on start from a log helper.
2023-02-23 13:07:13 +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