Add Wallclock Timestamp toggle in Monitor Settings

build-default-monitor-config-from-definitions
Moe 2020-05-02 13:25:38 -07:00
parent ca4a3723e8
commit 5dbeb8c5e5
4 changed files with 21 additions and 2 deletions

View File

@ -478,6 +478,25 @@ module.exports = function(s,config,lang){
"example": "25",
"possible": ""
},
{
"name": "detail=wall_clock_timestamp_ignore",
"field": lang['Use Camera Timestamps'],
"description": "Base all incoming camera data in camera time instead of server time.",
"default": "0",
"example": "",
"form-group-class": "h_t_input h_t_h264",
"fieldType": "select",
"possible": [
{
"name": lang.No,
"value": "0"
},
{
"name": lang.Yes,
"value": "1"
}
]
},
{
hidden: true,
"name": "height",

View File

@ -22,6 +22,7 @@
"RAM": "RAM",
"CPU": "CPU",
"on": "on",
"Use Camera Timestamps": "Use Camera Timestamps",
"Power Viewer": "Power Viewer",
"Power Video Viewer": "Power Video Viewer",
"Time-lapse": "Time-lapse",

View File

@ -40,7 +40,6 @@ module.exports = function(s){
if(config.insertOrphans === undefined){config.insertOrphans = true}
if(config.orphanedVideoCheckMax === undefined){config.orphanedVideoCheckMax = 2}
if(config.detectorMergePamRegionTriggers === undefined){config.detectorMergePamRegionTriggers = false}
if(config.wallClockTimestampAsDefault === undefined){config.wallClockTimestampAsDefault = true}
//Child Nodes
if(config.childNodes === undefined)config.childNodes = {};
//enabled

View File

@ -422,7 +422,7 @@ module.exports = function(s,config,lang,onFinish){
x.hwaccel = ''
x.cust_input = ''
//wallclock fix for strangely long, single frame videos
if(config.wallClockTimestampAsDefault && e.type === 'h264' && x.cust_input.indexOf('-use_wallclock_as_timestamps 1') === -1){x.cust_input+=' -use_wallclock_as_timestamps 1';}
if(e.details.wall_clock_timestamp_ignore !== '1' && e.type === 'h264' && x.cust_input.indexOf('-use_wallclock_as_timestamps 1') === -1){x.cust_input+=' -use_wallclock_as_timestamps 1';}
//input - frame rate (capture rate)
if(e.details.sfps && e.details.sfps!==''){x.input_fps=' -r '+e.details.sfps}else{x.input_fps=''}
//input - analyze duration