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

allow calling PLAY twice (#128)

This commit is contained in:
aler9 2020-11-24 23:39:09 +01:00
parent 359a7f0f2f
commit bed42ab2b6
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/client/client.go
View File

@ -770,14 +770,17 @@ func (c *Client) handleRequest(req *base.Request) error {
} }
case base.PLAY: case base.PLAY:
// play can be sent twice, allow calling it even if we're already playing
err := c.checkState(map[state]struct{}{ err := c.checkState(map[state]struct{}{
statePrePlay: {}, statePrePlay: {},
statePlay: {},
}) })
if err != nil { if err != nil {
c.writeResError(cseq, base.StatusBadRequest, err) c.writeResError(cseq, base.StatusBadRequest, err)
return errStateTerminate return errStateTerminate
} }
if c.state == statePrePlay {
basePath, ok := req.URL.BasePath() basePath, ok := req.URL.BasePath()
if !ok { if !ok {
c.writeResError(cseq, base.StatusBadRequest, fmt.Errorf("unable to find base path (%s)", req.URL)) c.writeResError(cseq, base.StatusBadRequest, fmt.Errorf("unable to find base path (%s)", req.URL))
@ -796,6 +799,7 @@ func (c *Client) handleRequest(req *base.Request) error {
c.writeResError(cseq, base.StatusBadRequest, fmt.Errorf("no tracks have been setup")) c.writeResError(cseq, base.StatusBadRequest, fmt.Errorf("no tracks have been setup"))
return errStateTerminate return errStateTerminate
} }
}
// write response before setting state // write response before setting state
// otherwise, in case of TCP connections, RTP packets could be sent // otherwise, in case of TCP connections, RTP packets could be sent
@ -807,7 +811,11 @@ func (c *Client) handleRequest(req *base.Request) error {
"Session": base.HeaderValue{sessionId}, "Session": base.HeaderValue{sessionId},
}, },
}) })
if c.state == statePrePlay {
return errStatePlay return errStatePlay
}
return nil
case base.RECORD: case base.RECORD:
err := c.checkState(map[state]struct{}{ err := c.checkState(map[state]struct{}{