Skip to content

Fix crash in draw() when a multi-preview surface is removed concurrently #2225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
x270880x wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Open

Fix crash in draw() when a multi-preview surface is removed concurrently #2225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/src/main/java/com/pedro/library/view/GlStreamInterface.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,9 @@ class GlStreamInterface(private val context: Context): OnFrameAvailableListener,
surfaceManager.swapBuffer()
}
}
val previewSnapshot = multiPreviewSurfaceManagers.values.toList()
// Not toList(): for one element it calls iterator().next(), which throws NoSuchElementException
// if that surface is removed from another thread in between. ArrayList copies via toArray(), which can't.
val previewSnapshot = ArrayList(multiPreviewSurfaceManagers.values)
previewSnapshot.forEach { info ->
if (info.surfaceManager.isReady) {
if (info.surfaceManager.makeCurrent()) {
Expand Down
Loading