Skip to content

Commit

Permalink
fix: Fix audio/video limits since muted stated was moved to SourceInf…
Browse files Browse the repository at this point in the history 
…o. (#1090)

* fix: Fix audio/video limits since muted stated was moved to SourceInfo.

* Add backward compat (for e.g. jigasi), read mediaType from SourceInfo.
  • Loading branch information
@bgrozev
bgrozev authored Aug 16, 2023
1 parent 5acd99d commit 42cb648
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 30 deletions.
63 changes: 38 additions & 25 deletions jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomMemberImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.jitsi.jicofo.xmpp.Features
import org.jitsi.jicofo.xmpp.XmppCapsStats
import org.jitsi.jicofo.xmpp.XmppConfig
import org.jitsi.jicofo.xmpp.muc.MemberRole.Companion.fromSmack
import org.jitsi.utils.MediaType
import org.jitsi.utils.OrderedJsonObject
import org.jitsi.utils.logging2.Logger
import org.jitsi.utils.logging2.createChildLogger
Expand Down Expand Up @@ -100,14 +101,43 @@ class ChatRoomMemberImpl(
return robot || isJigasi || isJibri
}

private fun setSourceInfo(sourceInfoString: String) {
val sourceInfos: Set<SourceInfo> = try {
parseSourceInfoJson(sourceInfoString)
} catch (e: Exception) {
logger.warn("Ignoring invalid SourceInfo JSON", e)
return
private fun updateSourceInfo(presence: Presence) {
val sourceInfo = presence.getExtension<StandardExtensionElement>("SourceInfo", "jabber:client")
if (sourceInfo == null) {
sourceInfos = emptySet()
} else {
val sourceInfos: Set<SourceInfo> = try {
parseSourceInfoJson(sourceInfo.text)
} catch (e: Exception) {
logger.warn("Ignoring invalid SourceInfo JSON", e)
return
}
this.sourceInfos = sourceInfos
}

val wasAudioMuted = isAudioMuted
isAudioMuted = if (sourceInfo == null) {
// Support the old format, still used by jigasi
presence.getExtension(AudioMutedExtension::class.java)?.isAudioMuted ?: true
} else {
sourceInfos.filter { it.mediaType == MediaType.AUDIO }.none { !it.muted }
}
if (isAudioMuted != wasAudioMuted) {
logger.debug { "isAudioMuted = $isAudioMuted" }
if (isAudioMuted) chatRoom.audioSendersCount-- else chatRoom.audioSendersCount++
}

val wasVideoMuted = isVideoMuted
isVideoMuted = if (sourceInfo == null) {
// Support the old format, still used by jigasi
presence.getExtension(VideoMutedExtension::class.java)?.isVideoMuted ?: true
} else {
sourceInfos.filter { it.mediaType == MediaType.VIDEO }.none { !it.muted }
}
if (isVideoMuted != wasVideoMuted) {
logger.debug { "isVideoMuted = $isVideoMuted" }
if (isVideoMuted) chatRoom.videoSendersCount-- else chatRoom.videoSendersCount++
}
this.sourceInfos = sourceInfos
}

/**
Expand All @@ -133,8 +163,7 @@ class ChatRoomMemberImpl(
capsNodeVer = "${it.node}#${it.ver}"
}

val sourceInfo = presence.getExtension<StandardExtensionElement>("SourceInfo", "jabber:client")
setSourceInfo(if (sourceInfo == null) "{}" else sourceInfo.text)
updateSourceInfo(presence)

// We recognize jigasi by the existence of a "feature" extension in its presence.
val features = presence.getExtension(FeaturesExtension::class.java)
Expand Down Expand Up @@ -180,22 +209,6 @@ class ChatRoomMemberImpl(
presence.getExtension(StatsId::class.java)?.let {
statsId = it.statsId
}

val wasAudioMuted = isAudioMuted
// defaults to true
isAudioMuted = presence.getExtension(AudioMutedExtension::class.java)?.isAudioMuted ?: true
if (isAudioMuted != wasAudioMuted) {
logger.debug { "isAudioMuted = $isAudioMuted" }
if (isAudioMuted) chatRoom.audioSendersCount-- else chatRoom.audioSendersCount++
}

val wasVideoMuted = isVideoMuted
// defaults to true
isVideoMuted = presence.getExtension(VideoMutedExtension::class.java)?.isVideoMuted ?: true
if (isVideoMuted != wasVideoMuted) {
logger.debug { "isVideoMuted = $isVideoMuted" }
if (isVideoMuted) chatRoom.videoSendersCount-- else chatRoom.videoSendersCount++
}
}

/**
Expand Down
29 changes: 27 additions & 2 deletions jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/SourceInfo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
package org.jitsi.jicofo.xmpp.muc

import org.jitsi.jicofo.conference.source.VideoType
import org.jitsi.utils.MediaType
import org.json.simple.JSONObject
import org.json.simple.parser.JSONParser

/** The information about a source contained in a jitsi-meet SourceInfo extension. */
data class SourceInfo(
val name: String,
val muted: Boolean,
val videoType: VideoType?
val videoType: VideoType?,
val mediaType: MediaType?
)

/**
Expand All @@ -45,6 +47,29 @@ fun parseSourceInfoJson(s: String): Set<SourceInfo> {
else -> VideoType.parseString(videoTypeValue)
}

SourceInfo(name, muted, videoType)
val mediaTypeField = sourceJson["mediaType"] as? String
val mediaType = when {
"audio".equals(mediaTypeField, ignoreCase = true) -> MediaType.AUDIO
"video".equals(mediaTypeField, ignoreCase = true) -> MediaType.VIDEO
else -> parseMediaTypeFromName(name)
}

SourceInfo(name, muted, videoType, mediaType)
}.toSet()
}

/**
* If not explicitly signaled the media type is encoded in the name as in `abcd-a0` (an audio source) and `abcd-v5`
* (a video source).
*/
private fun parseMediaTypeFromName(name: String): MediaType? = name.indexOf('-').let { indexOfDash ->
if (indexOfDash < 0 || indexOfDash == name.length - 1) {
null
} else {
when (name[indexOfDash + 1]) {
'a' -> MediaType.AUDIO
'v' -> MediaType.VIDEO
else -> null
}
}
}
22 changes: 19 additions & 3 deletions jicofo-common/src/test/kotlin/org/jitsi/jicofo/xmpp/muc/SourceInfoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import io.kotest.assertions.throwables.shouldThrow
import io.kotest.core.spec.style.ShouldSpec
import io.kotest.matchers.shouldBe
import org.jitsi.jicofo.conference.source.VideoType
import org.jitsi.utils.MediaType
import org.json.simple.parser.ParseException

class SourceInfoTest : ShouldSpec() {
Expand Down Expand Up @@ -59,16 +60,31 @@ class SourceInfoTest : ShouldSpec() {
"3b554cf4-v1": {
"muted": true,
"videoType": "desktop"
},
"3b554cf4-v3": {
"mediaType": "audio"
}
}
""".trimIndent()
).shouldBe(
setOf(
SourceInfo("3b554cf4-a0", false, null),
SourceInfo("3b554cf4-v0", true, null),
SourceInfo("3b554cf4-v1", true, VideoType.Desktop),
SourceInfo("3b554cf4-a0", false, null, MediaType.AUDIO),
SourceInfo("3b554cf4-v0", true, null, MediaType.VIDEO),
SourceInfo("3b554cf4-v1", true, VideoType.Desktop, MediaType.VIDEO),
// The explicitly signaled "audio" precedes over "video" inferred from "-v3" in the name.
SourceInfo("3b554cf4-v3", true, null, MediaType.AUDIO),
)
)
}
context("Parsing media type") {
parseSourceInfoJson("""{ "abc-a0": {} }""".trimIndent()).first().mediaType shouldBe MediaType.AUDIO
parseSourceInfoJson("""{ "abc-v0": {} }""".trimIndent()).first().mediaType shouldBe MediaType.VIDEO
parseSourceInfoJson("""{ "abc-d0": {} }""".trimIndent()).first().mediaType shouldBe null
parseSourceInfoJson("""{ "abc0": {} }""".trimIndent()).first().mediaType shouldBe null
parseSourceInfoJson("""{ "abc0": { "mediaType": "audio" } }""".trimIndent()).first().mediaType shouldBe
MediaType.AUDIO
parseSourceInfoJson("""{ "abc0": { "mediaType": "VIDEO" } }""".trimIndent()).first().mediaType shouldBe
MediaType.VIDEO
}
}
}

0 comments on commit 42cb648

Please sign in to comment.