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

Merge branch 'SubstreamFix' into 'dev' 

Additional fixes for substream.

See merge request Shinobi-Systems/Shinobi!518
master
Moe 2024-10-22 00:32:32 +00:00
parent 0079f6cde8 dd424a707b
commit cdf1f6f79a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ffmpeg/builders.js
View File

@ -195,7 +195,7 @@ module.exports = (s,config,lang) => {
if(channelStreamDirectory !== e.sdir){
if (fs.existsSync(channelStreamDirectory)) {
try {
fs.rmdirSync(channelStreamDirectory, { recursive: true, force: true })
fs.rmSync(channelStreamDirectory, { recursive: true, force: true })
}catch(err){
// s.debugLog(err)
}
@ -255,7 +255,7 @@ module.exports = (s,config,lang) => {
}
if(!videoCodecisCopy || outputRequiresEncoding){
if(videoWidth && videoHeight && !e.details.hwaccel_format) streamFlags.push(`-s ${videoWidth}x${videoHeight}`)
if(videoFps && streamType === 'mjpeg' || streamType === 'b64'){
if(videoFps && streamType === 'mjpeg' || videoFps && streamType === 'b64'){
streamFilters.push(`fps=${videoFps}`)
}
}

8
web/assets/js/bs5.monitorSettings.js
View File

@ -605,9 +605,11 @@ async function importIntoMonitorEditor(options){
var monitorGroups = monitorDetails.groups ? safeJsonParse(monitorDetails.groups) : []
monitorTags = monitorTags.concat(monitorGroups)
loadMonitorGroupTriggerList()
$.get(getApiPrefix()+'/hls/'+monitorConfig.ke+'/'+monitorConfig.mid+'/detectorStream.m3u8',function(data){
$('#monEditBufferPreview').html(data)
})
if (monitorConfig.ke && monitorConfig.mid) {
$.get(getApiPrefix()+'/hls/'+monitorConfig.ke+'/'+monitorConfig.mid+'/detectorStream.m3u8',function(data){
$('#monEditBufferPreview').html(data)
})
}
tagsInput.tagsinput('removeAll');
monitorTags.forEach((tag) => {
tagsInput.tagsinput('add',tag);