Commit graph

2005 commits

Author SHA1 Message Date
Romain Vimont
e9fc35e9b1 Introduce bytebuf util
Add a ring-buffer for bytes. It will be useful for buffering audio.
2023-03-03 01:18:17 +01:00
Romain Vimont
ffe3b87f3c Pass AVCodecContext to frame sinks
Frame consumers may need details about the frame format.
2023-03-03 01:18:17 +01:00
Romain Vimont
5d8f891153 Add an audio decoder 2023-03-03 01:18:17 +01:00
Romain Vimont
c2b3985f80 Give a name to decoder instances
This will be useful in logs.
2023-03-03 01:18:17 +01:00
Romain Vimont
d81804359e Rename decoder to video_decoder 2023-03-03 01:18:17 +01:00
Romain Vimont
96385b531c Log display sizes in display list
This is more convenient than just the display id alone.
2023-03-03 01:18:17 +01:00
Romain Vimont
954c774894 Add --list-device-displays 2023-03-03 01:18:17 +01:00
Romain Vimont
1bdf0f1594 Move log message helpers to LogUtils
This class will also contain other log helpers.
2023-03-03 01:18:17 +01:00
Romain Vimont
d358139656 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-03-03 01:18:17 +01:00
Romain Vimont
f816558e7a Add --list-encoders
Add an option to list the device encoders properly.
2023-03-03 01:18:17 +01:00
Romain Vimont
c0fe77d0b4 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-03-03 01:18:17 +01:00
Romain Vimont
74e380c8e0 Add --audio-encoder
Similar to --video-encoder, but for audio.
2023-03-03 01:18:17 +01:00
Romain Vimont
67d9396db1 Extract unknown encoder error message
This will allow to reuse the same code for audio encoder selection.
2023-03-03 01:18:17 +01:00
Romain Vimont
9ae632ca2f Add --audio-codec-options
Similar to --video-codec-options, but for audio.
2023-03-03 01:18:17 +01:00
Romain Vimont
092b683402 Extract application of codec options
This will allow to reuse the same code for audio codec options.
2023-03-03 01:18:17 +01:00
Romain Vimont
b1ccbbea55 Add support for AAC audio codec
Add option --audio-codec=aac.
2023-03-03 01:18:17 +01:00
Romain Vimont
bcd51211f2 Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-03-03 01:18:17 +01:00
Romain Vimont
de2b17873a Add --audio-bit-rate
Add an option to configure the audio bit-rate.
2023-03-03 01:18:17 +01:00
Romain Vimont
38e317f3b7 Disable MethodLength checkstyle on createOptions()
This method will grow as needed to initialize options.
2023-03-03 01:18:17 +01:00
Romain Vimont
5ba37b0522 Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.
2023-03-03 01:18:17 +01:00
Romain Vimont
b6b178f6cf Rename --codec-options to --video-codec-options
This prepares the introduction of --audio-codec-options.
2023-03-03 01:18:17 +01:00
Romain Vimont
4d83cc3ec6 Rename --bit-rate to --video-bit-rate
This prepares the introduction of --audio-bit-rate.
2023-03-03 01:18:17 +01:00
Romain Vimont
26e7d495d4 Rename --codec to --video-codec
This prepares the introduction of --audio-codec.
2023-03-03 01:18:17 +01:00
Romain Vimont
0dfa43a6a1 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-03-03 01:18:17 +01:00
Romain Vimont
484c3dedc0 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-03-03 01:18:17 +01:00
Romain Vimont
dfb3347633 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 <4feeee8891%5E%21/>
2023-03-03 01:18:17 +01:00
Romain Vimont
9a89e21527 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-03-03 01:18:17 +01:00
Romain Vimont
fd4fffa436 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-03-03 01:18:17 +01:00
Romain Vimont
c54a087e44 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-03-03 01:18:17 +01:00
Romain Vimont
f3da281ce8 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-03-03 01:18:17 +01:00
Romain Vimont
8fc3e20cd7 Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-03-03 01:18:17 +01:00
Romain Vimont
0026ea4cd9 Force --no-audio if no display and no recording
The client does not use the audio stream if there is no display and no
recording (i.e. only V4L2), so disable audio so that the device does not
attempt to capture it.
2023-03-03 01:18:17 +01:00
Romain Vimont
fa5e40c6b8 Give a name to demuxer instances
This will be useful in logs.
2023-03-03 01:18:17 +01:00
Romain Vimont
42b12a0ee8 Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-03-03 01:18:17 +01:00
Romain Vimont
e04add64d8 Extract OPUS extradata
For OPUS codec, FFmpeg expects the raw extradata, but MediaCodec wraps
it in some structure.

Fix the config packet to send only the raw extradata.
2023-03-03 01:18:17 +01:00
Romain Vimont
2ee2660ef7 Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-03-03 01:18:17 +01:00
Romain Vimont
2be2376cf7 Encode recorded audio on the device
For now, the encoded packets are just logged into the console.
2023-03-03 01:18:17 +01:00
Simon Chan
4fa52d7983 Capture device audio
Create an AudioRecorder to capture the audio source REMOTE_SUBMIX.

For now, the captured packets are just logged into the console.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-03-03 01:18:17 +01:00
Simon Chan
369a56fcd8 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-03-03 01:18:17 +01:00
Simon Chan
8d319cbd67 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-03-03 01:18:17 +01:00
Romain Vimont
72aa2ebd03 Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-03-03 01:18:17 +01:00
Romain Vimont
792d2f2c66 Use shell package name for workarounds
For consistency.
2023-03-03 01:18:17 +01:00
Romain Vimont
bebff7989f Use ROOT_UID from FakeContext
Remove USER_ID from ServiceManager, and replace it by a constant in
FakeContext.

This is the same as android.os.Process.ROOT_UID, but this constant has
been introduced in API 29.
2023-03-03 01:18:17 +01:00
Romain Vimont
4f09051835 Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-03-03 01:18:17 +01:00
Romain Vimont
740a57ec4f Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-03-03 01:18:17 +01:00
Simon Chan
f48963d450 Add a fake Android Context
Since scrcpy-server is not an Android application (it's a java
executable), it has no Context.

Some features will require a Context instance to get the package name
and the UID. Add a FakeContext for this purpose.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-03-03 01:18:17 +01:00
Romain Vimont
3c3e743726 Improve error message for unknown encoder
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
2023-03-03 01:18:17 +01:00
Romain Vimont
c0b26a90cb Rename "codec" variable to "mediaCodec"
This will allow to use "codec" for the Codec type.
2023-03-03 01:18:17 +01:00
Romain Vimont
050fe55b6f Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-03-03 01:18:17 +01:00
Romain Vimont
4182b29a91 Pass all args to ScreenEncoder constructor
There is no good reason to pass some of them in the constructor and some
others as parameters of the streamScreen() method.
2023-03-03 01:18:17 +01:00