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

Update jitsi-utils #1925

Merged
merged 4 commits into from
Jul 20, 2022
Merged

Update jitsi-utils #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2fc601
Update jitsi-utils.
bgrozev Jul 20, 2022
3ca4ee4
squash: Update another old reference.
bgrozev Jul 20, 2022
c9e19f0
squash: Update another old reference.
bgrozev Jul 20, 2022
dcac25a
chore: Update jicoco.
bgrozev Jul 20, 2022
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
3 changes: 1 addition & 2 deletions jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import org.json.simple.JSONObject
import java.time.Clock
import java.time.Duration
import java.time.Instant
import java.util.*
import java.util.concurrent.atomic.LongAdder

/**
Expand Down Expand Up @@ -90,7 +89,7 @@ class TransportCcEngine(

private var lastRtt: Duration? = null

private val lossListeners = LinkedList<LossListener>()
private val lossListeners = mutableListOf<LossListener>()

/**
* Called when an RTP sender has a new round-trip time estimate.
Expand Down
4 changes: 2 additions & 2 deletions ...media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import org.jitsi.utils.secs
import java.time.Clock
import java.time.Duration
import java.time.Instant
import java.util.*
import java.util.TreeMap

/**
* Extract the TCC sequence numbers from each passing packet and generate
Expand Down Expand Up @@ -70,7 +70,7 @@ class TccGeneratorNode(
}
private val rfc3711IndexTracker = Rfc3711IndexTracker()

private val lossListeners = LinkedList<LossListener>()
private val lossListeners = mutableListOf<LossListener>()

init {
streamInformation.onRtpExtensionMapping(TRANSPORT_CC) {
Expand Down
5 changes: 2 additions & 3 deletions jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,8 @@ private fun createSource(
): MediaSourceDesc {
var height = 720

val encodings = Array(primarySsrcs.size) {
encodingIdx ->
val primarySsrc: Long = primarySsrcs.get(encodingIdx)
val encodings = Array(primarySsrcs.size) { encodingIdx ->
val primarySsrc: Long = primarySsrcs[encodingIdx]
val ret = createRtpEncodingDesc(
primarySsrc,
numSpatialLayersPerStream, numTemporalLayersPerStream, encodingIdx, height
Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import org.jitsi.nlj.util.RtpExtensionHandler
import org.jitsi.nlj.util.RtpPayloadTypesChangedHandler
import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbFirPacket
import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbPliPacket
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.ms
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock

class KeyframeRequesterTest : ShouldSpec() {
override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf
Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import io.kotest.matchers.shouldBe
import org.jitsi.nlj.resources.logging.StdoutLogger
import org.jitsi.rtp.rtcp.RtcpPacket
import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.RtcpFbNackPacket
import org.jitsi.test.concurrent.FakeScheduledExecutorService
import org.jitsi.utils.concurrent.FakeScheduledExecutorService

class StreamPacketRequesterTest : ShouldSpec() {
override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf
Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.jitsi.nlj.resources.logging.StdoutLogger
import org.jitsi.nlj.rtp.bandwidthestimation.BandwidthEstimator
import org.jitsi.nlj.util.bytes
import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.RtcpFbTccPacketBuilder
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.time.FakeClock
import java.util.logging.Level

class TransportCcEngineTest : FunSpec() {
Expand Down
2 changes: 1 addition & 1 deletion ...ransform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.jitsi.nlj.util.bits
import org.jitsi.nlj.util.bps
import org.jitsi.nlj.util.bytes
import org.jitsi.nlj.util.mbps
import org.jitsi.test.concurrent.FakeScheduledExecutorService
import org.jitsi.utils.concurrent.FakeScheduledExecutorService
import org.jitsi.utils.logging.DiagnosticContext
import org.jitsi.utils.logging.TimeSeriesLogger
import org.jitsi.utils.logging2.LoggerImpl
Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import org.jitsi.nlj.test_utils.timeline
import org.jitsi.rtp.rtcp.RtcpReportBlock
import org.jitsi.rtp.rtcp.RtcpRrPacket
import org.jitsi.rtp.rtcp.RtcpSrPacket
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.ms
import org.jitsi.utils.time.FakeClock
import java.time.Duration

class EndpointConnectionStatsTest : ShouldSpec() {
Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package org.jitsi.nlj.stats
import io.kotest.core.spec.IsolationMode
import io.kotest.core.spec.style.ShouldSpec
import io.kotest.matchers.shouldBe
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import java.time.Duration

class PacketIOActivityTest : ShouldSpec() {
Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import org.jitsi.nlj.util.atRate
import org.jitsi.nlj.util.howMuchCanISendAtRate
import org.jitsi.nlj.util.`in`
import org.jitsi.rtp.rtp.RtpPacket
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.div
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import java.time.Duration
import java.time.Instant

Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.jitsi.nlj.test_utils

import org.jitsi.test.time.FakeClock
import org.jitsi.utils.time.FakeClock
import java.time.Duration
import java.time.Instant

Expand Down
2 changes: 1 addition & 1 deletion ...orm/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import org.jitsi.nlj.util.StreamInformationStoreImpl
import org.jitsi.nlj.util.mbps
import org.jitsi.rtp.rtp.RtpPacket
import org.jitsi.rtp.rtp.header_extensions.AbsSendTimeHeaderExtension
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import java.time.Duration

class RemoteBandwidthEstimatorTest : ShouldSpec() {
Expand Down
2 changes: 1 addition & 1 deletion ...a-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.RtcpFbTccPacket
import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.UnreceivedPacketReport
import org.jitsi.rtp.rtp.RtpPacket
import org.jitsi.rtp.rtp.header_extensions.TccHeaderExtension
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.ms
import org.jitsi.utils.time.FakeClock
import java.time.Duration
import java.util.Random

Expand Down
2 changes: 1 addition & 1 deletion jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import io.kotest.core.spec.style.ShouldSpec
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
import io.kotest.matchers.types.shouldBeSameInstanceAs
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import java.time.Instant

internal class TimeExpiringCacheTest : ShouldSpec() {
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import io.mockk.every
import io.mockk.mockk
import io.mockk.slot
import org.jitsi.nlj.util.NEVER
import org.jitsi.test.concurrent.FakeScheduledExecutorService
import org.jitsi.utils.concurrent.FakeScheduledExecutorService
import org.jitsi.utils.logging2.LoggerImpl
import org.jitsi.utils.mins
import org.jitsi.utils.secs
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import io.mockk.mockk
import io.mockk.verify
import org.jitsi.config.withNewConfig
import org.jitsi.shutdown.ShutdownServiceImpl
import org.jitsi.test.concurrent.FakeScheduledExecutorService
import org.jitsi.utils.OrderedJsonObject
import org.jitsi.utils.concurrent.FakeScheduledExecutorService
import org.jitsi.videobridge.shutdown.ShutdownConfig
import org.jitsi.videobridge.shutdown.ShutdownState
import org.jitsi.videobridge.util.TaskPools
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import org.jitsi.nlj.rtp.VideoRtpPacket
import org.jitsi.nlj.util.bps
import org.jitsi.nlj.util.kbps
import org.jitsi.nlj.util.mbps
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.logging.DiagnosticContext
import org.jitsi.utils.logging2.createLogger
import org.jitsi.utils.ms
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
import java.util.function.Supplier

Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import io.kotest.core.spec.style.StringSpec
import org.jitsi.nlj.PacketInfo
import org.jitsi.nlj.format.RtxPayloadType
import org.jitsi.nlj.rtp.VideoRtpPacket
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.logging.DiagnosticContext
import org.jitsi.utils.logging2.createLogger
import org.jitsi.utils.ms
import org.jitsi.utils.nanos
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
import java.util.function.Supplier
import kotlin.random.Random
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ import org.jitsi.nlj.util.Bandwidth
import org.jitsi.nlj.util.bps
import org.jitsi.nlj.util.kbps
import org.jitsi.nlj.util.mbps
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.logging.DiagnosticContext
import org.jitsi.utils.logging2.createLogger
import org.jitsi.utils.ms
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import org.jitsi.videobridge.configWithMultiStreamDisabled
import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
import java.time.Instant
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.jitsi.nlj.MediaSourceDesc
import org.jitsi.nlj.RtpEncodingDesc
import org.jitsi.nlj.VideoType
import org.jitsi.nlj.util.bps
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.time.FakeClock
import java.time.Instant

/**
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import org.jitsi.nlj.RtpEncodingDesc
import org.jitsi.nlj.VideoType
import org.jitsi.nlj.util.bps
import org.jitsi.nlj.util.kbps
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.logging.DiagnosticContext
import org.jitsi.utils.time.FakeClock

/**
* Test the logic for selecting the layers to be considered for a source and the "preferred" layer.
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import org.jitsi.nlj.RtpEncodingDesc
import org.jitsi.nlj.VideoType
import org.jitsi.nlj.util.bps
import org.jitsi.nlj.util.kbps
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.logging.DiagnosticContext
import org.jitsi.utils.time.FakeClock

/**
* Test the logic for selecting the layers to be considered for an endpoint and the "preferred" layer.
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import io.mockk.mockk
import io.mockk.verify
import org.jitsi.ConfigTest
import org.jitsi.config.withNewConfig
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.mins
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock

class JvbLoadManagerTest : ConfigTest() {
init {
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package org.jitsi.videobridge.util

import io.kotest.core.spec.style.ShouldSpec
import io.kotest.matchers.shouldBe
import org.jitsi.test.time.FakeClock
import org.jitsi.utils.secs
import org.jitsi.utils.time.FakeClock
import java.time.Duration

class BooleanStateTimeTrackerTest : ShouldSpec() {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<kotlin.version>1.6.21</kotlin.version>
<kotest.version>5.3.0</kotest.version>
<junit.version>5.8.2</junit.version>
<jicoco.version>1.1-112-g46bbe5c</jicoco.version>
<jitsi.utils.version>1.0-115-gb93957d</jitsi.utils.version>
<jicoco.version>1.1-113-g4e7ea8b</jicoco.version>
<jitsi.utils.version>1.0-119-ga7b23ff</jitsi.utils.version>
<ktlint-maven-plugin.version>1.13.1</ktlint-maven-plugin.version>
<maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
<spotbugs.version>4.6.0</spotbugs.version>
Expand Down