Merge branch 'master' into audio-compression

cmd/revid-cli/main.go

@@ -102,8 +102,6 @@ func handleFlags() revid.Config {
 
 		inputPtr              = flag.String("Input", "", "The input type: Raspivid, File, Webcam")
 		inputCodecPtr         = flag.String("InputCodec", "", "The codec of the input: H264, Mjpeg")
-		output1Ptr            = flag.String("Output1", "", "The first output type: Http, Rtmp, File, Udp, Rtp")
-		output2Ptr            = flag.String("Output2", "", "The second output type: Http, Rtmp, File, Udp, Rtp")
 		rtmpMethodPtr         = flag.String("RtmpMethod", "", "The method used to send over rtmp: Ffmpeg, Librtmp")
 		packetizationPtr      = flag.String("Packetization", "", "The method of data packetisation: Flv, Mpegts, None")
 		quantizePtr           = flag.Bool("Quantize", false, "Quantize input (non-variable bitrate)")
@@ -126,6 +124,9 @@ func handleFlags() revid.Config {
 		configFilePtr         = flag.String("ConfigFile", "", "NetSender config file")
 	)
 
+	var outputs flagStrings
+	flag.Var(&outputs, "Output", "output type: Http, Rtmp, File, Udp, Rtp (may be used more than once)")
+
 	flag.Parse()
 
 	log = logger.New(defaultLogVerbosity, &smartlogger.New(*logPathPtr).LogRoller)
@@ -167,40 +168,24 @@ func handleFlags() revid.Config {
 		log.Log(logger.Error, pkg+"bad input codec argument")
 	}
 
-	switch *output1Ptr {
-	case "File":
-		cfg.Output1 = revid.File
-	case "Http":
-		cfg.Output1 = revid.Http
-	case "Rtmp":
-		cfg.Output1 = revid.Rtmp
-	case "FfmpegRtmp":
-		cfg.Output1 = revid.FfmpegRtmp
-	case "Udp":
-		cfg.Output1 = revid.Udp
-	case "Rtp":
-		cfg.Output1 = revid.Rtp
-	case "":
-	default:
-		log.Log(logger.Error, pkg+"bad output 1 argument")
-	}
-
-	switch *output2Ptr {
-	case "File":
-		cfg.Output2 = revid.File
-	case "Http":
-		cfg.Output2 = revid.Http
-	case "Rtmp":
-		cfg.Output2 = revid.Rtmp
-	case "FfmpegRtmp":
-		cfg.Output2 = revid.FfmpegRtmp
-	case "Udp":
-		cfg.Output2 = revid.Udp
-	case "Rtp":
-		cfg.Output2 = revid.Rtp
-	case "":
-	default:
-		log.Log(logger.Error, pkg+"bad output 2 argument")
+	for _, o := range outputs {
+		switch o {
+		case "File":
+			cfg.Outputs = append(cfg.Outputs, revid.File)
+		case "Http":
+			cfg.Outputs = append(cfg.Outputs, revid.Http)
+		case "Rtmp":
+			cfg.Outputs = append(cfg.Outputs, revid.Rtmp)
+		case "FfmpegRtmp":
+			cfg.Outputs = append(cfg.Outputs, revid.FfmpegRtmp)
+		case "Udp":
+			cfg.Outputs = append(cfg.Outputs, revid.Udp)
+		case "Rtp":
+			cfg.Outputs = append(cfg.Outputs, revid.Rtp)
+		case "":
+		default:
+			log.Log(logger.Error, pkg+"bad output argument", "arg", o)
+		}
 	}
 
 	switch *rtmpMethodPtr {
@@ -380,15 +365,19 @@ func updateRevid(ns *netsender.Sender, rv *revid.Revid, cfg revid.Config, vars m
 	for key, value := range vars {
 		switch key {
 		case "Output":
+			// FIXME(kortschak): There can be only one!
+			// How do we specify outputs after the first?
+			//
+			// Maybe we shouldn't be doing this!
 			switch value {
 			case "File":
-				cfg.Output1 = revid.File
+				cfg.Outputs[0] = revid.File
 			case "Http":
-				cfg.Output1 = revid.Http
+				cfg.Outputs[0] = revid.Http
 			case "Rtmp":
-				cfg.Output1 = revid.Rtmp
+				cfg.Outputs[0] = revid.Rtmp
 			case "FfmpegRtmp":
-				cfg.Output1 = revid.FfmpegRtmp
+				cfg.Outputs[0] = revid.FfmpegRtmp
 			default:
 				log.Log(logger.Warning, pkg+"invalid Output1 param", "value", value)
 				continue
@@ -474,3 +463,28 @@ func updateRevid(ns *netsender.Sender, rv *revid.Revid, cfg revid.Config, vars m
 
 	return startRevid(ns, cfg)
 }
+
+// flagStrings implements an appending string set flag.
+type flagStrings []string
+
+func (v *flagStrings) String() string {
+	if *v != nil {
+		return strings.Join(*v, ",")
+	}
+	return ""
+}
+
+func (v *flagStrings) Set(s string) error {
+	if s == "" {
+		return nil
+	}
+	for _, e := range *v {
+		if e == s {
+			return nil
+		}
+	}
+	*v = append(*v, s)
+	return nil
+}
+
+func (v *flagStrings) Get() interface{} { return *v }

revid/cmd/h264-file-to-flv-rtmp/main.go

@@ -58,7 +58,7 @@ func main() {
 		Input:         revid.File,
 		InputFileName: inputFile,
 		InputCodec:    revid.H264,
-		Output1:       revid.Rtmp,
+		Outputs:       []byte{revid.Rtmp},
 		RtmpMethod:    revid.LibRtmp,
 		RtmpUrl:       *rtmpUrlPtr,
 		Packetization: revid.Flv,

revid/cmd/h264-file-to-mpgets-file/main.go

@@ -50,7 +50,7 @@ func main() {
 		Input:          revid.File,
 		InputFileName:  inputFile,
 		InputCodec:     revid.H264,
-		Output1:        revid.File,
+		Outputs:        []byte{revid.File},
 		OutputFileName: outputFile,
 		Packetization:  revid.Mpegts,
 		Logger:         logger.New(logger.Info, &smartlogger.New(logPath).LogRoller),

revid/config.go

@@ -40,8 +40,7 @@ type Config struct {
 
 	Input         uint8
 	InputCodec    uint8
-	Output1       uint8
-	Output2       uint8
+	Outputs       []uint8
 	RtmpMethod    uint8
 	Packetization uint8
 
@@ -172,45 +171,33 @@ func (c *Config) Validate(r *Revid) error {
 		return errors.New("bad input codec defined in config")
 	}
 
-	switch c.Output1 {
-	case File:
-	case Udp:
-	case Rtmp, FfmpegRtmp:
-		if c.RtmpUrl == "" {
-			c.Logger.Log(logger.Info, pkg+"no RTMP URL: falling back to HTTP")
-			c.Output1 = Http
-			break
+	for i, o := range c.Outputs {
+		switch o {
+		case File:
+		case Udp:
+		case Rtmp, FfmpegRtmp:
+			if c.RtmpUrl == "" {
+				c.Logger.Log(logger.Info, pkg+"no RTMP URL: falling back to HTTP")
+				c.Outputs[i] = Http
+				// FIXME(kortschak): Does this want the same line as below?
+				//  c.FramesPerClip = httpFramesPerClip
+				break
+			}
+			c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for rtmp out",
+				"framesPerClip", defaultFramesPerClip)
+			c.FramesPerClip = defaultFramesPerClip
+		case NothingDefined:
+			c.Logger.Log(logger.Warning, pkg+"no output defined, defaulting", "output",
+				defaultOutput)
+			c.Outputs[i] = defaultOutput
+			fallthrough
+		case Http, Rtp:
+			c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for http out",
+				"framesPerClip", httpFramesPerClip)
+			c.FramesPerClip = httpFramesPerClip
+		default:
+			return errors.New("bad output type defined in config")
 		}
-		c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for rtmp out",
-			"framesPerClip", defaultFramesPerClip)
-		c.FramesPerClip = defaultFramesPerClip
-	case NothingDefined:
-		c.Logger.Log(logger.Warning, pkg+"no output defined, defaulting", "output",
-			defaultOutput)
-		c.Output1 = defaultOutput
-		fallthrough
-	case Http, Rtp:
-		c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for http out",
-			"framesPerClip", httpFramesPerClip)
-		c.FramesPerClip = httpFramesPerClip
-	default:
-		return errors.New("bad output type defined in config")
-	}
-
-	switch c.Output2 {
-	case File:
-	case Rtp:
-	case Udp:
-	case Rtmp, FfmpegRtmp:
-		if c.RtmpUrl == "" {
-			c.Logger.Log(logger.Info, pkg+"no RTMP URL: falling back to HTTP")
-			c.Output2 = Http
-			break
-		}
-	case NothingDefined:
-	case Http:
-	default:
-		return errors.New("bad output2 type defined in config")
 	}
 
 	if c.FramesPerClip < 1 {

revid/revid.go

@@ -157,8 +157,15 @@ func (p *packer) Write(frame []byte) (int, error) {
 		return n, err
 	}
 	p.packetCount++
+	var hasRtmp bool
+	for _, d := range p.owner.config.Outputs {
+		if d == Rtmp {
+			hasRtmp = true
+			break
+		}
+	}
 	now := time.Now()
-	if (p.owner.config.Output1 != Rtmp && now.Sub(p.lastTime) > clipDuration && p.packetCount%7 == 0) || p.owner.config.Output1 == Rtmp {
+	if hasRtmp || (now.Sub(p.lastTime) > clipDuration && p.packetCount%7 == 0) {
 		p.owner.buffer.Flush()
 		p.packetCount = 0
 		p.lastTime = now
@@ -203,40 +210,35 @@ func (r *Revid) reset(config Config) error {
 		}
 	}
 
-	n := 1
-	if r.config.Output2 != 0 && r.config.Output2 != Rtp {
-		n = 2
-	}
-	r.destination = make([]loadSender, n)
-
-	for outNo, outType := range []uint8{r.config.Output1, r.config.Output2} {
-		switch outType {
+	r.destination = r.destination[:0]
+	for _, typ := range r.config.Outputs {
+		switch typ {
 		case File:
 			s, err := newFileSender(config.OutputFileName)
 			if err != nil {
 				return err
 			}
-			r.destination[outNo] = s
+			r.destination = append(r.destination, s)
 		case FfmpegRtmp:
 			s, err := newFfmpegSender(config.RtmpUrl, fmt.Sprint(r.config.FrameRate))
 			if err != nil {
 				return err
 			}
-			r.destination[outNo] = s
+			r.destination = append(r.destination, s)
 		case Rtmp:
 			s, err := newRtmpSender(config.RtmpUrl, rtmpConnectionTimeout, rtmpConnectionMaxTries, r.config.Logger.Log)
 			if err != nil {
 				return err
 			}
-			r.destination[outNo] = s
+			r.destination = append(r.destination, s)
 		case Http:
-			r.destination[outNo] = newHttpSender(r.ns, r.config.Logger.Log)
+			r.destination = append(r.destination, newHttpSender(r.ns, r.config.Logger.Log))
 		case Udp:
 			s, err := newUdpSender(r.config.RtpAddress, r.config.Logger.Log)
 			if err != nil {
 				return err
 			}
-			r.destination[outNo] = s
+			r.destination = append(r.destination, s)
 		case Rtp:
 			r.rtpSender, err = newRtpSender(r.config.RtpAddress, r.config.Logger.Log, r.config.FrameRate)
 			if err != nil {

stream/mts/encoder.go

@@ -233,6 +233,12 @@ const (
 // generate handles the incoming data and generates equivalent mpegts packets -
 // sending them to the output channel.
 func (e *Encoder) Encode(nalu []byte) error {
+	if e.psiCount <= 0 {
+		err := e.writePSI()
+		if err != nil {
+			return err
+		}
+	}
 	// Prepare PES data.
 	pesPkt := pes.Packet{
 		StreamID:     streamID,
@@ -262,14 +268,8 @@ func (e *Encoder) Encode(nalu []byte) error {
 			pkt.PCR = e.pcr()
 			pusi = false
 		}
-		if e.psiCount <= 0 {
-			err := e.writePSI()
-			if err != nil {
-				return err
-			}
-		}
-		e.psiCount--
 		_, err := e.dst.Write(pkt.Bytes(e.tsSpace[:PacketSize]))
+		e.psiCount--
 		if err != nil {
 			return err
 		}