moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the decoder stop hack and try to workaround the issue differently

Browse Source
This commit is contained in:
Cameron Gutman 2017-06-06 22:48:28 -07:00
parent d1e41e41a1
commit 4b9c6b149a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/limelight/Game.java
View File

@ -993,14 +993,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
@Override @Override
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
if (connected) { if (connected) {
// HACK: Android is supposed to let you return from this function
// before throwing a fit if you access the surface again. Unfortunately,
// MediaCodec often tries to access the destroyed surface and triggers
// an IllegalStateException. To workaround this, we will invoke
// the DecoderRenderer's stop function ourselves, so it will hopefully
// happen early enough to not trigger the bug
decoderRenderer.stop();
stopConnection(); stopConnection();
} }
} }

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

@ -416,10 +416,18 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
// Halt the rendering thread // Halt the rendering thread
rendererThread.interrupt(); rendererThread.interrupt();
// Invalidate pending decode buffers
videoDecoder.flush();
// Wait for the renderer thread to shut down
try { try {
rendererThread.join(); rendererThread.join();
} catch (InterruptedException ignored) { } } catch (InterruptedException ignored) { }
// Stop the video decoder
videoDecoder.stop();
// Halt the spinner threads // Halt the spinner threads
for (Thread t : spinnerThreads) { for (Thread t : spinnerThreads) {
t.interrupt(); t.interrupt();