mirror of https://bitbucket.org/ausocean/av.git
Add configurable threshold
This commit is contained in:
parent
d3b67e26c3
commit
84057782d4
|
@ -75,7 +75,7 @@ const (
|
||||||
bufferSize = 1000/clipDuration
|
bufferSize = 1000/clipDuration
|
||||||
bitrateOutputDelay = 60 // s
|
bitrateOutputDelay = 60 // s
|
||||||
httpTimeOut = 5 // s
|
httpTimeOut = 5 // s
|
||||||
motionThreshold = 0
|
motionThreshold = "0.0025"
|
||||||
)
|
)
|
||||||
|
|
||||||
// flag values
|
// flag values
|
||||||
|
@ -173,7 +173,7 @@ func main() {
|
||||||
case err := <-inputErrChan:
|
case err := <-inputErrChan:
|
||||||
fmt.Fprintln(os.Stderr, err)
|
fmt.Fprintln(os.Stderr, err)
|
||||||
fmt.Fprintln(os.Stderr, "Trying again in 10s")
|
fmt.Fprintln(os.Stderr, "Trying again in 10s")
|
||||||
//time.Sleep(10 * time.Second)
|
time.Sleep(10 * time.Second)
|
||||||
go input(*inputURL, *outputURL)
|
go input(*inputURL, *outputURL)
|
||||||
case err := <-outputErrChan:
|
case err := <-outputErrChan:
|
||||||
fmt.Fprintln(os.Stderr, err)
|
fmt.Fprintln(os.Stderr, err)
|
||||||
|
@ -247,7 +247,7 @@ func input(input string, output string) {
|
||||||
if *flags&filterMotionDetect != 0{
|
if *flags&filterMotionDetect != 0{
|
||||||
args := []string{
|
args := []string{
|
||||||
"-i", input,
|
"-i", input,
|
||||||
"-vf", "select=gt(scene\\,0.0025),setpts=N/(FRAME_RATE*TB)",
|
"-vf", "select=gt(scene\\,"+motionThreshold+"),setpts=N/(FRAME_RATE*TB)",
|
||||||
"-f", "mpegts", "-",
|
"-f", "mpegts", "-",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -337,12 +337,6 @@ func clipStore(br *bufio.Reader, input string){
|
||||||
|
|
||||||
_, err := io.ReadFull(br, clip[clipSize:upperBound])
|
_, err := io.ReadFull(br, clip[clipSize:upperBound])
|
||||||
|
|
||||||
for err != nil && err.Error() == "EOF"{
|
|
||||||
fmt.Println("EOF")
|
|
||||||
fmt.Println(br.Buffered())
|
|
||||||
time.Sleep(time.Second)
|
|
||||||
_, err = io.ReadFull(br, clip[clipSize:upperBound])
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
inputErrChan <- err
|
inputErrChan <- err
|
||||||
|
@ -420,7 +414,6 @@ func output(output string) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
|
|
||||||
err := sendClip(clip, output, conn)
|
err := sendClip(clip, output, conn)
|
||||||
sendClipToStdout(clip, output, conn)
|
|
||||||
for err != nil {
|
for err != nil {
|
||||||
outputErrChan <- err
|
outputErrChan <- err
|
||||||
err = sendClip(clip, output, conn)
|
err = sendClip(clip, output, conn)
|
||||||
|
|
Loading…
Reference in New Issue