Commit graph

1998 commits

Author SHA1 Message Date
Simon Chan
80af4b83aa 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-26 19:25:42 +01:00
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
e9037a3c71 Log display sizes in display list
This is more convenient than just the display id alone.
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
c333131c7f Move log message helpers to LogUtils
This class will also contain other log helpers.
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
34cf80845c Extract unknown encoder error message
This will allow to reuse the same code for audio encoder selection.
2023-02-26 18:46:50 +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
1b4aca9bd0 Extract application of codec options
This will allow to reuse the same code for audio codec options.
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
2220e4a523 Disable MethodLength checkstyle on createOptions()
This method will grow as needed to initialize options.
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
2f6807f3f6 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-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
Romain Vimont
031627d315 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-26 18:46:24 +01:00
Romain Vimont
7d103df37a Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-02-26 18:46:24 +01:00
Romain Vimont
013cca61e8 Encode recorded audio on the device
For now, the encoded packets are just logged into the console.
2023-02-26 18:46:22 +01:00
Simon Chan
f8704432d6 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-26 17:10:42 +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
4997a2e6a3 Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-24 21:29:30 +01:00
Romain Vimont
453eca7c18 Use shell package name for workarounds
For consistency.
2023-02-24 21:29:30 +01:00
Romain Vimont
de31f4e9a5 Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-24 21:29:30 +01:00
Romain Vimont
6dacd1ad62 Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-24 21:29:30 +01:00
Simon Chan
0e8705f611 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-24 21:29:30 +01:00
Romain Vimont
e982679166 Use Process.ROOT_UID
Replace ServiceManager.USER_ID by existing constant Process.ROOT_UID.
2023-02-24 21:29:30 +01:00
Romain Vimont
bcd6a998b8 Improve error message for unknown encoder
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
2023-02-24 21:29:30 +01:00
Romain Vimont
23a6b3e6c2 Rename "codec" variable to "mediaCodec"
This will allow to use "codec" for the Codec type.
2023-02-24 21:29:30 +01:00