Merge branch 'dev' into iam

This commit is contained in:
Ingo Oppermann
2023-05-15 21:17:23 +02:00
152 changed files with 2375 additions and 713 deletions

View File

@@ -2633,6 +2633,10 @@ const docTemplate = `{
"looping": {
"type": "boolean"
},
"looping_runtime": {
"type": "integer",
"format": "uint64"
},
"output": {
"$ref": "#/definitions/api.AVstreamIO"
},
@@ -3754,6 +3758,10 @@ const docTemplate = `{
},
"type": {
"type": "string"
},
"updated_at": {
"type": "integer",
"format": "int64"
}
}
},
@@ -4055,6 +4063,11 @@ const docTemplate = `{
"coder": {
"type": "string"
},
"extradata_size_bytes": {
"description": "bytes",
"type": "integer",
"format": "uint64"
},
"format": {
"type": "string"
},
@@ -4065,6 +4078,9 @@ const docTemplate = `{
"type": "integer",
"format": "uint64"
},
"framerate": {
"$ref": "#/definitions/api.ProgressIOFramerate"
},
"height": {
"type": "integer",
"format": "uint64"
@@ -4077,6 +4093,10 @@ const docTemplate = `{
"type": "integer",
"format": "uint64"
},
"keyframe": {
"type": "integer",
"format": "uint64"
},
"layout": {
"type": "string"
},
@@ -4117,6 +4137,20 @@ const docTemplate = `{
}
}
},
"api.ProgressIOFramerate": {
"type": "object",
"properties": {
"avg": {
"type": "number"
},
"max": {
"type": "number"
},
"min": {
"type": "number"
}
}
},
"api.RTMPChannel": {
"type": "object",
"properties": {
@@ -5438,18 +5472,7 @@ const docTemplate = `{
"type": "string"
},
"auth": {
"type": "object",
"properties": {
"enable": {
"type": "boolean"
},
"password": {
"type": "string"
},
"username": {
"type": "string"
}
}
"$ref": "#/definitions/value.S3StorageAuth"
},
"bucket": {
"type": "string"
@@ -5473,6 +5496,20 @@ const docTemplate = `{
"type": "boolean"
}
}
},
"value.S3StorageAuth": {
"type": "object",
"properties": {
"enable": {
"type": "boolean"
},
"password": {
"type": "string"
},
"username": {
"type": "string"
}
}
}
},
"securityDefinitions": {