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

iStreamer check fix and hide Automatic Connection options for Streamer type

merge-requests/16/head
Moe 2018-07-15 14:41:14 -07:00
parent 989c4984a4
commit fe89c9f5ab
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
camera.js
View File

@ -1765,7 +1765,7 @@ s.coSpawnClose = function(e){
} }
s.ffmpeg = function(e){ s.ffmpeg = function(e){
e.coProcessor = false e.coProcessor = false
e.isStreamer = (e.type === ('dashcam'||'socket')) e.isStreamer = (e.type === 'dashcam'|| e.type === 'socket')
if(e.details.accelerator === '1' && e.details.hwaccel_vcodec !== 'auto' && e.isStreamer === false){ if(e.details.accelerator === '1' && e.details.hwaccel_vcodec !== 'auto' && e.isStreamer === false){
e.coProcessor = true e.coProcessor = true
} }

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

@ -90,20 +90,22 @@
</select></div> </select></div>
</label> </label>
</div> </div>
<div class="form-group"> <div class="h_t_input h_t_h264 h_t_hls h_t_mp4 h_t_jpeg h_t_mjpeg h_t_local">
<label><div><span><%-lang['Automatic']%></span></div> <div class="form-group h_t_input h_t_h264 h_t_hls h_t_mp4 h_t_jpeg h_t_mjpeg">
<div><select class="form-control" detail="auto_host_enable" selector="h_auto_host"> <label><div><span><%-lang['Automatic']%></span></div>
<option value="0"><%-lang.No%></option> <div><select class="form-control" detail="auto_host_enable" selector="h_auto_host">
<option value="1" selected><%-lang.Yes%></option> <option value="0"><%-lang.No%></option>
</select></div> <option value="1" selected><%-lang.Yes%></option>
</label> </select></div>
</div>
<div class="form-group h_auto_host_input h_auto_host_1">
<div class="form-group">
<label><div><span><%-lang['Full URL Path']%></span></div>
<div><input class="form-control" detail="auto_host" placeholder="Example : rtsp://123.123.123.123/stream/1"></div>
</label> </label>
</div> </div>
<div class="form-group h_auto_host_input h_auto_host_1">
<div class="form-group">
<label><div><span><%-lang['Full URL Path']%></span></div>
<div><input class="form-control" detail="auto_host" placeholder="Example : rtsp://123.123.123.123/stream/1"></div>
</label>
</div>
</div>
</div> </div>
<div class="h_auto_host_input h_auto_host_0 auto_host_fill" style="display:none"> <div class="h_auto_host_input h_auto_host_0 auto_host_fill" style="display:none">
<div class="form-group h_t_input h_t_h264 h_t_hls h_t_mp4 h_t_jpeg h_t_mjpeg"> <div class="form-group h_t_input h_t_h264 h_t_hls h_t_mp4 h_t_jpeg h_t_mjpeg">