Fix(SSRC rewriting): Catch exceptions rewriting SSRCs in the SSRC cac…

…he. (#2192)
jitsi · Jul 18, 2024 · 1eb3054 · 1eb3054
1 parent 97e03bb
commit 1eb3054
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/SsrcCache.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/SsrcCache.kt
@@ -411,23 +411,28 @@ abstract class SsrcCache(val size: Int, val ep: SsrcRewriter, val parentLogger:
         val remappings = mutableListOf<SendSource>()
         var send = false
 
-        synchronized(sendSources) {
-            var rs = receivedSsrcs[packet.ssrc]
-            if (rs == null) {
-                val props = findSourceProps(packet.ssrc) ?: return false
-                rs = ReceiveSsrc(props)
-                receivedSsrcs[packet.ssrc] = rs
-                logger.debug { "Added receive SSRC: ${packet.ssrc}" }
-            }
+        try {
+            synchronized(sendSources) {
+                var rs = receivedSsrcs[packet.ssrc]
+                if (rs == null) {
+                    val props = findSourceProps(packet.ssrc) ?: return false
+                    rs = ReceiveSsrc(props)
+                    receivedSsrcs[packet.ssrc] = rs
+                    logger.debug { "Added receive SSRC: ${packet.ssrc}" }
+                }
 
-            val ss = getSendSource(rs.props.ssrc1, rs.props, allowCreateOnPacket, remappings)
-            if (ss != null) {
-                send = ss.rewriteRtp(packet, start, rs)
+                val ss = getSendSource(rs.props.ssrc1, rs.props, allowCreateOnPacket, remappings)
+                if (ss != null) {
+                    send = ss.rewriteRtp(packet, start, rs)
+                }
             }
-        }
 
-        if (remappings.isNotEmpty()) {
-            notifyMappings(remappings)
+            if (remappings.isNotEmpty()) {
+                notifyMappings(remappings)
+            }
+        } catch (e: Exception) {
+            logger.error("Error rewriting SSRC", e)
+            send = false
         }
 
         return send