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

Merged in revid-output-var (pull request #312) 

revid: Output var

Approved-by: Saxon Milton <saxon.milton@gmail.com>
This commit is contained in:
Scott Barnard 2019-12-31 03:56:13 +00:00 committed by Saxon Milton
parent fda173938a af2de3f938
commit edcb8090ff
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
revid/config/config.go
View File

@ -292,6 +292,7 @@ var TypeData = map[string]string{
"MTSRBSize": "int",
"MTSRBWriteTimeout": "int",
"OutputPath": "string",
"Output": "enum:File,Http,Rtmp,Rtp",
"Outputs": "string",
"Quantization": "uint",
"Rotation": "uint",

19
revid/revid.go
View File

@ -523,7 +523,7 @@ func (r *Revid) Update(vars map[string]string) error {
default:
r.cfg.Logger.Log(logger.Warning, pkg+"invalid InputCodec variable value", "value", value)
}
case "Output":
case "Outputs":
outputs := strings.Split(value, ",")
r.cfg.Outputs = make([]uint8, len(outputs))
@ -538,10 +538,25 @@ func (r *Revid) Update(vars map[string]string) error {
case "Rtp":
r.cfg.Outputs[i] = config.OutputRTP
default:
r.cfg.Logger.Log(logger.Warning, pkg+"invalid output param", "value", value)
r.cfg.Logger.Log(logger.Warning, pkg+"invalid outputs param", "value", value)
continue
}
}
case "Output":
r.cfg.Outputs = make([]uint8, 1)
switch value {
case "File":
r.cfg.Outputs[0] = config.OutputFile
case "Http":
r.cfg.Outputs[0] = config.OutputHTTP
case "Rtmp":
r.cfg.Outputs[0] = config.OutputRTMP
case "Rtp":
r.cfg.Outputs[0] = config.OutputRTP
default:
r.cfg.Logger.Log(logger.Warning, pkg+"invalid output param", "value", value)
continue
}
case "RtmpUrl":
r.cfg.RTMPURL = value