Reuse NTP time conversion in report package

Reduces some code duplication

Author: mengelbart

pkg/report/receiver_interceptor_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/pion/interceptor"
+	"github.com/pion/interceptor/internal/ntp"
 	"github.com/pion/interceptor/internal/test"
 	"github.com/pion/logging"
 	"github.com/pion/rtcp"
@@ -123,7 +124,7 @@ func TestReceiverInterceptor(t *testing.T) {
 		stream.ReceiveRTCP([]rtcp.Packet{
 			&rtcp.SenderReport{
 				SSRC:        123456,
-				NTPTime:     ntpTime(now),
+				NTPTime:     ntp.ToNTP(now),
 				RTPTime:     987654321 + uint32(now.Sub(rtpTime).Seconds()*90000),
 				PacketCount: 10,
 				OctetCount:  0,
@@ -237,7 +238,7 @@ func TestReceiverInterceptor(t *testing.T) {
 		stream.ReceiveRTCP([]rtcp.Packet{
 			&rtcp.SenderReport{
 				SSRC:        123456,
-				NTPTime:     ntpTime(now),
+				NTPTime:     ntp.ToNTP(now),
 				RTPTime:     987654321 + uint32(now.Sub(rtpTime).Seconds()*90000),
 				PacketCount: 10,
 				OctetCount:  0,
@@ -419,7 +420,7 @@ func TestReceiverInterceptor(t *testing.T) {
 		stream.ReceiveRTCP([]rtcp.Packet{
 			&rtcp.SenderReport{
 				SSRC:        123456,
-				NTPTime:     ntpTime(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)),
+				NTPTime:     ntp.ToNTP(time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)),
 				RTPTime:     987654321,
 				PacketCount: 0,
 				OctetCount:  0,

pkg/report/sender_interceptor.go

@@ -126,13 +126,3 @@ func (s *SenderInterceptor) BindLocalStream(info *interceptor.StreamInfo, writer
 		return writer.Write(header, payload, a)
 	})
 }
-
-func ntpTime(t time.Time) uint64 {
-	// seconds since 1st January 1900
-	s := (float64(t.UnixNano()) / 1000000000) + 2208988800
-
-	// higher 32 bits are the integer part, lower 32 bits are the fractional part
-	integerPart := uint32(s)
-	fractionalPart := uint32((s - float64(integerPart)) * 0xFFFFFFFF)
-	return uint64(integerPart)<<32 | uint64(fractionalPart)
-}

pkg/report/sender_interceptor_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/pion/interceptor"
+	"github.com/pion/interceptor/internal/ntp"
 	"github.com/pion/interceptor/internal/test"
 	"github.com/pion/logging"
 	"github.com/pion/rtcp"
@@ -40,7 +41,7 @@ func TestSenderInterceptor(t *testing.T) {
 		assert.True(t, ok)
 		assert.Equal(t, &rtcp.SenderReport{
 			SSRC:        123456,
-			NTPTime:     ntpTime(mt.Now()),
+			NTPTime:     ntp.ToNTP(mt.Now()),
 			RTPTime:     2269117121,
 			PacketCount: 0,
 			OctetCount:  0,
@@ -81,7 +82,7 @@ func TestSenderInterceptor(t *testing.T) {
 		assert.True(t, ok)
 		assert.Equal(t, &rtcp.SenderReport{
 			SSRC:        123456,
-			NTPTime:     ntpTime(mt.Now()),
+			NTPTime:     ntp.ToNTP(mt.Now()),
 			RTPTime:     2269117121,
 			PacketCount: 10,
 			OctetCount:  20,

pkg/report/sender_stream.go

@@ -4,6 +4,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pion/interceptor/internal/ntp"
 	"github.com/pion/rtcp"
 	"github.com/pion/rtp"
 )
@@ -45,7 +46,7 @@ func (stream *senderStream) generateReport(now time.Time) *rtcp.SenderReport {
 
 	return &rtcp.SenderReport{
 		SSRC:        stream.ssrc,
-		NTPTime:     ntpTime(now),
+		NTPTime:     ntp.ToNTP(now),
 		RTPTime:     stream.lastRTPTimeRTP + uint32(now.Sub(stream.lastRTPTimeTime).Seconds()*stream.clockRate),
 		PacketCount: stream.packetCount,
 		OctetCount:  stream.octetCount,