ynerant
/
ghostream
mirror of https://gitlab.crans.org/nounous/ghostream.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Parse JSON from server SDP

This commit is contained in:
Alexandre Iooss 2020-10-22 08:23:35 +02:00
parent ba8bf426e0
commit a2a74761bb
No known key found for this signature in database
GPG Key ID: 6C79278F3FCDCC02
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/static/js/modules/webrtc.js
View File

@ -90,9 +90,9 @@ export class GsWebRTC {
/** /**
* Set WebRTC remote description * Set WebRTC remote description
* After that, the connection will be established and ontrack will be fired. * After that, the connection will be established and ontrack will be fired.
* @param {*} data Session description data * @param {RTCSessionDescription} sdp Session description data
*/ */
setRemoteDescription(data) { setRemoteDescription(sdp) {
this.pc.setRemoteDescription(new RTCSessionDescription(data)); this.pc.setRemoteDescription(sdp);
} }
} }

4
web/static/js/modules/websocket.js
View File

@ -55,9 +55,9 @@ export class GsWebSocket {
*/ */
onDescription(callback) { onDescription(callback) {
this.socket.addEventListener("message", (event) => { this.socket.addEventListener("message", (event) => {
// FIXME: json to session description
console.log("Message from server ", event.data); console.log("Message from server ", event.data);
callback(event.data); const sdp = new RTCSessionDescription(JSON.parse(event.data));
callback(sdp);
}); });
} }
} }

4
web/static/js/viewer.js
View File

@ -26,8 +26,8 @@ export function initViewerPage(stream, stunServers, viewersCounterRefreshPeriod)
c.onICECandidate(localDescription => { c.onICECandidate(localDescription => {
s.sendDescription(localDescription, stream, quality); s.sendDescription(localDescription, stream, quality);
}); });
s.onDescription(data => { s.onDescription(sdp => {
c.setRemoteDescription(data); c.setRemoteDescription(sdp);
}); });
// Register keyboard events // Register keyboard events