👌 IMPROVE: 导出RTSP插件

兼容sdp中没有包含sps和pps的情况
更新依赖版本
2025-09-27 12:02:20 +08:00 · 2022-09-04 12:43:42 +08:00 · 2022-08-21 14:49:54 +08:00 · 2022-07-29 20:43:39 +08:00 · 2022-07-23 11:59:26 +08:00 · 2022-07-03 01:14:23 +08:00
11 changed files with 588 additions and 744 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-.vscode
-node_modules
--- a/README.md
+++ b/README.md
@@ -1,63 +1,82 @@
 # RTSP插件
-
+rtsp插件提供rtsp协议的推拉流能力，以及向远程服务器推拉rtsp协议的能力。
 ## 插件地址

-github.com/Monibuca/plugin-rtsp
+https://github.com/Monibuca/plugin-rtsp

 ## 插件引入
 ```go
 import (
-    _ "github.com/Monibuca/plugin-rtsp"
+    _ "m7s.live/plugin/rtsp/v4"
 )
 ```

-## 默认插件配置
-
-```toml
-[RTSP]
-# 端口接收推流
-ListenAddr = ":554"
-Reconnect = true
-[RTSP.AutoPullList]
-"live/rtsp1" = "rtsp://admin:admin@192.168.1.212:554/cam/realmonitor?channel=1&subtype=1"
-"live/rtsp2" = "rtsp://admin:admin@192.168.1.212:554/cam/realmonitor?channel=2&subtype=1"
+## 推拉地址形式
 ```
+rtsp://localhost/live/test
+```
+- `localhost`是m7s的服务器域名或者IP地址，默认端口`554`可以不写，否则需要写
+- `live`代表`appName`
+- `test`代表`streamName`
+- m7s中`live/test`将作为`streamPath`为流的唯一标识

- `ListenAddr`是监听的地址
- `Reconnect` 是否自动重连
- `RTSP.AutoPullList` 可以配置多项，用于自动拉流，key是streamPath，value是远程rtsp地址
-
-### 特殊功能
-
-当自动拉流列表中当的streamPath为sub/xxx 这种形式的话，在gb28181的分屏显示时会优先采用rtsp流，已实现分屏观看子码流效果
-## 插件功能
-
-### 接收RTSP协议的推流

 例如通过ffmpeg向m7s进行推流

 ```bash
-ffmpeg -i **** rtsp://localhost/live/test
+ffmpeg -i [视频源] -c:v h264 -f rtsp rtsp://localhost/live/test
 ```

 会在m7s内部形成一个名为live/test的流

-### 从远程拉取rtsp到m7s中

-可调用接口
-`/api/rtsp/pull?target=[RTSP地址]&streamPath=[流标识]`
-
-## 使用编程方式拉流
-```go
-new(RTSPClient).PullStream("live/user1","rtsp://xxx.xxx.xxx.xxx/live/user1") 
+如果m7s中已经存在live/test流的话就可以用rtsp协议进行播放
+```bash
+ffplay rtsp://localhost/live/test
 ```

-### 罗列所有的rtsp协议的流

-可调用接口
-`/api/rtsp/list`
+## 配置

-### 从m7s中拉取rtsp协议流
+```yaml
+rtsp:
+    publish:
+        pubaudio: true
+        pubvideo: true
+        kickexist: false
+        publishtimeout: 10
+        waitclosetimeout: 0
+    subscribe:
+        subaudio: true
+        subvideo: true
+        iframeonly: false
+        waittimeout: 10
+    pull:
+        repull: 0
+        pullonstart: false
+        pullonsubscribe: false
+        pulllist: {}
+    push:
+        repush: 0
+        pushlist: {}
+    listenaddr: :554
+    udpaddr: :8000
+    rtcpaddr: :8001
+    readbuffersize: 2048
+    pullprotocol: 'auto'
+```
+:::tip 配置覆盖
+publish
+subscribe
+两项中未配置部分将使用全局配置
+:::
+## API

-直接通过协议rtsp://xxx.xxx.xxx.xxx/live/user1 即可播放
-> h265 编码拉流尚未实现，敬请期待
+### `rtsp/api/list`
+获取所有rtsp流
+
+### `rtsp/api/pull?target=[RTSP地址]&streamPath=[流标识]`
+从远程拉取rtsp到m7s中
+
+### `rtsp/api/push?target=[RTSP地址]&streamPath=[流标识]`
+将本地的流推送到远端
--- a/client.go
+++ b/client.go
@@ -1,205 +1,135 @@
 package rtsp

 import (
-	"errors"
-	"time"
-	"unsafe"
-
-	. "github.com/Monibuca/engine/v3"
-	. "github.com/Monibuca/utils/v3"
-	"github.com/Monibuca/utils/v3/codec"
 	"github.com/aler9/gortsplib"
-	"github.com/aler9/gortsplib/pkg/aac"
-	"github.com/aler9/gortsplib/pkg/base"
-	"github.com/pion/rtp"
-	"github.com/pion/rtp/codecs"
+	"github.com/aler9/gortsplib/pkg/url"
+	"m7s.live/engine/v4"
 )

