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

Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

axis-lock
Moe A 2023-05-01 20:54:00 -07:00
parent 4174fabc3e 5e0ebed789
commit 0861604bf6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ffmpeg/builders.js
View File

@ -549,7 +549,7 @@ module.exports = (s,config,lang) => {
}
}
if(videoExtIsMp4){
customRecordingFlags.push(`-movflags +faststart`)
customRecordingFlags.push(`-segment_format_options movflags=faststart+frag_keyframe+empty_moov`)
}
if(videoCodec === 'h264_vaapi'){
recordingFilters.push('format=nv12,hwupload')

20
web/pages/blocks/home/menuSide.ejs
View File

@ -33,6 +33,16 @@
include fieldBuilders.ejs
%>
<% drawBlock(define.SideMenu.blocks.SideMenuBeforeList) %>
<div tab-specific-content="liveGrid" style="display:none">
<div class="form-group px-3">
<div class="dropdown">
<a class="btn btn-sm btn-block btn-default dropdown-toggle" href="#" role="button" id="monitor-group-selections-opener" data-bs-toggle="dropdown" aria-expanded="false">
<%- lang['Monitor Groups'] %>
</a>
<ul class="dropdown-menu <%- `${define.Theme.isDark ? 'dropdown-menu-dark bg-dark' : ''}` %> shadow-lg" aria-labelledby="monitor-group-selections-opener" id="monitor-group-selections"></ul>
</div>
</div>
</div>
<div id="side-menu-collapse-point" class="collapse show home-collapse">
<ul id="pageTabLinks" class="nav flex-column nav-pills">
<div class="pb-2 px-3" id="home-collapse">
@ -62,16 +72,6 @@
<div id="createdTabLinks" class="pb-3 px-3 hidden-empty"></div>
</ul>
</div>
<div tab-specific-content="liveGrid" style="display:none">
<div class="form-group px-3">
<div class="dropdown">
<a class="btn btn-sm btn-block btn-default dropdown-toggle" href="#" role="button" id="monitor-group-selections-opener" data-bs-toggle="dropdown" aria-expanded="false">
<%- lang['Monitor Groups'] %>
</a>
<ul class="dropdown-menu <%- `${define.Theme.isDark ? 'dropdown-menu-dark bg-dark' : ''}` %> shadow-lg" aria-labelledby="monitor-group-selections-opener" id="monitor-group-selections"></ul>
</div>
</div>
</div>
<% drawBlock(define.SideMenu.blocks.SideMenuAfterList) %>
<% if(showMonitors){ %>
<div>