From 45acbf5cd12eb45e2a03bca355fd4fcb2a1b8f66 Mon Sep 17 00:00:00 2001
From: ZSC714725 <zang199193@163.com>
Date: Thu, 23 Mar 2023 17:55:29 +0800
Subject: [PATCH] solve ffmpeg warning

---
 pkg/mpegts/pack.go       |  2 ++
 pkg/remux/rtmp2mpegts.go | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/mpegts/pack.go b/pkg/mpegts/pack.go
index f35091f..b4d1ecd 100644
--- a/pkg/mpegts/pack.go
+++ b/pkg/mpegts/pack.go
@@ -11,12 +11,14 @@ package mpegts
 import (
 	"encoding/hex"
 	"fmt"
+
 	"github.com/q191201771/naza/pkg/nazabytes"
 )
 
 // Frame 帧数据，用于打包成mpegts格式的数据
 type Frame struct {
 	Pts uint64 // =(毫秒 * 90)
+	Cts uint32
 	Dts uint64
 	Cc  uint8 // continuity_counter of TS Header
 
diff --git a/pkg/remux/rtmp2mpegts.go b/pkg/remux/rtmp2mpegts.go
index 391e27a..3e9fbc9 100644
--- a/pkg/remux/rtmp2mpegts.go
+++ b/pkg/remux/rtmp2mpegts.go
@@ -10,6 +10,8 @@ package remux
 
 import (
 	"encoding/hex"
+	"math"
+
 	"github.com/q191201771/lal/pkg/aac"
 	"github.com/q191201771/lal/pkg/avc"
 	"github.com/q191201771/lal/pkg/base"
@@ -18,7 +20,6 @@ import (
 	"github.com/q191201771/naza/pkg/bele"
 	"github.com/q191201771/naza/pkg/nazabytes"
 	"github.com/q191201771/naza/pkg/nazalog"
-	"math"
 )
 
 const (
@@ -366,7 +367,7 @@ func (s *Rtmp2MpegtsRemuxer) feedVideo(msg base.RtmpMsg) {
 	var frame mpegts.Frame
 	frame.Cc = s.videoCc
 	frame.Dts = dts
-	frame.Pts = frame.Dts + uint64(cts)*90
+	frame.Cts = cts
 	frame.Key = msg.IsVideoKeyNalu()
 	frame.Raw = s.videoOut
 	frame.Pid = mpegts.PidVideo
@@ -494,11 +495,8 @@ func (s *Rtmp2MpegtsRemuxer) adjustDtsPts(frame *mpegts.Frame) {
 		if s.basicVideoDts == math.MaxUint64 {
 			s.basicVideoDts = frame.Dts
 		}
-		if s.basicVideoPts == math.MaxUint64 {
-			s.basicVideoPts = frame.Pts
-		}
 		frame.Dts = subSafe(frame.Dts, s.basicVideoDts, s.uk, frame)
-		frame.Pts = subSafe(frame.Pts, s.basicVideoPts, s.uk, frame)
+		frame.Pts = frame.Dts + uint64(90*frame.Cts)
 	}
 }