Update for ktlint 1.0.0 (ktlint-maven-plugin 3.0.0).

jitsi · Oct 2, 2023 · af2d04b · af2d04b
1 parent 30dcf51
commit af2d04b
Show file tree

Hide file tree

Showing 97 changed files with 788 additions and 897 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,6 @@
 [*.{kt,kts}]
 max_line_length=120
+ktlint_code_style = intellij_idea
 
 # I find trailing commas annoying
 ktlint_standard_trailing-comma-on-call-site = disabled

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/MediaSourceDesc.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/MediaSourceDesc.kt
@@ -87,19 +87,21 @@ class MediaSourceDesc
     private fun updateLayerCache() {
         layersById.clear()
         layersByIndex.clear()
-        val layers_ = ArrayList<RtpLayerDesc>()
+        val tempLayers = ArrayList<RtpLayerDesc>()
 
         for (encoding in rtpEncodings) {
             for (layer in encoding.layers) {
                 layersById[encoding.encodingId(layer)] = layer
                 layersByIndex[layer.index] = layer
-                layers_.add(layer)
+                tempLayers.add(layer)
             }
         }
-        layers = Collections.unmodifiableList(layers_)
+        layers = Collections.unmodifiableList(tempLayers)
     }
 
-    init { updateLayerCache() }
+    init {
+        updateLayerCache()
+    }
 
     /**
      * Gets the last "stable" bitrate (in bps) of the encoding of the specified
@@ -126,15 +128,13 @@ class MediaSourceDesc
     fun hasRtpLayers(): Boolean = layers.isNotEmpty()
 
     @Synchronized
-    fun numRtpLayers(): Int =
-        layersByIndex.size
+    fun numRtpLayers(): Int = layersByIndex.size
 
     val primarySSRC: Long
         get() = rtpEncodings[0].primarySSRC
 
     @Synchronized
-    fun getRtpLayerByQualityIdx(idx: Int): RtpLayerDesc? =
-        layersByIndex[idx]
+    fun getRtpLayerByQualityIdx(idx: Int): RtpLayerDesc? = layersByIndex[idx]
 
     @Synchronized
     fun findRtpLayerDesc(videoRtpPacket: VideoRtpPacket): RtpLayerDesc? {
@@ -147,8 +147,7 @@ class MediaSourceDesc
     }
 
     @Synchronized
-    fun findRtpEncodingDesc(ssrc: Long): RtpEncodingDesc? =
-        rtpEncodings.find { it.matches(ssrc) }
+    fun findRtpEncodingDesc(ssrc: Long): RtpEncodingDesc? = rtpEncodings.find { it.matches(ssrc) }
 
     @Synchronized
     fun setEncodingLayers(layers: Array<RtpLayerDesc>, ssrc: Long) {

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/PacketInfo.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/PacketInfo.kt
@@ -215,6 +215,7 @@ open class PacketInfo @JvmOverloads constructor(
         /**
          * If this is enabled all [Node]s will verify that the payload didn't unexpectedly change. This is expensive.
          */
+        @field:Suppress("ktlint:standard:property-naming")
         var ENABLE_PAYLOAD_VERIFICATION = false
     }
 }

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/RtpEncodingDesc.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/RtpEncodingDesc.kt
@@ -69,7 +69,9 @@ constructor(
             require(layer.eid == eid) { "Cannot add layer with EID ${layer.eid} to encoding with EID $eid" }
         }
     }
