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

Bug Fix for Detector flag building

merge-requests/63/head
Moe 2019-02-16 14:56:46 -08:00
parent 322d50d912
commit 89bbbf4330
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
definitions/en_CA.json
View File

@ -769,7 +769,7 @@
{
"name": "detail=detector_send_video_length",
"field": "Notification Video Length",
"description": "The length of the video that gets sent to your Notification service, like Email or Discord.",
"description": "In seconds. The length of the video that gets sent to your Notification service, like Email or Discord.",
"default": "10",
"example": "",
"possible": ""
@ -843,8 +843,16 @@
{
"name": "detail=detector_fps",
"field": "Detector Rate (FPS)",
"description": "How many frames a second to send to the motion detector; 1 is the default.",
"default": "1",
"description": "How many frames a second to send to the motion detector; 2 is the default.",
"default": "2",
"example": "",
"possible": ""
},
{
"name": "detail=detector_buffer_seconds",
"field": "Recorded Buffer",
"description": "How many seconds before the event to include in the recorded video.",
"default": "5",
"example": "",
"possible": ""
},

3
languages/en_CA.json
View File

@ -355,7 +355,7 @@
"Connected": "Connected",
"Not Saved": "Not Saved",
"Not Connected": "Not Connected",
"Lisence Plate Detector": "Lisence Plate Detector",
"License Plate Detector": "License Plate Detector",
"OpenCV Cascades": "OpenCV Cascades",
"Refresh List of Cascades": "Refresh List of Cascades",
"\"No Motion\" Detector": "\"No Motion\" Detector",
@ -398,6 +398,7 @@
"HLS Preset": "Preset Template",
"HLS List Size": "List Size",
"Traditional Recording": "Traditional Recording",
"Recorded Buffer": "Recorded Buffer",
"Buffer Preview": "Buffer Preview",
"HLS Start Number": "HLS Start Number",
"HLS Live Start Index": "HLS Live Start Index",

5
libs/ffmpeg.js
View File

@ -788,6 +788,8 @@ module.exports = function(s,config,onFinish){
if(e.details.detector_use_detect_object === '1'){
//for object detection
x.pipe += s.createFFmpegMap(e,e.details.input_map_choices.detector)
if(e.details.detector_scale_x_object&&e.details.detector_scale_x_object!==''&&e.details.detector_scale_y_object&&e.details.detector_scale_y_object!==''){x.dobjratio=' -s '+e.details.detector_scale_x_object+'x'+e.details.detector_scale_y_object}else{x.dobjratio=x.dratio}
x.pipe += ' -r ' + x.detector_fps + x.dobjratio + x.cust_detect
if(e.details.detector_h264 === '1'){
x.pipe += h264Output
}else{
@ -848,7 +850,6 @@ module.exports = function(s,config,onFinish){
if(!e.details.detector_buffer_hls_list_size||e.details.detector_buffer_hls_list_size===''){e.details.detector_buffer_hls_list_size='4'}
if(!e.details.detector_buffer_start_number||e.details.detector_buffer_start_number===''){e.details.detector_buffer_start_number='0'}
if(!e.details.detector_buffer_live_start_index||e.details.detector_buffer_live_start_index===''){e.details.detector_buffer_live_start_index='-3'}
if(e.details.detector_buffer_vcodec.indexOf('_vaapi')>-1){
if(x.hwaccel.indexOf('-vaapi_device')>-1){
x.detector_buffer_filters.push('format=nv12')
@ -869,7 +870,7 @@ module.exports = function(s,config,onFinish){
if(x.detector_buffer_filters.length>0){
x.pipe+=' -vf '+x.detector_buffer_filters.join(',')
}
x.pipe+=x.detector_buffer_fps+x.detector_buffer_acodec+' -c:v '+e.details.detector_buffer_vcodec+' -f hls -tune '+e.details.detector_buffer_tune+' -g '+e.details.detector_buffer_g+' -hls_time '+e.details.detector_buffer_hls_time+' -hls_list_size '+e.details.detector_buffer_hls_list_size+' -start_number '+e.details.detector_buffer_start_number+' -live_start_index '+e.details.detector_buffer_live_start_index+' -hls_allow_cache 0 -hls_flags +delete_segments+omit_endlist "'+e.sdir+'detectorStream.m3u8"'
x.pipe += x.detector_buffer_fps+x.detector_buffer_acodec+' -c:v '+e.details.detector_buffer_vcodec+' -f hls -tune '+e.details.detector_buffer_tune+' -g '+e.details.detector_buffer_g+' -hls_time '+e.details.detector_buffer_hls_time+' -hls_list_size '+e.details.detector_buffer_hls_list_size+' -start_number '+e.details.detector_buffer_start_number+' -live_start_index '+e.details.detector_buffer_live_start_index+' -hls_allow_cache 0 -hls_flags +delete_segments+omit_endlist "'+e.sdir+'detectorStream.m3u8"'
}
}
ffmpeg.buildCoProcessorFeed = function(e,x){

4
web/pages/blocks/monitoredit.ejs
View File

@ -1213,12 +1213,12 @@
</div>
<div class="form-group">
<label><div><span><%-lang['Width']%></span></div>
<div><input class="form-control" type="number" min="1" detail="detector_scale_x_object" placeholder="320"></div>
<div><input class="form-control" type="number" min="1" detail="detector_scale_x_object" placeholder=""></div>
</label>
</div>
<div class="form-group">
<label><div><span><%-lang['Height']%></span></div>
<div><input class="form-control" type="number" min="1" detail="detector_scale_y_object" placeholder="240"></div>
<div><input class="form-control" type="number" min="1" detail="detector_scale_y_object" placeholder=""></div>
</label>
</div>
</div>