thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rtp keep alive bug

Browse Source
This commit is contained in:
nareix 2016-06-12 10:00:40 +08:00
parent b9fb9fc360
commit f2dca8e369
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.go
View File

@ -123,12 +123,17 @@ func (self *Client) writeLine(line string) (err error) {
func (self *Client) sendRtpKeepalive() (err error) { func (self *Client) sendRtpKeepalive() (err error) {
if self.RtpKeepAliveTimeout > 0 { if self.RtpKeepAliveTimeout > 0 {
if !self.rtpKeepaliveTimer.IsZero() && time.Now().Sub(self.rtpKeepaliveTimer) > self.RtpKeepAliveTimeout { if self.rtpKeepaliveTimer.IsZero() {
self.rtpKeepaliveTimer = time.Now()
} else if time.Now().Sub(self.rtpKeepaliveTimer) > self.RtpKeepAliveTimeout {
self.rtpKeepaliveTimer = time.Now()
if self.DebugConn {
fmt.Println("rtp: keep alive")
}
if err = self.Options(); err != nil { if err = self.Options(); err != nil {
return return
} }
} }
self.rtpKeepaliveTimer = time.Now()
} }
return return
} }
@ -174,19 +179,18 @@ func (self *Client) ReadResponse() (res Response, err error) {
} }
} }
} else if res.BlockLength > 0 { } else if res.BlockLength > 0 {
if err = self.sendRtpKeepalive(); err != nil {
return
}
self.conn.Timeout = self.RtpTimeout self.conn.Timeout = self.RtpTimeout
res.Block = make([]byte, res.BlockLength) res.Block = make([]byte, res.BlockLength)
if _, err = io.ReadFull(self.rconn, res.Block); err != nil { if _, err = io.ReadFull(self.rconn, res.Block); err != nil {
return return
} }
if err = self.sendRtpKeepalive(); err != nil {
return
}
} }
}() }()
self.conn.Timeout = self.RtspTimeout self.conn.Timeout = self.RtspTimeout
var h [4]byte var h [4]byte
if _, err = io.ReadFull(self.rconn, h[:]); err != nil { if _, err = io.ReadFull(self.rconn, h[:]); err != nil {
return return