-    init { validateLayerEids(initialLayers) }
+    init {
+        validateLayerEids(initialLayers)
+    }
 
     internal var layers = initialLayers
         set(newLayers) {
@@ -97,8 +99,7 @@ constructor(
      * rid). This server-side id is used in the layer lookup table that is
      * maintained in [MediaSourceDesc].
      */
-    fun encodingId(layer: RtpLayerDesc): Long =
-        calcEncodingId(primarySSRC, layer.layerId)
+    fun encodingId(layer: RtpLayerDesc): Long = calcEncodingId(primarySSRC, layer.layerId)
 
     /**
      * Get the secondary ssrc for this encoding that corresponds to the given
@@ -162,8 +163,7 @@ constructor(
     }
 
     companion object {
-        fun calcEncodingId(ssrc: Long, layerId: Int) =
-            ssrc or (layerId.toLong() shl 32)
+        fun calcEncodingId(ssrc: Long, layerId: Int) = ssrc or (layerId.toLong() shl 32)
     }
 }
 

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/RtpLayerDesc.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/RtpLayerDesc.kt
@@ -49,9 +49,9 @@ constructor(
     /**
      * The max height of the bitstream that this instance represents. The actual
      * height may be less due to bad network or system load.
+     *
+     * XXX we should be able to sniff the actual height from the RTP packets.
      */
-    // XXX we should be able to sniff the actual height from the RTP
-    // packets.
     val height: Int,
     /**
      * The max frame rate (in fps) of the bitstream that this instance
@@ -287,11 +287,10 @@ constructor(
          * Get a string description of a layer index.
          */
         @JvmStatic
-        fun indexString(index: Int): String =
-            if (index == SUSPENDED_INDEX) {
-                "SUSP"
-            } else {
-                "E${getEidFromIndex(index)}S${getSidFromIndex(index)}T${getTidFromIndex(index)}"
-            }
+        fun indexString(index: Int): String = if (index == SUSPENDED_INDEX) {
+            "SUSP"
+        } else {
+            "E${getEidFromIndex(index)}S${getSidFromIndex(index)}T${getTidFromIndex(index)}"
+        }
     }
 }
diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/Transceiver.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/Transceiver.kt
@@ -299,8 +299,7 @@ class Transceiver(
         internalTransformers = internal
     }
 
-    fun setSrtpInformation(srtpTransformers: SrtpTransformers) =
-        setSrtpInformationInternal(srtpTransformers, false)
+    fun setSrtpInformation(srtpTransformers: SrtpTransformers) = setSrtpInformationInternal(srtpTransformers, false)
 
     /**
      * Forcibly mute or unmute the incoming audio stream

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/codec/vp8/Vp8Utils.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/codec/vp8/Vp8Utils.kt
@@ -79,18 +79,16 @@ class Vp8Utils {
             }
         }
 
-        fun getTemporalLayerIdOfFrame(vp8Payload: ByteBuffer) =
-            DePacketizer.VP8PayloadDescriptor.getTemporalLayerIndex(
-                vp8Payload.array(),
-                vp8Payload.arrayOffset(),
-                vp8Payload.limit()
-            )
+        fun getTemporalLayerIdOfFrame(vp8Payload: ByteBuffer) = DePacketizer.VP8PayloadDescriptor.getTemporalLayerIndex(
+            vp8Payload.array(),
+            vp8Payload.arrayOffset(),
+            vp8Payload.limit()
+        )
 
-        fun getTemporalLayerIdOfFrame(vp8Packet: RtpPacket) =
-            DePacketizer.VP8PayloadDescriptor.getTemporalLayerIndex(
-                vp8Packet.buffer,
-                vp8Packet.payloadOffset,
-                vp8Packet.payloadLength
-            )
+        fun getTemporalLayerIdOfFrame(vp8Packet: RtpPacket) = DePacketizer.VP8PayloadDescriptor.getTemporalLayerIndex(
+            vp8Packet.buffer,
+            vp8Packet.payloadOffset,
+            vp8Packet.payloadLength
+        )
     }
 }
diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/codec/vpx/VpxUtils.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/codec/vpx/VpxUtils.kt
@@ -54,8 +54,7 @@ class VpxUtils {
          * @return the extended picture ID resulting from doing "start + delta"
          */
         @JvmStatic
