moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-02-16 10:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only try to recover from CodecExceptions or IllegalStateExceptions

Browse Source
This commit is contained in:
Cameron Gutman
2022-09-18 00:20:41 -05:00
parent 33c1f0a71c
commit 06099b2663
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
View File

@@ -618,39 +618,43 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer implements C
return false;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (e instanceof CodecException) {
CodecException codecExc = (CodecException) e;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && e instanceof CodecException) {
CodecException codecExc = (CodecException) e;
if (codecExc.isTransient()) {
// We'll let transient exceptions go
LimeLog.warning(codecExc.getDiagnosticInfo());
return true;
if (codecExc.isTransient()) {
// We'll let transient exceptions go
LimeLog.warning(codecExc.getDiagnosticInfo());
return true;
}
LimeLog.severe(codecExc.getDiagnosticInfo());
// We can attempt a recovery or reset at this stage to try to start decoding again
if (codecRecoveryAttempts < CR_MAX_TRIES) {
if (codecExc.isRecoverable()) {
needsRestart = true;
}
else {
needsReset = true;
}
LimeLog.severe(codecExc.getDiagnosticInfo());
// We can attempt a recovery or reset at this stage to try to start decoding again
if (codecRecoveryAttempts < CR_MAX_TRIES) {
if (codecExc.isRecoverable()) {
needsRestart = true;
}
else {
needsReset = true;
}
// The recovery will take place when all threads reach doCodecRecoveryIfRequired().
return false;
}
// The recovery will take place when all threads reach doCodecRecoveryIfRequired().
return false;
}
}
// If we got here, this is most likely an IllegalStateException which was used prior to L
// to indicate codec errors (unexpected transition to the error state). Recovery from this
// requires a full decoder reset.
if (codecRecoveryAttempts < CR_MAX_TRIES) {
needsReset = true;
return false;
else if (e instanceof IllegalStateException) {
// IllegalStateException was primarily used prior to the introduction of CodecException.
// Recovery from this requires a full decoder reset.
//
// NB: CodecException is an IllegalStateException, so we must check for it first.
if (codecRecoveryAttempts < CR_MAX_TRIES) {
needsReset = true;
return false;
}
}
else {
// If it's not a CodecException or IllegalStateException, it's not an "expected" failure.
throw e;
}
// Only throw if we're not in the middle of codec recovery