Commit Graph
1958 Commits
Author SHA1 Message Date
Romain Vimont e285612ee8 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-19 20:36:07 +01:00
Romain Vimont e672dfd6e6 Add record audio support
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
2023-02-19 20:36:07 +01:00
Romain Vimont 753358ec31 Rename video-specific variables in recorder
This paves the way to add audio-specific variables.
2023-02-19 20:36:07 +01:00
Romain Vimont fe7b51e9a1 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-19 20:36:07 +01:00
Romain Vimont 583ee7e950 Add an audio demuxer
Add a demuxer which will read the stream from the audio socket.
2023-02-19 20:36:07 +01:00
Romain Vimont 25e68cd7ba Give a name to demuxer instances
This will be useful in logs.
2023-02-19 20:36:07 +01:00
Romain Vimont ceb3423b98 Rename demuxer to video_demuxer
There will be another demuxer instance for audio.
2023-02-19 20:36:07 +01:00
Romain Vimont 7f6678d369 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-19 20:36:07 +01:00
Romain Vimont 2522c16989 Use a streamer to send the audio stream
Send each encoded audio packet using a streamer.
2023-02-19 20:36:07 +01:00
Romain Vimont a6b7a857a2 Encode recorded audio on the device
For now, the encoded packets are just logged in the console.
2023-02-19 20:36:07 +01:00
Simon ChanandRomain Vimont 91717b4eb2 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-19 20:36:07 +01:00
Simon ChanandRomain Vimont e5ce5383e1 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-19 20:36:07 +01:00
Simon ChanandRomain Vimont b0bff7b761 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-19 20:36:07 +01:00
Romain Vimont fe88d2268e Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-19 20:36:07 +01:00
Romain Vimont 378fbf2235 Use shell package name for workarounds
For consistency.
2023-02-19 20:36:07 +01:00
Romain Vimont a09f85819a Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-19 20:36:07 +01:00
Romain VimontandSimon Chan 9b66079daf Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-19 20:36:07 +01:00
Simon ChanandRomain Vimont a17e2b10a2 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-19 20:36:07 +01:00
Romain Vimont ef82a51183 Use Process.ROOT_UID
Replace ServiceManager.USER_ID by existing constant Process.ROOT_UID.
2023-02-19 20:36:07 +01:00
Romain Vimont 345439a0af Improve error message for unknown encoder
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
2023-02-19 20:36:07 +01:00
Romain Vimont c63d4f4066 Rename "codec" variable to "mediaCodec"
This will allow to use "codec" for the Codec type.
2023-02-19 20:36:07 +01:00
Romain Vimont 3d469aa6aa Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-02-19 20:36:07 +01:00
Romain Vimont 27e8af1e13 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-19 20:36:07 +01:00
Romain Vimont 4b731090dc Move screen encoder initialization
This prepares further refactors.
2023-02-19 20:36:07 +01:00
Romain Vimont 07f482c90b Write streamer header from ScreenEncoder
The screen encoder is responsible to write data to the video streamer.
2023-02-19 20:36:07 +01:00
Romain Vimont 05ca212d5d 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-19 20:36:07 +01:00
Romain Vimont 9df1a5a63f 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-19 20:36:07 +01:00
Romain Vimont 9e14942a72 Refactor recorder logic
Process the initial config packet (necessary to write the header)
separately.
2023-02-19 20:36:07 +01:00
Romain Vimont a18ebb778a Move last packet recording
Write the last packet at the end.
2023-02-19 20:36:07 +01:00
Romain Vimont 03c8523a74 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-19 20:36:07 +01:00
Romain Vimont fa2ed20d80 Inline packet_sink impl in recorder
Remove useless wrappers.
2023-02-19 20:36:07 +01:00
Romain Vimont ba5722493d 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-19 20:36:07 +01:00
Romain Vimont f09eed5aa5 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-19 20:36:07 +01:00
Romain Vimont a1c1edacf9 Move previous packet to a local variable
It is only used from run_recorder().
2023-02-19 20:36:07 +01:00
Romain Vimont 727f2edbfc Move pts_origin to a local variable
It is only used from run_recorder().
2023-02-19 20:36:07 +01:00
Romain Vimont bda6b8a495 Change PTS origin type from uint64_t to int64_t
It is initialized from AVPacket.pts, which is an int64_t.
2023-02-19 20:36:07 +01:00
Romain Vimont 1fde93b21e Fix --encoder documentation
Mention that it depends on the codec provided by --codec (which is not
necessarily H264 anymore).
2023-02-19 20:36:07 +01:00
Romain Vimont 58d35eca2b Do not print stacktraces when unnecessary
User-friendly error messages are printed on specific configuration
exceptions. In that case, do not print the stacktrace.

Also handle the user-friendly error message directly where the error
occurs, and print multiline messages in a single log call, to avoid
confusing interleaving.
2023-02-19 20:36:06 +01:00
Romain Vimont ebecbe6bc6 Fix inconsistent quotes
The encoder name started with a simple quote but ended with a
double quote. Use a single quote for both.
2023-02-19 16:18:19 +01:00
Romain Vimont d5dff239c8 Suggest commands with an explicit '=' 2023-02-19 16:18:19 +01:00
Romain Vimont 5cf86ef7ff Move finally-block to fix deadlock on stop
DesktopConnection implements Closeable, so it is implicitly closed after
its try-with-resources block. Closing the DesktopConnection shutdowns
the sockets, so it is necessary in particular to wake up blocking read()
calls from the controller.

But the controller thread was joined before the DesktopConnection was
closed, causing a deadlock. To fix the problem, join the controller
thread only after the DesktopConnection is closed.

Refs 400a1c69b1
2023-02-19 15:59:05 +01:00
Romain Vimont e02f30f895 Remove unnecessary error logs
When a call to a packet or frame sink fails, do not log the error on the
caller side: either the "failure" is expected (explicitly stopped) or it
must be logged by the packet or frame sink implementation.
2023-02-19 02:10:14 +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