This commit is contained in:
Devaev Maxim
2021-05-24 09:06:54 +03:00
parent db192b0769
commit 566a58665e

View File

@@ -131,7 +131,7 @@ function _JanusStreamer(__setActive, __setInactive, __setInfo) {
error: function(error) { error: function(error) {
__logError("Can't attach uStreamer: ", error); __logError("Can't attach uStreamer: ", error);
__setInfo(false, false, error) __setInfo(false, false, error);
__destroyJanus(); __destroyJanus();
}, },
@@ -162,7 +162,7 @@ function _JanusStreamer(__setActive, __setInactive, __setInfo) {
__logError("Got janus error:", msg.error); __logError("Got janus error:", msg.error);
__sendStop(); __sendStop();
__sendWatch(); __sendWatch();
__setInfo(false, false, msg.error) __setInfo(false, false, msg.error);
return; return;
} else { } else {
__logInfo("Got Janus message:", msg); __logInfo("Got Janus message:", msg);
@@ -279,14 +279,14 @@ function _MjpegStreamer(__setActive, __setInactive, __setInfo) {
__state = state; __state = state;
__findId(); __findId();
if (__id.length > 0 && __id in __state.stream.clients_stat) { if (__id.length > 0 && __id in __state.stream.clients_stat) {
__setActive(); __setStreamActive();
__stopChecking(); __stopChecking();
} else { } else {
__ensureChecking(); __ensureChecking();
} }
} else { } else {
__stopChecking(); __stopChecking();
__setInactive(); __setStreamInactive();
} }
}; };
@@ -298,7 +298,7 @@ function _MjpegStreamer(__setActive, __setInactive, __setInfo) {
} }
}; };
var __setActive = function() { var __setStreamActive = function() {
let old_fps = __fps; let old_fps = __fps;
__fps = __state.stream.clients_stat[__id].fps; __fps = __state.stream.clients_stat[__id].fps;
if (old_fps < 0) { if (old_fps < 0) {
@@ -308,7 +308,7 @@ function _MjpegStreamer(__setActive, __setInactive, __setInfo) {
__setInfo(true, __state.source.online, `${__fps} fps`); __setInfo(true, __state.source.online, `${__fps} fps`);
}; };
var __setInactive = function() { var __setStreamInactive = function() {
let old_fps = __fps; let old_fps = __fps;
__key = tools.makeId(); __key = tools.makeId();
__id = ""; __id = "";
@@ -348,14 +348,14 @@ function _MjpegStreamer(__setActive, __setInactive, __setInfo) {
__findId(); __findId();
if (__id.legnth > 0 && __id in __state.stream.clients_stat) { if (__id.legnth > 0 && __id in __state.stream.clients_stat) {
__setActive(); __setStreamActive();
__stopChecking(); __stopChecking();
} else if (__id.length > 0 && __timer_retries >= 0) { } else if (__id.length > 0 && __timer_retries >= 0) {
__timer_retries -= 1; __timer_retries -= 1;
} else { } else {
__setInactive(); __setStreamInactive();
__stopChecking(); __stopChecking();
let path = `/streamer/stream?key=${__key}`; let path = `/streamer/stream?key=${__key}`;