mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-07-29 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable audio on initialization error

Browse source 
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.
This commit is contained in:
Romain Vimont 2023-02-18 18:09:18 +01:00
commit 0abb268432
6 changed files with 91 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
View file

@ -255,6 +255,11 @@ public final class AudioEncoder {
waitEnded();
} finally {
if (!recorderStarted) {
// Notify the client that the audio could not be captured
streamer.writeDisableStream();
}
// Cleanup everything (either at the end or on error at any step of the initialization)
if (mediaCodecThread != null) {
Looper looper = mediaCodecThread.getLooper();

6
server/src/main/java/com/genymobile/scrcpy/Streamer.java
View file

@ -40,6 +40,12 @@ public final class Streamer {
}
}
public void writeDisableStream() throws IOException {
// Writing 0 (32-bit) as codec-id means that the device disables the stream (because it could not capture)
byte[] zeros = new byte[4];
IO.writeFully(fd, zeros, 0, zeros.length);
}
public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
if (codec == AudioCodec.OPUS) {
fixOpusConfigPacket(codecBuffer, bufferInfo);