Use time.Time as type

Signed-off-by: Šimon Brandner <[email protected]>

Author: SimonBrandner

pkg/conference/participant.go

@@ -2,7 +2,7 @@ package conference
 
 import (
 	"encoding/json"
-	"sync/atomic"
+	"time"
 
 	"github.com/matrix-org/waterfall/pkg/peer"
 	"github.com/matrix-org/waterfall/pkg/signaling"
@@ -24,7 +24,7 @@ type PublishedTrack struct {
 	track *webrtc.TrackLocalStaticRTP
 	// The time when we sent the last PLI to the sender. We store this to avoid
 	// spamming the sender.
-	lastPLITimestamp atomic.Int64
+	lastPLITimestamp time.Time
 }
 
 // Participant represents a participant in the conference.

pkg/conference/peer_message_processor.go

@@ -117,7 +117,7 @@ func (c *Conference) processForwardRTCPMessage(msg peer.RTCPReceived) {
 	for _, participant := range c.participants {
 		for _, publishedTrack := range participant.publishedTracks {
 			if publishedTrack.track.StreamID() == msg.StreamID && publishedTrack.track.ID() == msg.TrackID {
-				participant.peer.WriteRTCP(msg.Packets, msg.StreamID, msg.TrackID, publishedTrack.lastPLITimestamp.Load())
+				participant.peer.WriteRTCP(msg.Packets, msg.StreamID, msg.TrackID, publishedTrack.lastPLITimestamp)
 			}
 		}
 	}
@@ -127,7 +127,7 @@ func (c *Conference) processPLISentMessage(msg peer.PLISent) {
 	for _, participant := range c.participants {
 		for _, publishedTrack := range participant.publishedTracks {
 			if publishedTrack.track.StreamID() == msg.StreamID && publishedTrack.track.ID() == msg.TrackID {
-				publishedTrack.lastPLITimestamp.Store(msg.Timestamp)
+				publishedTrack.lastPLITimestamp = msg.Timestamp
 			}
 		}
 	}

pkg/peer/messages.go

@@ -1,6 +1,8 @@
 package peer
 
 import (
+	"time"
+
 	"github.com/pion/rtcp"
 	"github.com/pion/webrtc/v3"
 	"maunium.net/go/mautrix/event"
@@ -47,7 +49,7 @@ type RTCPReceived struct {
 }
 
 type PLISent struct {
-	Timestamp int64
+	Timestamp time.Time
 	StreamID  string
 	TrackID   string
 }

pkg/peer/peer.go

@@ -119,7 +119,7 @@ func (p *Peer[ID]) SubscribeTo(track *webrtc.TrackLocalStaticRTP) error {
 	return nil
 }
 
-func (p *Peer[ID]) WriteRTCP(packets []rtcp.Packet, streamID string, trackID string, lastPLITimestamp int64) error {
+func (p *Peer[ID]) WriteRTCP(packets []rtcp.Packet, streamID string, trackID string, lastPLITimestamp time.Time) error {
 	const minimalPLIInterval = time.Millisecond * 500
 
 	packetsToSend := []rtcp.Packet{}
@@ -147,11 +147,11 @@ func (p *Peer[ID]) WriteRTCP(packets []rtcp.Packet, streamID string, trackID str
 		case *rtcp.PictureLossIndication:
 			// Since we sometimes spam the sender with PLIs, make sure we don't send
 			// them way too often
-			if time.Now().UnixNano()-lastPLITimestamp < minimalPLIInterval.Nanoseconds() {
+			if time.Now().UnixNano()-lastPLITimestamp.UnixNano() < minimalPLIInterval.Nanoseconds() {
 				continue
 			}
 
-			p.sink.Send(PLISent{Timestamp: time.Now().UnixNano(), StreamID: streamID, TrackID: trackID})
+			p.sink.Send(PLISent{Timestamp: time.Now(), StreamID: streamID, TrackID: trackID})
 
 			typedPacket.MediaSSRC = mediaSSRC
 			packetsToSend = append(packetsToSend, typedPacket)