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

fix stream_fps condition

merge-requests/21/head
Moe 2018-08-20 15:00:18 -07:00
parent ace8c7e916
commit e8fa79239c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
camera.js
View File

@ -630,6 +630,7 @@ s.kill = function(x,e,p){
delete(s.group[e.ke].mon[e.id].spawn_exit); delete(s.group[e.ke].mon[e.id].spawn_exit);
}catch(er){} }catch(er){}
} }
s.group[e.ke].mon[e.id].firstStreamChunk = {}
clearTimeout(s.group[e.ke].mon[e.id].checker); clearTimeout(s.group[e.ke].mon[e.id].checker);
delete(s.group[e.ke].mon[e.id].checker); delete(s.group[e.ke].mon[e.id].checker);
clearTimeout(s.group[e.ke].mon[e.id].checkStream); clearTimeout(s.group[e.ke].mon[e.id].checkStream);
@ -1649,8 +1650,8 @@ s.createStreamChannel = function(e,number,channel){
//add input feed map //add input feed map
x.pipe += s.createFFmpegMap(e,e.details.input_map_choices['stream_channel-'+(number-config.pipeAddition)]) x.pipe += s.createFFmpegMap(e,e.details.input_map_choices['stream_channel-'+(number-config.pipeAddition)])
} }
if(channel.stream_vcodec!=='copy'){ if(e.details.stream_vcodec !== 'copy' || e.details.stream_type === 'mjpeg' || e.details.stream_type === 'gif' || e.details.stream_type === 'b64'){
x.cust_stream+=x.stream_fps x.cust_stream += x.stream_fps
} }
switch(channel.stream_type){ switch(channel.stream_type){
case'mp4': case'mp4':