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

Live Grid : Error Handling for video stream-elements

fix-timezone-by-ui
Moe 2022-10-20 08:42:58 -07:00
parent 1f80727362
commit 981cf5ab05
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/assets/js/bs5.liveGrid.js
View File

@ -99,6 +99,22 @@ function buildStreamElementHtml(streamType){
}
return html
}
function attachVideoElementErrorHandler(monitorId){
var monitor = loadedMonitors[monitorId]
var monitorDetails = safeJsonParse(monitor.details)
var streamType = subStreamChannel ? monitorDetails.substream ? monitorDetails.substream.output.stream_type : 'hls' : monitorDetails.stream_type
if(
streamType === 'flv' ||
streamType === 'hls'
){
var streamBlock = liveGridElements[monitorId].monitorItem.find('video.stream-block')
streamBlock[0].onerror = function(){
setTimeout(function(){
mainSocket.f({f:'monitor',ff:'watch_on',id:monitorId})
},2000)
}
}
}
function resetMonitorCanvas(monitorId,initiateAfter,subStreamChannel){
var monitor = loadedMonitors[monitorId]
var details = monitor.details
@ -108,6 +124,7 @@ function resetMonitorCanvas(monitorId,initiateAfter,subStreamChannel){
closeLiveGridPlayer(monitorId,false)
streamBlock.find('.stream-element').remove()
streamBlock.append(buildStreamElementHtml(streamType))
attachVideoElementErrorHandler(monitorId)
if(initiateAfter)initiateLiveGridPlayer(monitor,subStreamChannel)
}
function replaceMonitorInfoInHtml(htmlString,monitor){
@ -278,6 +295,7 @@ function drawLiveGridBlock(monitorConfig,subStreamChannel){
}catch(re){
debugLog(re)
}
attachVideoElementErrorHandler(monitorId)
setCosmeticMonitorInfo(loadedMonitors[monitorId],subStreamChannel)
setLiveGridOpenCount(1)
}
@ -353,9 +371,9 @@ function initiateLiveGridPlayer(monitor,subStreamChannel){
setTimeout(function(){
var stream = containerElement.find('.stream-element');
var onPoseidonError = function(){
// setTimeout(function(){
// mainSocket.f({f:'monitor',ff:'watch_on',id:monitor.mid})
// },5000)
setTimeout(function(){
mainSocket.f({f:'monitor',ff:'watch_on',id:monitorId})
},2000)
}
if(!loadedPlayer.PoseidonErrorCount)loadedPlayer.PoseidonErrorCount = 0
if(loadedPlayer.PoseidonErrorCount >= 5)return