web/static/js/modules/webrtc.js

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

web/static/js/modules/websocket.js

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

web/static/js/viewer.js

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

web/websocket_handler.go

@@ -16,9 +16,9 @@ var upgrader = websocket.Upgrader{
 
 // clientDescription is sent by new client
 type clientDescription struct {
-	WebRtcSdp webrtc.SessionDescription
+	webRtcSdp webrtc.SessionDescription
-	Stream    string
+	stream    string
-	Quality   string
+	quality   string
 }
 
 // websocketHandler exchanges WebRTC SDP and viewer count
@@ -40,22 +40,22 @@ func websocketHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// Get requested stream
-		stream, err := streams.Get(c.Stream)
+		stream, err := streams.Get(c.stream)
 		if err != nil {
-			log.Printf("Stream not found: %s", c.Stream)
+			log.Printf("Stream not found: %s", c.stream)
 			return
 		}
 
 		// Get requested quality
-		q, err := stream.GetQuality(c.Quality)
+		q, err := stream.GetQuality(c.quality)
 		if err != nil {
-			log.Printf("Quality not found: %s", c.Quality)
+			log.Printf("Quality not found: %s", c.quality)
 			return
 		}
 
 		// Exchange session descriptions with WebRTC stream server
 		// FIXME: Add trickle ICE support
-		q.WebRtcRemoteSdp <- c.WebRtcSdp
+		q.WebRtcRemoteSdp <- c.webRtcSdp
 		localDescription := <-q.WebRtcLocalSdp
 
 		// Send new local description