pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,006 Commits 434 Branches 35 Tags
cfdb85de1bc1dc7b04985f6e82861aa452fcb489
Commit Graph
2006 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Vimont cfdb85de1b Log display sizes in display list 
This is more convenient than just the display id alone.
 2023-03-06 09:58:02 +01:00
Romain Vimont 04b662b2f0 Add --list-displays 2023-03-06 09:58:02 +01:00
Romain Vimont b00c393cd0 Move log message helpers to LogUtils 
This class will also contain other log helpers.
 2023-03-06 09:58:02 +01:00
Romain Vimont 94fef53781 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:58:02 +01:00
Romain Vimont 9670645818 Add --list-encoders 
Add an option to list the device encoders properly.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:58:02 +01:00
Romain Vimont 42aa59f2c2 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:58:02 +01:00
Romain Vimont ea35c23b6b Add --audio-encoder 
Similar to --video-encoder, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:58:01 +01:00
Romain Vimont aa9860a9f9 Extract unknown encoder error message 
This will allow to reuse the same code for audio encoder selection.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:57:42 +01:00
Romain Vimont 400173c280 Add --audio-codec-options 
Similar to --video-codec-options, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:57:36 +01:00
Romain Vimont 3cd76e0bac Extract application of codec options 
This will allow to reuse the same code for audio codec options.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 0cd6e4d5dd Add support for AAC audio codec 
Add option --audio-codec=aac.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 56c65bd4c6 Add --audio-codec 
Introduce the selection mechanism. Alternative codecs will be added
later.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 78dcc01dcf Add --audio-bit-rate 
Add an option to configure the audio bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont b9e0803806 Disable MethodLength checkstyle on createOptions() 
This method will grow as needed to initialize options.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 879f086e6a Rename --encoder to --video-encoder 
This prepares the introduction of --audio-encoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 0828631b16 Rename --codec-options to --video-codec-options 
This prepares the introduction of --audio-codec-options.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 7653158e5a Rename --bit-rate to --video-bit-rate 
This prepares the introduction of --audio-bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 42082f622f Rename --codec to --video-codec 
This prepares the introduction of --audio-codec.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 5a02005fc3 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 8c680d391d 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont a9ea8b7c1f 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/>
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 4be7925667 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 43d6d0d4bc Add record audio support 
Make the recorder accept two input sources (video and audio), and mux
them into a single file.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 7a4fe1e8f6 Rename video-specific variables in recorder 
This paves the way to add audio-specific variables.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 75cd0ea3b5 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 1f9523dd67 Add an audio demuxer 
Add a demuxer which will read the stream from the audio socket.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont f0b74e2ed8 Force --no-audio if no display and no recording 
The client does not use the audio stream if there is no display and no
recording (i.e. only V4L2), so disable audio so that the device does not
attempt to capture it.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 6da741177f Give a name to demuxer instances 
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont f8231417aa Rename demuxer to video_demuxer 
There will be another demuxer instance for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont f230db9476 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 24a904800f Use a streamer to send the audio stream 
Send each encoded audio packet using a streamer.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:26:29 +01:00
Romain Vimont 9bc0998c09 Encode recorded audio on the device 
For now, the encoded packets are just logged into the console.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-06 09:25:46 +01:00
Romain Vimont cd7bdabc84 Make streamer more generic 
Expose a method to write a packet from raw metadata (without
BufferInfo).
 2023-03-05 21:08:42 +01:00
Simon ChanandRomain Vimont 901fdc6bf6 Capture device audio 
Create an AudioRecorder to capture the audio source REMOTE_SUBMIX.

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

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-03-05 18:13:25 +01:00
Simon ChanandRomain Vimont 2d7630882a 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-03-05 18:13:25 +01:00
Simon ChanandRomain Vimont 0457253655 Add --no-audio option 
Audio will be enabled by default (when supported). Add an option to
disable it.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-03-03 21:43:57 +01:00
Romain Vimont 484f38be1c Use FakeContext for Application instance 
This will expose the correct package name and UID to the application
context.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:43:54 +01:00
Romain Vimont 013bf96cd0 Use shell package name for workarounds 
For consistency.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:43:50 +01:00
Romain Vimont 3c090b3d9e 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:43:44 +01:00
Romain Vimont 31068ee607 Use PACKAGE_NAME from FakeContext 
Remove duplicated constant.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:43:41 +01:00
Romain VimontandSimon Chan e23366fb4e Use AttributionSource from FakeContext 
FakeContext already provides an AttributeSource instance.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
 2023-03-03 21:43:33 +01:00
Simon ChanandRomain Vimont b5ae5bf6bb 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.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2023-03-03 21:43:11 +01:00
Romain Vimont e068fe43cf Improve error message for unknown encoder 
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:43:06 +01:00
Romain Vimont 883a998c10 Rename "codec" variable to "mediaCodec" 
This will allow to use "codec" for the Codec type.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:43:04 +01:00
Romain Vimont 3c670dc52a Make streamer independent of codec type 
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:42:47 +01:00
Romain Vimont af1f00bece 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-03-03 21:09:21 +01:00
Romain Vimont 7853c4c303 Move screen encoder initialization 
This prepares further refactors.
 2023-03-03 21:09:21 +01:00
Romain Vimont bbb025bcf3 Write streamer header from ScreenEncoder 
The screen encoder is responsible to write data to the video streamer.
 2023-03-03 21:09:21 +01:00
Romain Vimont 9e4d7f59d7 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-03-03 21:09:21 +01:00
Romain Vimont 89c3de5498 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-03-03 21:09:21 +01:00