From 76abf5474f5426047ddeb512aecdd0a987e5449f Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 13 Apr 2023 15:43:59 +0200 Subject: [PATCH] Fix compilation error --- docs/docs.go | 33 +++++++++++++++++++++------------ docs/swagger.json | 33 +++++++++++++++++++++------------ docs/swagger.yaml | 22 ++++++++++++++-------- ffmpeg/parse/types.go | 5 +++++ restream/restream.go | 2 ++ 5 files changed, 63 insertions(+), 32 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 6dcaa995..a1598001 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -2475,6 +2475,9 @@ const docTemplate = `{ "debug": { "type": "object", "properties": { + "auto_max_procs": { + "type": "boolean" + }, "force_gc": { "type": "integer", "format": "int" @@ -3762,18 +3765,7 @@ const docTemplate = `{ "format": "uint64" }, "framerate": { - "type": "object", - "properties": { - "avg": { - "type": "number" - }, - "max": { - "type": "number" - }, - "min": { - "type": "number" - } - } + "$ref": "#/definitions/api.ProgressIOFramerate" }, "height": { "type": "integer", @@ -3831,6 +3823,20 @@ const docTemplate = `{ } } }, + "api.ProgressIOFramerate": { + "type": "object", + "properties": { + "avg": { + "type": "number" + }, + "max": { + "type": "number" + }, + "min": { + "type": "number" + } + } + }, "api.RTMPChannel": { "type": "object", "properties": { @@ -4425,6 +4431,9 @@ const docTemplate = `{ "debug": { "type": "object", "properties": { + "auto_max_procs": { + "type": "boolean" + }, "force_gc": { "type": "integer", "format": "int" diff --git a/docs/swagger.json b/docs/swagger.json index f4e06f17..fb20469c 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -2468,6 +2468,9 @@ "debug": { "type": "object", "properties": { + "auto_max_procs": { + "type": "boolean" + }, "force_gc": { "type": "integer", "format": "int" @@ -3755,18 +3758,7 @@ "format": "uint64" }, "framerate": { - "type": "object", - "properties": { - "avg": { - "type": "number" - }, - "max": { - "type": "number" - }, - "min": { - "type": "number" - } - } + "$ref": "#/definitions/api.ProgressIOFramerate" }, "height": { "type": "integer", @@ -3824,6 +3816,20 @@ } } }, + "api.ProgressIOFramerate": { + "type": "object", + "properties": { + "avg": { + "type": "number" + }, + "max": { + "type": "number" + }, + "min": { + "type": "number" + } + } + }, "api.RTMPChannel": { "type": "object", "properties": { @@ -4418,6 +4424,9 @@ "debug": { "type": "object", "properties": { + "auto_max_procs": { + "type": "boolean" + }, "force_gc": { "type": "integer", "format": "int" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 347647c5..3c68e219 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -143,6 +143,8 @@ definitions: type: object debug: properties: + auto_max_procs: + type: boolean force_gc: format: int type: integer @@ -1012,14 +1014,7 @@ definitions: format: uint64 type: integer framerate: - properties: - avg: - type: number - max: - type: number - min: - type: number - type: object + $ref: '#/definitions/api.ProgressIOFramerate' height: format: uint64 type: integer @@ -1061,6 +1056,15 @@ definitions: format: uint64 type: integer type: object + api.ProgressIOFramerate: + properties: + avg: + type: number + max: + type: number + min: + type: number + type: object api.RTMPChannel: properties: name: @@ -1525,6 +1529,8 @@ definitions: type: object debug: properties: + auto_max_procs: + type: boolean force_gc: format: int type: integer diff --git a/ffmpeg/parse/types.go b/ffmpeg/parse/types.go index efb6105e..a7473285 100644 --- a/ffmpeg/parse/types.go +++ b/ffmpeg/parse/types.go @@ -259,6 +259,11 @@ type ProgressIO struct { Coder string Frame uint64 Keyframe uint64 + Framerate struct { + Min float64 + Max float64 + Average float64 + } FPS float64 Packet uint64 PPS float64 diff --git a/restream/restream.go b/restream/restream.go index bd14e73e..04868995 100644 --- a/restream/restream.go +++ b/restream/restream.go @@ -1332,6 +1332,7 @@ func convertProgressFromParser(progress *app.Progress, pprogress parse.Progress) Coder: pinput.Coder, Frame: pinput.Frame, Keyframe: pinput.Keyframe, + Framerate: pinput.Framerate, FPS: pinput.FPS, Packet: pinput.Packet, PPS: pinput.PPS, @@ -1389,6 +1390,7 @@ func convertProgressFromParser(progress *app.Progress, pprogress parse.Progress) Coder: poutput.Coder, Frame: poutput.Frame, Keyframe: poutput.Keyframe, + Framerate: poutput.Framerate, FPS: poutput.FPS, Packet: poutput.Packet, PPS: poutput.PPS,