Skip to content

Properly trim buffer as buffered amount changes #743

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
davidliu merged 1 commit into from
Aug 19, 2025
Merged

Properly trim buffer as buffered amount changes #743

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
20 changes: 17 additions & 3 deletions livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import io.livekit.android.util.Either
import io.livekit.android.util.FlowObservable
import io.livekit.android.util.LKLog
import io.livekit.android.util.TTLMap
import io.livekit.android.util.flow
import io.livekit.android.util.flowDelegate
import io.livekit.android.util.nullSafe
import io.livekit.android.util.withCheckLock
Expand Down Expand Up @@ -170,6 +171,7 @@ internal constructor(
private var lossyDataChannel: DataChannel? = null
private var lossyDataChannelSub: DataChannel? = null
private var reliableDataChannelManager: DataChannelManager? = null
private var reliableBufferedAmountJob: Job? = null
private var reliableDataChannelSubManager: DataChannelManager? = null
private var lossyDataChannelManager: DataChannelManager? = null
private var lossyDataChannelSubManager: DataChannelManager? = null
Expand Down Expand Up @@ -313,8 +315,18 @@ internal constructor(
RELIABLE_DATA_CHANNEL_LABEL,
reliableInit,
).also { dataChannel ->
reliableDataChannelManager = DataChannelManager(dataChannel, DataChannelObserver(dataChannel))
dataChannel.registerObserver(reliableDataChannelManager)

val dataChannelManager = DataChannelManager(dataChannel, DataChannelObserver(dataChannel))
reliableDataChannelManager = dataChannelManager
dataChannel.registerObserver(dataChannelManager)
reliableBufferedAmountJob?.cancel()
reliableBufferedAmountJob = coroutineScope.launch {
dataChannelManager::bufferedAmount.flow.collect { bufferedAmount ->
synchronized(reliableStateLock) {
reliableMessageBuffer.trim(bufferedAmount)
}
}
}
}
}

Expand Down Expand Up @@ -430,6 +442,8 @@ internal constructor(
subscriber?.closeBlocking()
subscriber = null

reliableBufferedAmountJob?.cancel()
reliableBufferedAmountJob = null
reliableDataChannelManager?.dispose()
reliableDataChannelManager = null
reliableDataChannel = null
Expand Down Expand Up @@ -918,7 +932,7 @@ internal constructor(
private const val MAX_RECONNECT_TIMEOUT = 60 * 1000
private const val MAX_ICE_CONNECT_TIMEOUT_MS = 20000

private const val DATA_CHANNEL_LOW_THRESHOLD = 2 * 1024 * 1024 // 64 KB
private const val DATA_CHANNEL_LOW_THRESHOLD = 2 * 1024 * 1024 // 2 MB

private val RELIABLE_RECEIVE_STATE_TTL_MS = 30.seconds
private val RELIABLE_RETRY_AMOUNT = (DATA_CHANNEL_LOW_THRESHOLD * 1.25).toLong()
Expand Down