-type RTSPClient struct {
-	RTSPublisher
-	Transport         gortsplib.Transport
+type RTSPPuller struct {
+	RTSPPublisher
+	engine.Puller
 	*gortsplib.Client `json:"-"`
+	gortsplib.Transport
 }

-// PullStream 从外部拉流
-func (rtsp *RTSPClient) PullStream(streamPath string, rtspUrl string) (err error) {
-	rtsp.Stream = &Stream{
-		StreamPath: streamPath,
-		Type:       "RTSP Pull",
-		ExtraProp:  rtsp,
-	}
-	if result := rtsp.Publish(); result {
-		rtsp.URL = rtspUrl
-		if config.Reconnect {
-			go func() {
-				for rtsp.pullStream(); rtsp.Err() == nil; rtsp.pullStream() {
-					Printf("reconnecting:%s in 5 seconds", rtspUrl)
-					if rtsp.Transport == gortsplib.TransportTCP {
-						rtsp.Transport = gortsplib.TransportUDP
-					} else {
-						rtsp.Transport = gortsplib.TransportTCP
-					}
-					time.Sleep(time.Second * 5)
-				}
-				if rtsp.IsTimeout {
-					go rtsp.PullStream(streamPath, rtspUrl)
-				}
-			}()
+func (p *RTSPPuller) Connect() error {
+	switch rtspConfig.PullProtocol {
+	case "tcp", "TCP":
+		p.Transport = gortsplib.TransportTCP
+	case "udp", "UDP":
+		p.Transport = gortsplib.TransportUDP
+	default:
+		if p.Transport == gortsplib.TransportTCP {
+			p.Transport = gortsplib.TransportUDP
 		} else {
-			go rtsp.pullStream()
+			p.Transport = gortsplib.TransportTCP
 		}
-		return
 	}
-	return errors.New("publish badname")
-}
-func (rtsp *RTSPClient) PushStream(streamPath string, rtspUrl string) (err error) {
-	if s := FindStream(streamPath); s != nil {
-		var tracks gortsplib.Tracks
-		var sub RTSPSubscriber
-		sub.Type = "RTSP push out"
-		sub.vt = s.WaitVideoTrack("h264", "h265")
-		sub.at = s.WaitAudioTrack("aac", "pcma", "pcmu")
-		ssrc := uintptr(unsafe.Pointer(&sub))
-		var trackIds = 0
-		if sub.vt != nil {
-			trackId := trackIds
-			var vtrack *gortsplib.Track
-			var vpacketer rtp.Packetizer
-			switch sub.vt.CodecID {
-			case codec.CodecID_H264:
-				if vtrack, err = gortsplib.NewTrackH264(96, &gortsplib.TrackConfigH264{
-					SPS: sub.vt.ExtraData.NALUs[0],
-					PPS: sub.vt.ExtraData.NALUs[1],
-				}); err == nil {
-					vpacketer = rtp.NewPacketizer(1200, 96, uint32(ssrc), &codecs.H264Payloader{}, rtp.NewFixedSequencer(1), 90000)
-				} else {
-					return err
-				}
-			case codec.CodecID_H265:
-				vtrack = NewH265Track(96, sub.vt.ExtraData.NALUs)
-				vpacketer = rtp.NewPacketizer(1200, 96, uint32(ssrc), &H265Payloader{}, rtp.NewFixedSequencer(1), 90000)
+	p.Client = &gortsplib.Client{
+		OnPacketRTP: func(ctx *gortsplib.ClientOnPacketRTPCtx) {
+			if p.RTSPPublisher.Tracks[ctx.TrackID] != nil {
+				p.RTSPPublisher.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
 			}
-			var st uint32
-			onVideo := func(ts uint32, pack *VideoPack) {
-				for _, nalu := range pack.NALUs {
-					for _, pack := range vpacketer.Packetize(nalu, (ts-st)*90) {
-						rtp, _ := pack.Marshal()
-						rtsp.WritePacketRTP(trackId, rtp)
-					}
-				}
-				st = ts
-			}
-			sub.OnVideo = func(ts uint32, pack *VideoPack) {
-				if st = ts; st != 0 {
-					sub.OnVideo = onVideo
-				}
-				onVideo(ts, pack)
-			}
-			tracks = append(tracks, vtrack)
-			trackIds++
-		}
-		if sub.at != nil {
-			var st uint32
-			trackId := trackIds
-			switch sub.at.CodecID {
-			case codec.CodecID_PCMA, codec.CodecID_PCMU:
-				atrack := NewG711Track(97, map[byte]string{7: "pcma", 8: "pcmu"}[sub.vt.CodecID])
-				apacketizer := rtp.NewPacketizer(1200, 97, uint32(ssrc), &codecs.G711Payloader{}, rtp.NewFixedSequencer(1), 8000)
-				sub.OnAudio = func(ts uint32, pack *AudioPack) {
-					for _, pack := range apacketizer.Packetize(pack.Raw, (ts-st)*8) {
-						buf, _ := pack.Marshal()
-						rtsp.WritePacketRTP(trackId, buf)
-					}
-					st = ts
-				}
-				tracks = append(tracks, atrack)
-			case codec.CodecID_AAC:
-				var mpegConf aac.MPEG4AudioConfig
-				mpegConf.Decode(sub.at.ExtraData[2:])
-				conf := &gortsplib.TrackConfigAAC{
-					Type:              int(mpegConf.Type),
-					SampleRate:        mpegConf.SampleRate,
-					ChannelCount:      mpegConf.ChannelCount,
-					AOTSpecificConfig: mpegConf.AOTSpecificConfig,
-				}
-				if atrack, err := gortsplib.NewTrackAAC(97, conf); err == nil {
-					apacketizer := rtp.NewPacketizer(1200, 97, uint32(ssrc), &AACPayloader{}, rtp.NewFixedSequencer(1), uint32(mpegConf.SampleRate))
-					sub.OnAudio = func(ts uint32, pack *AudioPack) {
-						for _, pack := range apacketizer.Packetize(pack.Raw, (ts-st)*uint32(mpegConf.SampleRate)/1000) {
-							buf, _ := pack.Marshal()
-							rtsp.WritePacketRTP(trackId, buf)
-						}
-						st = ts
-					}
-					tracks = append(tracks, atrack)
-				}
-			}
-		}
-		return rtsp.StartPublishing(rtspUrl, tracks)
-	}
-	return errors.New("stream not exist")
-}
-func (client *RTSPClient) pullStream() {
-	if client.Err() != nil {
-		return
-	}
-	client.Client = &gortsplib.Client{
-		OnPacketRTP: func(trackID int, payload []byte) {
-			var clone []byte
-			client.processFunc[trackID](append(clone, payload...))
 		},
-		Transport: &client.Transport,
+		ReadBufferCount: rtspConfig.ReadBufferSize,
+		Transport:       &p.Transport,
 	}
-	defer client.Client.Close()
 	// parse URL
-	u, err := base.ParseURL(client.URL)
+	u, err := url.Parse(p.RemoteURL)
 	if err != nil {
-		Printf("ParseURL:%s error:%v", client.URL, err)
-		return
+		return err
 	}
 	// connect to the server
-	if err = client.Start(u.Scheme, u.Host); err != nil {
-		Printf("connect:%s error:%v", client.URL, err)
+	if err = p.Client.Start(u.Scheme, u.Host); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (p *RTSPPuller) Pull() {
+	u, _ := url.Parse(p.RemoteURL)
+	if _, err := p.Options(u); err != nil {
 		return
 	}
-	var res *base.Response
-	if res, err = client.Options(u); err != nil {
-		Printf("option:%s error:%v", client.URL, err)
-		return
-	}
-	Println(res)
 	// find published tracks
-	tracks, baseURL, res, err := client.Describe(u)
+	tracks, baseURL, _, err := p.Describe(u)
 	if err != nil {
-		Printf("Describe:%s error:%v", client.URL, err)
 		return
 	}
-	Println(res)
-	if client.processFunc == nil {
-		client.setTracks(tracks)
-	}
-	for _, track := range tracks {
-		if res, err = client.Setup(true, track, baseURL, 0, 0); err != nil {
-			Printf("Setup:%s error:%v", baseURL.String(), err)
-			return
-		}
-		Println(res)
-	}
-	// start reading tracks
-	if res, err = client.Play(nil); err != nil {
-		Printf("Play:%s error:%v", baseURL.String(), err)
+	p.tracks = tracks
+	p.SetTracks()
+	if err = p.SetupAndPlay(tracks, baseURL); err != nil {
 		return
 	}
-	Println(res)
-	// wait until a fatal error
-	var fatalChan = make(chan error)
-	go func() {
-		fatalChan <- client.Wait()
-	}()
-	select {
-	case err := <-fatalChan:
-		Printf("Wait:%s error:%v", baseURL.String(), err)
-	case <-client.Done():
-		Printf("client:%s done", client.URL)
+	p.Wait()
+}
+
+type RTSPPusher struct {
+	RTSPSubscriber
+	engine.Pusher
+	*gortsplib.Client
+	gortsplib.Transport
+}
+
+func (p *RTSPPusher) OnEvent(event any) {
+	switch v := event.(type) {
+	case engine.VideoRTP:
+		p.Client.WritePacketRTP(p.videoTrackId, &v.Packet, p.Video.Frame.PTS == p.Video.Frame.DTS)
+	case engine.AudioRTP:
+		p.Client.WritePacketRTP(p.audioTrackId, &v.Packet, p.Audio.Frame.PTS == p.Audio.Frame.DTS)
+	default:
+		p.RTSPSubscriber.OnEvent(event)
 	}
 }
+func (p *RTSPPusher) Connect() error {
+	if p.Transport == gortsplib.TransportTCP {
+		p.Transport = gortsplib.TransportUDP
+	} else {
+		p.Transport = gortsplib.TransportTCP
+	}
+	p.Client = &gortsplib.Client{
+		ReadBufferCount: rtspConfig.ReadBufferSize,
+		Transport:       &p.Transport,
+	}
+	// parse URL
+	u, err := url.Parse(p.RemoteURL)
+	if err != nil {
+		return err
+	}
+	// connect to the server
+	if err = p.Client.Start(u.Scheme, u.Host); err != nil {
+		return err
+	}
+	_, err = p.Client.Options(u)
+	return err
+}
+func (p *RTSPPusher) Push() (err error) {
+	var u *url.URL
+	u, err = url.Parse(p.RemoteURL)
+	defer func() {
+		if err != nil {
+			p.Close()
+		}
+	}()
+	// startTime := time.Now()
+	// for len(p.tracks) < 2 {
+	// 	if time.Sleep(time.Second); time.Since(startTime) > time.Second*10 {
+	// 		return fmt.Errorf("timeout")
+	// 	}
+	// }
+	if _, err = p.Announce(u, p.tracks); err != nil {
+		return
+	}
+	for _, track := range p.tracks {
+		_, err = p.Setup(false, track, u, 0, 0)
+		if err != nil {
+			return
+		}
+	}
+	if _, err = p.Record(); err != nil {
+		return
+	}
+	p.PlayRTP()
+	return
+}
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,33 @@
-module github.com/Monibuca/plugin-rtsp/v3
+module m7s.live/plugin/rtsp/v4

-go 1.16
+go 1.18

 require (
-	github.com/Monibuca/engine/v3 v3.3.11
-	github.com/Monibuca/utils/v3 v3.0.5
-	github.com/aler9/gortsplib v0.0.0-20211212220644-6f374e396529
-	github.com/pion/rtp v1.7.4
-	github.com/pion/sdp/v3 v3.0.4
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
+	github.com/aler9/gortsplib v0.0.0-20220717125404-c6972424d6b8
+	go.uber.org/zap v1.21.0
+	m7s.live/engine/v4 v4.4.0
+)
+
+require (
+	github.com/cnotch/ipchub v1.1.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
+	github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
+	github.com/pion/randutil v0.1.0 // indirect
+	github.com/pion/rtcp v1.2.9 // indirect
+	github.com/pion/rtp v1.7.13 // indirect
+	github.com/pion/sdp/v3 v3.0.5 // indirect
+	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
+	github.com/q191201771/naza v0.30.2 // indirect
+	github.com/shirou/gopsutil/v3 v3.22.5 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.5.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
+	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,18 +1,10 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
-github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/Monibuca/engine/v3 v3.3.11 h1:4zuuW34UgBxNT66wg+SbYm0C/kp2wghnoqWjM06eIIs=
-github.com/Monibuca/engine/v3 v3.3.11/go.mod h1:LowMZ/iw4t6tfTZkSYZHIA0Z1HE8b7xfTDLO4WhX3Hg=
-github.com/Monibuca/utils/v3 v3.0.4 h1:PssGhww+qePzw4qpB3g2DCG5Buru0Cu64UiqtAPuHjc=
-github.com/Monibuca/utils/v3 v3.0.4/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
-github.com/Monibuca/utils/v3 v3.0.5 h1:w14x0HkWTbF4MmHbINLlOwe4VJNoSOeaQChMk5E/4es=
-github.com/Monibuca/utils/v3 v3.0.5/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
-github.com/aler9/gortsplib v0.0.0-20211118111704-d5bdc197beb5 h1:qcrLOrHxW0x9fIguacwD/2CIlswI6kVCUThtx/uuhSs=
-github.com/aler9/gortsplib v0.0.0-20211118111704-d5bdc197beb5/go.mod h1:fyQrQyHo8QvdR/h357tkv1g36VesZlzEPsdAu2VrHHc=
-github.com/aler9/gortsplib v0.0.0-20211212220644-6f374e396529 h1:j2tfs+eUubyZnuwmYWzK+IS681IixfUyD8bivz4sqAw=
-github.com/aler9/gortsplib v0.0.0-20211212220644-6f374e396529/go.mod h1:fyQrQyHo8QvdR/h357tkv1g36VesZlzEPsdAu2VrHHc=
+github.com/aler9/gortsplib v0.0.0-20220717125404-c6972424d6b8 h1:GdQOJFYbcrw8bXGClhroHTBIEJAb/jPCIV33Q966rms=
+github.com/aler9/gortsplib v0.0.0-20220717125404-c6972424d6b8/go.mod h1:WI3nMhY2mM6nfoeW9uyk7TyG5Qr6YnYxmFoCply0sbo=
 github.com/asticode/go-astikit v0.20.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
 github.com/asticode/go-astits v1.10.0/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ=
+github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/cnotch/apirouter v0.0.0-20200731232942-89e243a791f3/go.mod h1:5deJPLON/x/s2dLOQfuKS0lenhOIT4xX0pvtN/OEIuY=
 github.com/cnotch/ipchub v1.1.0 h1:hH0lh2mU3AZXPiqMwA0pdtqrwo7PFIMRGush9OobMUs=
 github.com/cnotch/ipchub v1.1.0/go.mod h1:2PbeBs2q2VxxTVCn1eYCDwpAWuVXbq1+N0FU7GimOH4=
@@ -21,88 +13,146 @@ github.com/cnotch/queue v0.0.0-20200326024423-6e88bdbf2ad4/go.mod h1:zOssjAlNusO
 github.com/cnotch/queue v0.0.0-20201224060551-4191569ce8f6/go.mod h1:zOssjAlNusOxvtaqT+EMA+Iyi8rrtKr4/XfzN1Fgoeg=
 github.com/cnotch/scheduler v0.0.0-20200522024700-1d2da93eefc5/go.mod h1:F4GE3SZkJZ8an1Y0ZCqvSM3jeozNuKzoC67erG1PhIo=
 github.com/cnotch/xlog v0.0.0-20201208005456-cfda439cd3a0/go.mod h1:RW9oHsR79ffl3sR3yMGgxYupMn2btzdtJUwoxFPUE5E=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emitter-io/address v1.0.0/go.mod h1:GfZb5+S/o8694B1GMGK2imUYQyn2skszMvGNA5D84Ug=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/funny/slab v0.0.0-20180511031532-b1fad5e5d478 h1:Db9StoJ6RZN3YttC0Pm0I4Y5izITRYch3RMbT59BYN0=
-github.com/funny/slab v0.0.0-20180511031532-b1fad5e5d478/go.mod h1:0j1+svBH8ABEIPdUP0AIg4qedsybnXGJBakCEw8cfoo=
-github.com/funny/utest v0.0.0-20161029064919-43870a374500 h1:Z0r1CZnoIWFB/Uiwh1BU5FYmuFe6L5NPi6XWQEmsTRg=
-github.com/funny/utest v0.0.0-20161029064919-43870a374500/go.mod h1:mUn39tBov9jKnTWV1RlOYoNzxdBFHiSzXWdY1FoNGGg=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/icza/bitio v1.0.0 h1:squ/m1SHyFeCA6+6Gyol1AxV9nmPPlJFT8c2vKdj3U8=
-github.com/icza/bitio v1.0.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
-github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
-github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
 github.com/kelindar/process v0.0.0-20170730150328-69a29e249ec3/go.mod h1:+lTCLnZFXOkqwD8sLPl6u4erAc0cP8wFegQHfipz7KE=
 github.com/kelindar/rate v1.0.0/go.mod h1:AjT4G+hTItNwt30lucEGZIz8y7Uk5zPho6vurIZ+1Es=
 github.com/kelindar/tcp v1.0.0/go.mod h1:JB5hj1cshLU60XrLij2BBxW3JQ4hOye8vqbyvuKb52k=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 h1:aczX6NMOtt6L4YT0fQvKkDK6LZEtdOso9sUH89V1+P0=
+github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281/go.mod h1:lc+czkgO/8F7puNki5jk8QyujbfK1LOT7Wl0ON2hxyk=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
-github.com/pion/rtcp v1.2.4 h1:NT3H5LkUGgaEapvp0HGik+a+CpflRF7KTD7H+o7OWIM=
-github.com/pion/rtcp v1.2.4/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
-github.com/pion/rtp v1.6.1/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
+github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
+github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
 github.com/pion/rtp v1.6.2/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/rtp v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA=
-github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
-github.com/pion/sdp/v3 v3.0.2/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
-github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8=
-github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
+github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
+github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
+github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU=
+github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
 github.com/pixelbender/go-sdp v1.1.0/go.mod h1:6IBlz9+BrUHoFTea7gcp4S54khtOhjCW/nVDLhmZBAs=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/q191201771/naza v0.19.1 h1:4KLcxT2CHztO+7miPRtBG3FFgadSQYQw1gPPPKN7rnY=
-github.com/q191201771/naza v0.19.1/go.mod h1:5LeGupZZFtYP1g/S203n9vXoUNVdlRnPIfM6rExjqt0=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
+github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/q191201771/naza v0.30.2 h1:9ZC4T5AdSgGlW9cuFGp6H0mOOXQ156HxOzkYPqrvc14=
+github.com/q191201771/naza v0.30.2/go.mod h1:n+dpJjQSh90PxBwxBNuifOwQttywvSIN5TkWSSYCeBk=
+github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
+github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJQoJA=
+github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA=
 github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518/go.mod h1:CKI4AZ4XmGV240rTHfO0hfE83S6/a3/Q1siZJ/vXf7A=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A=
+github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210610132358-84b48f89b13b h1:k+E048sYJHyVnsr1GDrRZWQ32D2C7lWs9JRc0bel53A=
-golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93 h1:MYimHLfoXEpOhqd/zgoA/uoXzHB86AEky4LAx5ij9xA=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI=
-golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+m7s.live/engine/v4 v4.4.0 h1:e8YuCyUKgrnOxnRjkH6/bqEG9JAB116Q5Mngd0Mzhh0=
+m7s.live/engine/v4 v4.4.0/go.mod h1:uzpGiVnIcuoXehpvqOj9iTVxnyf7RZQZ/Ikiwyjs01E=
--- a/main.go
+++ b/main.go
@@ -1,107 +1,110 @@
 package rtsp

 import (
-	"encoding/json"
-	"fmt"
-	"log"
 	"net/http"
+	"sync"
 	"time"

-	. "github.com/Monibuca/engine/v3"
-	. "github.com/Monibuca/utils/v3"
 	"github.com/aler9/gortsplib"
+	"go.uber.org/zap"
+	. "m7s.live/engine/v4"
+	"m7s.live/engine/v4/config"
+	"m7s.live/engine/v4/util"
 )

-var config = struct {
-	ListenAddr   string
-	UDPAddr      string
-	RTCPAddr     string
-	Timeout      int
-	Reconnect    bool
-	AutoPullList map[string]string
-	AutoPushList map[string]string
-}{":554", ":8000", ":8001", 0, false, nil, nil}
-
-type RTSPStreamInfo struct {
-	StreamPath      string
-	Type            string //流类型，来自发布者
-	StartTime       time.Time
-	URL             string
-	SubscriberCount int
+type RTSPConfig struct {
+	config.Publish
+	config.Subscribe
+	config.Pull
+	config.Push
+	ListenAddr     string
+	UDPAddr        string
+	RTCPAddr       string
+	ReadBufferSize int
+	PullProtocol   string //tcp、udp、 auto（default）
+	sync.Map
 }

-func init() {
-	InstallPlugin(&PluginConfig{
-		Name:   "RTSP",
-		Config: &config,
-		Run:    runPlugin,
-	})
+func (conf *RTSPConfig) OnEvent(event any) {
+	switch v := event.(type) {
+	case FirstConfig:
+		s := &gortsplib.Server{
+			Handler:           conf,
+			RTSPAddress:       conf.ListenAddr,
+			UDPRTPAddress:     conf.UDPAddr,
+			UDPRTCPAddress:    conf.RTCPAddr,
+			MulticastIPRange:  "224.1.0.0/16",
+			MulticastRTPPort:  8002,
+			MulticastRTCPPort: 8003,
+		}
+		s.Start()
+		if conf.PullOnStart {
+			for streamPath, url := range conf.PullList {
+				if err := RTSPPlugin.Pull(streamPath, url, new(RTSPPuller), false); err != nil {
+					RTSPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
+				}
+			}
+		}
+	case SEpublish:
+		for streamPath, url := range conf.PushList {
+			if streamPath == v.Stream.Path {
+				if err := RTSPPlugin.Push(streamPath, url, new(RTSPPusher), false); err != nil {
+					RTSPPlugin.Error("push", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
+				}
+			}
+		}
+	case *Stream: //按需拉流
+		if conf.PullOnSubscribe {
+			for streamPath, url := range conf.PullList {
+				if streamPath == v.Path {
+					if err := RTSPPlugin.Pull(streamPath, url, new(RTSPPuller), false); err != nil {
+						RTSPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
+					}
+					break
+				}
+			}
+		}
+	}
 }
-func getRtspList() (info []*RTSPStreamInfo) {
-	for _, s := range Streams.ToList() {
-		switch rtsp := s.ExtraProp.(type) {
-		case *RTSPublisher:
-			info = append(info, rtsp.GetInfo())
-		case *RTSPClient:
-			info = append(info, rtsp.GetInfo())
+
+var rtspConfig = &RTSPConfig{
+	ListenAddr:     ":554",
+	UDPAddr:        ":8000",
+	RTCPAddr:       ":8001",
+	ReadBufferSize: 2048,
+}
+var RTSPPlugin = InstallPlugin(rtspConfig)
+
+func filterStreams() (ss []*Stream) {
+	Streams.RLock()
+	defer Streams.RUnlock()
+	for _, s := range Streams.Map {
+		switch s.Publisher.(type) {
+		case *RTSPPublisher, *RTSPPuller:
+			ss = append(ss, s)
 		}
 	}
 	return
 }
-func runPlugin() {
-	http.HandleFunc("/api/rtsp/list", func(w http.ResponseWriter, r *http.Request) {
-		CORS(w, r)
-		if r.URL.Query().Get("json") != "" {
-			if jsonData, err := json.Marshal(getRtspList()); err == nil {
-				w.Write(jsonData)
-			} else {
-				w.WriteHeader(500)
-			}
-			return
-		}
-		sse := NewSSE(w, r.Context())
-		var err error
-		for tick := time.NewTicker(time.Second); err == nil; <-tick.C {
-			err = sse.WriteJSON(getRtspList())
-		}
-	})
-	http.HandleFunc("/api/rtsp/pull", func(w http.ResponseWriter, r *http.Request) {
-		CORS(w, r)
-		targetURL := r.URL.Query().Get("target")
-		streamPath := r.URL.Query().Get("streamPath")
-		if err := (&RTSPClient{Transport: gortsplib.TransportTCP}).PullStream(streamPath, targetURL); err == nil {
-			w.Write([]byte(`{"code":0}`))
-		} else {
-			w.Write([]byte(fmt.Sprintf(`{"code":1,"msg":"%s"}`, err.Error())))
-		}
-	})
-	for streamPath, url := range config.AutoPullList {
-		if err := (&RTSPClient{Transport: gortsplib.TransportTCP}).PullStream(streamPath, url); err != nil {
-			Println(err)
-		}
-	}
-	go AddHook(HOOK_PUBLISH, func(s *Stream) {
-		for streamPath, url := range config.AutoPushList {
-			if s.StreamPath == streamPath {
-				(&RTSPClient{}).PushStream(streamPath, url)
-			}
-		}
-	})
-	if config.ListenAddr != "" {
-		go log.Fatal(ListenRtsp(config.ListenAddr))
+
+func (*RTSPConfig) API_list(w http.ResponseWriter, r *http.Request) {
+	util.ReturnJson(filterStreams, time.Second, w, r)
+}
+
+func (*RTSPConfig) API_Pull(rw http.ResponseWriter, r *http.Request) {
+	err := RTSPPlugin.Pull(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), new(RTSPPuller), r.URL.Query().Has("save"))
+	if err != nil {
+		http.Error(rw, err.Error(), http.StatusBadRequest)
+	} else {
+		rw.Write([]byte("ok"))
 	}
 }

-func ListenRtsp(addr string) error {
-	defer log.Println("rtsp server start!")
-	s := &gortsplib.Server{
-		Handler:           &RTSPServer{},
-		RTSPAddress:       addr,
-		UDPRTPAddress:     config.UDPAddr,
-		UDPRTCPAddress:    config.RTCPAddr,
-		MulticastIPRange:  "224.1.0.0/16",
-		MulticastRTPPort:  8002,
-		MulticastRTCPPort: 8003,
+func (*RTSPConfig) API_Push(rw http.ResponseWriter, r *http.Request) {
+	err := RTSPPlugin.Push(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), new(RTSPPusher), r.URL.Query().Has("save"))
+	if err != nil {
+		http.Error(rw, err.Error(), http.StatusBadRequest)
+	} else {
+		rw.Write([]byte("ok"))
 	}
-	return s.StartAndWait()
 }
--- a/payloader.go
+++ b/payloader.go
@@ -1,24 +0,0 @@
-package rtsp
-
-// AACayloader payloads AAC packets
-type AACPayloader struct{}
-
-// Payload fragments an AAC packet across one or more byte arrays
-func (p *AACPayloader) Payload(mtu uint16, payload []byte) [][]byte {
-	var out [][]byte
-	o := make([]byte, len(payload)+4)
-	//AU_HEADER_LENGTH,因为单位是bit, 除以8就是auHeader的字节长度；又因为单个auheader字节长度2字节，所以再除以2就是auheader的个数。
-	o[0] = 0x00 //高位
-	o[1] = 0x10 //低位
-	//AU_HEADER
-	o[2] = (byte)((len(payload) & 0x1fe0) >> 5) //高位
-	o[3] = (byte)((len(payload) & 0x1f) << 3)   //低位
-	copy(o[4:], payload)
-	return append(out, o)
-}
-
-type H265Payloader struct{}
-
-func (p *H265Payloader) Payload(mtu uint16, payload []byte) [][]byte {
-	return nil
-}
--- a/publisher.go
+++ b/publisher.go
@@ -3,46 +3,38 @@ package rtsp
 import (
 	"encoding/base64"
 	"encoding/hex"
+	"errors"
+	"fmt"
 	"strconv"
 	"strings"

-	. "github.com/Monibuca/engine/v3"
-	. "github.com/Monibuca/utils/v3"
 	"github.com/aler9/gortsplib"
+	. "m7s.live/engine/v4"
+	"m7s.live/engine/v4/common"
+	. "m7s.live/engine/v4/track"
 )

-type RTSPublisher struct {
-	*Stream     `json:"-"`
-	URL         string
-	stream      *gortsplib.ServerStream
-	processFunc []func([]byte)
+type RTSPPublisher struct {
+	Publisher
+	Tracks []common.AVTrack `json:"-"`
+	RTSPIO
 }

-func (p *RTSPublisher) GetInfo() (info *RTSPStreamInfo) {
-	info = &RTSPStreamInfo{
-		URL:             p.URL,
-		StreamPath:      p.StreamPath,
-		Type:            p.Type,
-		StartTime:       p.StartTime,
-		SubscriberCount: len(p.Subscribers),
-	}
-	return
-}
-func (p *RTSPublisher) setTracks(tracks gortsplib.Tracks) {
-	if p.processFunc != nil {
-		p.processFunc = p.processFunc[:len(tracks)]
-		return
-	} else {
-		p.processFunc = make([]func([]byte), len(tracks))
-	}
-	for i, track := range tracks {
-		v, ok := track.Media.Attribute("rtpmap")
+func (p *RTSPPublisher) SetTracks() error {
+	p.Tracks = make([]common.AVTrack, len(p.tracks))
+	for trackId, track := range p.tracks {
+		md := track.MediaDescription()
+		v, ok := md.Attribute("rtpmap")
 		if !ok {
+			return errors.New("rtpmap attribute not found")
+		}
+		v = strings.TrimSpace(v)
+		vals := strings.Split(v, " ")
+		if len(vals) != 2 {
 			continue
 		}
-
 		fmtp := make(map[string]string)
-		if v, ok := track.Media.Attribute("fmtp"); ok {
+		if v, ok = md.Attribute("fmtp"); ok {
 			if tmp := strings.SplitN(v, " ", 2); len(tmp) == 2 {
 				for _, kv := range strings.Split(tmp[1], ";") {
 					kv = strings.Trim(kv, " ")
@@ -57,76 +49,89 @@ func (p *RTSPublisher) setTracks(tracks gortsplib.Tracks) {
 				}
 			}
 		}
-
-		v = strings.TrimSpace(v)
-		vals := strings.Split(v, " ")
-		if len(vals) != 2 {
-			continue
-		}
 		timeScale := 0
 		keyval := strings.Split(vals[1], "/")
 		if i, err := strconv.Atoi(keyval[1]); err == nil {
 			timeScale = i
 		}
 		if len(keyval) >= 2 {
-			Printf("track %d is %s", i, keyval[0])
 			switch strings.ToLower(keyval[0]) {
 			case "h264":
-				vt := p.NewRTPVideo(7)
-				if conf, err := track.ExtractConfigH264(); err == nil {
-					vt.PushNalu(0, 0, conf.SPS, conf.PPS)
+				vt := NewH264(p.Stream)
+				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
+					vt.DecoderConfiguration.PayloadType = byte(payloadType)
+				}
+				p.Tracks[trackId] = vt
+				t := track.(*gortsplib.TrackH264)
+				if len(t.SPS) > 0 {
+					vt.WriteSlice(common.NALUSlice{t.SPS})
+				}
+				if len(t.PPS) > 0 {
+					vt.WriteSlice(common.NALUSlice{t.PPS})
 				}
-				p.processFunc[i] = vt.Push
 			case "h265", "hevc":
-				vt := p.NewRTPVideo(12)
+				vt := NewH265(p.Stream)
+				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
+					vt.DecoderConfiguration.PayloadType = byte(payloadType)
+				}
+				p.Tracks[trackId] = vt
 				if v, ok := fmtp["sprop-vps"]; ok {
 					vps, _ := base64.StdEncoding.DecodeString(v)
-					vt.PushNalu(0, 0, vps)
+					vt.WriteSlice(common.NALUSlice{vps})
 				}
 				if v, ok := fmtp["sprop-sps"]; ok {
 					sps, _ := base64.StdEncoding.DecodeString(v)
-					vt.PushNalu(0, 0, sps)
+					vt.WriteSlice(common.NALUSlice{sps})
 				}
 				if v, ok := fmtp["sprop-pps"]; ok {
 					pps, _ := base64.StdEncoding.DecodeString(v)
-					vt.PushNalu(0, 0, pps)
+					vt.WriteSlice(common.NALUSlice{pps})
 				}
-				p.processFunc[i] = vt.Push
 			case "pcma":
-				at := p.NewRTPAudio(7)
-				at.SoundRate = timeScale
-				at.SoundSize = 16
+				at := NewG711(p.Stream, true)
+				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
+					at.DecoderConfiguration.PayloadType = byte(payloadType)
+				}
+				p.Tracks[trackId] = at
+				at.SampleRate = uint32(timeScale)
 				if len(keyval) >= 3 {
 					x, _ := strconv.Atoi(keyval[2])
 					at.Channels = byte(x)
 				} else {
 					at.Channels = 1
 				}
-				at.ExtraData = []byte{(at.CodecID << 4) | (1 << 1)}
-				p.processFunc[i] = at.Push
+				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
 			case "pcmu":
-				at := p.NewRTPAudio(8)
-				at.SoundRate = timeScale
-				at.SoundSize = 16
+				at := NewG711(p.Stream, false)
+				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
+					at.DecoderConfiguration.PayloadType = byte(payloadType)
+				}
+				p.Tracks[trackId] = at
+				at.SampleRate = uint32(timeScale)
 				if len(keyval) >= 3 {
 					x, _ := strconv.Atoi(keyval[2])
 					at.Channels = byte(x)
 				} else {
 					at.Channels = 1
 				}
-				at.ExtraData = []byte{(at.CodecID << 4) | (1 << 1)}
-				p.processFunc[i] = at.Push
+				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
 			case "mpeg4-generic":
-				at := p.NewRTPAudio(0)
+				at := NewAAC(p.Stream)
+				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
+					at.DecoderConfiguration.PayloadType = byte(payloadType)
+				}
+				p.Tracks[trackId] = at
 				if config, ok := fmtp["config"]; ok {
 					asc, _ := hex.DecodeString(config)
-					at.SetASC(asc)
+					// 复用AVCC写入逻辑，解析出AAC的配置信息
+					at.WriteAVCC(0, append([]byte{0xAF, 0}, asc...))
 				} else {
-					Println("aac no config")
+					RTSPPlugin.Warn("aac no config")
 				}
-				at.SoundSize = 16
-				p.processFunc[i] = at.Push
+			default:
+				return fmt.Errorf("unsupport codec:%s", keyval[0])
 			}
 		}
 	}
+	return nil
 }
--- a/server.go
+++ b/server.go
@@ -1,254 +1,120 @@
 package rtsp

 import (
-	"fmt"
-	"sync"
-	"unsafe"
-
-	"github.com/Monibuca/engine/v3"
-	. "github.com/Monibuca/utils/v3"
-	"github.com/Monibuca/utils/v3/codec"
 	"github.com/aler9/gortsplib"
-	"github.com/aler9/gortsplib/pkg/aac"
 	"github.com/aler9/gortsplib/pkg/base"
-	"github.com/pion/rtp"
-	"github.com/pion/rtp/codecs"
+	. "m7s.live/engine/v4"
 )

-// 接收RTSP推流：OnConnOpen->OnAnnounce->OnSetup->OnSessionOpen
-// 接收RTSP拉流：OnConnOpen->OnDescribe->OnSetup->OnSessionOpen
-type RTSPServer struct {
-	sync.Map
-}
-type RTSPSubscriber struct {
-	stream *gortsplib.ServerStream
-	engine.Subscriber
-	vt *engine.VideoTrack
-	at *engine.AudioTrack
+type RTSPIO struct {
+	tracks       gortsplib.Tracks
+	stream       *gortsplib.ServerStream
+	audioTrackId int
+	videoTrackId int
 }

-// called after a connection is opened.
-func (sh *RTSPServer) OnConnOpen(ctx *gortsplib.ServerHandlerOnConnOpenCtx) {
-	Printf("rtsp conn opened")
+func (conf *RTSPConfig) OnConnOpen(ctx *gortsplib.ServerHandlerOnConnOpenCtx) {
+	RTSPPlugin.Debug("conn opened")
 }

-// called after a connection is closed.
-func (sh *RTSPServer) OnConnClose(ctx *gortsplib.ServerHandlerOnConnCloseCtx) {
-	Printf("rtsp conn closed (%v)", ctx.Error)
-	if p, ok := sh.Load(ctx.Conn); ok {
-		switch v := p.(type) {
-		case *RTSPublisher:
-			v.Close()
-		case *RTSPSubscriber:
-			v.Close()
-		}
-		sh.Delete(ctx.Conn)
+func (conf *RTSPConfig) OnConnClose(ctx *gortsplib.ServerHandlerOnConnCloseCtx) {
+	RTSPPlugin.Debug("conn closed")
+	if p, ok := conf.LoadAndDelete(ctx.Conn); ok {
+		p.(IIO).Stop()
 	}
 }

-// called after a session is opened.
-func (sh *RTSPServer) OnSessionOpen(ctx *gortsplib.ServerHandlerOnSessionOpenCtx) {
-	Printf("rtsp session opened")
+func (conf *RTSPConfig) OnSessionOpen(ctx *gortsplib.ServerHandlerOnSessionOpenCtx) {
+	RTSPPlugin.Debug("session opened")
 }

-// called after a session is closed.
-func (sh *RTSPServer) OnSessionClose(ctx *gortsplib.ServerHandlerOnSessionCloseCtx) {
-	Printf("rtsp session closed")
-	if v, ok := sh.LoadAndDelete(ctx.Session); ok {
-		switch v := v.(type) {
-		case *RTSPublisher:
-			v.Close()
-		case *RTSPSubscriber:
-			v.Close()
-		}
+func (conf *RTSPConfig) OnSessionClose(ctx *gortsplib.ServerHandlerOnSessionCloseCtx) {
+	RTSPPlugin.Debug("session closed")
+	if p, ok := conf.LoadAndDelete(ctx.Session); ok {
+		p.(IIO).Stop()
 	}
 }

 // called after receiving a DESCRIBE request.
-func (sh *RTSPServer) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) {
-	Printf("describe request")
-	var err error
-	if s := engine.FindStream(ctx.Path); s != nil {
-		var tracks gortsplib.Tracks
-		var stream *gortsplib.ServerStream
-		var sub RTSPSubscriber
-		sub.Type = "RTSP pull"
-		sub.vt = s.WaitVideoTrack("h264", "h265")
-		sub.at = s.WaitAudioTrack("aac", "pcma", "pcmu")
-		ssrc := uintptr(unsafe.Pointer(stream))
-		var trackIds = 0
-		if sub.vt != nil {
-			trackId := trackIds
-			var vtrack *gortsplib.Track
-			var vpacketer rtp.Packetizer
-			switch sub.vt.CodecID {
-			case codec.CodecID_H264:
-				if vtrack, err = gortsplib.NewTrackH264(96, &gortsplib.TrackConfigH264{
-					SPS: sub.vt.ExtraData.NALUs[0],
-					PPS: sub.vt.ExtraData.NALUs[1],
-				}); err == nil {
-					vpacketer = rtp.NewPacketizer(1200, 96, uint32(ssrc), &codecs.H264Payloader{}, rtp.NewFixedSequencer(1), 90000)
-				} else {
-					return nil, nil, err
-				}
-			case codec.CodecID_H265:
-				vtrack = NewH265Track(96, sub.vt.ExtraData.NALUs)
-				vpacketer = rtp.NewPacketizer(1200, 96, uint32(ssrc), &H265Payloader{}, rtp.NewFixedSequencer(1), 90000)
-			}
-			var st uint32
-			onVideo := func(ts uint32, pack *engine.VideoPack) {
-				for _, nalu := range pack.NALUs {
-					for _, pack := range vpacketer.Packetize(nalu, (ts-st)*90) {
-						rtp, _ := pack.Marshal()
-						stream.WritePacketRTP(trackId, rtp)
-					}
-				}
-				st = ts
-			}
-			sub.OnVideo = func(ts uint32, pack *engine.VideoPack) {
-				if st = ts; st != 0 {
-					sub.OnVideo = onVideo
-				}
-				onVideo(ts, pack)
-			}
-			tracks = append(tracks, vtrack)
-			trackIds++
-		}
-		if sub.at != nil {
-			var st uint32
-			trackId := trackIds
-			switch sub.at.CodecID {
-			case codec.CodecID_PCMA, codec.CodecID_PCMU:
-				atrack := NewG711Track(97, map[byte]string{7: "pcma", 8: "pcmu"}[sub.vt.CodecID])
-				apacketizer := rtp.NewPacketizer(1200, 97, uint32(ssrc), &codecs.G711Payloader{}, rtp.NewFixedSequencer(1), 8000)
-				sub.OnAudio = func(ts uint32, pack *engine.AudioPack) {
-					for _, pack := range apacketizer.Packetize(pack.Raw, (ts-st)*8) {
-						buf, _ := pack.Marshal()
-						stream.WritePacketRTP(trackId, buf)
-					}
-					st = ts
-				}
-				tracks = append(tracks, atrack)
-			case codec.CodecID_AAC:
-				var mpegConf aac.MPEG4AudioConfig
-				mpegConf.Decode(sub.at.ExtraData[2:])
-				conf := &gortsplib.TrackConfigAAC{
-					Type:              int(mpegConf.Type),
-					SampleRate:        mpegConf.SampleRate,
-					ChannelCount:      mpegConf.ChannelCount,
-					AOTSpecificConfig: mpegConf.AOTSpecificConfig,
-				}
-				if atrack, err := gortsplib.NewTrackAAC(97, conf); err == nil {
-					apacketizer := rtp.NewPacketizer(1200, 97, uint32(ssrc), &AACPayloader{}, rtp.NewFixedSequencer(1), uint32(mpegConf.SampleRate))
-					sub.OnAudio = func(ts uint32, pack *engine.AudioPack) {
-						for _, pack := range apacketizer.Packetize(pack.Raw, (ts-st)*uint32(mpegConf.SampleRate)/1000) {
-							buf, _ := pack.Marshal()
-							stream.WritePacketRTP(trackId, buf)
-						}
-						st = ts
-					}
-					tracks = append(tracks, atrack)
-				}
-			}
-		}
-		stream = gortsplib.NewServerStream(tracks)
-		sub.stream = stream
-		sh.Store(ctx.Conn, &sub)
+func (conf *RTSPConfig) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) {
+	RTSPPlugin.Debug("describe request")
+	var suber RTSPSubscriber
+	suber.SetIO(ctx.Conn.NetConn())
+	if err := RTSPPlugin.Subscribe(ctx.Path, &suber); err == nil {
+		conf.Store(ctx.Conn, &suber)
 		return &base.Response{
 			StatusCode: base.StatusOK,
-		}, stream, nil
-		// if stream, ok := s.ExtraProp.(*gortsplib.ServerStream); ok {
-		// 	return &base.Response{
-		// 		StatusCode: base.StatusOK,
-		// 	}, stream, nil
-		// }
+		}, suber.stream, nil
+	} else {
+		return &base.Response{
+			StatusCode: base.StatusNotFound,
+		}, suber.stream, nil
 	}
-	return &base.Response{
-		StatusCode: base.StatusNotFound,
-	}, nil, nil
 }

-// called after receiving an ANNOUNCE request.
-func (sh *RTSPServer) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (*base.Response, error) {
-	Printf("announce request")
-	p := &RTSPublisher{
-		Stream: &engine.Stream{
-			StreamPath: ctx.Path,
-			Type:       "RTSP push",
-		},
+func (conf *RTSPConfig) OnSetup(ctx *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
+	var resp base.Response
+	resp.StatusCode = base.StatusOK
+	if p, ok := conf.Load(ctx.Conn); ok {
+		switch v := p.(type) {
+		case *RTSPSubscriber:
+			return &resp, v.stream, nil
+		case *RTSPPublisher:
+			return &resp, v.stream, nil
+		}
 	}
-	p.ExtraProp = p
-	p.URL = ctx.Req.URL.String()
-	if p.Publish() {
-		p.setTracks(ctx.Tracks)
+	resp.StatusCode = base.StatusNotFound
+	return &resp, nil, nil
+}
+
+func (conf *RTSPConfig) OnPlay(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
+	var resp base.Response
+	resp.StatusCode = base.StatusNotFound
+	if p, ok := conf.Load(ctx.Conn); ok {
+		switch v := p.(type) {
+		case *RTSPSubscriber:
+			resp.StatusCode = base.StatusOK
+			go func() {
+				v.PlayRTP()
+				ctx.Session.Close()
+			}()
+		}
+	}
+	return &resp, nil
+}
+func (conf *RTSPConfig) OnRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*base.Response, error) {
+	return &base.Response{
+		StatusCode: base.StatusOK,
+	}, nil
+}
+func (conf *RTSPConfig) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (*base.Response, error) {
+	p := &RTSPPublisher{}
+	p.SetIO(ctx.Conn.NetConn())
+	if err := RTSPPlugin.Publish(ctx.Path, p); err == nil {
+		p.tracks = ctx.Tracks
 		p.stream = gortsplib.NewServerStream(ctx.Tracks)
-		sh.Store(ctx.Conn, p)
-		sh.Store(ctx.Session, p)
+		if err = p.SetTracks(); err != nil {
+			return nil, err
+		}
+		conf.Store(ctx.Conn, p)
+		conf.Store(ctx.Session, p)
 	} else {
 		return &base.Response{
 			StatusCode: base.StatusBadRequest,
-		}, fmt.Errorf("streamPath is already exist")
+		}, nil
 	}
 	return &base.Response{
 		StatusCode: base.StatusOK,
 	}, nil
 }

-// called after receiving a SETUP request.
-func (sh *RTSPServer) OnSetup(ctx *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
-	Printf("setup request")
-	if p, ok := sh.Load(ctx.Conn); ok {
+func (conf *RTSPConfig) OnPacketRTP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx) {
+	if p, ok := conf.Load(ctx.Session); ok {
 		switch v := p.(type) {
-		case *RTSPublisher:
-			return &base.Response{
-				StatusCode: base.StatusOK,
-			}, v.stream, nil
-		case *RTSPSubscriber:
-			return &base.Response{
-				StatusCode: base.StatusOK,
-			}, v.stream, nil
+		case *RTSPPublisher:
+			if v.Tracks[ctx.TrackID] != nil {
+				v.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
+			}
 		}
 	}
-	return &base.Response{
-		StatusCode: base.StatusNotFound,
-	}, nil, nil
-}
-
-// called after receiving a PLAY request.
-func (sh *RTSPServer) OnPlay(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
-	Printf("play request")
-	if p, ok := sh.Load(ctx.Conn); ok {
-		if sub := p.(*RTSPSubscriber); sub.Subscribe(ctx.Path) == nil {
-			go func() {
-				sub.Play(sub.at, sub.vt)
-				ctx.Conn.Close()
-			}()
-			return &base.Response{
-				StatusCode: base.StatusOK,
-			}, nil
-		}
-	}
-	return &base.Response{
-		StatusCode: base.StatusNotFound,
-	}, nil
-}
-
-// called after receiving a RECORD request.
-func (sh *RTSPServer) OnRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*base.Response, error) {
-	Printf("record request")
-	return &base.Response{
-		StatusCode: base.StatusOK,
-	}, nil
-}
-
-// called after receiving a frame.
-func (sh *RTSPServer) OnPacketRTP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx) {
-	if p, ok := sh.Load(ctx.Session); ok {
-		rtsp := p.(*RTSPublisher)
-		if rtsp.Err() != nil {
-			ctx.Session.Close()
-			return
-		}
-		rtsp.processFunc[ctx.TrackID](ctx.Payload)
-	}
 }
--- a/subscriber.go
+++ b/subscriber.go
@@ -0,0 +1,63 @@
+package rtsp
+
+import (
+	"github.com/aler9/gortsplib"
+	"github.com/aler9/gortsplib/pkg/aac"
+	. "m7s.live/engine/v4"
+	"m7s.live/engine/v4/codec"
+	"m7s.live/engine/v4/track"
+)
+
+type RTSPSubscriber struct {
+	Subscriber
+	RTSPIO
+}
+
+func (s *RTSPSubscriber) OnEvent(event any) {
+	switch v := event.(type) {
+	case *track.Video:
+		switch v.CodecID {
+		case codec.CodecID_H264:
+			extra := v.DecoderConfiguration.Raw
+			vtrack := &gortsplib.TrackH264{
+				PayloadType: v.DecoderConfiguration.PayloadType, SPS: extra[0], PPS: extra[1],
+			}
+			s.videoTrackId = len(s.tracks)
+			s.tracks = append(s.tracks, vtrack)
+		case codec.CodecID_H265:
+			vtrack := &gortsplib.TrackH265{
+				PayloadType: v.DecoderConfiguration.PayloadType, VPS: v.DecoderConfiguration.Raw[0], SPS: v.DecoderConfiguration.Raw[1], PPS: v.DecoderConfiguration.Raw[2],
+			}
+			s.videoTrackId = len(s.tracks)
+			s.tracks = append(s.tracks, vtrack)
+		}
+		s.AddTrack(v)
+	case *track.Audio:
+		switch v.CodecID {
+		case codec.CodecID_AAC:
+			var mpegConf aac.MPEG4AudioConfig
+			mpegConf.Unmarshal(v.DecoderConfiguration.Raw)
+			atrack := &gortsplib.TrackAAC{
+				PayloadType: v.DecoderConfiguration.PayloadType, Config: &mpegConf, SizeLength: 13, IndexLength: 3, IndexDeltaLength: 3,
+			}
+			s.audioTrackId = len(s.tracks)
+			s.tracks = append(s.tracks, atrack)
+		case codec.CodecID_PCMA:
+			s.audioTrackId = len(s.tracks)
+
+			s.tracks = append(s.tracks, &gortsplib.TrackPCMA{})
+		case codec.CodecID_PCMU:
+			s.audioTrackId = len(s.tracks)
+			s.tracks = append(s.tracks, &gortsplib.TrackPCMU{})
+		}
+		s.AddTrack(v)
+	case ISubscriber:
+		s.stream = gortsplib.NewServerStream(s.tracks)
+	case VideoRTP:
+		s.stream.WritePacketRTP(s.videoTrackId, &v.Packet, s.Video.Frame.PTS == s.Video.Frame.DTS)
+	case AudioRTP:
+		s.stream.WritePacketRTP(s.audioTrackId, &v.Packet, s.Audio.Frame.PTS == s.Audio.Frame.DTS)
+	default:
+		s.Subscriber.OnEvent(event)
+	}
+}
--- a/track.go
+++ b/track.go
@@ -1,87 +0,0 @@
-package rtsp
-
-import (
-	"encoding/base64"
-	"fmt"
-	"strconv"
-
-	"github.com/aler9/gortsplib"
-	psdp "github.com/pion/sdp/v3"
-)
-
-// func NewTrackAAC(payloadType uint8, conf *gortsplib.TrackConfigAAC) (*gortsplib.Track, error) {
-// 	mpegConf, err := aac.MPEG4AudioConfig{
-// 		Type:              aac.MPEG4AudioType(conf.Type),
-// 		SampleRate:        conf.SampleRate,
-// 		ChannelCount:      conf.ChannelCount,
-// 		AOTSpecificConfig: conf.AOTSpecificConfig,
-// 	}.Encode()
-// 	if err != nil {
-// 		return nil, err
-// 	}
-
-// 	typ := strconv.FormatInt(int64(payloadType), 10)
-
-// 	return &gortsplib.Track{
-// 		Media: &psdp.MediaDescription{
-// 			MediaName: psdp.MediaName{
-// 				Media:   "audio",
-// 				Protos:  []string{"RTP", "AVP"},
-// 				Formats: []string{typ},
-// 			},
-// 			Attributes: []psdp.Attribute{
-// 				{
-// 					Key: "rtpmap",
-// 					Value: typ + " mpeg4-generic/" + strconv.FormatInt(int64(conf.SampleRate), 10) +
-// 						"/" + strconv.FormatInt(int64(conf.ChannelCount), 10),
-// 				},
-// 				{
-// 					Key: "fmtp",
-// 					Value: typ + " profile-level-id=1; " +
-// 						"mode=AAC-hbr; " +
-// 						"sizelength=6; " +
-// 						"indexlength=2; " +
-// 						"indexdeltalength=2; " +
-// 						"config=" + hex.EncodeToString(mpegConf),
-// 				},
-// 			},
-// 		},
-// 	}, nil
-// }
-func NewG711Track(payloadType uint8, law string) *gortsplib.Track {
-	return &gortsplib.Track{
-		Media: &psdp.MediaDescription{
-			MediaName: psdp.MediaName{
-				Media:   "audio",
-				Protos:  []string{"RTP", "AVP"},
-				Formats: []string{strconv.FormatInt(int64(payloadType), 10)}},
-			Attributes: []psdp.Attribute{
-				{
-					Key:   "rtpmap",
-					Value: fmt.Sprintf("%d %s/8000/1", payloadType, law),
-				},
-			},
-		},
-	}
-}
-func NewH265Track(payloadType uint8, sprop [][]byte) *gortsplib.Track {
-	return &gortsplib.Track{
-		Media: &psdp.MediaDescription{
-			MediaName: psdp.MediaName{
-				Media:   "video",
-				Protos:  []string{"RTP", "AVP"},
-				Formats: []string{fmt.Sprintf("%d", payloadType)},
-			},
-			Attributes: []psdp.Attribute{
-				{
-					Key:   "rtpmap",
-					Value: fmt.Sprintf("%d H265/90000", payloadType),
-				},
-				{
-					Key:   "fmtp",
-					Value: fmt.Sprintf("%d packetization-mode=1;sprop-vps=%s;sprop-sps=%s;sprop-pps=%s;", payloadType, base64.StdEncoding.EncodeToString(sprop[0]), base64.StdEncoding.EncodeToString(sprop[1]), base64.StdEncoding.EncodeToString(sprop[2])),
-				},
-			},
-		},
-	}
-}
Author	SHA1	Message	Date
dexter	0501a84da6	👌 IMPROVE: 导出RTSP插件	2022-09-04 12:43:42 +08:00
dexter	7d08e06922	兼容sdp中没有包含sps和pps的情况	2022-08-21 14:49:54 +08:00
dexter	754a28e506	更新依赖版本	2022-07-29 20:43:39 +08:00
dexter	9b058153d2	增加强制指定拉流协议的配置	2022-07-23 11:59:26 +08:00
dexter	ae37279dd1	aler9未处理回调中带有err的情况	2022-07-03 01:14:23 +08:00
dexter	93d6eedff2	适配engine 4.4.0	2022-06-25 20:11:32 +08:00
dexter	2c1d908d7e	跟随引擎4.3.0版本	2022-06-19 23:44:28 +08:00
dexter	ced54a94a4	添加序列化屏蔽字段	2022-06-19 15:30:06 +08:00
dexter	f9bc450d01	跟随aler9升级	2022-06-05 21:09:37 +08:00
dexter	44fb77d121	去掉g711代码	2022-05-27 13:42:06 +08:00
dexter	1b6981cccb	使用官方创建的g711	2022-05-27 12:41:00 +08:00
dexter	2cd295d32c	payloadType推拉对应	2022-05-26 20:35:27 +08:00
dexter	57ec489fef	engine已实现等待track功能	2022-05-26 11:20:11 +08:00
dexter	a2100768b4	rtp降为v1	2022-05-15 16:32:45 +08:00
dexter	76956b16d1	对推流可能无法解析的情况进行报错	2022-05-10 21:58:35 +08:00
dexter	91e1726920	暂时修复向远程推流	2022-05-10 15:30:14 +08:00
dexter	4a0da71ee9	修改推流	2022-05-09 22:03:55 +08:00
langhuihui	701d55469d	update readme	2022-05-04 21:38:20 +08:00
langhuihui	e273d0010e	将pcma的payloadType设置为8	2022-05-03 22:28:21 +08:00
langhuihui	96834e26a1	加上空格	2022-05-03 22:24:07 +08:00
dexter	7d0451c204	优化代码	2022-04-24 09:55:37 +08:00
langhuihui	c7c8858d36	添加API接口	2022-04-05 21:19:08 +08:00
dexter	731521f771	升级playblock	2022-03-27 11:33:34 +08:00
dexter	17334dd106	发布功能完善	2022-03-20 00:16:16 +08:00
dexter	2d9838bdfa	加上client逻辑	2022-03-19 01:15:19 +08:00
dexter	bd5a146ea6	v4 update	2022-03-18 01:24:32 +08:00
dexter	e411d30e91	Merge pull request #17 from jianglieshan/aler9 fix:修改rtsp插件作为服务端出流时，ssrc为0的bug	2022-01-16 13:12:11 +08:00
jianglieshan	709a4cee7b	fix:修改rtsp插件作为服务端出流时，ssrc为0的bug	2022-01-15 16:50:40 +08:00
dexter	a90f52769d	Merge pull request #16 from ziminghua/aler9 增加RTSPClient关闭的事件订阅，同步关闭客户端连接	2022-01-11 17:00:40 +08:00
訾明华	3764a26bbd	增加RTSPClient关闭的事件订阅，同步关闭客户端连接增加RTSPClient关闭的事件订阅，同步关闭客户端连接	2022-01-11 16:52:14 +08:00
dexter	2533ab2604	Merge pull request #15 from ziminghua/aler9 多slice的情况下，同步同一帧的时间戳	2022-01-11 11:40:38 +08:00
訾明华	db07f0d588	多slice的情况下，同步同一帧的时间戳 `vpacketer.Packetize`再打包的过程中会把当前的timestamp+samples作为下一次打包的时间戳，如果多slice会连续传递samples导致同一帧的时间戳不一致	2022-01-11 11:34:29 +08:00
dexter	f110513d70	增加配置项ReadBufferSize	2021-12-29 22:59:45 +08:00
dexter	8901f4c117	修复bug	2021-12-29 22:16:11 +08:00
dexter	2f7c2de352	增加读取缓存大小，设置Mark标志位	2021-12-29 20:18:12 +08:00
dexter	af053bb5e6	对处理回调判空	2021-12-27 20:42:06 +08:00
dexter	bed7ba8a87	修复一个低级错误	2021-12-22 16:32:06 +08:00
dexter	0cbc4beb0f	Merge pull request #13 from lhong1001/rtsp-syld modified by syld 2021-12-20	2021-12-20 18:24:49 +08:00
root	edbfc07275	modified by syld 2021-12-20	2021-12-20 17:43:08 +08:00