Merge pull request #20 from ziminghua/aler9

解决发布超时后，重连RTSP，无法播放的BUG

client.go

@@ -42,6 +42,7 @@ func (rtsp *RTSPClient) PullStream(streamPath string, rtspUrl string) (err error
 					time.Sleep(time.Second * 5)
 				}
 				if rtsp.IsTimeout {
+					rtsp.processFunc = nil
 					go rtsp.PullStream(streamPath, rtspUrl)
 				}
 			}()
@@ -145,12 +146,14 @@ func (client *RTSPClient) pullStream() {
 	}
 	client.Client = &gortsplib.Client{
 		OnPacketRTP: func(trackID int, payload []byte) {
+			// Println("OnPacketRTP", trackID, len(payload))
 			if f := client.processFunc[trackID]; f != nil {
 				var clone []byte
 				f(append(clone, payload...))
 			}
 		},
-		Transport: &client.Transport,
+		ReadBufferSize: config.ReadBufferSize,
+		Transport:      &client.Transport,
 	}
 	// parse URL
 	u, err := base.ParseURL(client.URL)
@@ -163,6 +166,9 @@ func (client *RTSPClient) pullStream() {
 		Printf("connect:%s error:%v", client.URL, err)
 		return
 	}
+	client.OnClose = func() {
+		client.Client.Close()
+	}
 	//client.close should be after connected!
 	defer client.Client.Close()
 	var res *base.Response

main.go

@@ -13,14 +13,15 @@ import (
 )
 
 var config = struct {
-	ListenAddr   string
+	ListenAddr     string
-	UDPAddr      string
+	UDPAddr        string
-	RTCPAddr     string
+	RTCPAddr       string
-	Timeout      int
+	Timeout        int
-	Reconnect    bool
+	Reconnect      bool
-	AutoPullList map[string]string
+	AutoPullList   map[string]string
-	AutoPushList map[string]string
+	AutoPushList   map[string]string
-}{":554", ":8000", ":8001", 0, false, nil, nil}
+	ReadBufferSize int
+}{":554", ":8000", ":8001", 0, false, nil, nil, 2048}
 
 var pconfig = PluginConfig{
 	Name:   "RTSP",
@@ -84,7 +85,7 @@ func runPlugin() {
 			Println(err)
 		}
 	}
-	
+
 	go AddHook(HOOK_PUBLISH, func(s *Stream) {
 		for streamPath, url := range config.AutoPushList {
 			if s.StreamPath == streamPath {

server.go

@@ -75,7 +75,7 @@ func (sh *RTSPServer) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*ba
 		sub.Type = "RTSP pull"
 		sub.vt = s.WaitVideoTrack("h264", "h265")
 		sub.at = s.WaitAudioTrack("aac", "pcma", "pcmu")
-		ssrc := uintptr(unsafe.Pointer(stream))
+		ssrc := uintptr(unsafe.Pointer(&stream))
 		var trackIds = 0
 		if sub.vt != nil {
 			trackId := trackIds
@@ -97,9 +97,17 @@ func (sh *RTSPServer) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*ba
 			}
 			var st uint32
 			onVideo := func(ts uint32, pack *engine.VideoPack) {
-				for _, nalu := range pack.NALUs {
+				for i, nalu := range pack.NALUs {
-					for _, pack := range vpacketer.Packetize(nalu, (ts-st)*90) {
+					var samples uint32
-						rtp, _ := pack.Marshal()
+					if i == len(pack.NALUs)-1 {
+						samples = (ts - st) * 90
+					} else {
+						samples = 0
+					}
+					packs := vpacketer.Packetize(nalu, samples)
+					for j, rtpack := range packs {
+						rtpack.Marker = i == len(pack.NALUs)-1 && j == len(packs)-1
+						rtp, _ := rtpack.Marshal()
 						stream.WritePacketRTP(trackId, rtp)
 					}
 				}