aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2026-01-25 16:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move mediaCodec.stop() to finally block

Browse Source 
This will allow to stop MediaCodec only after clean ups of other
components which must be performed before stopping MediaCodec.
This commit is contained in:
Romain Vimont
2024-11-10 09:00:32 +01:00
parent c0056637e9
commit 292af180c0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
View File

@@ -108,9 +108,6 @@ public class SurfaceEncoder implements AsyncProcessor {
// The capture might have been closed internally (for example if the camera is disconnected)
alive = !stopped.get() && !capture.isClosed();
}
// do not call stop() on exception, it would trigger an IllegalStateException
mediaCodec.stop();
} catch (IllegalStateException | IllegalArgumentException e) {
Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
if (!prepareRetry(size)) {
@@ -120,6 +117,11 @@ public class SurfaceEncoder implements AsyncProcessor {
alive = true;
} finally {
reset.setRunningMediaCodec(null);
try {
mediaCodec.stop();
} catch (IllegalStateException e) {
// ignore
}
mediaCodec.reset();
if (surface != null) {
surface.release();