Commit graph

1953 commits

Author SHA1 Message Date
Romain Vimont
8c154d53d6 Add support for AAC audio codec
Add option --audio-codec=aac.
2023-02-18 19:30:59 +01:00
Romain Vimont
105b482082 Add option to select audio codec
Introduce the selection mechanism. Alternative codecs will be added
later.
2023-02-18 19:30:14 +01:00
Romain Vimont
4dbb7aa685 Add --audio-bit-rate option
Add an option to configure the audio bit-rate.
2023-02-18 19:10:29 +01:00
Romain Vimont
637683ed7a 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-18 19:10:29 +01:00
Romain Vimont
166257b808 Disable audio if device could not capture
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.
2023-02-18 19:10:28 +01:00
Romain Vimont
3038bf4c3b Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-18 19:10:28 +01:00
Romain Vimont
b7af74b01a Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-18 19:10:28 +01:00
Romain Vimont
3f3e60dd7a 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-18 19:10:28 +01:00
Romain Vimont
d722b9de4d Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-18 19:10:28 +01:00
Romain Vimont
6a3d311d47 Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-18 19:10:28 +01:00
Romain Vimont
a1b97fbfaa 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-18 19:10:28 +01:00
Romain Vimont
5d5a1d6888 Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-02-18 19:10:28 +01:00
Romain Vimont
c19fefbcbd Encode recorded audio in OPUS on the device
For now, the encoded packets are just logged in the console.
2023-02-18 19:10:28 +01:00
Simon Chan
bc0f51023e Capture device audio
Create an AudioRecorder to capture the audio source REMOTE_SUBMIX.

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

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
2023-02-18 19:10:28 +01:00
Simon Chan
3a8a7d5ba8 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-18 19:10:27 +01:00
Simon Chan
1fe2afb4df 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-18 19:10:27 +01:00
Romain Vimont
47d0c189ec Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-18 19:10:27 +01:00
Romain Vimont
c76264c149 Use shell package name for workarounds
For consistency.
2023-02-18 19:10:27 +01:00
Romain Vimont
be09e65fa4 Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-18 19:10:27 +01:00
Romain Vimont
de8a9a4045 Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-18 19:10:27 +01:00
Simon Chan
4e47d78f30 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-18 19:10:27 +01:00
Romain Vimont
0873b08c85 Use Process.ROOT_UID
Replace ServiceManager.USER_ID by existing constant Process.ROOT_UID.
2023-02-18 19:10:27 +01:00
Romain Vimont
83c64d918b Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-02-18 19:10:26 +01:00
Romain Vimont
aedd90a955 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-18 19:10:26 +01:00
Romain Vimont
e153f4657c Move screen encoder initialization
This prepares further refactors.
2023-02-18 19:10:26 +01:00
Romain Vimont
dd2959b0cb Write streamer header from ScreenEncoder
The screen encoder is responsible to write data to the video streamer.
2023-02-18 19:10:26 +01:00
Romain Vimont
6118c2b4cd 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-18 19:10:26 +01:00
Romain Vimont
fad8c68090 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-18 19:10:26 +01:00
Romain Vimont
9b5b75d800 Refactor recorder logic
Process the initial config packet (necessary to write the header)
separately.
2023-02-18 19:10:26 +01:00
Romain Vimont
1270617422 Move last packet recording
Write the last packet at the end.
2023-02-18 19:10:26 +01:00
Romain Vimont
0cbbf82917 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-18 19:10:26 +01:00
Romain Vimont
25b3ad844c Inline packet_sink impl in recorder
Remove useless wrappers.
2023-02-18 19:10:26 +01:00
Romain Vimont
689314578e 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-18 19:10:26 +01:00
Romain Vimont
af61c7340d 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-18 19:10:25 +01:00
Romain Vimont
f0c991537f Move previous packet to a local variable
It is only used from run_recorder().
2023-02-18 19:10:25 +01:00
Romain Vimont
6b542c8ceb Move pts_origin to a local variable
It is only used from run_recorder().
2023-02-18 19:10:25 +01:00
Romain Vimont
01b647b910 Change PTS origin type from uint64_t to int64_t
It is initialized from AVPacket.pts, which is an int64_t.
2023-02-18 19:10:25 +01:00
Romain Vimont
25e2eb7d7c Document default video codec
Mention the default option value, like for other commands.
2023-02-18 19:10:25 +01:00
Romain Vimont
280a9afda8 Fix command-line help typo 2023-02-18 18:11:34 +01:00
Romain Vimont
e91618586c Prefix receiver by sc_
Like all other components in scrcpy.
2023-02-18 09:37:31 +01:00
Romain Vimont
680ddf64be Fix demuxer error message
Now that there are several possible codecs, do not hardcode H.264 in the
error message.

Refs 3e517cd40e
2023-02-18 09:31:06 +01:00
Romain Vimont
f4e7085c34 Log non-EPIPE I/O exceptions
On close, the client closes the socket. This wakes up socket blocking
calls on the server-side, by throwing an exception. Since this exception
is expected, it was not logged.

However, other IOExceptions might occur, which must not be ignored. For
that purpose, log only IOException when they are not caused by an EPIPE
error.
2023-02-17 08:33:16 +01:00
Romain Vimont
439a1fd4ed Rename 'uid' to 'scid'
A random identifier is generated to differentiate multiple running
scrcpy instances. Rename it from 'uid' to 'scid' (scrcpy id) not to
confuse it with Linux UID.

Fixes #3729 <https://github.com/Genymobile/scrcpy/issues/3729>
Refs 4315be1648
2023-02-11 09:58:40 +01:00
Romain Vimont
49eb326ce9 Extract packet merging
Config packets must be prepended to the next media packet. Extract the
logic to a new sc_packet_merger helper to simplify the demuxer code.
2023-02-11 09:44:33 +01:00
Romain Vimont
f03f32267e Remove unused parser
Since 1c02b58412, the parser is not used
anymore.
2023-02-10 23:18:11 +01:00
Romain Vimont
45b2e6db5c Log component stopped in finally clause
The message must be logged even when no exception occurs.
2023-02-10 19:06:17 +01:00
Romain Vimont
400a1c69b1 Join all threads before end of main
Some calls from separate threads may throw exceptions once the main()
method has returned.
2023-02-10 19:04:56 +01:00
Romain Vimont
730eb1086a Properly report demuxer errors
All demuxer errors were reported as "device disconnected", even if the
failure was not related to device socket read.
2023-02-10 18:55:43 +01:00
Romain Vimont
4f9e9c6619 Prefix UI events constants by SC_ 2023-02-10 18:55:43 +01:00
Romain Vimont
953edfd1df Split codec_id reading
Receive codec id and convert it to AVCodecID separately.

This will allow the caller to distinguish between EOS and unknown codec
id.
2023-02-10 18:55:43 +01:00