Comunic/ComunicRTCProxy
1
0
Fork 0
mirror of https://gitlab.com/comunic/ComunicRTCProxy synced 2024-12-26 05:28:53 +00:00
Code Issues Projects Releases Wiki Activity

Add trickling (part 1)

Browse Source
This commit is contained in:
Pierre HUBERT 2020-04-12 14:51:06 +02:00
parent 3c69839fa8
commit 570830571e
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
relay.go
View File

@ -9,6 +9,7 @@ import (
"fmt" "fmt"
"io" "io"
"log" "log"
"sync"
"time" "time"
"github.com/pion/rtcp" "github.com/pion/rtcp"
@ -186,6 +187,10 @@ func newCall(mainOffer receivedSignal, r activeRelay) {
log.Printf("Starting new call: %s", mainOffer.callHash) log.Printf("Starting new call: %s", mainOffer.callHash)
// Ice candidates mutex
var candidatesMux sync.Mutex
pendingCandidates := make([]*webrtc.ICECandidate, 0)
// Since we are answering use PayloadTypes declared by offerer // Since we are answering use PayloadTypes declared by offerer
mediaEngine := webrtc.MediaEngine{} mediaEngine := webrtc.MediaEngine{}
err := mediaEngine.PopulateFromSDP(mainOffer.sdp) err := mediaEngine.PopulateFromSDP(mainOffer.sdp)
@ -195,8 +200,13 @@ func newCall(mainOffer receivedSignal, r activeRelay) {
return return
} }
// Enable trickling
s := webrtc.SettingEngine{}
s.SetTrickle(true)
// Create the API object with the MediaEngine // Create the API object with the MediaEngine
api := webrtc.NewAPI(webrtc.WithMediaEngine(mediaEngine)) api := webrtc.NewAPI(webrtc.WithMediaEngine(mediaEngine),
webrtc.WithSettingEngine(s))
// Setup config // Setup config
peerConnectionConfig := webrtc.Configuration{ peerConnectionConfig := webrtc.Configuration{
@ -214,6 +224,28 @@ func newCall(mainOffer receivedSignal, r activeRelay) {
// Close peer connection // Close peer connection
defer mainPeerConnection.Close() defer mainPeerConnection.Close()
// Forward ice candidates
mainPeerConnection.OnICECandidate(func(c *webrtc.ICECandidate) {
if c == nil || r.closed {
return
}
// Lock the list of candidates
candidatesMux.Lock()
defer candidatesMux.Unlock()
desc := mainPeerConnection.RemoteDescription()
if desc == nil {
// Add the signal to the pending list
pendingCandidates = append(pendingCandidates, c)
} else {
// Send the signal directly
sendSignal(mainOffer.callHash, mainOffer.peerID, c.ToJSON())
}
})
// Allow us to receive 1 audio & 1 video track // Allow us to receive 1 audio & 1 video track
if _, err = mainPeerConnection.AddTransceiverFromKind(webrtc.RTPCodecTypeVideo, if _, err = mainPeerConnection.AddTransceiverFromKind(webrtc.RTPCodecTypeVideo,
webrtc.RtpTransceiverInit{Direction: webrtc.RTPTransceiverDirectionRecvonly}); err != nil { webrtc.RtpTransceiverInit{Direction: webrtc.RTPTransceiverDirectionRecvonly}); err != nil {
@ -316,16 +348,19 @@ func newCall(mainOffer receivedSignal, r activeRelay) {
return return
} }
// Forward ice candidates
mainPeerConnection.OnICECandidate(func(c *webrtc.ICECandidate) {
if c != nil {
sendSignal(mainOffer.callHash, mainOffer.peerID, c.ToJSON())
}
})
// Send anwser // Send anwser
if !r.closed { if !r.closed {
sendSignal(mainOffer.callHash, mainOffer.peerID, answer) sendSignal(mainOffer.callHash, mainOffer.peerID, answer)
// Warning ! Do not put this outside a specific block
candidatesMux.Lock()
// Send pending ice candidates
for _, val := range pendingCandidates {
sendSignal(mainOffer.callHash, mainOffer.peerID, val)
}
candidatesMux.Unlock()
} }
// Keep a list of active tracks // Keep a list of active tracks
@ -401,6 +436,7 @@ func newCall(mainOffer receivedSignal, r activeRelay) {
// Send ice candidates // Send ice candidates
newPeerConnection.OnICECandidate(func(c *webrtc.ICECandidate) { newPeerConnection.OnICECandidate(func(c *webrtc.ICECandidate) {
if c != nil { if c != nil {
println("new ice candidate 2")
sendSignal(r.callHash, newMessage.peerID, c.ToJSON()) sendSignal(r.callHash, newMessage.peerID, c.ToJSON())
} }
}) })