deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-18 21:46:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #669 from strukturag/janus-multistream

Browse source 
Improve support for Janus 1.x
This commit is contained in:
Joachim Bauch 2024-04-16 16:23:58 +02:00 committed by GitHub
parent 71a4248568 bd445bd99b
commit 0aed690463
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mcu_janus.go
View file

@ -143,6 +143,7 @@ type mcuJanus struct {
gw *JanusGateway gw *JanusGateway
session *JanusSession session *JanusSession
handle *JanusHandle handle *JanusHandle
version int
closeChan chan struct{} closeChan chan struct{}
@ -283,6 +284,10 @@ func (m *mcuJanus) ConnectionInterrupted() {
m.notifyOnDisconnected() m.notifyOnDisconnected()
} }
func (m *mcuJanus) isMultistream() bool {
return m.version >= 1000
}
func (m *mcuJanus) Start() error { func (m *mcuJanus) Start() error {
ctx := context.TODO() ctx := context.TODO()
info, err := m.gw.Info(ctx) info, err := m.gw.Info(ctx)
@ -296,6 +301,8 @@ func (m *mcuJanus) Start() error {
return fmt.Errorf("Plugin %s is not supported", pluginVideoRoom) return fmt.Errorf("Plugin %s is not supported", pluginVideoRoom)
} }
m.version = info.Version
log.Printf("Found %s %s by %s", plugin.Name, plugin.VersionString, plugin.Author) log.Printf("Found %s %s by %s", plugin.Name, plugin.VersionString, plugin.Author)
if !info.DataChannels { if !info.DataChannels {
return fmt.Errorf("Data channels are not supported") return fmt.Errorf("Data channels are not supported")
@ -1175,7 +1182,15 @@ retry:
"request": "join", "request": "join",
"ptype": "subscriber", "ptype": "subscriber",
"room": p.roomId, "room": p.roomId,
"feed": streamTypeUserIds[p.streamType], }
if p.mcu.isMultistream() {
join_msg["streams"] = []map[string]interface{}{
{
"feed": streamTypeUserIds[p.streamType],
},
}
} else {
join_msg["feed"] = streamTypeUserIds[p.streamType]
} }
if stream != nil { if stream != nil {
stream.AddToMessage(join_msg) stream.AddToMessage(join_msg)