Forward RTCP packets from WHIP connections to WHEP sessions

Glimesh · Apr 25, 2024 · d8a7422 · d8a7422
1 parent b751fb8
commit d8a7422
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/internal/webrtc/whep.go b/internal/webrtc/whep.go
@@ -16,6 +16,7 @@ import (
 type (
 	whepSession struct {
 		videoTrack     *trackMultiCodec
+		peerConnection *webrtc.PeerConnection
 		currentLayer   atomic.Value
 		sequenceNumber uint16
 		timestamp      uint32
@@ -147,8 +148,9 @@ func WHEP(offer, streamKey string) (string, string, error) {
 	defer stream.whepSessionsLock.Unlock()
 
 	stream.whepSessions[whepSessionId] = &whepSession{
-		videoTrack: videoTrack,
-		timestamp:  50000,
+		peerConnection: peerConnection,
+		videoTrack:     videoTrack,
+		timestamp:      50000,
 	}
 	stream.whepSessions[whepSessionId].currentLayer.Store("")
 	return peerConnection.LocalDescription().SDP, whepSessionId, nil

diff --git a/internal/webrtc/whip.go b/internal/webrtc/whip.go
@@ -121,6 +121,20 @@ func videoWriter(remoteTrack *webrtc.TrackRemote, stream *stream, peerConnection
 	}
 }
 
+func forwardRtcpToWhepSessions(rtpReceiver *webrtc.RTPReceiver, stream *stream) {
+	for {
+		rtcpPackets, _, rtcpErr := rtpReceiver.ReadRTCP()
+		if rtcpErr != nil {
+			return
+		}
+		for _, sess := range stream.whepSessions {
+			if sess.peerConnection.ConnectionState() == webrtc.PeerConnectionStateConnected {
+				sess.peerConnection.WriteRTCP(rtcpPackets)
+			}
+		}
+	}
+}
+
 func WHIP(offer, streamKey string) (string, error) {
 	peerConnection, err := newPeerConnection(apiWhip)
 	if err != nil {
@@ -135,6 +149,7 @@ func WHIP(offer, streamKey string) (string, error) {
 	}
 
 	peerConnection.OnTrack(func(remoteTrack *webrtc.TrackRemote, rtpReceiver *webrtc.RTPReceiver) {
+		go forwardRtcpToWhepSessions(rtpReceiver, stream)
 		if strings.HasPrefix(remoteTrack.Codec().RTPCodecCapability.MimeType, "audio") {
 			audioWriter(remoteTrack, stream)
 		} else {