Skip to content

Fix: Stop RTSP2Web (close RTCPeerConnection) when playback stops #4211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connortechnology merged 1 commit into from
Jan 28, 2025
Merged

Fix: Stop RTSP2Web (close RTCPeerConnection) when playback stops #4211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions web/js/MonitorStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ function MonitorStream(monitorData) {
this.height = monitorData.height;
this.RTSP2WebEnabled = monitorData.RTSP2WebEnabled;
this.RTSP2WebType = monitorData.RTSP2WebType;
this.webrtc = null;
this.mseStreamingStarted = false;
this.mseQueue = [];
this.mseSourceBuffer = null;
Expand Down Expand Up @@ -291,7 +292,7 @@ function MonitorStream(monitorData) {
} else if (this.RTSP2WebType == 'WebRTC') {
const webrtcUrl = rtsp2webModUrl;
webrtcUrl.pathname = "/stream/" + this.id + "/channel/0/webrtc";
startRTSP2WebPlay(videoEl, webrtcUrl.href);
startRTSP2WebPlay(videoEl, webrtcUrl.href, this);
}
this.statusCmdTimer = setInterval(this.statusCmdQuery.bind(this), statusRefreshTimeout);
this.started = true;
Expand Down Expand Up @@ -344,6 +345,10 @@ function MonitorStream(monitorData) {
this.statusCmdTimer = clearInterval(this.statusCmdTimer);
this.streamCmdTimer = clearInterval(this.streamCmdTimer);
this.started = false;
if (this.webrtc) {
this.webrtc.close();
this.webrtc = null;
}
};

this.kill = function() {
Expand Down Expand Up @@ -976,35 +981,35 @@ const waitUntil = (condition) => {
});
};

function startRTSP2WebPlay(videoEl, url) {
const webrtc = new RTCPeerConnection({
function startRTSP2WebPlay(videoEl, url, stream) {
stream.webrtc = new RTCPeerConnection({
iceServers: [{
urls: ['stun:stun.l.google.com:19302']
}],
sdpSemantics: 'unified-plan'
});
webrtc.ontrack = function(event) {
stream.webrtc.ontrack = function(event) {
console.log(event.streams.length + ' track is delivered');
videoEl.srcObject = event.streams[0];
videoEl.play();
};
webrtc.addTransceiver('video', {direction: 'sendrecv'});
webrtc.onnegotiationneeded = async function handleNegotiationNeeded() {
const offer = await webrtc.createOffer();
stream.webrtc.addTransceiver('video', {direction: 'sendrecv'});
stream.webrtc.onnegotiationneeded = async function handleNegotiationNeeded() {
const offer = await stream.webrtc.createOffer();

await webrtc.setLocalDescription(offer);
await stream.webrtc.setLocalDescription(offer);

fetch(url, {
method: 'POST',
body: new URLSearchParams({data: btoa(webrtc.localDescription.sdp)})
body: new URLSearchParams({data: btoa(stream.webrtc.localDescription.sdp)})
})
.catch((rejected) => {
console.log(rejected);
})
.then((response) => response.text())
.then((data) => {
try {
webrtc.setRemoteDescription(
stream.webrtc.setRemoteDescription(
new RTCSessionDescription({type: 'answer', sdp: atob(data)})
);
} catch (e) {
Expand All @@ -1013,14 +1018,16 @@ function startRTSP2WebPlay(videoEl, url) {
});
};

const webrtcSendChannel = webrtc.createDataChannel('rtsptowebSendChannel');
const webrtcSendChannel = stream.webrtc.createDataChannel('rtsptowebSendChannel');
webrtcSendChannel.onopen = (event) => {
console.log(`${webrtcSendChannel.label} has opened`);
webrtcSendChannel.send('ping');
};
webrtcSendChannel.onclose = (_event) => {
console.log(`${webrtcSendChannel.label} has closed`);
startRTSP2WebPlay(videoEl, url);
if (stream.started) {
startRTSP2WebPlay(videoEl, url, stream);
}
};
webrtcSendChannel.onmessage = (event) => console.log(event.data);
}
Expand Down