Browse Source

update gortsplib

pull/340/head
aler9 4 years ago
parent
commit
0dff484ff5
  1. 2
      go.mod
  2. 4
      go.sum
  3. 18
      internal/clientrtsp/client.go

2
go.mod

@ -5,7 +5,7 @@ go 1.15 @@ -5,7 +5,7 @@ go 1.15
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-20210310150132-830e3079e366
github.com/aler9/gortsplib v0.0.0-20210313202643-32c10cfb66cd
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.4.9
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51

4
go.sum

@ -2,8 +2,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo @@ -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-20210310150132-830e3079e366 h1:68edOFG2H1ntH5FhGZQJ72aq61wjiC9xRuvNI8/6haU=
github.com/aler9/gortsplib v0.0.0-20210310150132-830e3079e366/go.mod h1:aj4kDzanb3JZ46sFywWShcsnqqXTLE/3PNjwDhQZGM0=
github.com/aler9/gortsplib v0.0.0-20210313202643-32c10cfb66cd h1:+9AYNCIlkuZF3d3OOqDRC9D+bLdyrDPiVi8q+gmq8mQ=
github.com/aler9/gortsplib v0.0.0-20210313202643-32c10cfb66cd/go.mod h1:aj4kDzanb3JZ46sFywWShcsnqqXTLE/3PNjwDhQZGM0=
github.com/aler9/rtmp v0.0.0-20210309202041-2d7177b7300d h1:LAX8pNvYpGgFpKdbPpEZWjNkHbmyvjMrT3vO7s7aaKU=
github.com/aler9/rtmp v0.0.0-20210309202041-2d7177b7300d/go.mod h1:vzuE21rowz+lT1NGsWbreIvYulgBpCGnQyeTyFblUHc=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=

18
internal/clientrtsp/client.go

@ -592,16 +592,18 @@ func (c *Client) playStart() { @@ -592,16 +592,18 @@ func (c *Client) playStart() {
c.path.OnClientPlay(client.PlayReq{c, resc}) //nolint:govet
<-resc
tracksLen := len(c.conn.Tracks())
c.log(logger.Info, "is reading from path '%s', %d %s with %s",
c.path.Name(),
c.conn.SetuppedTracksLen(),
tracksLen,
func() string {
if c.conn.SetuppedTracksLen() == 1 {
if tracksLen == 1 {
return "track"
}
return "tracks"
}(),
*c.conn.SetuppedTracksProtocol())
*c.conn.StreamProtocol())
if c.path.Conf().RunOnRead != "" {
c.onReadCmd = externalcmd.New(c.path.Conf().RunOnRead, c.path.Conf().RunOnReadRestart, externalcmd.Environment{
@ -622,16 +624,18 @@ func (c *Client) recordStart() { @@ -622,16 +624,18 @@ func (c *Client) recordStart() {
c.path.OnClientRecord(client.RecordReq{c, resc}) //nolint:govet
<-resc
tracksLen := len(c.conn.Tracks())
c.log(logger.Info, "is publishing to path '%s', %d %s with %s",
c.path.Name(),
c.conn.SetuppedTracksLen(),
tracksLen,
func() string {
if c.conn.SetuppedTracksLen() == 1 {
if tracksLen == 1 {
return "track"
}
return "tracks"
}(),
*c.conn.SetuppedTracksProtocol())
*c.conn.StreamProtocol())
if c.path.Conf().RunOnPublish != "" {
c.onPublishCmd = externalcmd.New(c.path.Conf().RunOnPublish, c.path.Conf().RunOnPublishRestart, externalcmd.Environment{
@ -649,7 +653,7 @@ func (c *Client) recordStop() { @@ -649,7 +653,7 @@ func (c *Client) recordStop() {
// OnIncomingFrame implements path.Reader.
func (c *Client) OnIncomingFrame(trackID int, streamType gortsplib.StreamType, buf []byte) {
if !c.conn.HasSetuppedTrack(trackID) {
if !c.conn.HasTrack(trackID) {
return
}

Loading…
Cancel
Save