ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proper fix for recording dimensions 

- this fix is not backward compatible, you will need to reset your dimensions manually. default is Auto (blank).
merge-requests/63/head
Moe 2019-04-02 23:21:19 -07:00
parent 774756e3ad
commit ee678cf4f3
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
definitions/en_CA.js
View File

@ -472,6 +472,24 @@ module.exports = function(s,config,lang){
"example": "25",
"possible": ""
},
{
hidden: true,
"name": "height",
"field": lang["Height"],
"description": "Height of the stream image.",
"default": "480",
"example": "720, 0 for Auto",
"possible": ""
},
{
hidden: true,
"name": "width",
"field": lang["Width"],
"description": "Width of the stream image.",
"default": "640",
"example": "1280, 0 for Auto",
"possible": ""
},
{
"name": "detail=accelerator",
"field": lang.Accelerator,
@ -1478,7 +1496,7 @@ module.exports = function(s,config,lang){
"possible": ""
},
{
"name": "height",
"name": "detail=record_scale_y",
"field": lang["Record Height"],
"description": "Height of the stream image.",
"default": "",
@ -1487,7 +1505,7 @@ module.exports = function(s,config,lang){
"possible": ""
},
{
"name": "width",
"name": "detail=record_scale_x",
"field": lang["Record Width"],
"description": "Width of the stream image.",
"default": "",

4
libs/ffmpeg.js
View File

@ -659,8 +659,8 @@ module.exports = function(s,config,lang,onFinish){
x.record_video_filters = []
x.record_string = ''
//record - resolution
if(e.width!==''&&e.height!==''&&e.width!=='0'&&e.height!=='0'&&!isNaN(e.width)&&!isNaN(e.height)){
x.record_dimensions=' -s '+e.width+'x'+e.height
if(e.record_scale_x!==''&&e.record_scale_y!==''&&e.record_scale_x!=='0'&&e.record_scale_y!=='0'&&!isNaN(e.record_scale_x)&&!isNaN(e.record_scale_y)){
x.record_dimensions=' -s '+e.record_scale_x+'x'+e.record_scale_y
}else{
x.record_dimensions=''
}