RepoMirrors
/
mediamtx
mirror of https://github.com/bluenviron/mediamtx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move deadline handling into gortsplib

This commit is contained in:
aler9 2020-05-03 15:22:41 +02:00
parent 3ca94f9f9d
commit 6a641cd4f0
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -5,7 +5,7 @@ go 1.13
require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/aler9/gortsplib v0.0.0-20200503123511-fc0216b54c90
github.com/aler9/gortsplib v0.0.0-20200503131544-a171a9e328ec
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gortc.io/sdp v0.17.0
)

4
go.sum
View File

@ -2,8 +2,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/aler9/gortsplib v0.0.0-20200503123511-fc0216b54c90 h1:5aJvth91rfyL6okWPJKmnch6POwuNZKbgQZkt2cT7Gg=
github.com/aler9/gortsplib v0.0.0-20200503123511-fc0216b54c90/go.mod h1:YiIgmmv0ELkWUy11Jj2h5AgfqLCpy8sIX/l9MmS8+uw=
github.com/aler9/gortsplib v0.0.0-20200503131544-a171a9e328ec h1:8giuucZXMi/qEGru9Ic8Zxz6k6Jd2rASkFrVaslwr+s=
github.com/aler9/gortsplib v0.0.0-20200503131544-a171a9e328ec/go.mod h1:YiIgmmv0ELkWUy11Jj2h5AgfqLCpy8sIX/l9MmS8+uw=
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/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=

36
server-client.go
View File

@ -9,7 +9,6 @@ import (
"os/exec"
"strconv"
"strings"
"time"
"github.com/aler9/gortsplib"
"gortc.io/sdp"
@ -122,7 +121,7 @@ type serverClient struct {
func newServerClient(p *program, nconn net.Conn) *serverClient {
c := &serverClient{
p: p,
conn: gortsplib.NewConnServer(nconn),
conn: gortsplib.NewConnServer(nconn, _READ_TIMEOUT, _WRITE_TIMEOUT),
state: _CLIENT_STATE_STARTING,
chanWrite: make(chan *gortsplib.InterleavedFrame),
}
@ -213,11 +212,6 @@ func (c *serverClient) run() {
}
}
func (c *serverClient) writeResDeadline(res *gortsplib.Response) {
c.conn.NetConn().SetWriteDeadline(time.Now().Add(_WRITE_TIMEOUT))
c.conn.WriteResponse(res)
}
func (c *serverClient) writeResError(req *gortsplib.Request, code gortsplib.StatusCode, err error) {
c.log("ERR: %s", err)
@ -226,7 +220,7 @@ func (c *serverClient) writeResError(req *gortsplib.Request, code gortsplib.Stat
header["CSeq"] = []string{cseq[0]}
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: code,
Header: header,
})
@ -268,7 +262,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
// do not check state, since OPTIONS can be requested
// in any state
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -307,7 +301,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
return false
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -337,7 +331,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
c.log("ERR: Unauthorized: %s", err)
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusUnauthorized,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -393,7 +387,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
return false
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -478,7 +472,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
return false
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -539,7 +533,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
interleaved := fmt.Sprintf("%d-%d", ((len(c.streamTracks) - 1) * 2), ((len(c.streamTracks)-1)*2)+1)
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -619,7 +613,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
return false
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -678,7 +672,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
return false
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -736,7 +730,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
// first write response, then set state
// otherwise, in case of TCP connections, RTP packets could be written
// before the response
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -755,14 +749,11 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
c.state = _CLIENT_STATE_PLAY
c.p.mutex.Unlock()
//c.conn.NetConn().SetWriteDeadline(time.Now().Add(_WRITE_TIMEOUT))
// when protocol is TCP, the RTSP connection becomes a RTP connection
if c.streamProtocol == _STREAM_PROTOCOL_TCP {
// write RTP frames sequentially
go func() {
for frame := range c.chanWrite {
c.conn.NetConn().SetWriteDeadline(time.Now().Add(_WRITE_TIMEOUT))
c.conn.WriteInterleavedFrame(frame)
}
}()
@ -799,7 +790,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
c.state = _CLIENT_STATE_PRE_PLAY
c.p.mutex.Unlock()
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -834,7 +825,7 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
return false
}
c.writeResDeadline(&gortsplib.Response{
c.conn.WriteResponse(&gortsplib.Response{
StatusCode: gortsplib.StatusOK,
Header: gortsplib.Header{
"CSeq": []string{cseq[0]},
@ -857,7 +848,6 @@ func (c *serverClient) handleRequest(req *gortsplib.Request) bool {
// receive RTP data and parse it
if c.streamProtocol == _STREAM_PROTOCOL_TCP {
for {
c.conn.NetConn().SetReadDeadline(time.Now().Add(_READ_TIMEOUT))
frame, err := c.conn.ReadInterleavedFrame()
if err != nil {
c.log("ERR: %s", err)