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

Fixing rtmp stuff

This commit is contained in:
Unknown 2018-03-14 20:17:00 +10:30
parent 36986d543b
commit f3da74a364
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
revid/RevidInstance.go
View File

@ -128,12 +128,6 @@ func NewRevidInstance(config Config) (r *revidInst, err error) {
go r.packClips() go r.packClips()
r.Log(Info, "New revid instance created! config is:") r.Log(Info, "New revid instance created! config is:")
r.Log(Info, fmt.Sprintf("%v", r.config)) r.Log(Info, fmt.Sprintf("%v", r.config))
if r.setupOutput != nil {
err = r.setupOutput()
if err != nil {
return
}
}
return return
} }
@ -234,6 +228,13 @@ func (r *revidInst) Start() {
return return
} }
r.Log(Info, "Starting Revid!") r.Log(Info, "Starting Revid!")
if r.setupOutput != nil {
err := r.setupOutput()
if err != nil {
r.Log(Error, "Output setup didn't work!")
return
}
}
go r.setupInput() go r.setupInput()
go r.outputClips() go r.outputClips()
r.isRunning = true r.isRunning = true
@ -248,6 +249,9 @@ func (r *revidInst) Stop() {
if r.cmd != nil && r.cmd.Process != nil { if r.cmd != nil && r.cmd.Process != nil {
r.cmd.Process.Kill() r.cmd.Process.Kill()
} }
if r.config.RtmpMethod == LibRtmp {
r.rtmpInst.EndSession()
}
} else { } else {
r.Log(Warning, "revidInst.Stop() called but revid not running!") r.Log(Warning, "revidInst.Stop() called but revid not running!")
} }