修复相互引用内存泄露问题

gb28181/source_udp.go

@@ -39,3 +39,9 @@ func (u *UDPSource) InputRtp(pkt *rtp.Packet) error {
 	u.jitterBuffer.Push(pkt.SequenceNumber, pkt)
 	return nil
 }
+
+func (u *UDPSource) Close() {
+	u.jitterBuffer.Flush()
+	u.jitterBuffer.Close()
+	u.BaseGBSource.Close()
+}

jt1078/jt_session.go

@@ -287,6 +287,11 @@ func (s *Session) Close() {
 		s.videoBuffer.Clear()
 	}
 
+	if s.Conn != nil {
+		s.Conn.Close()
+		s.Conn = nil
+	}
+
 	s.PublishSource.Close()
 }
 

rtsp/rtsp_session.go

@@ -84,6 +84,11 @@ func (s *session) response(response *http.Response, body []byte) error {
 }
 
 func (s *session) close() {
+	if s.conn != nil {
+		s.conn.Close()
+		s.conn = nil
+	}
+
 	if s.sink_ != nil {
 		s.sink_.Close()
 		s.sink_ = nil

rtsp/rtsp_stream.go

@@ -166,6 +166,16 @@ func (t *tranStream) AddTrack(stream utils.AVStream) error {
 	return nil
 }
 
+func (t *tranStream) Close() error {
+	for _, track := range t.rtpTracks {
+		if track != nil {
+			track.Close()
+		}
+	}
+
+	return nil
+}
+
 func (t *tranStream) WriteHeader() error {
 	description := sdp.SessionDescription{
 		Version: 0,

rtsp/rtsp_track.go

@@ -19,6 +19,13 @@ type rtspTrack struct {
 	tmpExtraDataBuffer [][]byte //缓存带有编码信息的rtp包, 整个过程会多次回调(sps->pps->sei...), 先保存到临时区, 最后再缓存到extraDataBuffer
 }
 
+func (r *rtspTrack) Close() {
+	if r.muxer != nil {
+		r.muxer.Close()
+		r.muxer = nil
+	}
+}
+
 func NewRTSPTrack(muxer librtp.Muxer, pt byte, rate int, mediaType utils.AVMediaType) *rtspTrack {
 	stream := &rtspTrack{
 		pt:        pt,

stream/trans_stream.go

@@ -1,7 +1,6 @@
 package stream
 
 import (
-	"github.com/yangjiechina/avformat/stream"
 	"github.com/yangjiechina/avformat/utils"
 )
 
@@ -31,8 +30,8 @@ type TransStream interface {
 }
 
 type BaseTransStream struct {
-	Sinks      map[SinkId]Sink
-	muxer      stream.Muxer
+	Sinks map[SinkId]Sink
+	//muxer      stream.Muxer
 	Tracks     []utils.AVStream
 	Completed  bool
 	ExistVideo bool