pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,212 Commits 434 Branches 35 Tags
v2.1.1
Commit Graph

2212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Vimont
e22660d698 Add an audio decoder 
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
05f0e35d2a Give a name to decoder instances 
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
99837fa600 Rename decoder to video_decoder 
This prepares the introduction of audio_decoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
a205ff6c8b Log display sizes in display list 
This is more convenient than just the display id alone.
 2023-03-10 22:22:15 +01:00
Romain Vimont
b65301f672 Add --list-displays 
Add an option to list the device displays properly.
 2023-03-10 22:22:15 +01:00
Romain Vimont
2596ca02f0 Move log message helpers to LogUtils 
This class will also contain other log helpers.
 2023-03-10 22:22:15 +01:00
Romain Vimont
50d56a9a2b Quit on audio configuration failure 
When audio capture fails on the device, scrcpy continues 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-10 22:22:15 +01:00
Romain Vimont
9196dc1563 Add --list-encoders 
Add an option to list the device encoders properly.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
b7e5284adf 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-10 22:22:15 +01:00
Romain Vimont
f9960e959f Add --audio-encoder 
Similar to --video-encoder, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
6f332a2bc7 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-10 22:22:15 +01:00
Romain Vimont
b03c864c70 Add --audio-codec-options 
Similar to --video-codec-options, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
58cf8e5401 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-10 22:22:15 +01:00
Romain Vimont
4601735e51 Add support for AAC audio codec 
Add option --audio-codec=aac.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
839b842aa7 Add --audio-codec 
Introduce the selection mechanism. Alternative codecs will be added
later.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
0870b8c8be Add --audio-bit-rate 
Add an option to configure the audio bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
8e640dc90f 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-10 22:22:15 +01:00
Romain Vimont
e694619d53 Rename --encoder to --video-encoder 
This prepares the introduction of --audio-encoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
31555fa530 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-10 22:22:15 +01:00
Romain Vimont
9087e85c3f 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-10 22:22:15 +01:00
Romain Vimont
cee40ca047 Rename --codec to --video-codec 
This prepares the introduction of --audio-codec.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
a1802dab76 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-10 22:22:15 +01:00
Romain Vimont
17d5301c0f 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-10 22:22:15 +01:00
Romain Vimont
80c0780b77 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/>
PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
13a3395a33 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-10 22:22:15 +01:00
Romain Vimont
7de0622214 Add audio recording 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-10 22:22:15 +01:00
Romain Vimont
3d29f6ef06 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-10 22:22:15 +01:00
Romain Vimont
609b098a97 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-10 22:22:15 +01:00
Romain Vimont
de430bc4aa 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-10 22:22:15 +01:00
Romain Vimont
f60b5767f4 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-10 22:22:15 +01:00
Romain Vimont
d499f890e7 Give a name to demuxer instances 
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
e9876788c9 Rename demuxer to video_demuxer 
There will be another demuxer instance for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
15556d1f3b 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-10 22:22:15 +01:00
Romain Vimont
7cf5cf5875 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-10 22:22:15 +01:00
Romain Vimont
5eed2c52c2 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-10 22:22:15 +01:00
Romain Vimont
464a35b05e Make streamer more generic 
Expose a method to write a packet from raw metadata (without
BufferInfo).
 2023-03-10 22:22:15 +01:00
Simon Chan
11d32616a9 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-10 22:22:15 +01:00
Simon Chan
e841241a8e 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-10 22:22:15 +01:00
Simon Chan
3cf03e4a4b 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-10 22:22:15 +01:00
Romain Vimont
8487ddba64 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-10 22:22:15 +01:00
Romain Vimont
84ba6435bb Use shell package name for workarounds 
For consistency.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
42285ae869 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-10 22:22:15 +01:00
Romain Vimont
820189b6a6 Use PACKAGE_NAME from FakeContext 
Remove duplicated constant.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-10 22:22:15 +01:00
Romain Vimont
9a815ceba8 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-10 22:22:15 +01:00
Simon Chan
a5541b3476 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-10 22:22:15 +01:00
Romain Vimont
10ef8da95d 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-10 22:22:15 +01:00
Romain Vimont
90d88a6927 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-10 22:22:15 +01:00
Romain Vimont
10ce0f376a 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-10 22:22:15 +01:00
Romain Vimont
c226797991 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-10 22:22:15 +01:00
Romain Vimont
ae9b08b905 Move screen encoder initialization 
This prepares further refactors.
 2023-03-10 22:22:15 +01:00