apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-25 08:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation error

Browse Source
This commit is contained in:
Ingo Oppermann
2023-04-13 15:43:59 +02:00
parent 5d9db55032
commit 76abf5474f
5 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
docs/docs.go
View File

@@ -2475,6 +2475,9 @@ const docTemplate = `{
"debug": { "debug": {
"type": "object", "type": "object",
"properties": { "properties": {
"auto_max_procs": {
"type": "boolean"
},
"force_gc": { "force_gc": {
"type": "integer", "type": "integer",
"format": "int" "format": "int"
@@ -3762,18 +3765,7 @@ const docTemplate = `{
"format": "uint64" "format": "uint64"
}, },
"framerate": { "framerate": {
"type": "object", "$ref": "#/definitions/api.ProgressIOFramerate"
"properties": {
"avg": {
"type": "number"
},
"max": {
"type": "number"
},
"min": {
"type": "number"
}
}
}, },
"height": { "height": {
"type": "integer", "type": "integer",
@@ -3831,6 +3823,20 @@ const docTemplate = `{
} }
} }
}, },
"api.ProgressIOFramerate": {
"type": "object",
"properties": {
"avg": {
"type": "number"
},
"max": {
"type": "number"
},
"min": {
"type": "number"
}
}
},
"api.RTMPChannel": { "api.RTMPChannel": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -4425,6 +4431,9 @@ const docTemplate = `{
"debug": { "debug": {
"type": "object", "type": "object",
"properties": { "properties": {
"auto_max_procs": {
"type": "boolean"
},
"force_gc": { "force_gc": {
"type": "integer", "type": "integer",
"format": "int" "format": "int"

33
docs/swagger.json
View File

@@ -2468,6 +2468,9 @@
"debug": { "debug": {
"type": "object", "type": "object",
"properties": { "properties": {
"auto_max_procs": {
"type": "boolean"
},
"force_gc": { "force_gc": {
"type": "integer", "type": "integer",
"format": "int" "format": "int"
@@ -3755,18 +3758,7 @@
"format": "uint64" "format": "uint64"
}, },
"framerate": { "framerate": {
"type": "object", "$ref": "#/definitions/api.ProgressIOFramerate"
"properties": {
"avg": {
"type": "number"
},
"max": {
"type": "number"
},
"min": {
"type": "number"
}
}
}, },
"height": { "height": {
"type": "integer", "type": "integer",
@@ -3824,6 +3816,20 @@
} }
} }
}, },
"api.ProgressIOFramerate": {
"type": "object",
"properties": {
"avg": {
"type": "number"
},
"max": {
"type": "number"
},
"min": {
"type": "number"
}
}
},
"api.RTMPChannel": { "api.RTMPChannel": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -4418,6 +4424,9 @@
"debug": { "debug": {
"type": "object", "type": "object",
"properties": { "properties": {
"auto_max_procs": {
"type": "boolean"
},
"force_gc": { "force_gc": {
"type": "integer", "type": "integer",
"format": "int" "format": "int"

22
docs/swagger.yaml
View File

@@ -143,6 +143,8 @@ definitions:
type: object type: object
debug: debug:
properties: properties:
auto_max_procs:
type: boolean
force_gc: force_gc:
format: int format: int
type: integer type: integer
@@ -1012,14 +1014,7 @@ definitions:
format: uint64 format: uint64
type: integer type: integer
framerate: framerate:
properties: $ref: '#/definitions/api.ProgressIOFramerate'
avg:
type: number
max:
type: number
min:
type: number
type: object
height: height:
format: uint64 format: uint64
type: integer type: integer
@@ -1061,6 +1056,15 @@ definitions:
format: uint64 format: uint64
type: integer type: integer
type: object type: object
api.ProgressIOFramerate:
properties:
avg:
type: number
max:
type: number
min:
type: number
type: object
api.RTMPChannel: api.RTMPChannel:
properties: properties:
name: name:
@@ -1525,6 +1529,8 @@ definitions:
type: object type: object
debug: debug:
properties: properties:
auto_max_procs:
type: boolean
force_gc: force_gc:
format: int format: int
type: integer type: integer

5
ffmpeg/parse/types.go
View File

@@ -259,6 +259,11 @@ type ProgressIO struct {
Coder string Coder string
Frame uint64 Frame uint64
Keyframe uint64 Keyframe uint64
Framerate struct {
Min float64
Max float64
Average float64
}
FPS float64 FPS float64
Packet uint64 Packet uint64
PPS float64 PPS float64

2
restream/restream.go
View File

@@ -1332,6 +1332,7 @@ func convertProgressFromParser(progress *app.Progress, pprogress parse.Progress)
Coder: pinput.Coder, Coder: pinput.Coder,
Frame: pinput.Frame, Frame: pinput.Frame,
Keyframe: pinput.Keyframe, Keyframe: pinput.Keyframe,
Framerate: pinput.Framerate,
FPS: pinput.FPS, FPS: pinput.FPS,
Packet: pinput.Packet, Packet: pinput.Packet,
PPS: pinput.PPS, PPS: pinput.PPS,
@@ -1389,6 +1390,7 @@ func convertProgressFromParser(progress *app.Progress, pprogress parse.Progress)
Coder: poutput.Coder, Coder: poutput.Coder,
Frame: poutput.Frame, Frame: poutput.Frame,
Keyframe: poutput.Keyframe, Keyframe: poutput.Keyframe,
Framerate: poutput.Framerate,
FPS: poutput.FPS, FPS: poutput.FPS,
Packet: poutput.Packet, Packet: poutput.Packet,
PPS: poutput.PPS, PPS: poutput.PPS,