drgreen/scrcpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error handling in raw audio recorder

Browse Source 
It is incorret to ever call:

    streamer.writeDisableStream(...);

after:

    streamer.writeAudioHeader();

Move the try-catch block so that it can never happen.
This commit is contained in:
Romain Vimont 2023-11-11 11:09:47 +01:00
parent 9d5f53caa7
commit 420d3a40dd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/com/genymobile/scrcpy/AudioRawRecorder.java
View File

@ -32,7 +32,13 @@ public final class AudioRawRecorder implements AsyncProcessor {
final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
try {
capture.start();
try {
capture.start();
} catch (Throwable t) {
// Notify the client that the audio could not be captured
streamer.writeDisableStream(false);
throw t;
}
streamer.writeAudioHeader();
while (!Thread.currentThread().isInterrupted()) {
@ -45,10 +51,6 @@ public final class AudioRawRecorder implements AsyncProcessor {
streamer.writePacket(buffer, bufferInfo);
}
} catch (Throwable e) {
// Notify the client that the audio could not be captured
streamer.writeDisableStream(false);
throw e;
} finally {
capture.stop();
}