Commit graph

2005 commits

Author SHA1 Message Date
Simon Chan
20fab90546 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.

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-27 20:53:14 +01:00
Romain Vimont
0e08a1e484 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-27 20:53:14 +01:00
Romain Vimont
e2b065bc4a 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-27 20:53:14 +01:00
Romain Vimont
c91727c086 Introduce bytebuf util
Add a ring-buffer for bytes. It will be useful for buffering audio.
2023-02-27 20:53:14 +01:00
Romain Vimont
2a26c279c5 Pass AVCodecContext to frame sinks
Frame consumers may need details about the frame format.
2023-02-27 20:53:14 +01:00
Romain Vimont
38f8cb1357 Add an audio decoder 2023-02-27 20:53:14 +01:00
Romain Vimont
b856db7239 Give a name to decoder instances
This will be useful in logs.
2023-02-27 20:53:14 +01:00
Romain Vimont
b70cb2ff7c Rename decoder to video_decoder 2023-02-27 20:53:14 +01:00
Romain Vimont
e4260dc5d5 Log display sizes in display list
This is more convenient than just the display id alone.
2023-02-27 20:53:14 +01:00
Romain Vimont
a7af7d9844 Add --list-device-displays 2023-02-27 20:53:14 +01:00
Romain Vimont
b05004cdd8 Move log message helpers to LogUtils
This class will also contain other log helpers.
2023-02-27 20:53:14 +01:00
Romain Vimont
bbf9df265e 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-27 20:53:14 +01:00
Romain Vimont
001b62917e Add --list-encoders
Add an option to list the device encoders properly.
2023-02-27 20:53:14 +01:00
Romain Vimont
cbc0cef95d 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-27 20:53:14 +01:00
Romain Vimont
754b3aff14 Add --audio-encoder
Similar to --video-encoder, but for audio.
2023-02-27 20:53:14 +01:00
Romain Vimont
07a4293524 Extract unknown encoder error message
This will allow to reuse the same code for audio encoder selection.
2023-02-27 20:53:14 +01:00
Romain Vimont
160e00ff43 Add --audio-codec-options
Similar to --video-codec-options, but for audio.
2023-02-27 20:53:14 +01:00
Romain Vimont
1fd9a7a5c6 Extract application of codec options
This will allow to reuse the same code for audio codec options.
2023-02-27 20:53:14 +01:00
Romain Vimont
6f5326a4bf Add support for AAC audio codec
Add option --audio-codec=aac.
2023-02-27 20:53:14 +01:00
Romain Vimont
9da5285561 Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-02-27 20:53:14 +01:00
Romain Vimont
1966c4df4b Add --audio-bit-rate
Add an option to configure the audio bit-rate.
2023-02-27 20:53:14 +01:00
Romain Vimont
96434f999c Disable MethodLength checkstyle on createOptions()
This method will grow as needed to initialize options.
2023-02-27 20:53:14 +01:00
Romain Vimont
b3586f32f7 Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.
2023-02-27 20:53:14 +01:00
Romain Vimont
38a7dcd83c Rename --codec-options to --video-codec-options
This prepares the introduction of --audio-codec-options.
2023-02-27 20:53:14 +01:00
Romain Vimont
0c2e2b998d Rename --bit-rate to --video-bit-rate
This prepares the introduction of --audio-bit-rate.
2023-02-27 20:53:14 +01:00
Romain Vimont
3513fc7809 Rename --codec to --video-codec
This prepares the introduction of --audio-codec.
2023-02-27 20:53:14 +01:00
Romain Vimont
fef75277bc 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-27 20:53:14 +01:00
Romain Vimont
5192891fc8 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-27 20:53:14 +01:00
Romain Vimont
079fd1ea47 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/>
2023-02-27 20:53:14 +01:00
Romain Vimont
b814ca84df 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-27 20:53:14 +01:00
Romain Vimont
f095f61d65 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-27 20:53:14 +01:00
Romain Vimont
69ebf8a578 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-27 20:53:14 +01:00
Romain Vimont
067cea8674 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-27 20:53:14 +01:00
Romain Vimont
59ffc76d4e Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-27 20:53:14 +01:00
Romain Vimont
3c702afdb0 Give a name to demuxer instances
This will be useful in logs.
2023-02-27 20:53:14 +01:00
Romain Vimont
d652e49001 Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-27 20:53:14 +01:00
Romain Vimont
7f079333dc 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-02-27 20:53:14 +01:00
Romain Vimont
623585c359 Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-02-27 20:53:14 +01:00
Romain Vimont
f0f92d9f08 Encode recorded audio on the device
For now, the encoded packets are just logged into the console.
2023-02-27 20:53:14 +01:00
Simon Chan
04ab232a40 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-02-27 20:53:14 +01:00
Simon Chan
e55db52ed9 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-27 20:53:14 +01:00
Simon Chan
73ff2d730d 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-27 20:53:14 +01:00
Romain Vimont
e0c0383ab8 Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-27 20:53:14 +01:00
Romain Vimont
27366ba158 Use shell package name for workarounds
For consistency.
2023-02-27 20:53:14 +01:00
Romain Vimont
071e002d6c 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-02-27 20:53:14 +01:00
Romain Vimont
f6e7512c53 Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-27 20:53:14 +01:00
Romain Vimont
dd308b1634 Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-27 20:53:14 +01:00
Simon Chan
83d5d2c779 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-02-27 20:53:14 +01:00
Romain Vimont
eff48a9c39 Improve error message for unknown encoder
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
2023-02-27 20:53:14 +01:00
Romain Vimont
8fb6f86021 Rename "codec" variable to "mediaCodec"
This will allow to use "codec" for the Codec type.
2023-02-27 20:53:14 +01:00