kunmeng/vdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove ping / pong

Browse Source
This commit is contained in:
Andrey Semochkin
2021-04-23 10:48:39 +03:00
parent 242dfb0860
commit 338966ed52
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
format/webrtcv3/adapter.go
View File

@@ -51,7 +51,7 @@ type Options struct {
func NewMuxer(options Options) *Muxer { func NewMuxer(options Options) *Muxer {
tmp := Muxer{Options: options, ClientACK: time.NewTimer(time.Second * 20), StreamACK: time.NewTimer(time.Second * 20), streams: make(map[int8]*Stream)} tmp := Muxer{Options: options, ClientACK: time.NewTimer(time.Second * 20), StreamACK: time.NewTimer(time.Second * 20), streams: make(map[int8]*Stream)}
go tmp.WaitCloser() //go tmp.WaitCloser()
return &tmp return &tmp
} }
func (element *Muxer) NewPeerConnection(configuration webrtc.Configuration) (*webrtc.PeerConnection, error) { func (element *Muxer) NewPeerConnection(configuration webrtc.Configuration) (*webrtc.PeerConnection, error) {
@@ -197,7 +197,6 @@ func (element *Muxer) WritePacket(pkt av.Packet) (err error) {
if element.stop { if element.stop {
return ErrorClientOffline return ErrorClientOffline
} }
//Wait client ICEConnectionStateConnected
if element.status == webrtc.ICEConnectionStateChecking { if element.status == webrtc.ICEConnectionStateChecking {
WritePacketSuccess = true WritePacketSuccess = true
return nil return nil
@@ -240,24 +239,7 @@ func (element *Muxer) WritePacket(pkt av.Packet) (err error) {
return nil return nil
} }
} }
func (element *Muxer) WaitCloser() {
waitT := time.NewTimer(time.Second * 10)
for {
select {
case <-waitT.C:
if element.stop {
return
}
waitT.Reset(time.Second * 10)
case <-element.StreamACK.C:
log.Println("Stream Not Send Video Close")
element.Close()
case <-element.ClientACK.C:
log.Println("Client Not Send ACK (probably the browser is minimized) or tab not active Close client")
element.Close()
}
}
}
func (element *Muxer) Close() error { func (element *Muxer) Close() error {
element.stop = true element.stop = true
if element.pc != nil { if element.pc != nil {