From a14c87ad60bbc6223ff9b1dcf6362770e34c2193 Mon Sep 17 00:00:00 2001 From: Alexey Khit Date: Sun, 23 Jul 2023 22:35:24 +0300 Subject: [PATCH] Code refactoring for MJPEG source --- pkg/mjpeg/client.go | 12 ++++++++---- pkg/mjpeg/producer.go | 7 +++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg/mjpeg/client.go b/pkg/mjpeg/client.go index 3940166f..2211dbd1 100644 --- a/pkg/mjpeg/client.go +++ b/pkg/mjpeg/client.go @@ -3,15 +3,16 @@ package mjpeg import ( "bufio" "errors" - "github.com/AlexxIT/go2rtc/pkg/core" - "github.com/AlexxIT/go2rtc/pkg/tcp" - "github.com/pion/rtp" "io" "net/http" "net/textproto" "strconv" "strings" "time" + + "github.com/AlexxIT/go2rtc/pkg/core" + "github.com/AlexxIT/go2rtc/pkg/tcp" + "github.com/pion/rtp" ) type Client struct { @@ -112,7 +113,10 @@ func (c *Client) startMJPEG(boundary string) error { } if c.receiver != nil { - packet := &rtp.Packet{Header: rtp.Header{Timestamp: now()}, Payload: buf} + packet := &rtp.Packet{ + Header: rtp.Header{Timestamp: core.Now90000()}, + Payload: buf, + } c.receiver.WriteRTP(packet) } diff --git a/pkg/mjpeg/producer.go b/pkg/mjpeg/producer.go index 58132ced..69d67faf 100644 --- a/pkg/mjpeg/producer.go +++ b/pkg/mjpeg/producer.go @@ -3,8 +3,9 @@ package mjpeg import ( "encoding/json" "errors" - "github.com/AlexxIT/go2rtc/pkg/core" "strings" + + "github.com/AlexxIT/go2rtc/pkg/core" ) func (c *Client) GetMedias() []*core.Media { @@ -14,7 +15,9 @@ func (c *Client) GetMedias() []*core.Media { Direction: core.DirectionRecvonly, Codecs: []*core.Codec{ { - Name: core.CodecJPEG, ClockRate: 90000, PayloadType: core.PayloadTypeRAW, + Name: core.CodecJPEG, + ClockRate: 90000, + PayloadType: core.PayloadTypeRAW, }, }, }}