update pts

livekit · Oct 23, 2023 · 8c84866 · 8c84866
1 parent b6e86a4
commit 8c84866
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pkg/pipeline/builder/segment.go b/pkg/pipeline/builder/segment.go
@@ -67,7 +67,7 @@ func BuildSegmentBin(pipeline *gstreamer.Pipeline, p *config.PipelineConfig) (*g
 	_, err = sink.Connect("format-location-full", func(self *gst.Element, fragmentId uint, firstSample *gst.Sample) string {
 		var pts time.Duration
 		if firstSample != nil && firstSample.GetBuffer() != nil {
-			pts = firstSample.GetBuffer().PresentationTimestamp()
+			pts = *firstSample.GetBuffer().PresentationTimestamp().AsDuration()
 		} else {
 			logger.Infow("nil sample passed into 'format-location-full' event handler, assuming 0 pts")
 		}

diff --git a/pkg/pipeline/builder/video.go b/pkg/pipeline/builder/video.go
@@ -687,10 +687,11 @@ func (b *VideoBin) createSrcPad(trackID string) {
 		for b.nextPTS.Load() != 0 {
 			time.Sleep(time.Millisecond * 100)
 		}
-		if buffer.PresentationTimestamp() < b.lastPTS.Load() {
+		pts := *buffer.PresentationTimestamp().AsDuration()
+		if pts < b.lastPTS.Load() {
 			return gst.PadProbeDrop
 		}
-		b.lastPTS.Store(buffer.PresentationTimestamp())
+		b.lastPTS.Store(pts)
 		return gst.PadProbeOK
 	})
 	b.pads[trackID] = pad
@@ -703,10 +704,11 @@ func (b *VideoBin) createTestSrcPad() {
 	pad := b.selector.GetRequestPad("sink_%u")
 	pad.AddProbe(gst.PadProbeTypeBuffer, func(pad *gst.Pad, info *gst.PadProbeInfo) gst.PadProbeReturn {
 		buffer := info.GetBuffer()
-		if buffer.PresentationTimestamp() < b.lastPTS.Load() {
+		pts := *buffer.PresentationTimestamp().AsDuration()
+		if pts < b.lastPTS.Load() {
 			return gst.PadProbeDrop
 		}
-		if nextPTS := b.nextPTS.Load(); nextPTS != 0 && buffer.PresentationTimestamp() >= nextPTS {
+		if nextPTS := b.nextPTS.Load(); nextPTS != 0 && pts >= nextPTS {
 			if err := b.setSelectorPad(b.nextPad); err != nil {
 				logger.Errorw("failed to unmute", err)
 				return gst.PadProbeDrop
@@ -715,7 +717,7 @@ func (b *VideoBin) createTestSrcPad() {
 			b.nextPTS.Store(0)
 		}
 		if b.selectedPad == videoTestSrcName {
-			b.lastPTS.Store(buffer.PresentationTimestamp())
+			b.lastPTS.Store(pts)
 		}
 		return gst.PadProbeOK
 	})

diff --git a/pkg/pipeline/source/sdk/appwriter.go b/pkg/pipeline/source/sdk/appwriter.go
@@ -350,7 +350,7 @@ func (w *AppWriter) pushPacket(pkt *rtp.Packet, pts time.Duration) error {
 	}
 
 	b := gst.NewBufferFromBytes(p)
-	b.SetPresentationTimestamp(pts)
+	b.SetPresentationTimestamp(gst.ClockTime(uint64(pts)))
 	if flow := w.src.PushBuffer(b); flow != gst.FlowOK {
 		w.logger.Infow("unexpected flow return", "flow", flow)
 	}