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

Renamed NativeRtmp to just Rtmp - since it is exposed to clients. FfmpegRtmp should be deprecated.

This commit is contained in:
Alan Noble 2018-06-25 10:53:26 +09:30
parent 72d7dc3991
commit 9d113cc498
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/revid-cli/main.go
View File

@ -151,8 +151,8 @@ func main() {
config.Output = revid.File config.Output = revid.File
case "Http": case "Http":
config.Output = revid.Http config.Output = revid.Http
case "NativeRtmp": case "Rtmp":
config.Output = revid.NativeRtmp config.Output = revid.Rtmp
case "FfmpegRtmp": case "FfmpegRtmp":
config.Output = revid.FfmpegRtmp config.Output = revid.FfmpegRtmp
case "": case "":

4
revid/config.go
View File

@ -80,7 +80,7 @@ const (
QuantizationOff QuantizationOff
Yes Yes
No No
NativeRtmp Rtmp
FfmpegRtmp FfmpegRtmp
) )
@ -172,7 +172,7 @@ func (c *Config) Validate(r *Revid) error {
switch c.Output { switch c.Output {
case File: case File:
case NativeRtmp, FfmpegRtmp: case Rtmp, FfmpegRtmp:
if c.RtmpUrl == "" { if c.RtmpUrl == "" {
r.Log(Info, "No RTMP URL: falling back to HTTP") r.Log(Info, "No RTMP URL: falling back to HTTP")
c.Output = Http c.Output = Http

2
revid/revid.go
View File

@ -158,7 +158,7 @@ func (r *Revid) reset(config Config) error {
return err return err
} }
r.destination = s r.destination = s
case NativeRtmp: case Rtmp:
s, err := newRtmpSender(config.RtmpUrl, rtmpConnectionTimout, rtmpConnectionMaxTries, r.Log) s, err := newRtmpSender(config.RtmpUrl, rtmpConnectionTimout, rtmpConnectionMaxTries, r.Log)
if err != nil { if err != nil {
return err return err