Compare commits

...

2 Commits

Author SHA1 Message Date
charlestamz
a69b739e5e 修复Invite报文 2023-02-20 16:41:55 +08:00
dexter
4e96efa9ff fix: 丢包逻辑判断第一个包会丢掉 2023-02-20 16:20:28 +08:00
2 changed files with 7 additions and 3 deletions

View File

@@ -322,7 +322,7 @@ func (channel *Channel) Invite(opt InviteOptions) (code int, err error) {
// }
sdpInfo := []string{
"v=0",
fmt.Sprintf("o=%s 0 0 IN IP4 %s", channel.DeviceID, d.mediaIP),
fmt.Sprintf("o=%s 0 0 IN IP4 %s", d.ID, d.mediaIP),
"s=" + s,
"u=" + channel.DeviceID + ":0",
"c=IN IP4 " + d.mediaIP,

View File

@@ -42,7 +42,7 @@ func (p *GBPublisher) PrintDump(s string) {
func (p *GBPublisher) OnEvent(event any) {
if p.channel == nil {
p.parser.EsHandler = p
// p.parser.EsHandler = p
p.IO.OnEvent(event)
return
}
@@ -55,7 +55,7 @@ func (p *GBPublisher) OnEvent(event any) {
p.Type = "GB28181 Playback"
p.channel.RecordPublisher = p
}
p.parser.EsHandler = p
// p.parser.EsHandler = p
conf.publishers.Add(p.SSRC, p)
if err := error(nil); p.dump != "" {
if p.dumpFile, err = os.OpenFile(p.dump, os.O_WRONLY|os.O_CREATE, 0644); err != nil {
@@ -178,6 +178,10 @@ func (p *GBPublisher) ReceiveAudio(es mpegps.MpegPsEsStream) {
// 解析rtp封装 https://www.ietf.org/rfc/rfc2250.txt
func (p *GBPublisher) PushPS(rtp *rtp.Packet) {
if p.parser.EsHandler == nil {
p.parser.EsHandler = p
p.lastSeq = rtp.SequenceNumber - 1
}
if conf.IsMediaNetworkTCP() {
p.parser.Feed(rtp.Payload)
p.lastSeq = rtp.SequenceNumber