Skip to content

Commit 8e5897e

Browse files
authored
Update libwebrtc to m144 (#886)
* Prepare for libwebrtc m144 * Update to m144 * spotless and changeset * Remove unneeded code
1 parent 9a028bc commit 8e5897e

8 files changed

Lines changed: 23 additions & 11 deletions

File tree

.changeset/ten-ants-try.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"client-sdk-android": minor
3+
---
4+
5+
Update libwebrtc to m144

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
webrtc = "137.7151.05"
2+
webrtc = "144.7559.01"
33

44
androidJainSipRi = "1.3.0-91"
55
androidx-activity = "1.9.0"

livekit-android-sdk/src/main/java/io/livekit/android/e2ee/E2EEOptions.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2025 LiveKit, Inc.
2+
* Copyright 2023-2026 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,13 +17,15 @@
1717
package io.livekit.android.e2ee
1818

1919
import livekit.LivekitModels.Encryption
20+
import livekit.org.webrtc.FrameCryptorKeyDerivationAlgorithm
2021

2122
internal const val defaultRatchetSalt = "LKFrameEncryptionKey"
2223
internal const val defaultMagicBytes = "LK-ROCKS"
2324
internal const val defaultRatchetWindowSize = 16
2425
internal const val defaultFailureTolerance = -1
2526
internal const val defaultKeyRingSize = 16
2627
internal const val defaultDiscardFrameWhenCryptorNotReady = false
28+
internal val defaultKeyDerivationAlgorithm = FrameCryptorKeyDerivationAlgorithm.PBKDF2
2729

2830
class E2EEOptions(
2931
var keyProvider: KeyProvider = BaseKeyProvider(
@@ -34,6 +36,7 @@ class E2EEOptions(
3436
defaultFailureTolerance,
3537
defaultKeyRingSize,
3638
defaultDiscardFrameWhenCryptorNotReady,
39+
defaultKeyDerivationAlgorithm,
3740
),
3841
encryptionType: Encryption.Type = Encryption.Type.GCM,
3942
) {

livekit-android-sdk/src/main/java/io/livekit/android/e2ee/KeyProvider.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2025 LiveKit, Inc.
2+
* Copyright 2023-2026 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package io.livekit.android.e2ee
1818

1919
import io.livekit.android.util.LKLog
2020
import livekit.org.webrtc.FrameCryptorFactory
21+
import livekit.org.webrtc.FrameCryptorKeyDerivationAlgorithm
2122
import livekit.org.webrtc.FrameCryptorKeyProvider
2223

2324
internal class KeyInfo(var participantId: String, var keyIndex: Int, var key: String) {
@@ -49,6 +50,7 @@ class BaseKeyProvider(
4950
failureTolerance: Int = defaultFailureTolerance,
5051
keyRingSize: Int = defaultKeyRingSize,
5152
discardFrameWhenCryptorNotReady: Boolean = defaultDiscardFrameWhenCryptorNotReady,
53+
keyDerivationAlgorithm: FrameCryptorKeyDerivationAlgorithm = defaultKeyDerivationAlgorithm,
5254
) : KeyProvider {
5355

5456
private val latestSetIndex = mutableMapOf<String, Int>()
@@ -61,6 +63,7 @@ class BaseKeyProvider(
6163
failureTolerance,
6264
keyRingSize,
6365
discardFrameWhenCryptorNotReady,
66+
keyDerivationAlgorithm,
6467
)
6568

6669
override fun setSharedKey(key: String, keyIndex: Int?): Boolean {

livekit-android-sdk/src/main/java/io/livekit/android/webrtc/PeerConnectionExt.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2025 LiveKit, Inc.
2+
* Copyright 2023-2026 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -52,7 +52,6 @@ fun RTCConfiguration.copy(): RTCConfiguration {
5252
}
5353

5454
fun RTCConfiguration.copyFrom(config: RTCConfiguration) {
55-
activeResetSrtpParams = config.activeResetSrtpParams
5655
audioJitterBufferFastAccelerate = config.audioJitterBufferFastAccelerate
5756
audioJitterBufferMaxPackets = config.audioJitterBufferMaxPackets
5857
bundlePolicy = config.bundlePolicy

livekit-android-test/src/main/java/io/livekit/android/test/mock/MockAudioDeviceModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 LiveKit, Inc.
2+
* Copyright 2024-2026 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package io.livekit.android.test.mock
1919
import livekit.org.webrtc.audio.AudioDeviceModule
2020

2121
class MockAudioDeviceModule : AudioDeviceModule {
22-
override fun getNativeAudioDeviceModulePointer(): Long {
22+
override fun getNative(webrtcEnvRef: Long): Long {
2323
return 1
2424
}
2525

livekit-android-test/src/main/java/io/livekit/android/test/mock/MockLKObjects.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 LiveKit, Inc.
2+
* Copyright 2024-2026 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@ object MockLKObjects {
2525
eglBaseProvider = { MockEglBase() },
2626
audioDeviceModuleProvider = {
2727
object : AudioDeviceModule {
28-
override fun getNativeAudioDeviceModulePointer(): Long = 1
28+
override fun getNative(webrtcEnvRef: Long): Long {
29+
return 1
30+
}
2931

3032
override fun release() {}
3133

livekit-android-test/src/test/java/io/livekit/android/webrtc/RTCConfigurationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 LiveKit, Inc.
2+
* Copyright 2023-2026 LiveKit, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ class RTCConfigurationTest : BaseTest() {
5252
fillWithMockData(originalConfig)
5353
val newConfig = originalConfig.copy()
5454

55-
newConfig.activeResetSrtpParams = false
55+
newConfig.iceCheckMinInterval = 5
5656

5757
var caughtError = false
5858
try {

0 commit comments

Comments
 (0)