-        fun applyExtendedPictureIdDelta(start: Int, delta: Int): Int =
-            (start + delta) and EXTENDED_PICTURE_ID_MASK
+        fun applyExtendedPictureIdDelta(start: Int, delta: Int): Int = (start + delta) and EXTENDED_PICTURE_ID_MASK
 
         /**
          * Returns the delta between two VP8/VP9 Tl0PicIdx values, taking into account
@@ -86,7 +85,6 @@ class VpxUtils {
          * @return the Tl0PicIdx resulting from doing "start + delta"
          */
         @JvmStatic
-        fun applyTl0PicIdxDelta(start: Int, delta: Int): Int =
-            (start + delta) and TL0PICIDX_MASK
+        fun applyTl0PicIdxDelta(start: Int, delta: Int): Int = (start + delta) and TL0PICIDX_MASK
     }
 }
diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/DtlsUtils.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/DtlsUtils.kt
@@ -100,10 +100,7 @@ class DtlsUtils {
          *
          * TODO: make the algorithm dynamic (passed in) to support older dtls versions/clients
          */
-        private fun generateCertificate(
-            subject: X500Name,
-            keyPair: KeyPair
-        ): Certificate {
+        private fun generateCertificate(subject: X500Name, keyPair: KeyPair): Certificate {
             val now = System.currentTimeMillis()
             val startDate = Date(now - Duration.ofDays(1).toMillis())
             val expiryDate = Date(now + Duration.ofDays(7).toMillis())
@@ -182,10 +179,7 @@ class DtlsUtils {
          * and validate against the fingerprints presented by the remote endpoint
          * via the signaling path.
          */
-        private fun verifyAndValidateCertificate(
-            certificate: Certificate,
-            remoteFingerprints: Map<String, String>
-        ) {
+        private fun verifyAndValidateCertificate(certificate: Certificate, remoteFingerprints: Map<String, String>) {
             // RFC 4572 "Connection-Oriented Media Transport over the Transport
             // Layer Security (TLS) Protocol in the Session Description Protocol
             // (SDP)" defines that "[a] certificate fingerprint MUST be computed

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/TlsClientImpl.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/dtls/TlsClientImpl.kt
@@ -169,8 +169,7 @@ class TlsClientImpl(
         logger.cinfo { "Negotiated DTLS version $serverVersion" }
     }
 
-    override fun getSupportedVersions(): Array<ProtocolVersion> =
-        arrayOf<ProtocolVersion>(ProtocolVersion.DTLSv12)
+    override fun getSupportedVersions(): Array<ProtocolVersion> = arrayOf<ProtocolVersion>(ProtocolVersion.DTLSv12)
 
     override fun notifyAlertRaised(alertLevel: Short, alertDescription: Short, message: String?, cause: Throwable?) =
         logger.notifyAlertRaised(alertLevel, alertDescription, message, cause)

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtcp/RtcpRrGenerator.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtcp/RtcpRrGenerator.kt
@@ -127,7 +127,9 @@ class RtcpRrGenerator(
             when (packets.size) {
                 0 -> {}
                 1 -> rtcpSender(packets.first())
-                else -> for (packet in CompoundRtcpPacket.createWithMtu(packets)) { rtcpSender(packet) }
+                else -> for (packet in CompoundRtcpPacket.createWithMtu(packets)) {
+                    rtcpSender(packet)
+                }
             }
             backgroundExecutor.schedule(this::doWork, reportingInterval)
         }

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/AudioRtpPacket.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/AudioRtpPacket.kt
@@ -23,10 +23,9 @@ open class AudioRtpPacket(
     length: Int
 ) : RtpPacket(buffer, offset, length) {
 
-    override fun clone(): AudioRtpPacket =
-        AudioRtpPacket(
-            cloneBuffer(BYTES_TO_LEAVE_AT_START_OF_PACKET),
-            BYTES_TO_LEAVE_AT_START_OF_PACKET,
-            length
-        )
+    override fun clone(): AudioRtpPacket = AudioRtpPacket(
+        cloneBuffer(BYTES_TO_LEAVE_AT_START_OF_PACKET),
+        BYTES_TO_LEAVE_AT_START_OF_PACKET,
+        length
+    )
 }
diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/PaddingVideoPacket.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/PaddingVideoPacket.kt
@@ -25,8 +25,7 @@ class PaddingVideoPacket private constructor(
     length: Int
 ) : VideoRtpPacket(buffer, offset, length) {
 
-    override fun clone(): PaddingVideoPacket =
-        throw NotImplementedError("clone() not supported for padding packets.")
+    override fun clone(): PaddingVideoPacket = throw NotImplementedError("clone() not supported for padding packets.")
 
     companion object {
         /**

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/RedAudioRtpPacket.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/RedAudioRtpPacket.kt
@@ -33,19 +33,17 @@ class RedAudioRtpPacket(
         removed = true
     }
 
-    fun removeRedAndGetRedundancyPackets(): List<AudioRtpPacket> =
-        if (removed) {
-            throw IllegalStateException("RED encapsulation already removed.")
-        } else {
-            parser.decapsulate(this, parseRedundancy = true).also { removed = true }
-        }
+    fun removeRedAndGetRedundancyPackets(): List<AudioRtpPacket> = if (removed) {
+        throw IllegalStateException("RED encapsulation already removed.")
+    } else {
+        parser.decapsulate(this, parseRedundancy = true).also { removed = true }
+    }
 
-    override fun clone(): RedAudioRtpPacket =
-        RedAudioRtpPacket(
-            cloneBuffer(BYTES_TO_LEAVE_AT_START_OF_PACKET),
-            BYTES_TO_LEAVE_AT_START_OF_PACKET,
-            length
-        )
+    override fun clone(): RedAudioRtpPacket = RedAudioRtpPacket(
+        cloneBuffer(BYTES_TO_LEAVE_AT_START_OF_PACKET),
+        BYTES_TO_LEAVE_AT_START_OF_PACKET,
+        length
+    )
 
     companion object {
         val parser = RedPacketParser(::AudioRtpPacket)

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/RtpExtensions.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/RtpExtensions.kt
@@ -100,7 +100,6 @@ enum class RtpExtensionType(val uri: String) {
 
     companion object {
         private val uriMap = RtpExtensionType.values().associateBy(RtpExtensionType::uri)
-        fun createFromUri(uri: String): RtpExtensionType? =
-            uriMap.getOrDefault(uri, null)
+        fun createFromUri(uri: String): RtpExtensionType? = uriMap.getOrDefault(uri, null)
     }
 }
diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt
@@ -256,7 +256,9 @@ class TransportCcEngine(
      * [PacketDetailState] is the state of a [PacketDetail]
      */
     private enum class PacketDetailState {
-        Unreported, ReportedLost, ReportedReceived
+        Unreported,
+        ReportedLost,
+        ReportedReceived
     }
 
     /**

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/codec/vp8/Vp8Packet.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/codec/vp8/Vp8Packet.kt
@@ -79,6 +79,7 @@ class Vp8Packet private constructor(
 
     val hasTL0PICIDX = DePacketizer.VP8PayloadDescriptor.hasTL0PICIDX(buffer, payloadOffset, payloadLength)
 
+    @field:Suppress("ktlint:standard:property-naming")
     private var _TL0PICIDX = TL0PICIDX
         ?: DePacketizer.VP8PayloadDescriptor.getTL0PICIDX(buffer, payloadOffset, payloadLength)
 

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/codec/vp9/Vp9Packet.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/codec/vp9/Vp9Packet.kt
@@ -94,6 +94,7 @@ class Vp9Packet private constructor(
     val isInterPicturePredicted =
         DePacketizer.VP9PayloadDescriptor.isInterPicturePredicted(buffer, payloadOffset, payloadLength)
 
+    @field:Suppress("ktlint:standard:property-naming")
     private var _TL0PICIDX =
         TL0PICIDX ?: DePacketizer.VP9PayloadDescriptor.getTL0PICIDX(buffer, payloadOffset, payloadLength)
 
@@ -153,10 +154,8 @@ class Vp9Packet private constructor(
     val usesInterLayerDependency: Boolean =
         DePacketizer.VP9PayloadDescriptor.usesInterLayerDependency(buffer, payloadOffset, payloadLength)
 
-    fun getScalabilityStructure(
-        eid: Int = 0,
-        baseFrameRate: Double = 30.0
-    ) = Companion.getScalabilityStructure(buffer, payloadOffset, payloadLength, ssrc, eid, baseFrameRate)
+    fun getScalabilityStructure(eid: Int = 0, baseFrameRate: Double = 30.0) =
+        Companion.getScalabilityStructure(buffer, payloadOffset, payloadLength, ssrc, eid, baseFrameRate)
 
     val scalabilityStructureNumSpatial: Int
         get() {

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/srtp/SrtpUtil.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/srtp/SrtpUtil.kt
@@ -34,12 +34,24 @@ class SrtpUtil {
 
         fun getSrtpProtectionProfileFromName(profileName: String): Int {
             return when (profileName) {
-                "SRTP_AES128_CM_HMAC_SHA1_80" -> { SRTPProtectionProfile.SRTP_AES128_CM_HMAC_SHA1_80 }
-                "SRTP_AES128_CM_HMAC_SHA1_32" -> { SRTPProtectionProfile.SRTP_AES128_CM_HMAC_SHA1_32 }
-                "SRTP_NULL_HMAC_SHA1_32" -> { SRTPProtectionProfile.SRTP_NULL_HMAC_SHA1_32 }
-                "SRTP_NULL_HMAC_SHA1_80" -> { SRTPProtectionProfile.SRTP_NULL_HMAC_SHA1_80 }
-                "SRTP_AEAD_AES_128_GCM" -> { SRTPProtectionProfile.SRTP_AEAD_AES_128_GCM }
-                "SRTP_AEAD_AES_256_GCM" -> { SRTPProtectionProfile.SRTP_AEAD_AES_256_GCM }
+                "SRTP_AES128_CM_HMAC_SHA1_80" -> {
+                    SRTPProtectionProfile.SRTP_AES128_CM_HMAC_SHA1_80
+                }
+                "SRTP_AES128_CM_HMAC_SHA1_32" -> {
+                    SRTPProtectionProfile.SRTP_AES128_CM_HMAC_SHA1_32
+                }
+                "SRTP_NULL_HMAC_SHA1_32" -> {
+                    SRTPProtectionProfile.SRTP_NULL_HMAC_SHA1_32
+                }
+                "SRTP_NULL_HMAC_SHA1_80" -> {
+                    SRTPProtectionProfile.SRTP_NULL_HMAC_SHA1_80
+                }
+                "SRTP_AEAD_AES_128_GCM" -> {
+                    SRTPProtectionProfile.SRTP_AEAD_AES_128_GCM
+                }
+                "SRTP_AEAD_AES_256_GCM" -> {
+                    SRTPProtectionProfile.SRTP_AEAD_AES_256_GCM
+                }
                 else -> throw IllegalArgumentException("Unsupported SRTP protection profile: $profileName")
             }
         }

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/PipelineDsl.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/PipelineDsl.kt
@@ -48,7 +48,9 @@ class PipelineBuilder {
     }
 
     fun node(node: Node, condition: () -> Boolean = { true }) {
-        if (condition()) { addNode(node) }
+        if (condition()) {
+            addNode(node)
+        }
     }
 
     /**

diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/Node.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/Node.kt
@@ -130,7 +130,10 @@ sealed class Node(
     abstract fun trace(f: () -> Unit)
 
     companion object {
+        @field:Suppress("ktlint:standard:property-naming")
         var TRACE_ENABLED = false
+
+        @field:Suppress("ktlint:standard:property-naming")
         var PLUGINS_ENABLED = false
 
         // 'Plugins' are observers which, when enabled, will be passed every packet that passes through