Skip to content

fix(video): Prevent crash and ANR during content share stop #706

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

Merged
georgezy-amzn merged 2 commits into from
Jun 15, 2026
+15 −5
Merged

fix(video): Prevent crash and ANR during content share stop #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2147925
fix(video): Prevent crash and ANR during content share stop
georgezy-amzn Jun 11, 2026
9693498
fix(video): Move blocking content share teardown off main thread
georgezy-amzn Jun 12, 2026
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
1 change: 1 addition & 0 deletions ...ervices/chime/sdk/meetings/audiovideo/video/capture/DefaultSurfaceTextureCaptureSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ class DefaultSurfaceTextureCaptureSource(
runBlocking(handler.asCoroutineDispatcher().immediate) {
logger.info(TAG, "Setting on frame available listener to null")
surfaceTexture.setOnFrameAvailableListener(null)
handler.removeCallbacksAndMessages(null)
}
}

Expand Down
19 changes: 14 additions & 5 deletions ...ices/chime/sdk/meetings/internal/contentshare/DefaultContentShareVideoClientController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,23 @@ class DefaultContentShareVideoClientController(
}

override fun stopVideoShare() {
if (!isSharing) return
isSharing = false

logger.info(TAG, "Stopping content share video client")
videoClient?.javaStopService()
videoClient?.destroy()
videoClient = null
videoSourceAdapter.source = null

isSharing = false
eglCore?.release()
val client = videoClient
val core = eglCore
videoClient = null
eglCore = null

Thread {
client?.setSending(false)
client?.javaStopService()
client?.destroy()
core?.release()
}.start()
}

override fun subscribeToVideoClientStateChange(observer: ContentShareObserver) {
Expand Down
Loading