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

Merge branch 'master' into treatment

This commit is contained in:
Trek H 2020-08-20 09:28:15 +09:30
parent e5e9c31ffb 9cf63fdf20
commit 6ab9b145d8
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
revid/senders.go
View File

@ -95,19 +95,24 @@ func (s *httpSender) Write(d []byte) (int, error) {
func (s *httpSender) Close() error { return nil } func (s *httpSender) Close() error { return nil }
func httpSend(d []byte, client *netsender.Sender, log func(lvl int8, msg string, args ...interface{})) error { func httpSend(d []byte, client *netsender.Sender, log func(lvl int8, msg string, args ...interface{})) error {
// Only send if "V0" is configured as an input. // Only send if "V0" or "S0" are configured as input.
send := false send := false
ip := client.Param("ip") ip := client.Param("ip")
log(logger.Debug, "making pins, and sending recv request", "ip", ip) log(logger.Debug, "making pins, and sending recv request", "ip", ip)
pins := netsender.MakePins(ip, "V") pins := netsender.MakePins(ip, "V,S")
for i, pin := range pins { for i, pin := range pins {
if pin.Name == "V0" { switch pin.Name {
send = true case "V0":
pins[i].Value = len(d)
pins[i].Data = d
pins[i].MimeType = "video/mp2t" pins[i].MimeType = "video/mp2t"
break case "S0":
pins[i].MimeType = "audio/x-wav"
default:
continue
} }
pins[i].Value = len(d)
pins[i].Data = d
send = true
break
} }
if !send { if !send {