Merge branch 'dev' into vod

CHANGELOG.md

@@ -24,6 +24,10 @@
 -   Fix parsing S3 storage definition from environment variable
 -   Fix checking length of CPU time array ([#10](https://github.com/datarhei/core/issues/10))
 -   Fix memory consumption of memfs
+-   Fix possible infinite loop with HLS session rewriter
+-   Fix not propagating process limits
+-   Fix URL validation if the path contains FFmpeg specific placeholders
+-   Fix RTMP DoS attack (thx Johannes Frank)
 -   Deprecate ENV names that do not correspond to JSON name
 
 ### Core v16.11.0 > v16.12.0

docs/docs.go

@@ -2291,6 +2291,10 @@ const docTemplate = `{
                 "looping": {
                     "type": "boolean"
                 },
+                "looping_runtime": {
+                    "type": "integer",
+                    "format": "uint64"
+                },
                 "output": {
                     "$ref": "#/definitions/api.AVstreamIO"
                 },

docs/swagger.json

@@ -2284,6 +2284,10 @@
                 "looping": {
                     "type": "boolean"
                 },
+                "looping_runtime": {
+                    "type": "integer",
+                    "format": "uint64"
+                },
                 "output": {
                     "$ref": "#/definitions/api.AVstreamIO"
                 },

docs/swagger.yaml

@@ -22,6 +22,9 @@ definitions:
         $ref: '#/definitions/api.AVstreamIO'
       looping:
         type: boolean
+      looping_runtime:
+        format: uint64
+        type: integer
       output:
         $ref: '#/definitions/api.AVstreamIO'
       queue:

ffmpeg/parse/types.go

@@ -68,6 +68,7 @@ type ffmpegAVstream struct {
 	Drop           uint64           `json:"drop"`
 	Enc            uint64           `json:"enc"`
 	Looping        bool             `json:"looping"`
+	LoopingRuntime uint64           `json:"looping_runtime"`
 	Duplicating    bool             `json:"duplicating"`
 	GOP            string           `json:"gop"`
 }
@@ -80,6 +81,7 @@ func (av *ffmpegAVstream) export() *AVstream {
 		Dup:            av.Dup,
 		Enc:            av.Enc,
 		Looping:        av.Looping,
+		LoopingRuntime: av.LoopingRuntime,
 		Duplicating:    av.Duplicating,
 		GOP:            av.GOP,
 		Input:          av.Input.export(),
@@ -318,6 +320,7 @@ type AVstream struct {
 	Drop           uint64
 	Enc            uint64
 	Looping        bool
+	LoopingRuntime uint64
 	Duplicating    bool
 	GOP            string
 }

http/api/avstream.go

@@ -31,6 +31,7 @@ type AVstream struct {
 	Drop           uint64     `json:"drop" format:"uint64"`
 	Enc            uint64     `json:"enc" format:"uint64"`
 	Looping        bool       `json:"looping"`
+	LoopingRuntime uint64     `json:"looping_runtime" format:"uint64"`
 	Duplicating    bool       `json:"duplicating"`
 	GOP            string     `json:"gop"`
 }
@@ -46,6 +47,7 @@ func (a *AVstream) Unmarshal(av *app.AVstream) {
 	a.Drop = av.Drop
 	a.Enc = av.Enc
 	a.Looping = av.Looping
+	a.LoopingRuntime = av.LoopingRuntime
 	a.Duplicating = av.Duplicating
 	a.GOP = av.GOP
 

restream/app/avstream.go

@@ -3,7 +3,7 @@ package app
 type AVstreamIO struct {
 	State  string
 	Packet uint64 // counter
-	Time   uint64
+	Time   uint64 // sec
 	Size   uint64 // bytes
 }
 
@@ -16,6 +16,7 @@ type AVstream struct {
 	Drop           uint64 // counter
 	Enc            uint64 // counter
 	Looping        bool
+	LoopingRuntime uint64 // sec
 	Duplicating    bool
 	GOP            string
 }

restream/restream.go

@@ -1515,6 +1515,7 @@ func convertProgressFromParser(progress *app.Progress, pprogress parse.Progress)
 				Drop:           pinput.AVstream.Drop,
 				Enc:            pinput.AVstream.Enc,
 				Looping:        pinput.AVstream.Looping,
+				LoopingRuntime: pinput.AVstream.LoopingRuntime,
 				Duplicating:    pinput.AVstream.Duplicating,
 				GOP:            pinput.AVstream.GOP,
 			}