moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-06-16 22:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abort if the decoder doesn't recover within 5 seconds

Browse Source
This commit is contained in:
Cameron Gutman
2022-09-15 01:37:10 -05:00
parent 06861a2d17
commit 1673236940
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+10 -1
View File
@@ -70,10 +70,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer implements C
private String glRenderer; private String glRenderer;
private boolean foreground = true; private boolean foreground = true;
private PerfOverlayListener perfListener; private PerfOverlayListener perfListener;
private static final int CR_TIMEOUT_MS = 5000;
private volatile boolean needsRestart; private volatile boolean needsRestart;
private volatile boolean needsReset; private volatile boolean needsReset;
private final Object codecRecoveryMonitor = new Object(); private final Object codecRecoveryMonitor = new Object();
// Each thread that touches the MediaCodec object or any associated buffers must have a flag
// here and must call doCodecRecoveryIfRequired() on a regular basis.
private static final int CR_FLAG_INPUT_THREAD = 0x1; private static final int CR_FLAG_INPUT_THREAD = 0x1;
private static final int CR_FLAG_RENDER_THREAD = 0x2; private static final int CR_FLAG_RENDER_THREAD = 0x2;
private static final int CR_FLAG_CHOREOGRAPHER = 0x4; private static final int CR_FLAG_CHOREOGRAPHER = 0x4;
@@ -500,6 +504,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer implements C
return initializeDecoder(); return initializeDecoder();
} }
// All threads that interact with the MediaCodec instance must call this function regularly!
private boolean doCodecRecoveryIfRequired(int quiescenceFlag) { private boolean doCodecRecoveryIfRequired(int quiescenceFlag) {
if (!needsReset && !needsRestart) { if (!needsReset && !needsRestart) {
// Common case // Common case
@@ -547,9 +552,13 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer implements C
else { else {
// If we haven't quiesced all threads yet, wait to be signalled after recovery. // If we haven't quiesced all threads yet, wait to be signalled after recovery.
// The final thread to be quiesced will handle the codec recovery. // The final thread to be quiesced will handle the codec recovery.
long startTime = SystemClock.uptimeMillis();
while (needsReset || needsRestart) { while (needsReset || needsRestart) {
try { try {
codecRecoveryMonitor.wait(); if (SystemClock.uptimeMillis() - startTime >= CR_TIMEOUT_MS) {
throw new IllegalStateException("Decoder failed to recover within timeout");
}
codecRecoveryMonitor.wait(CR_TIMEOUT_MS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();