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

fixing build errors

This commit is contained in:
Unknown 2018-01-24 14:52:52 +10:30
parent 40079c6346
commit e9693c3289
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
revid/RevidInstance.go
View File

@ -141,7 +141,7 @@ func NewRevidInstance(config Config) (r *revidInst, err error) {
return nil, err return nil, err
} }
} }
r.generator = tsgenerator.NewTsGenerator(r.config.FrameRate) r.generator = tsgenerator.NewTsGenerator(25)
r.generator.Start() r.generator.Start()
r.h264Parser = h264.H264Parser{OutputChan: r.generator.GetNalInputChan()} r.h264Parser = h264.H264Parser{OutputChan: r.generator.GetNalInputChan()}
r.h264Parser.Start() r.h264Parser.Start()
@ -179,9 +179,9 @@ func (r *revidInst) Start() {
switch r.config.Input { switch r.config.Input {
case Raspivid: case Raspivid:
r.Log(Info, "Starting raspivid!") r.Log(Info, "Starting raspivid!")
cmd = exec.Command("raspivid", "-o", "-", "-n", "-t", "0", "-b", r.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") 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() stdout, _ := r.cmd.StdoutPipe()
err := r.cmd.Start() err := r.cmd.Start()
r.inputReader = bufio.NewReader(stdout) r.inputReader = bufio.NewReader(stdout)
if err != nil { if err != nil {

3
tsgenerator/TsGenerator.go
View File

@ -54,6 +54,9 @@ type TsGenerator interface {
generate() generate()
GetNalInputChan() chan<- []byte GetNalInputChan() chan<- []byte
GetTsOutputChan() <-chan *mpegts.MpegTsPacket GetTsOutputChan() <-chan *mpegts.MpegTsPacket
Start()
genPts()(pts uint64)
genPcr()(pts uint64)
} }
type tsGenerator struct { type tsGenerator struct {