Skip to content

Fix: URL parameters for RTSP2Web Type MSE due to which playback was unavailable & fix type HLS #4218

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 2 commits into from
Feb 8, 2025
Merged

Fix: URL parameters for RTSP2Web Type MSE due to which playback was unavailable & fix type HLS #4218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eff84b
Fix: URL parameters for RTSP2Web Type MSE (MonitorStream.js)
IgorA100 Feb 2, 2025
234b21d
Correctly stop RTSP2Web Type HLS when executing "MonitorStream.stop()…
IgorA100 Feb 2, 2025
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
38 changes: 26 additions & 12 deletions web/js/MonitorStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ function MonitorStream(monitorData) {
this.RTSP2WebEnabled = monitorData.RTSP2WebEnabled;
this.RTSP2WebType = monitorData.RTSP2WebType;
this.webrtc = null;
this.hls = null;
this.mse = null;
this.wsMSE = null;
this.mseStreamingStarted = false;
this.mseQueue = [];
this.mseSourceBuffer = null;
Expand Down Expand Up @@ -272,9 +275,9 @@ function MonitorStream(monitorData) {
}
*/
if (Hls.isSupported()) {
const hls = new Hls();
hls.loadSource(hlsUrl.href);
hls.attachMedia(videoEl);
this.hls = new Hls();
this.hls.loadSource(hlsUrl.href);
this.hls.attachMedia(videoEl);
} else if (video.canPlayType('application/vnd.apple.mpegurl')) {
videoEl.src = hlsUrl.href;
}
Expand All @@ -287,7 +290,8 @@ function MonitorStream(monitorData) {
});
const mseUrl = rtsp2webModUrl;
mseUrl.protocol = useSSL ? 'wss' : 'ws';
mseUrl.pathname = "/stream/" + this.id + "/channel/0/mse?uuid=" + this.id + "&channel=0";
mseUrl.pathname = "/stream/" + this.id + "/channel/0/mse";
mseUrl.search = "uuid=" + this.id + "&channel=0";
startMsePlay(this, videoEl, mseUrl.href);
} else if (this.RTSP2WebType == 'WebRTC') {
const webrtcUrl = rtsp2webModUrl;
Expand Down Expand Up @@ -348,6 +352,15 @@ function MonitorStream(monitorData) {
if (this.webrtc) {
this.webrtc.close();
this.webrtc = null;
} else if (this.hls) {
this.hls.destroy();
this.hls = null;
} else if (this.wsMSE) {
this.mse.endOfStream();
this.wsMSE.close();
this.wsMSE = null;
this.mseStreamingStarted = false;
this.mseSourceBuffer = null;
}
};

Expand Down Expand Up @@ -682,6 +695,7 @@ function MonitorStream(monitorData) {
} // end if have a new auth hash
} // end if has state
} else {
if (!this.started) return;
console.error(respObj.message);
// Try to reload the image stream.
if (stream.src) {
Expand Down Expand Up @@ -1033,14 +1047,14 @@ function startRTSP2WebPlay(videoEl, url, stream) {
}

function startMsePlay(context, videoEl, url) {
const mse = new MediaSource();
mse.addEventListener('sourceopen', function() {
const ws = new WebSocket(url);
ws.binaryType = 'arraybuffer';
ws.onopen = function(event) {
context.mse = new MediaSource();
context.mse.addEventListener('sourceopen', function() {
context.wsMSE = new WebSocket(url);
context.wsMSE.binaryType = 'arraybuffer';
context.wsMSE.onopen = function(event) {
console.log('Connect to ws');
};
ws.onmessage = function(event) {
context.wsMSE.onmessage = function(event) {
const data = new Uint8Array(event.data);
if (data[0] === 9) {
let mimeCodec;
Expand All @@ -1050,15 +1064,15 @@ function startMsePlay(context, videoEl, url) {
} else {
console.log("Browser too old. Doesn't support TextDecoder");
}
context.mseSourceBuffer = mse.addSourceBuffer('video/mp4; codecs="' + mimeCodec + '"');
context.mseSourceBuffer = context.mse.addSourceBuffer('video/mp4; codecs="' + mimeCodec + '"');
context.mseSourceBuffer.mode = 'segments';
context.mseSourceBuffer.addEventListener('updateend', pushMsePacket, videoEl, context);
} else {
readMsePacket(event.data, videoEl, context);
}
};
}, false);
videoEl.src = window.URL.createObjectURL(mse);
videoEl.src = window.URL.createObjectURL(context.mse);
}

function pushMsePacket(videoEl, context) {
Expand Down