GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 09:01:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-23 16:41:05 +02:00
parent b23fd2f9f1
commit 43f2f6f9aa
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/share/js/kvm/stream_janus.js
View File

@@ -229,19 +229,29 @@ export function JanusStreamer(__setActive, __setInactive, __setInfo, __orient, _
// Janus 1.x // Janus 1.x
"onremotetrack": function(changed_track, id, added, meta) { "onremotetrack": function(changed_track, id, added, meta) {
__logInfo("Got onremotetrack:", changed_track, id, added, meta); // Chrome sends `muted` notifiation for tracks in `disconnected` ICE state
// and Janus.js just removes muted track from list of available tracks.
// But track still exists actually so it's safe to just ignore
// reason == "mute" and "unmute".
let reason;
try {
reason = meta.reason;
} catch (err) {
reason = "???";
}
__logInfo("Got onremotetrack:", changed_track, id, added, reason, meta);
let el = $("stream-video"); let el = $("stream-video");
if (!el.srcObject) { if (!el.srcObject) {
el.srcObject = new MediaStream(); el.srcObject = new MediaStream();
} }
let stream = el.srcObject; let stream = el.srcObject;
// Chrome sends `muted` notifiation for tracks in `disconnected` ICE state
// and Janus.js just removes muted track from list of available tracks. if (added && reason == "created") {
// But track still exists actually so it's safe to just ignore
// reason == "mute" and "unmute".
if (added && meta.reason == "created") {
for (let track of stream.getTracks()) { for (let track of stream.getTracks()) {
if (track.kind === changed_track.kind && track.id !== changed_track.id) { if (track.kind === changed_track.kind && track.id !== changed_track.id) {
track.stop();
stream.removeTrack(track); stream.removeTrack(track);
} }
} }
@@ -250,7 +260,7 @@ export function JanusStreamer(__setActive, __setInactive, __setInfo, __orient, _
__sendKeyRequired(); __sendKeyRequired();
__startInfoInterval(); __startInfoInterval();
} }
} else if (!added && meta.reason == "ended") { } else if (!added && reason == "ended") {
stream.removeTrack(changed_track); stream.removeTrack(changed_track);
} }
}, },