Fixing cosmetic stuff

h264/h264Parser.go

@@ -56,10 +56,15 @@ func (p* H264Parser)Stop(){
   p.isParsing = false
 }
 
-func (p* H264Parser)Parse() {
+func (p *H264Parser)Start(){
+  go p.parse()
+}
+
+func (p *H264Parser)parse() {
 	p.isParsing = true
 	outputBuffer := make([]byte, 0, 10000)
 	searchingForEnd := false
+  p.InputByteChan = make(chan byte, 10000)
 	for p.isParsing {
     aByte := <-p.InputByteChan
 		outputBuffer = append(outputBuffer, aByte)

revid/RevidInstance.go

@@ -52,8 +52,6 @@ import (
 // defaults and networking consts
 const (
 	clipDuration    = 1                   // s
-	defaultPID         = 256
-	defaultFrameRate   = 25
 	mp2tPacketSize  = 188                 // MPEG-TS packet size
 	mp2tMaxPackets  = 2016 * clipDuration // # first multiple of 7 and 8 greater than 2000
 	udpPackets      = 7                   // # of UDP packets per ethernet frame (8 is the max)
@@ -62,15 +60,12 @@ const (
 	rtpSSRC         = 1 // any value will do
 	bufferSize      = 100 / clipDuration
 	httpTimeOut     = 5 // s
-	motionThreshold    = "0.0025"
-	qscale             = "3"
-	defaultRaspividCmd = "raspivid -o -"
-	framesPerSec       = 25
 	packetsPerFrame = 7
 	h264BufferSize  = 500000
 	bitrateTime     = 60
 )
 
+// Log Types
 const (
 	Error   = "Error"
 	Warning = "Warning"
@@ -78,6 +73,7 @@ const (
 	Debug   = "Debug"
 )
 
+// Config enums
 const (
 	Raspivid  = 0
 	Rtp       = 1
@@ -86,9 +82,6 @@ const (
 	HttpOut   = 5
 )
 
-var cmd *exec.Cmd
-var inputReader *bufio.Reader
-
 type Config struct {
 	Input          uint8
 	InputCmd       string
@@ -125,10 +118,8 @@ type revidInst struct {
 	inputFile   *os.File
 	generator   tsgenerator.TsGenerator
 	h264Parser  h264.H264Parser
-}
+	cmd         *exec.Cmd
-
+	inputReader *bufio.Reader
-func (r *revidInst) GetConfigRef() *Config{
-	return &r.config
 }
 
 func NewRevidInstance(config Config) (r *revidInst, err error) {
@@ -150,21 +141,22 @@ func NewRevidInstance(config Config) (r *revidInst, err error) {
 			return nil, err
 		}
 	}
-	r.generator = tsgenerator.NewTsGenerator(framesPerSec)
+	r.generator = tsgenerator.NewTsGenerator(r.config.FrameRate)
+	r.generator.Start()
 	r.h264Parser = h264.H264Parser{OutputChan: r.generator.GetNalInputChan()}
-	r.h264Parser.InputByteChan = make(chan byte, 10000)
+	r.h264Parser.Start()
-	// TODO: Need to create constructor for parser otherwise I'm going to break
-	// something eventuallyl
-	go r.h264Parser.Parse()
 	go r.input()
-	go r.generator.Generate()
 	r.Log(Info, "New revid instance created! config is:")
 	r.Log(Info, fmt.Sprintf("%v", r.config))
 	return
 }
 
+func (r *revidInst) GetConfigRef() *Config {
+	return &r.config
+}
+
 func (r *revidInst) ChangeState(newconfig Config) error {
-	// TODO: check that the config is G
+	// TODO: check that the config is legit
 	r.config = newconfig
 	return nil
 }
@@ -190,8 +182,8 @@ func (r *revidInst) Start() {
 		cmd = exec.Command("raspivid", "-o", "-", "-n", "-t", "0", "-b",
 			r.config.Bitrate, "-qp", r.config.Quantization, "-w", r.config.Width, "-h", r.config.Height, "-fps", r.config.FrameRate, "-ih", "-g", "100")
 		stdout, _ := cmd.StdoutPipe()
-		err := cmd.Start()
+		err := r.cmd.Start()
-		inputReader = bufio.NewReader(stdout)
+		r.inputReader = bufio.NewReader(stdout)
 		if err != nil {
 			r.Log(Error, err.Error())
 			return
@@ -201,16 +193,14 @@ func (r *revidInst) Start() {
 			r.Log(Info, "Reading camera data!")
 			for r.isRunning {
 				h264Data = make([]byte, 1)
-				_, err := io.ReadFull(inputReader, h264Data)
+				_, err := io.ReadFull(r.inputReader, h264Data)
-				if err != nil {
 				switch {
-					case err.Error() == "EOF" && r.isRunning:
+				case err != nil && err.Error() == "EOF" && r.isRunning:
 					r.Log(Error, "No data from camera!")
 					time.Sleep(5 * time.Second)
-					case r.isRunning:
+				case err != nil && r.isRunning:
 					r.Log(Error, err.Error())
-					}
+				default:
-				} else {
 					r.h264Parser.InputByteChan <- h264Data[0]
 				}
 			}
@@ -220,12 +210,15 @@ func (r *revidInst) Start() {
 		stats, err := r.inputFile.Stat()
 		if err != nil {
 			r.Log(Error, "Could not get input file stats!")
+			r.Stop()
 			return
 		}
 		h264Data = make([]byte, stats.Size())
 		_, err = r.inputFile.Read(h264Data)
 		if err != nil {
 			r.Log(Error, err.Error())
+			r.Stop()
+			return
 		}
 		for i := range h264Data {
 			r.h264Parser.InputByteChan <- h264Data[i]
@@ -238,7 +231,7 @@ func (r *revidInst) Stop() {
 	if r.isRunning {
 		r.Log(Info, "Stopping revid!")
 		r.isRunning = false
-		cmd.Process.Kill()
+		r.cmd.Process.Kill()
 	} else {
 		r.Log(Warning, "revidInst.Stop() called but revid not running!")
 	}
@@ -252,21 +245,20 @@ func (r *revidInst) input() {
 	for {
 		if clip, err := r.ringBuffer.Get(); err != nil {
 			r.Log(Error, err.Error())
-			r.Log(Warning,"Clearing tsPkt chan!")
+			r.Log(Warning, "Clearing TS chan!")
-			tsPktChanLen := len(r.generator.GetTsOutputChan())
+			for len(r.generator.GetTsOutputChan()) > 0 {
-			for i := 0; i < tsPktChanLen; i++ {
 				<-(r.generator.GetTsOutputChan())
 			}
 			time.Sleep(1 * time.Second)
 		} else {
 			for {
 				tsPacket := <-(r.generator.GetTsOutputChan())
-				byteSlice, err := tsPacket.ToByteSlice()
+				tsByteSlice, err := tsPacket.ToByteSlice()
 				if err != nil {
 					r.Log(Error, err.Error())
 				}
 				upperBound := clipSize + mp2tPacketSize
-				copy(clip[clipSize:upperBound], byteSlice)
+				copy(clip[clipSize:upperBound], tsByteSlice)
 				packetCount++
 				clipSize += mp2tPacketSize
 				// send if (1) our buffer is full or (2) 1 second has elapsed and we have % packetsPerFrame
@@ -302,6 +294,7 @@ func (r *revidInst) output() {
 		}
 		if clip, err := r.ringBuffer.Read(); err == nil {
 			r.Log(Debug, fmt.Sprintf("Delay is: %v\n", delay))
+			r.Log(Debug, fmt.Sprintf("Ring buffer size: %v\n", r.ringBuffer.GetNoOfElements()))
 			switch r.config.Output {
 			case File:
 				r.outputFile.Write(clip)

tsgenerator/TsGenerator.go

@@ -51,7 +51,7 @@ const (
 )
 
 type TsGenerator interface {
-	Generate()
+	generate()
 	GetNalInputChan() chan<- []byte
 	GetTsOutputChan() <-chan *mpegts.MpegTsPacket
 }
@@ -118,7 +118,11 @@ func (g *tsGenerator) genPcr()(pcr uint64){
 	return
 }
 
-func (g *tsGenerator) Generate() {
+func (g *tsGenerator) Start(){
+	go g.generate()
+}
+
+func (g *tsGenerator) generate() {
 	var rtpBuffer [](*rtp.RtpPacket)
 	for {
 		select {