mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-29 13:45:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1993 commits 592 branches 57 tags 37 MiB
Commit graph

1993 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
84703fe6af Add an audio decoder 2023-02-25 19:39:11 +01:00
Romain Vimont
4f0f0e9412 Give a name to decoder instances 
This will be useful in logs.
 2023-02-25 19:39:11 +01:00
Romain Vimont
5648d9a7ee Rename decoder to video_decoder 2023-02-25 19:39:11 +01:00
Romain Vimont
b0f4857ca1 Log display sizes in display list 
This is more convenient than just the display id alone.
 2023-02-25 19:39:11 +01:00
Romain Vimont
e1146666dc Add --list-device-displays 2023-02-25 19:39:11 +01:00
Romain Vimont
2109d15e6c Move log message helpers to LogUtils 
This class will also contain other log helpers.
 2023-02-25 19:39:11 +01:00
Romain Vimont
f91f5ad637 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.
 2023-02-25 19:39:11 +01:00
Romain Vimont
4b710b5307 Add --list-encoders 
Add an option to list the device encoders properly.
 2023-02-25 19:39:11 +01:00
Romain Vimont
09c3ef52b7 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.
 2023-02-25 19:39:11 +01:00
Romain Vimont
a388caafe9 Add --audio-encoder 
Similar to --video-encoder, but for audio.
 2023-02-25 19:39:11 +01:00
Romain Vimont
82d92948d5 Extract unknown encoder error message 
This will allow to reuse the same code for audio encoder selection.
 2023-02-25 19:39:11 +01:00
Romain Vimont
0d72399bc1 Add --audio-codec-options 
Similar to --video-codec-options, but for audio.
 2023-02-25 19:39:11 +01:00
Romain Vimont
24ae14cf46 Extract application of codec options 
This will allow to reuse the same code for audio codec options.
 2023-02-25 19:39:11 +01:00
Romain Vimont
269bffdbf9 Add support for AAC audio codec 
Add option --audio-codec=aac.
 2023-02-25 19:39:11 +01:00
Romain Vimont
ed1de493f9 Add --audio-codec 
Introduce the selection mechanism. Alternative codecs will be added
later.
 2023-02-25 19:39:11 +01:00
Romain Vimont
00c8d9e289 Add --audio-bit-rate 
Add an option to configure the audio bit-rate.
 2023-02-25 19:39:11 +01:00
Romain Vimont
39dd5da9cd Disable MethodLength checkstyle on createOptions() 
This method will grow as needed to initialize options.
 2023-02-25 19:39:11 +01:00
Romain Vimont
4294573225 Rename --encoder to --video-encoder 
This prepares the introduction of --audio-encoder.
 2023-02-25 19:39:11 +01:00
Romain Vimont
ea32ed6444 Rename --codec-options to --video-codec-options 
This prepares the introduction of --audio-codec-options.
 2023-02-25 19:39:11 +01:00
Romain Vimont
802fdf3e0b Rename --bit-rate to --video-bit-rate 
This prepares the introduction of --audio-bit-rate.
 2023-02-25 19:39:11 +01:00
Romain Vimont
e565d31c59 Rename --codec to --video-codec 
This prepares the introduction of --audio-codec.
 2023-02-25 19:39:11 +01:00
Romain Vimont
1de01c1c0e 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-25 19:39:11 +01:00
Romain Vimont
35c032267c 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.
 2023-02-25 19:39:11 +01:00
Romain Vimont
c7324e16c7 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/>
 2023-02-25 19:39:11 +01:00
Romain Vimont
0e84fe12d6 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-25 19:39:11 +01:00
Romain Vimont
66fe1fa003 Add record audio support 
Make the recorder accept two input sources (video and audio), and mux
them into a single file.
 2023-02-25 19:39:11 +01:00
Romain Vimont
0058b9e191 Rename video-specific variables in recorder 
This paves the way to add audio-specific variables.
 2023-02-25 19:39:11 +01:00
Romain Vimont
a5384efd9e 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-25 19:39:11 +01:00
Romain Vimont
696d61e6d9 Add an audio demuxer 
Add a demuxer which will read the stream from the audio socket.
 2023-02-25 19:39:11 +01:00
Romain Vimont
9a10a1dc06 Give a name to demuxer instances 
This will be useful in logs.
 2023-02-25 19:39:11 +01:00
Romain Vimont
12de66cf25 Rename demuxer to video_demuxer 
There will be another demuxer instance for audio.
 2023-02-25 19:39:11 +01:00
Romain Vimont
92b4ee21fe 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-25 19:39:11 +01:00
Romain Vimont
c8749db90b Use a streamer to send the audio stream 
Send each encoded audio packet using a streamer.
 2023-02-25 19:39:11 +01:00
Romain Vimont
57b6110e72 Encode recorded audio on the device 
For now, the encoded packets are just logged into the console.
 2023-02-25 19:39:11 +01:00
Simon Chan
f479beef83 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-24 21:29:30 +01:00
Simon Chan
114e226164 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-24 21:29:30 +01:00
Simon Chan
241d41b683 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-24 21:29:30 +01:00
Romain Vimont
4997a2e6a3 Use FakeContext for Application instance 
This will expose the correct package name and UID to the application
context.
 2023-02-24 21:29:30 +01:00
Romain Vimont
453eca7c18 Use shell package name for workarounds 
For consistency.
 2023-02-24 21:29:30 +01:00
Romain Vimont
de31f4e9a5 Use PACKAGE_NAME from FakeContext 
Remove duplicated constant.
 2023-02-24 21:29:30 +01:00
Romain Vimont
6dacd1ad62 Use AttributionSource from FakeContext 
FakeContext already provides an AttributeSource instance.

Co-authored-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>
 2023-02-24 21:29:30 +01:00
Simon Chan
0e8705f611 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-24 21:29:30 +01:00
Romain Vimont
e982679166 Use Process.ROOT_UID 
Replace ServiceManager.USER_ID by existing constant Process.ROOT_UID.
 2023-02-24 21:29:30 +01:00
Romain Vimont
bcd6a998b8 Improve error message for unknown encoder 
The provided encoder name depends on the selected codec. Improve the
error message and the suggestions.
 2023-02-24 21:29:30 +01:00
Romain Vimont
23a6b3e6c2 Rename "codec" variable to "mediaCodec" 
This will allow to use "codec" for the Codec type.
 2023-02-24 21:29:30 +01:00
Romain Vimont
91e2e8a5a5 Make streamer independent of codec type 
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.
 2023-02-24 21:29:30 +01:00
Romain Vimont
f5d0e3211c 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-24 21:29:30 +01:00
Romain Vimont
260d411c34 Move screen encoder initialization 
This prepares further refactors.
 2023-02-24 21:29:30 +01:00
Romain Vimont
92098d2a06 Write streamer header from ScreenEncoder 
The screen encoder is responsible to write data to the video streamer.
 2023-02-24 21:29:30 +01:00
Romain Vimont
768f5714d2 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-24 21:29:30 +01:00