Commit graph

1962 commits

Author SHA1 Message Date
Simon Chan
fb4d0ac01b 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-27 12:24:49 +01:00
Simon Chan
953e9065c9 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-27 12:24:49 +01:00
Simon Chan
15fb00df85 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-27 12:24:49 +01:00
Romain Vimont
015f8b6930 Use FakeContext for Application instance
This will expose the correct package name and UID to the application
context.
2023-02-27 12:24:49 +01:00
Romain Vimont
d55a136af4 Use shell package name for workarounds
For consistency.
2023-02-27 12:24:49 +01:00
Romain Vimont
b314aca010 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-27 12:24:49 +01:00
Romain Vimont
1154b62ecf Use PACKAGE_NAME from FakeContext
Remove duplicated constant.
2023-02-27 12:24:49 +01:00
Romain Vimont
7fb1bc9131 Use AttributionSource from FakeContext
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
2023-02-27 12:24:49 +01:00
Simon Chan
f4508d5a1e 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-27 12:24:49 +01:00
Romain Vimont
ca74b960c3 Improve error message for unknown encoder
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
2023-02-27 12:24:49 +01:00
Romain Vimont
537d445740 Rename "codec" variable to "mediaCodec"
This will allow to use "codec" for the Codec type.
2023-02-27 12:24:49 +01:00
Romain Vimont
99d30cfc3a Make streamer independent of codec type
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
2023-02-27 12:24:49 +01:00
Romain Vimont
d67a6aed34 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-27 12:24:49 +01:00
Romain Vimont
a6a3c4ca3d Move screen encoder initialization
This prepares further refactors.
2023-02-27 12:24:49 +01:00
Romain Vimont
74d1014b6d Write streamer header from ScreenEncoder
The screen encoder is responsible to write data to the video streamer.
2023-02-27 12:24:49 +01:00
Romain Vimont
f38d3166c3 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-27 12:24:49 +01:00
Romain Vimont
6f5f20d36f 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-27 12:24:49 +01:00
Romain Vimont
e1a2ba6185 Reorder initialization
Initialize components in the pipeline order: demuxer first, decoder and
recorder second.
2023-02-27 12:24:49 +01:00
Romain Vimont
cd2c4d3b0f Refactor recorder logic
Process the initial config packet (necessary to write the header)
separately.
2023-02-27 12:24:49 +01:00
Romain Vimont
7d22c0d354 Move last packet recording
Write the last packet at the end.
2023-02-27 12:24:49 +01:00
Romain Vimont
4d1d97d058 Add start() function for recorder
For consistency with the other components, do not start the internal
thread from an init() function.
2023-02-27 12:24:49 +01:00
Romain Vimont
2a41948fb6 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-27 12:24:49 +01:00
Romain Vimont
cbded6f74f Inline packet_sink impl in recorder
Remove useless wrappers.
2023-02-27 12:24:49 +01:00
Romain Vimont
2318ef4382 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-27 12:24:49 +01:00
Romain Vimont
863d446398 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-27 12:24:49 +01:00
Romain Vimont
6a159b0b0b Move previous packet to a local variable
It is only used from run_recorder().
2023-02-27 12:24:49 +01:00
Romain Vimont
c4dcf5159e Move pts_origin to a local variable
It is only used from run_recorder().
2023-02-27 12:24:49 +01:00
Romain Vimont
3add9c42dc Change PTS origin type from uint64_t to int64_t
It is initialized from AVPacket.pts, which is an int64_t.
2023-02-27 12:24:49 +01:00
Romain Vimont
71b61c388a Fix --encoder documentation
Mention that it depends on the codec provided by --codec (which is not
necessarily H264 anymore).
2023-02-27 12:24:49 +01:00
Romain Vimont
d836c53b76 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-27 12:24:49 +01:00
Romain Vimont
cfa23c2a8f Fix --no-clipboard-autosync bash completion
Fix typo.
2023-02-27 12:24:49 +01:00
Romain Vimont
fa6ac8d44f Split server stop() and join()
For consistency with the other components, call stop() and join()
separately.

This allows to stop all components, then join them all.
2023-02-27 12:24:49 +01:00
Romain Vimont
3dc2a05ea7 Print FFmpeg logs
FFmpeg logs are redirected to a specific SDL log category.

Initialize the log level for this category to print them as expected.
2023-02-27 12:24:49 +01:00
Romain Vimont
39ba9b3db6 Move FFmpeg callback initialization
Configure FFmpeg log redirection on start from a log helper.
2023-02-27 12:24:49 +01:00
Romain Vimont
2be3dc2fd9 Silence lint warning about constant in API 29
MediaFormat.MIMETYPE_VIDEO_AV1 has been added in API 29, but it is not
a problem to inline the constant in older versions.
2023-02-27 12:24:49 +01:00
Romain Vimont
dec3abf92e Remove manifest package name
As reported by gradle:

> Setting the namespace via a source AndroidManifest.xml's package
> attribute is deprecated.
>
> Please instead set the namespace (or testNamespace) in the module's
> build.gradle file, as described here:
> https://developer.android.com/studio/build/configure-app-module#set-namespace
2023-02-27 12:24:49 +01:00
Romain Vimont
193a4e4b9f Upgrade gradle build tools to 7.4.0
Plugin version 7.4.0.
Gradle version 7.5.

Refs <https://developer.android.com/studio/releases/gradle-plugin#updating-gradle>
2023-02-27 12:24:49 +01:00
Romain Vimont
3d10fbd9b4 Fix --bit-rate option in bash completion script
The option is --bit-rate, not --bitrate.
2023-02-21 19:50:01 +01:00
Romain Vimont
3e3756a323 Add auto-completion for --codec option
Add missing command to bash and zsh completion scripts.
2023-02-21 19:48:28 +01:00
Romain Vimont
5d6bcc5966 Use enum for long options constants
This avoids to manually assign values.
2023-02-21 19:47:27 +01:00
Romain Vimont
5973d4cdd7 Initialize mouse_input_mode explicitly
The explicit initialization was missing. It had no consequences because
SC_MOUSE_INPUT_MODE_INJECT == 0.

Fixes #3749 <https://github.com/Genymobile/scrcpy/issues/3749>
2023-02-21 12:11:39 +01:00
Romain Vimont
0a151b96fe Accept muxing AV1 into MP4 container
MP4 supports AV1.

Refs d2dce51038
2023-02-20 20:49:56 +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