mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revid: not closing destinations on call to revid.Reset() anymore

This commit is contained in:
Saxon 2019-02-25 17:00:31 +10:30
parent 8340143622
commit 5d5af5601f
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
revid/revid.go
View File

@ -231,15 +231,6 @@ func (r *Revid) reset(config Config) error {
r.buffer = ring.NewBuffer(ringBufferSize, ringBufferElementSize, writeTimeout) r.buffer = ring.NewBuffer(ringBufferSize, ringBufferElementSize, writeTimeout)
for _, dest := range r.destination {
if dest != nil {
err = dest.close()
if err != nil {
return err
}
}
}
r.destination = r.destination[:0] r.destination = r.destination[:0]
for _, typ := range r.config.Outputs { for _, typ := range r.config.Outputs {
switch typ { switch typ {

2
rtmp/conn.go
View File

@ -134,10 +134,10 @@ func Dial(url string, timeout uint, log Log) (*Conn, error) {
// Close terminates the RTMP connection. // Close terminates the RTMP connection.
// NB: Close is idempotent and the connection value is cleared completely. // NB: Close is idempotent and the connection value is cleared completely.
func (c *Conn) Close() error { func (c *Conn) Close() error {
c.log(DebugLevel, pkg+"Conn.Close")
if !c.isConnected() { if !c.isConnected() {
return errNotConnected return errNotConnected
} }
c.log(DebugLevel, pkg+"Conn.Close")
if c.streamID > 0 { if c.streamID > 0 {
if c.link.protocol&featureWrite != 0 { if c.link.protocol&featureWrite != 0 {
sendFCUnpublish(c) sendFCUnpublish(c)