Merged in http-push-fix (pull request #76)

Http push fix

Approved-by: Trek Hopton <trek.hopton@gmail.com>
This commit is contained in:
Saxon Milton 2018-12-08 10:36:38 +00:00
commit 32488d8b9f
2 changed files with 1 additions and 2 deletions

View File

@ -108,7 +108,7 @@ const (
defaultFramesPerClip = 1 defaultFramesPerClip = 1
defaultVerticalFlip = No defaultVerticalFlip = No
defaultHorizontalFlip = No defaultHorizontalFlip = No
httpFramesPerClip = 7 httpFramesPerClip = 560
defaultInputCodec = H264 defaultInputCodec = H264
defaultVerbosity = No defaultVerbosity = No
defaultRtpAddr = "localhost:6970" defaultRtpAddr = "localhost:6970"

View File

@ -58,7 +58,6 @@ const (
writeTimeout = 10 * time.Millisecond writeTimeout = 10 * time.Millisecond
readTimeout = 10 * time.Millisecond readTimeout = 10 * time.Millisecond
httpTimeout = 5 * time.Second httpTimeout = 5 * time.Second
packetsPerFrame = 7
bitrateTime = 1 * time.Minute bitrateTime = 1 * time.Minute
mjpegParserInChanLen = 100000 mjpegParserInChanLen = 100000
ffmpegPath = "/usr/local/bin/ffmpeg" ffmpegPath = "/usr/local/bin/ffmpeg"