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

2007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Vimont
d661d39765 Give a name to decoder instances 
This will be useful in logs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:58 +01:00
Romain Vimont
d2ce33eeae Rename decoder to video_decoder 
This prepares the introduction of audio_decoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:20 +01:00
Romain Vimont
e89ffb9c92 Log display sizes in display list 
This is more convenient than just the display id alone.
 2023-03-03 21:45:20 +01:00
Romain Vimont
0eeca46d5c Add --list-device-displays 2023-03-03 21:45:20 +01:00
Romain Vimont
e97d556905 Move log message helpers to LogUtils 
This class will also contain other log helpers.
 2023-03-03 21:45:20 +01:00
Romain Vimont
771a63f9d4 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-03 21:45:17 +01:00
Romain Vimont
4b8c200e7e Add --list-encoders 
Add an option to list the device encoders properly.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:16 +01:00
Romain Vimont
0134786ce7 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-03 21:45:14 +01:00
Romain Vimont
5275d4fa16 Add --audio-encoder 
Similar to --video-encoder, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:12 +01:00
Romain Vimont
b0c3191682 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-03 21:45:10 +01:00
Romain Vimont
de3e1cc77a Add --audio-codec-options 
Similar to --video-codec-options, but for audio.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:08 +01:00
Romain Vimont
1c4000c151 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-03 21:45:06 +01:00
Romain Vimont
5dbd6a3971 Add support for AAC audio codec 
Add option --audio-codec=aac.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:04 +01:00
Romain Vimont
07388d8509 Add --audio-codec 
Introduce the selection mechanism. Alternative codecs will be added
later.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:45:02 +01:00
Romain Vimont
ebabae2045 Add --audio-bit-rate 
Add an option to configure the audio bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:44:59 +01:00
Romain Vimont
779994f06a 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-03 21:44:56 +01:00
Romain Vimont
c3dd91cf72 Rename --encoder to --video-encoder 
This prepares the introduction of --audio-encoder.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:44:54 +01:00
Romain Vimont
f40d7b78c2 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-03 21:44:52 +01:00
Romain Vimont
30622c169a 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-03 21:44:49 +01:00
Romain Vimont
1feaeed8ea Rename --codec to --video-codec 
This prepares the introduction of --audio-codec.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:44:47 +01:00
Romain Vimont
c649e2a4c1 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-03 21:44:45 +01:00
Romain Vimont
fd019753fb 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-03 21:44:42 +01:00
Romain Vimont
2fda50851c 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-03 21:44:37 +01:00
Romain Vimont
4e67dbd0e2 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-03 21:44:30 +01:00
Romain Vimont
71238dbe53 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-03 21:44:28 +01:00
Romain Vimont
29b479bcf9 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-03 21:44:27 +01:00
Romain Vimont
10cb52265f 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-03 21:44:22 +01:00
Romain Vimont
94718156f1 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-03 21:44:20 +01:00
Romain Vimont
2301ad3353 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-03 21:44:18 +01:00
Romain Vimont
b72280bcc3 Give a name to demuxer instances 
This will be useful in logs.

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

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
 2023-03-03 21:44:13 +01:00
Romain Vimont
af12bdf05b 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-03 21:44:11 +01:00
Romain Vimont
e69871ae8a 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-03 21:44:08 +01:00
Romain Vimont
c7845387cf 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-03 21:44:05 +01:00
Simon Chan
26553129d4 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-03 21:44:03 +01:00
Simon Chan
87bb26fe61 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-03 21:44:01 +01:00
Simon Chan
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 Vimont
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 Chan
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