Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fix-camera-events-dispatch-race.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"client-sdk-android": patch
---

Fixed data race in `CameraEventsDispatchHandler` by using `CopyOnWriteArraySet` for thread-safe iteration.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 LiveKit, Inc.
* Copyright 2023-2025 LiveKit, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,61 +17,54 @@
package io.livekit.android.room.track.video

import livekit.org.webrtc.CameraVideoCapturer.CameraEventsHandler
import java.util.concurrent.CopyOnWriteArraySet

/**
* Dispatches CameraEventsHandler callbacks to registered handlers.
*/
class CameraEventsDispatchHandler : CameraEventsHandler {
private val handlers = mutableSetOf<CameraEventsHandler>()
private val handlers = CopyOnWriteArraySet<CameraEventsHandler>()

@Synchronized
fun registerHandler(handler: CameraEventsHandler) {
handlers.add(handler)
}

@Synchronized
fun unregisterHandler(handler: CameraEventsHandler) {
handlers.remove(handler)
}

override fun onCameraError(errorDescription: String) {
val handlersCopy = handlers.toMutableSet()
for (handler in handlersCopy) {
for (handler in handlers) {
handler.onCameraError(errorDescription)
}
}

override fun onCameraDisconnected() {
val handlersCopy = handlers.toMutableSet()
for (handler in handlersCopy) {
for (handler in handlers) {
handler.onCameraDisconnected()
}
}

override fun onCameraFreezed(errorDescription: String) {
val handlersCopy = handlers.toMutableSet()
for (handler in handlersCopy) {
for (handler in handlers) {
handler.onCameraFreezed(errorDescription)
}
}

override fun onCameraOpening(cameraName: String) {
val handlersCopy = handlers.toMutableSet()
for (handler in handlersCopy) {
for (handler in handlers) {
handler.onCameraOpening(cameraName)
}
}

override fun onFirstFrameAvailable() {
val handlersCopy = handlers.toMutableSet()
for (handler in handlersCopy) {
for (handler in handlers) {
handler.onFirstFrameAvailable()
}
}

override fun onCameraClosed() {
val handlersCopy = handlers.toMutableSet()
for (handler in handlersCopy) {
for (handler in handlers) {
handler.onCameraClosed()
}
}
Expand Down