Add Custom Flags field for Traditional Recording

merge-requests/63/head
Moe 2019-01-22 08:44:32 -08:00
parent 9cd6a1d3d5
commit 715b0e54cc
3 changed files with 15 additions and 0 deletions

View File

@ -436,6 +436,7 @@
"Stream to YouTube": "Stream to YouTube",
"Stream to YouTube Flags": "Stream to YouTube Flags",
"Recording Flags": "Recording Flags",
"Traditional Recording Flags": "Traditional Recording Flags",
"Output Method": "Output Method",
"Webhook": "Webhook",
"Event Webhook Error": "Event Webhook Error",
@ -803,6 +804,11 @@
"RTMP Stream":"RTMP Stream",
"Stream Channel":"Stream Channel",
"Confidence":"Confidence",
"Trainer Engine":"Trainer Engine",
"Train":"Train",
"TrainConfirm":"Are you sure you want to begin training? This can take more than 12 hours with over 500 images. This will consume a large amount of resources, like RAM or CPU.",
"Batch":"Batch",
"Subdivision":"Subdivision",
"Map":"Map",
"Add Map":"Add Map",
"Add Input Feed":"Add Input Feed",

View File

@ -780,6 +780,7 @@ module.exports = function(s,config,onFinish){
}
//Traditional Recording Buffer
if(e.details.detector=='1'&&e.details.detector_trigger=='1'&&e.details.detector_record_method==='sip'){
if(e.details.cust_sip_record && e.details.cust_sip_record !== ''){x.pipe += ' ' + e.details.cust_sip_record}
if(e.details.input_map_choices&&e.details.input_map_choices.detector_sip_buffer){
//add input feed map
x.pipe += s.createFFmpegMap(e,e.details.input_map_choices.detector_sip_buffer)
@ -863,6 +864,9 @@ module.exports = function(s,config,onFinish){
case'mjpeg':
x.ffmpegCommandString += ' -reconnect 1 -f mjpeg'+x.cust_input+x.hwaccel+' -i "'+e.url+'"';
break;
// case'rtmp':
// x.ffmpegCommandString += x.cust_input+x.hwaccel+' -i -';
// break;
case'h264':case'hls':case'mp4':
x.ffmpegCommandString += x.cust_input+x.hwaccel+' -i "'+e.url+'"';
break;

View File

@ -842,6 +842,11 @@
<div><input class="form-control" detail="cust_record"></div>
</label>
</div>
<div class="h_rec_mtd_input h_rec_mtd_sip">
<label><div><span><%-lang['Traditional Recording Flags']%></span></div>
<div><input class="form-control" detail="cust_sip_record"></div>
</label>
</div>
<div class="form-group">
<label><div><span><%-lang['Output Method']%></span></div>
<div><input class="form-control" detail="custom_output" placeholder="-f flv rtmp://.."></div>