Commit graph

1980 commits

Author SHA1 Message Date
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
Romain Vimont
91e2e8a5a5 Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-02-24 21:29:30 +01:00
Romain Vimont
f5d0e3211c 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-24 21:29:30 +01:00
Romain Vimont
260d411c34 Move screen encoder initialization
This prepares further refactors.
2023-02-24 21:29:30 +01:00
Romain Vimont
92098d2a06 Write streamer header from ScreenEncoder
The screen encoder is responsible to write data to the video streamer.
2023-02-24 21:29:30 +01:00
Romain Vimont
768f5714d2 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-24 21:29:30 +01:00
Romain Vimont
7650f41aad 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-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