mirror of https://bitbucket.org/ausocean/av.git
Updating remote
This commit is contained in:
Jack Richardson
parent
b09cea19f6
commit
11620de642
|
|
@ -32,8 +32,6 @@ package revid
|
|||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"crypto/md5"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
|
|
@ -49,6 +47,7 @@ import (
|
|||
"bitbucket.org/ausocean/av/tsgenerator"
|
||||
|
||||
"bitbucket.org/ausocean/av/ringbuffer"
|
||||
"bitbucket.org/ausocean/utils/smartLogger"
|
||||
)
|
||||
|
||||
// defaults and networking consts
|
||||
|
|
@ -70,7 +69,7 @@ const (
|
|||
framesPerSec = 25
|
||||
packetsPerFrame = 7
|
||||
h264BufferSize = 500000
|
||||
bitrateTime = 10
|
||||
bitrateTime = 60
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -95,7 +94,9 @@ type Config struct {
|
|||
Bitrate string
|
||||
FrameRate string
|
||||
HttpAddress string
|
||||
Quantization string
|
||||
Debug bool
|
||||
Logger smartLogger.LogInstance
|
||||
}
|
||||
|
||||
type RevidInst interface {
|
||||
|
|
@ -151,6 +152,8 @@ func NewRevidInstance(config Config) (r *revidInst, err error) {
|
|||
go r.h264Parser.Parse()
|
||||
go r.input()
|
||||
go r.generator.Generate()
|
||||
r.ErrOut("New revid instance created! Config is:")
|
||||
r.ErrOut(fmt.Sprintf("%v",r.config))
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -162,16 +165,16 @@ func (r *revidInst) ChangeState(newConfig Config) error {
|
|||
|
||||
func (r *revidInst) ErrOut(m string){
|
||||
if r.config.Debug {
|
||||
r.Error.Println(m)
|
||||
r.config.Logger.Log("Debug",m)
|
||||
}
|
||||
}
|
||||
|
||||
func (r *revidInst) Start() {
|
||||
r.isRunning = true
|
||||
switch r.config.Input {
|
||||
case Raspivid:
|
||||
r.ErrOut("Starting raspivid!")
|
||||
cmd = exec.Command("raspivid", "-o", "-", "-n", "-t", "0", "-b",
|
||||
r.config.Bitrate, "-w", r.config.Width, "-h", r.config.Height, "-fps", r.config.FrameRate, "-ih", "-g", "100")
|
||||
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()
|
||||
inputReader = bufio.NewReader(stdout)
|
||||
|
|
@ -181,12 +184,14 @@ func (r *revidInst) Start() {
|
|||
}
|
||||
case File:
|
||||
default:
|
||||
r.Error.Println("Input not valid!")
|
||||
r.ErrOut("Input not valid!")
|
||||
}
|
||||
r.isRunning = true
|
||||
var h264Data []byte
|
||||
switch r.config.Input {
|
||||
case Raspivid:
|
||||
go func() {
|
||||
r.ErrOut("Reading camera data!")
|
||||
for r.isRunning {
|
||||
h264Data = make([]byte, 1)
|
||||
_, err := io.ReadFull(inputReader, h264Data)
|
||||
|
|
@ -205,7 +210,8 @@ func (r *revidInst) Start() {
|
|||
case File:
|
||||
stats, err := r.inputFile.Stat()
|
||||
if err != nil {
|
||||
panic("Could not get file stats!")
|
||||
r.ErrOut("Could not get file stats!")
|
||||
return
|
||||
}
|
||||
h264Data = make([]byte, stats.Size())
|
||||
_, err = r.inputFile.Read(h264Data)
|
||||
|
|
@ -221,6 +227,7 @@ func (r *revidInst) Start() {
|
|||
|
||||
func (r *revidInst) Stop() {
|
||||
if r.isRunning {
|
||||
r.ErrOut("Stopping revid!")
|
||||
r.isRunning = false
|
||||
cmd.Process.Kill()
|
||||
}
|
||||
|
|
@ -233,7 +240,9 @@ func (r *revidInst) input() {
|
|||
prevTime := now
|
||||
for {
|
||||
if clip, err := r.ringBuffer.Get(); err != nil {
|
||||
panic(err.Error())
|
||||
r.ErrOut(err.Error())
|
||||
r.Stop()
|
||||
return
|
||||
} else {
|
||||
for {
|
||||
tsPacket := <-(r.generator.GetTsOutputChan())
|
||||
|
|
@ -250,7 +259,8 @@ func (r *revidInst) input() {
|
|||
if (packetCount == mp2tMaxPackets) ||
|
||||
(now.Sub(prevTime) > clipDuration*time.Second && packetCount%packetsPerFrame == 0) {
|
||||
if err := r.ringBuffer.DoneWriting(clipSize); err != nil {
|
||||
panic(err.Error())
|
||||
r.ErrOut(err.Error())
|
||||
r.ErrOut("Dropping that clip!")
|
||||
}
|
||||
clipSize = 0
|
||||
packetCount = 0
|
||||
|
|
@ -266,16 +276,27 @@ func (r *revidInst) output() {
|
|||
now := time.Now()
|
||||
prevTime := now
|
||||
bytes := 0
|
||||
delay := 0
|
||||
for r.isRunning {
|
||||
if r.ringBuffer.GetNoOfElements() < 2 {
|
||||
delay++
|
||||
time.Sleep(time.Duration(delay)*time.Millisecond)
|
||||
} else {
|
||||
if delay > 10 {
|
||||
delay -= 10
|
||||
}
|
||||
}
|
||||
if clip, err := r.ringBuffer.Read(); err == nil {
|
||||
r.ErrOut(fmt.Sprintf("Delay is: %v\n", delay))
|
||||
r.ErrOut(fmt.Sprintf("Ring buffer size: %v\n", r.ringBuffer.GetNoOfElements()))
|
||||
switch r.config.Output {
|
||||
case File:
|
||||
r.outputFile.Write(clip)
|
||||
case HttpOut:
|
||||
bytes += len(clip)
|
||||
for err := r.sendClipToHTTP(clip, r.config.HttpAddress); err != nil; {
|
||||
r.ErrOut("Post failed trying again!")
|
||||
err = r.sendClipToHTTP(clip, r.config.HttpAddress)
|
||||
time.Sleep(5*time.Second)
|
||||
}
|
||||
default:
|
||||
r.ErrOut("No output defined!")
|
||||
|
|
@ -285,10 +306,8 @@ func (r *revidInst) output() {
|
|||
}
|
||||
now = time.Now()
|
||||
deltaTime := now.Sub(prevTime)
|
||||
if deltaTime > time.Duration(bitrateTime)*time.Second {
|
||||
if r.config.Debug {
|
||||
fmt.Printf("Bitrate: %v bytes/s\n", int64(float64(bytes) / float64(deltaTime/1e9)))
|
||||
}
|
||||
if r.config.Debug && deltaTime > time.Duration(bitrateTime)*time.Second {
|
||||
fmt.Printf("Bitrate: %v bytes/s\n", int64(float64(bytes) / float64(deltaTime/1e9)))
|
||||
prevTime = now
|
||||
bytes = 0
|
||||
}
|
||||
|
|
@ -302,8 +321,7 @@ func (r *revidInst)sendClipToHTTP(clip []byte, output string) error {
|
|||
client := http.Client{
|
||||
Timeout: timeout,
|
||||
}
|
||||
hash := md5.Sum(clip)
|
||||
url := output + strconv.Itoa(len(clip)) + "." + hex.EncodeToString(hash[:]) // NB: append size.digest to output
|
||||
url := output + strconv.Itoa(len(clip))
|
||||
if r.config.Debug {
|
||||
fmt.Printf("Posting %s (%d bytes)\n", url, len(clip))
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue