Commit graph

1995 commits

Author SHA1 Message Date
Romain Vimont
cb1d98a59c Give a name to decoder instances
This will be useful in logs.
2023-02-26 22:41:07 +01:00
Romain Vimont
9400584364 Rename decoder to video_decoder 2023-02-26 22:41:07 +01:00
Romain Vimont
98c2762eaa Log display sizes in display list
This is more convenient than just the display id alone.
2023-02-26 22:41:07 +01:00
Romain Vimont
243c8cf1b3 Add --list-device-displays 2023-02-26 22:41:07 +01:00
Romain Vimont
63bc6d1053 Move log message helpers to LogUtils
This class will also contain other log helpers.
2023-02-26 22:41:07 +01:00
Romain Vimont
6926f5e4fd 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 22:41:07 +01:00
Romain Vimont
004eb47d4a Add --list-encoders
Add an option to list the device encoders properly.
2023-02-26 22:41:07 +01:00
Romain Vimont
d720d424d8 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 22:41:07 +01:00
Romain Vimont
43660079c5 Add --audio-encoder
Similar to --video-encoder, but for audio.
2023-02-26 22:41:07 +01:00
Romain Vimont
a5aba2948a Extract unknown encoder error message
This will allow to reuse the same code for audio encoder selection.
2023-02-26 22:41:07 +01:00
Romain Vimont
7a17895111 Add --audio-codec-options
Similar to --video-codec-options, but for audio.
2023-02-26 22:41:07 +01:00
Romain Vimont
fb2c9ef9e7 Extract application of codec options
This will allow to reuse the same code for audio codec options.
2023-02-26 22:41:07 +01:00
Romain Vimont
12d79686d1 Add support for AAC audio codec
Add option --audio-codec=aac.
2023-02-26 22:41:07 +01:00
Romain Vimont
923032e5ca Add --audio-codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-02-26 22:41:07 +01:00
Romain Vimont
4689cd07d4 Add --audio-bit-rate
Add an option to configure the audio bit-rate.
2023-02-26 22:41:07 +01:00
Romain Vimont
d99c3da08f Disable MethodLength checkstyle on createOptions()
This method will grow as needed to initialize options.
2023-02-26 22:41:07 +01:00
Romain Vimont
4082cb32f9 Rename --encoder to --video-encoder
This prepares the introduction of --audio-encoder.
2023-02-26 22:41:07 +01:00
Romain Vimont
f3b4160d77 Rename --codec-options to --video-codec-options
This prepares the introduction of --audio-codec-options.
2023-02-26 22:41:07 +01:00
Romain Vimont
207ae8b73c Rename --bit-rate to --video-bit-rate
This prepares the introduction of --audio-bit-rate.
2023-02-26 22:41:07 +01:00
Romain Vimont
cf15859214 Rename --codec to --video-codec
This prepares the introduction of --audio-codec.
2023-02-26 22:41:07 +01:00
Romain Vimont
6cdd4e867b 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 22:41:07 +01:00
Romain Vimont
560002047b 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 22:41:07 +01:00
Romain Vimont
3233aa1c4f 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-26 22:41:07 +01:00
Romain Vimont
a8a1da1a00 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 22:41:07 +01:00
Romain Vimont
230abb30c2 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-26 22:41:07 +01:00
Romain Vimont
cb0f4799a2 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-26 22:41:07 +01:00
Romain Vimont
5fc38264c0 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 22:41:07 +01:00
Romain Vimont
3feae6d41b Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-26 22:41:07 +01:00
Romain Vimont
8cf821471f Give a name to demuxer instances
This will be useful in logs.
2023-02-26 22:41:07 +01:00
Romain Vimont
bd51b342b4 Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-26 22:41:07 +01:00
Romain Vimont
fa85a128da 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 22:41:07 +01:00
Romain Vimont
cd099f7a2b Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-02-26 22:41:07 +01:00
Romain Vimont
20042addd4 Encode recorded audio on the device
For now, the encoded packets are just logged into the console.
2023-02-26 22:41:07 +01:00
Simon Chan
4d39bb9d26 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 22:41:07 +01:00
Simon Chan
50d180abf2 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-26 22:41:07 +01:00
Simon Chan
634ba5d7c4 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-26 22:41:07 +01:00
Romain Vimont
cadf95cfc4 Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-26 22:41:07 +01:00
Romain Vimont
13c8209071 Use shell package name for workarounds
For consistency.
2023-02-26 22:41:07 +01:00
Romain Vimont
c21f604f30 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-26 22:41:07 +01:00
Romain Vimont
db0bf6f34b Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-26 22:41:06 +01:00
Romain Vimont
09388f5352 Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-26 22:41:06 +01:00
Simon Chan
2f3092e6b4 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-26 22:41:06 +01:00
Romain Vimont
0ee541fe26 Improve error message for unknown encoder
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
2023-02-26 22:41:06 +01:00
Romain Vimont
58249715ac Rename "codec" variable to "mediaCodec"
This will allow to use "codec" for the Codec type.
2023-02-26 22:41:06 +01:00
Romain Vimont
bbf9eeadf1 Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-02-26 22:41:06 +01:00
Romain Vimont
3b8bb5feb5 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-02-26 22:41:06 +01:00
Romain Vimont
fa31aaaba8 Move screen encoder initialization
This prepares further refactors.
2023-02-26 22:41:06 +01:00
Romain Vimont
5b6ae2fef3 Write streamer header from ScreenEncoder
The screen encoder is responsible to write data to the video streamer.
2023-02-26 22:41:06 +01:00
Romain Vimont
bf1a4ae266 Use VideoStreamer directly from ScreenEncoder
The Callbacks interface notifies new packets. But in addition, the
screen encoder will need to write headers on start.

We could add a function onStart(), but for simplicity, just remove the
interface, which brings no value, and call the streamer directly.

Refs 87972e2022
2023-02-26 22:41:06 +01:00
Romain Vimont
a29da81f1a Simplify error handling on socket creation
On any error, all previously opened sockets must be closed.

Handle these errors in a single catch-block. Currently, there are only 2
sockets, but this will simplify even more with more sockets.

Note: this commit is better displayed with --ignore-space-change (-b).
2023-02-26 22:41:06 +01:00