Compare commits

...

6 Commits

Author SHA1 Message Date
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
2 changed files with 11 additions and 2 deletions

View File

@@ -165,6 +165,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

View File

@@ -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
@@ -98,7 +98,13 @@ func (sh *RTSPServer) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*ba
var st uint32
onVideo := func(ts uint32, pack *engine.VideoPack) {
for i, nalu := range pack.NALUs {
packs := vpacketer.Packetize(nalu, (ts-st)*90)
var samples uint32
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()