mirror of https://bitbucket.org/ausocean/av.git
revid: only using one set of ring buffer parameters rather than MTS and RTMP
This commit is contained in:
Saxon
parent
7086960e66
commit
d90d2203bd
|
|
@ -87,16 +87,9 @@ const (
|
|||
defaultPSITime = 2
|
||||
|
||||
// Ring buffer defaults.
|
||||
|
||||
// MTS ring buffer defaults.
|
||||
defaultMTSRBMaxElements = 10000
|
||||
defaultMTSRBCapacity = 200000000 // bytes
|
||||
defaultMTSRBWriteTimeout = 5
|
||||
|
||||
// RTMP ring buffer defaults.
|
||||
defaultRTMPRBMaxElements = 10000
|
||||
defaultRTMPRBCapacity = 200000000 // bytes
|
||||
defaultRTMPRBWriteTimeout = 5
|
||||
defaultRBMaxElements = 10000
|
||||
defaultRBCapacity = 200000000 // bytes (200MB)
|
||||
defaultRBWriteTimeout = 5
|
||||
|
||||
// Motion filter parameter defaults.
|
||||
defaultMinFPS = 1.0
|
||||
|
|
@ -284,15 +277,10 @@ type Config struct {
|
|||
Filters []int // Defines the methods of filtering to be used in between lexing and encoding.
|
||||
PSITime int // Sets the time between a packet being sent.
|
||||
|
||||
// RTMP ring buffer parameters.
|
||||
RTMPRBMaxElements int // The maximum possible number of elements in ring buffer.
|
||||
RTMPRBCapacity int // The total number of bytes available for the ring buffer.
|
||||
RTMPRBWriteTimeout int // The ringbuffer write timeout in seconds.
|
||||
|
||||
// MTS ring buffer parameters.
|
||||
MTSRBMaxElements int // The maximum possible number of elements in ring buffer.
|
||||
MTSRBCapacity int // The total number of bytes available for the ring buffer.
|
||||
MTSRBWriteTimeout int // The ringbuffer write timeout in seconds.
|
||||
// Ring buffer parameters.
|
||||
RBMaxElements int // The maximum possible number of elements in ring buffer.
|
||||
RBCapacity int // The total number of bytes available for the ring buffer.
|
||||
RBWriteTimeout int // The ringbuffer write timeout in seconds.
|
||||
|
||||
// Motion filter parameters.
|
||||
MinFPS float64 // The reduced framerate of the video when there is no motion.
|
||||
|
|
@ -312,51 +300,48 @@ type Config struct {
|
|||
// TypeData contains information about all of the variables that
|
||||
// can be set over the web. It is a psuedo const.
|
||||
var TypeData = map[string]string{
|
||||
"AutoWhiteBalance": "enum:off,auto,sun,cloud,shade,tungsten,fluorescent,incandescent,flash,horizon",
|
||||
"BitDepth": "int",
|
||||
"Brightness": "uint",
|
||||
"BurstPeriod": "uint",
|
||||
"CameraChan": "int",
|
||||
"CBR": "bool",
|
||||
"ClipDuration": "uint",
|
||||
"Exposure": "enum:auto,night,nightpreview,backlight,spotlight,sports,snow,beach,verylong,fixedfps,antishake,fireworks",
|
||||
"Filters": "enums:NoOp,MOG,VariableFPS,KNN",
|
||||
"FrameRate": "uint",
|
||||
"Height": "uint",
|
||||
"HorizontalFlip": "bool",
|
||||
"HTTPAddress": "string",
|
||||
"Input": "enum:raspivid,rtsp,v4l,file",
|
||||
"InputCodec": "enum:H264,MJPEG",
|
||||
"InputPath": "string",
|
||||
"KNNHistory": "uint",
|
||||
"KNNKernel": "float",
|
||||
"KNNMinArea": "float",
|
||||
"KNNThreshold": "float",
|
||||
"logging": "enum:Debug,Info,Warning,Error,Fatal",
|
||||
"MinFPS": "float",
|
||||
"MinFrames": "uint",
|
||||
"MOGHistory": "uint",
|
||||
"MOGMinArea": "float",
|
||||
"MOGThreshold": "float",
|
||||
"MTSRBCapacity": "uint",
|
||||
"MTSRBMaxElements": "uint",
|
||||
"MTSRBWriteTimeout": "uint",
|
||||
"Output": "enum:File,Http,Rtmp,Rtp",
|
||||
"OutputPath": "string",
|
||||
"Outputs": "enums:File,Http,Rtmp,Rtp",
|
||||
"Quantization": "uint",
|
||||
"Rotation": "uint",
|
||||
"RTMPRBCapacity": "uint",
|
||||
"RTMPRBMaxElements": "uint",
|
||||
"RTMPRBWriteTimeout": "uint",
|
||||
"RTMPURL": "string",
|
||||
"RTPAddress": "string",
|
||||
"Saturation": "int",
|
||||
"ShowWindows": "bool",
|
||||
"VBRBitrate": "int",
|
||||
"VBRQuality": "enum:standard,fair,good,great,excellent",
|
||||
"VerticalFlip": "bool",
|
||||
"Width": "uint",
|
||||
"AutoWhiteBalance": "enum:off,auto,sun,cloud,shade,tungsten,fluorescent,incandescent,flash,horizon",
|
||||
"BitDepth": "int",
|
||||
"Brightness": "uint",
|
||||
"BurstPeriod": "uint",
|
||||
"CameraChan": "int",
|
||||
"CBR": "bool",
|
||||
"ClipDuration": "uint",
|
||||
"Exposure": "enum:auto,night,nightpreview,backlight,spotlight,sports,snow,beach,verylong,fixedfps,antishake,fireworks",
|
||||
"Filters": "enums:NoOp,MOG,VariableFPS,KNN",
|
||||
"FrameRate": "uint",
|
||||
"Height": "uint",
|
||||
"HorizontalFlip": "bool",
|
||||
"HTTPAddress": "string",
|
||||
"Input": "enum:raspivid,rtsp,v4l,file",
|
||||
"InputCodec": "enum:H264,MJPEG",
|
||||
"InputPath": "string",
|
||||
"KNNHistory": "uint",
|
||||
"KNNKernel": "float",
|
||||
"KNNMinArea": "float",
|
||||
"KNNThreshold": "float",
|
||||
"logging": "enum:Debug,Info,Warning,Error,Fatal",
|
||||
"MinFPS": "float",
|
||||
"MinFrames": "uint",
|
||||
"MOGHistory": "uint",
|
||||
"MOGMinArea": "float",
|
||||
"MOGThreshold": "float",
|
||||
"RBCapacity": "uint",
|
||||
"RBMaxElements": "uint",
|
||||
"RBWriteTimeout": "uint",
|
||||
"Output": "enum:File,Http,Rtmp,Rtp",
|
||||
"OutputPath": "string",
|
||||
"Outputs": "enums:File,Http,Rtmp,Rtp",
|
||||
"Quantization": "uint",
|
||||
"Rotation": "uint",
|
||||
"RTMPURL": "string",
|
||||
"RTPAddress": "string",
|
||||
"Saturation": "int",
|
||||
"ShowWindows": "bool",
|
||||
"VBRBitrate": "int",
|
||||
"VBRQuality": "enum:standard,fair,good,great,excellent",
|
||||
"VerticalFlip": "bool",
|
||||
"Width": "uint",
|
||||
}
|
||||
|
||||
// Validation errors.
|
||||
|
|
@ -456,34 +441,19 @@ func (c *Config) Validate() error {
|
|||
c.RTPAddress = defaultRtpAddr
|
||||
}
|
||||
|
||||
if c.RTMPRBMaxElements <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"RTMPRBMaxElements bad or unset, defaulting", "RTMPRBMaxElements", defaultRTMPRBMaxElements)
|
||||
c.RTMPRBMaxElements = defaultRTMPRBMaxElements
|
||||
if c.RBMaxElements <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"RBMaxElements bad or unset, defaulting", "RBMaxElements", defaultRBMaxElements)
|
||||
c.RBMaxElements = defaultRBMaxElements
|
||||
}
|
||||
|
||||
if c.RTMPRBCapacity <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"RTMPRBCapacity bad or unset, defaulting", "RTMPRBCapacity", defaultRTMPRBCapacity)
|
||||
c.RTMPRBCapacity = defaultRTMPRBCapacity
|
||||
if c.RBCapacity <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"RBCapacity bad or unset, defaulting", "RBCapacity", defaultRBCapacity)
|
||||
c.RBCapacity = defaultRBCapacity
|
||||
}
|
||||
|
||||
if c.RTMPRBWriteTimeout <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"RTMPRBWriteTimeout bad or unset, defaulting", "RTMPRBWriteTimeout", defaultRTMPRBWriteTimeout)
|
||||
c.RTMPRBWriteTimeout = defaultRTMPRBWriteTimeout
|
||||
}
|
||||
|
||||
if c.MTSRBMaxElements <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"MTSRBSize bad or unset, defaulting", "MTSRBSize", defaultMTSRBMaxElements)
|
||||
c.MTSRBMaxElements = defaultMTSRBMaxElements
|
||||
}
|
||||
|
||||
if c.MTSRBCapacity <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"MTSRBElementSize bad or unset, defaulting", "MTSRBElementSize", defaultMTSRBCapacity)
|
||||
c.MTSRBCapacity = defaultMTSRBCapacity
|
||||
}
|
||||
|
||||
if c.MTSRBWriteTimeout <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"MTSRBWriteTimeout bad or unset, defaulting", "MTSRBWriteTimeout", defaultMTSRBWriteTimeout)
|
||||
c.MTSRBWriteTimeout = defaultMTSRBWriteTimeout
|
||||
if c.RBWriteTimeout <= 0 {
|
||||
c.Logger.Log(logger.Info, pkg+"RBWriteTimeout bad or unset, defaulting", "RBWriteTimeout", defaultRBWriteTimeout)
|
||||
c.RBWriteTimeout = defaultRBWriteTimeout
|
||||
}
|
||||
|
||||
if c.PSITime <= 0 {
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io.
|
|||
for _, out := range r.cfg.Outputs {
|
||||
switch out {
|
||||
case config.OutputHTTP:
|
||||
rb, err := vring.NewBuffer(r.cfg.MTSRBMaxElements, r.cfg.MTSRBCapacity, time.Duration(r.cfg.MTSRBWriteTimeout)*time.Second)
|
||||
rb, err := vring.NewBuffer(r.cfg.RBMaxElements, r.cfg.RBCapacity, time.Duration(r.cfg.RBWriteTimeout)*time.Second)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not initialise MTS ring buffer: %w", err)
|
||||
}
|
||||
|
|
@ -285,7 +285,7 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io.
|
|||
}
|
||||
mtsSenders = append(mtsSenders, w)
|
||||
case config.OutputRTMP:
|
||||
rb, err := vring.NewBuffer(r.cfg.RTMPRBMaxElements, r.cfg.RTMPRBCapacity, time.Duration(r.cfg.RTMPRBWriteTimeout)*time.Second)
|
||||
rb, err := vring.NewBuffer(r.cfg.RBMaxElements, r.cfg.RBCapacity, time.Duration(r.cfg.RBWriteTimeout)*time.Second)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not initialise RTMP ring buffer: %w", err)
|
||||
}
|
||||
|
|
@ -706,42 +706,42 @@ func (r *Revid) Update(vars map[string]string) error {
|
|||
r.cfg.Logger.Log(logger.Warning, pkg+"invalid RTMPRBMaxElements var", "value", value)
|
||||
break
|
||||
}
|
||||
r.cfg.RTMPRBMaxElements = v
|
||||
r.cfg.RBMaxElements = v
|
||||
case "RTMPRBCapacity":
|
||||
v, err := strconv.Atoi(value)
|
||||
if err != nil || v < 0 {
|
||||
r.cfg.Logger.Log(logger.Warning, pkg+"invalid RTMPRBCapacity var", "value", value)
|
||||
break
|
||||
}
|
||||
r.cfg.RTMPRBCapacity = v
|
||||
r.cfg.RBCapacity = v
|
||||
case "RTMPRBWriteTimeout":
|
||||
v, err := strconv.Atoi(value)
|
||||
if err != nil || v <= 0 {
|
||||
r.cfg.Logger.Log(logger.Warning, pkg+"invalid RTMPRBWriteTimeout var", "value", value)
|
||||
break
|
||||
}
|
||||
r.cfg.RTMPRBWriteTimeout = v
|
||||
r.cfg.RBWriteTimeout = v
|
||||
case "MTSRBMaxElements":
|
||||
v, err := strconv.Atoi(value)
|
||||
if err != nil || v < 0 {
|
||||
r.cfg.Logger.Log(logger.Warning, pkg+"invalid MTSRBMaxElements var", "value", value)
|
||||
break
|
||||
}
|
||||
r.cfg.MTSRBMaxElements = v
|
||||
r.cfg.RBMaxElements = v
|
||||
case "MTSRBCapacity":
|
||||
v, err := strconv.Atoi(value)
|
||||
if err != nil || v < 0 {
|
||||
r.cfg.Logger.Log(logger.Warning, pkg+"invalid MTSRBCapacity var", "value", value)
|
||||
break
|
||||
}
|
||||
r.cfg.MTSRBCapacity = v
|
||||
r.cfg.RBCapacity = v
|
||||
case "MTSRBWriteTimeout":
|
||||
v, err := strconv.Atoi(value)
|
||||
if err != nil || v <= 0 {
|
||||
r.cfg.Logger.Log(logger.Warning, pkg+"invalid MTSRBWriteTimeout var", "value", value)
|
||||
break
|
||||
}
|
||||
r.cfg.MTSRBWriteTimeout = v
|
||||
r.cfg.RBWriteTimeout = v
|
||||
case "CBR":
|
||||
v, ok := map[string]bool{"true": true, "false": false}[strings.ToLower(value)]
|
||||
if !ok {
|
||||
|
|
|
|||
|
|
@ -46,16 +46,12 @@ var (
|
|||
errSendFailed = errors.New("send failed")
|
||||
)
|
||||
|
||||
// Ring buffer parameters.
|
||||
const (
|
||||
// MTS ring buffer defaults.
|
||||
mtsRBMaxElements = 10000
|
||||
mtsRBCapacity = 200000000 // bytes
|
||||
mtsRBWriteTimeout = 5
|
||||
|
||||
// RTMP ring buffer defaults.
|
||||
rtmpRBMaxElements = 10000
|
||||
rtmpRBCapacity = 200000000 // bytes
|
||||
rtmpRBWriteTimeout = 5
|
||||
rbMaxElements = 10000
|
||||
rbCapacity = 200000000 // bytes
|
||||
rbWriteTimeout = 5
|
||||
)
|
||||
|
||||
// destination simulates a destination for the mtsSender. It allows for the
|
||||
|
|
@ -146,7 +142,7 @@ func TestMtsSenderSegment(t *testing.T) {
|
|||
// Create ringBuffer, sender, sender and the MPEGTS encoder.
|
||||
const numberOfClips = 11
|
||||
dst := &destination{t: t, done: make(chan struct{}), doneAt: numberOfClips}
|
||||
rb, err := vring.NewBuffer(mtsRBMaxElements, mtsRBCapacity, 0)
|
||||
rb, err := vring.NewBuffer(rbMaxElements, rbCapacity, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("could not initialise ring buffer: %v", err)
|
||||
}
|
||||
|
|
@ -229,7 +225,7 @@ func TestMtsSenderFailedSend(t *testing.T) {
|
|||
// Create destination, the mtsSender and the mtsEncoder
|
||||
const clipToFailAt = 3
|
||||
dst := &destination{t: t, testFails: true, failAt: clipToFailAt, done: make(chan struct{})}
|
||||
rb, err := vring.NewBuffer(mtsRBMaxElements, mtsRBCapacity, 0)
|
||||
rb, err := vring.NewBuffer(rbMaxElements, rbCapacity, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("could not initialise ring buffer: %v", err)
|
||||
}
|
||||
|
|
@ -314,7 +310,7 @@ func TestMtsSenderDiscontinuity(t *testing.T) {
|
|||
// Create destination, the mtsSender and the mtsEncoder.
|
||||
const clipToDelay = 3
|
||||
dst := &destination{t: t, sendDelay: 10 * time.Millisecond, delayAt: clipToDelay, done: make(chan struct{})}
|
||||
rb, err := vring.NewBuffer(1, mtsRBCapacity, 0)
|
||||
rb, err := vring.NewBuffer(1, rbCapacity, 0)
|
||||
if err != nil {
|
||||
t.Fatalf("could not initialise ring buffer: %v", err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue