Skip to content
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

Fix crash when setting publishing layers #559

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Fix crash when setting publishing layers #559

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions .changeset/eleven-schools-flash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"client-sdk-android": patch
---

Fix crash when setting publishing layers
81 changes: 45 additions & 36 deletions livekit-android-sdk/src/main/java/io/livekit/android/room/track/LocalVideoTrack.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,49 +316,58 @@ constructor(
sender: RtpSender,
qualities: List<LivekitRtc.SubscribedQuality>,
) {
val parameters = sender.parameters ?: return
val encodings = parameters.encodings ?: return
var hasChanged = false

if (encodings.firstOrNull()?.scalabilityMode != null) {
val encoding = encodings.first()
var maxQuality = ProtoVideoQuality.OFF
for (quality in qualities) {
if (quality.enabled && (maxQuality == ProtoVideoQuality.OFF || quality.quality.number > maxQuality.number)) {
maxQuality = quality.quality
if (isDisposed) {
LKLog.i { "attempted to set publishing layer for disposed video track." }
return
}
try {
val parameters = sender.parameters ?: return
val encodings = parameters.encodings ?: return
var hasChanged = false

if (encodings.firstOrNull()?.scalabilityMode != null) {
val encoding = encodings.first()
var maxQuality = ProtoVideoQuality.OFF
for (quality in qualities) {
if (quality.enabled && (maxQuality == ProtoVideoQuality.OFF || quality.quality.number > maxQuality.number)) {
maxQuality = quality.quality
}
}
}

if (maxQuality == ProtoVideoQuality.OFF) {
if (encoding.active) {
LKLog.v { "setting svc track to disabled" }
encoding.active = false
if (maxQuality == ProtoVideoQuality.OFF) {
if (encoding.active) {
LKLog.v { "setting svc track to disabled" }
encoding.active = false
hasChanged = true
}
} else if (!encoding.active) {
LKLog.v { "setting svc track to enabled" }
encoding.active = true
hasChanged = true
}
} else if (!encoding.active) {
LKLog.v { "setting svc track to enabled" }
encoding.active = true
hasChanged = true
}
} else {
// simulcast dynacast encodings
for (quality in qualities) {
val rid = EncodingUtils.ridForVideoQuality(quality.quality) ?: continue
val encoding = encodings.firstOrNull { it.rid == rid }
// use low quality layer settings for non-simulcasted streams
?: encodings.takeIf { it.size == 1 && quality.quality == LivekitModels.VideoQuality.LOW }?.first()
?: continue
if (encoding.active != quality.enabled) {
hasChanged = true
encoding.active = quality.enabled
LKLog.v { "setting layer ${quality.quality} to ${quality.enabled}" }
} else {
// simulcast dynacast encodings
for (quality in qualities) {
val rid = EncodingUtils.ridForVideoQuality(quality.quality) ?: continue
val encoding = encodings.firstOrNull { it.rid == rid }
// use low quality layer settings for non-simulcasted streams
?: encodings.takeIf { it.size == 1 && quality.quality == LivekitModels.VideoQuality.LOW }?.first()
?: continue
if (encoding.active != quality.enabled) {
hasChanged = true
encoding.active = quality.enabled
LKLog.v { "setting layer ${quality.quality} to ${quality.enabled}" }
}
}
}
}

if (hasChanged) {
// This refeshes the native code with the new information
sender.parameters = sender.parameters
if (hasChanged) {
// This refreshes the native code with the new information
sender.parameters = parameters
}
} catch (e: Exception) {
LKLog.w(e) { "Exception caught while setting publishing layers." }
return
}
}

Expand Down
Loading