Merge branch 'dev' into vod

docs/docs.go

@@ -3761,6 +3761,20 @@ const docTemplate = `{
                     "type": "integer",
                     "format": "uint64"
                 },
+                "framerate": {
+                    "type": "object",
+                    "properties": {
+                        "avg": {
+                            "type": "number"
+                        },
+                        "max": {
+                            "type": "number"
+                        },
+                        "min": {
+                            "type": "number"
+                        }
+                    }
+                },
                 "height": {
                     "type": "integer",
                     "format": "uint64"

docs/swagger.json

@@ -3754,6 +3754,20 @@
                     "type": "integer",
                     "format": "uint64"
                 },
+                "framerate": {
+                    "type": "object",
+                    "properties": {
+                        "avg": {
+                            "type": "number"
+                        },
+                        "max": {
+                            "type": "number"
+                        },
+                        "min": {
+                            "type": "number"
+                        }
+                    }
+                },
                 "height": {
                     "type": "integer",
                     "format": "uint64"

docs/swagger.yaml

@@ -1011,6 +1011,15 @@ definitions:
       frame:
         format: uint64
         type: integer
+      framerate:
+        properties:
+          avg:
+            type: number
+          max:
+            type: number
+          min:
+            type: number
+        type: object
       height:
         format: uint64
         type: integer

ffmpeg/parse/types.go

@@ -91,11 +91,16 @@ type ffmpegProgressIO struct {
 	// common
 	Index     uint64  `json:"index"`
 	Stream    uint64  `json:"stream"`
-	SizeKB    uint64  `json:"size_kb"`              // kbytes
+	SizeKB    uint64  `json:"size_kb"`    // kbytes
-	Size      uint64  `json:"size_bytes"`           // bytes
+	Size      uint64  `json:"size_bytes"` // bytes
-	Bitrate   float64 `json:"-"`                    // bit/s
+	Bitrate   float64 `json:"-"`          // bit/s
-	Frame     uint64  `json:"frame"`                // counter
+	Frame     uint64  `json:"frame"`      // counter
-	Keyframe  uint64  `json:"keyframe"`             // counter
+	Keyframe  uint64  `json:"keyframe"`   // counter
+	Framerate struct {
+		Min     float64 `json:"min"`
+		Max     float64 `json:"max"`
+		Average float64 `json:"avg"`
+	} `json:"framerate"`
 	Packet    uint64  `json:"packet"`               // counter
 	Extradata uint64  `json:"extradata_size_bytes"` // bytes
 	FPS       float64 `json:"-"`                    // rate, frames per second
@@ -110,6 +115,9 @@ func (io *ffmpegProgressIO) exportTo(progress *ProgressIO) {
 	progress.Stream = io.Stream
 	progress.Frame = io.Frame
 	progress.Keyframe = io.Keyframe
+	progress.Framerate.Min = io.Framerate.Min
+	progress.Framerate.Max = io.Framerate.Max
+	progress.Framerate.Average = io.Framerate.Average
 	progress.Packet = io.Packet
 	progress.FPS = io.FPS
 	progress.PPS = io.PPS

http/api/progress.go

@@ -7,26 +7,33 @@ import (
 	"github.com/datarhei/core/v16/restream/app"
 )
 
+type ProgressIOFramerate struct {
+	Min     json.Number `json:"min" swaggertype:"number" jsonschema:"type=number"`
+	Max     json.Number `json:"max" swaggertype:"number" jsonschema:"type=number"`
+	Average json.Number `json:"avg" swaggertype:"number" jsonschema:"type=number"`
+}
+
 // ProgressIO represents the progress of an ffmpeg input or output
 type ProgressIO struct {
 	ID      string `json:"id" jsonschema:"minLength=1"`
 	Address string `json:"address" jsonschema:"minLength=1"`
 
 	// General
-	Index     uint64      `json:"index" format:"uint64"`
+	Index     uint64              `json:"index" format:"uint64"`
-	Stream    uint64      `json:"stream" format:"uint64"`
+	Stream    uint64              `json:"stream" format:"uint64"`
-	Format    string      `json:"format"`
+	Format    string              `json:"format"`
-	Type      string      `json:"type"`
+	Type      string              `json:"type"`
-	Codec     string      `json:"codec"`
+	Codec     string              `json:"codec"`
-	Coder     string      `json:"coder"`
+	Coder     string              `json:"coder"`
-	Frame     uint64      `json:"frame" format:"uint64"`
+	Frame     uint64              `json:"frame" format:"uint64"`
-	Keyframe  uint64      `json:"keyframe" format:"uint64"`
+	Keyframe  uint64              `json:"keyframe" format:"uint64"`
-	FPS       json.Number `json:"fps" swaggertype:"number" jsonschema:"type=number"`
+	Framerate ProgressIOFramerate `json:"framerate"`
-	Packet    uint64      `json:"packet" format:"uint64"`
+	FPS       json.Number         `json:"fps" swaggertype:"number" jsonschema:"type=number"`
-	PPS       json.Number `json:"pps" swaggertype:"number" jsonschema:"type=number"`
+	Packet    uint64              `json:"packet" format:"uint64"`
-	Size      uint64      `json:"size_kb" format:"uint64"`                                    // kbytes
+	PPS       json.Number         `json:"pps" swaggertype:"number" jsonschema:"type=number"`
-	Bitrate   json.Number `json:"bitrate_kbit" swaggertype:"number" jsonschema:"type=number"` // kbit/s
+	Size      uint64              `json:"size_kb" format:"uint64"`                                    // kbytes
-	Extradata uint64      `json:"extradata_size_bytes" format:"uint64"`                       // bytes
+	Bitrate   json.Number         `json:"bitrate_kbit" swaggertype:"number" jsonschema:"type=number"` // kbit/s
+	Extradata uint64              `json:"extradata_size_bytes" format:"uint64"`                       // bytes
 
 	// Video
 	Pixfmt    string      `json:"pix_fmt,omitempty"`
@@ -59,6 +66,9 @@ func (i *ProgressIO) Unmarshal(io *app.ProgressIO) {
 	i.Coder = io.Coder
 	i.Frame = io.Frame
 	i.Keyframe = io.Keyframe
+	i.Framerate.Min = json.Number(fmt.Sprintf("%.3f", io.Framerate.Min))
+	i.Framerate.Max = json.Number(fmt.Sprintf("%.3f", io.Framerate.Max))
+	i.Framerate.Average = json.Number(fmt.Sprintf("%.3f", io.Framerate.Average))
 	i.FPS = json.Number(fmt.Sprintf("%.3f", io.FPS))
 	i.Packet = io.Packet
 	i.PPS = json.Number(fmt.Sprintf("%.3f", io.PPS))

restream/app/progress.go

@@ -11,8 +11,13 @@ type ProgressIO struct {
 	Type      string
 	Codec     string
 	Coder     string
-	Frame     uint64  // counter
+	Frame     uint64 // counter
-	Keyframe  uint64  // counter
+	Keyframe  uint64 // counter
+	Framerate struct {
+		Min     float64
+		Max     float64
+		Average float64
+	}
 	FPS       float64 // rate, frames per second
 	Packet    uint64  // counter
 	PPS       float64 // rate, packets per second