From 49e14781504a793bcb93fd03b0c3e2ccc8d6a4f1 Mon Sep 17 00:00:00 2001
From: Yevgeny Kazakov <yevgeny.kazakov@uni-ulm.de>
Date: Thu, 11 Apr 2019 23:33:50 +0200
Subject: [PATCH] Replace deprecated onaddstream with ontrack; fixes #98

---
 webrtc/sendrecv/js/webrtc.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/webrtc/sendrecv/js/webrtc.js b/webrtc/sendrecv/js/webrtc.js
index c13837e4c5..124c10d7cf 100644
--- a/webrtc/sendrecv/js/webrtc.js
+++ b/webrtc/sendrecv/js/webrtc.js
@@ -219,15 +219,10 @@ function websocketServerConnect() {
     ws_conn.addEventListener('close', onServerClose);
 }
 
-function onRemoteStreamAdded(event) {
-    videoTracks = event.stream.getVideoTracks();
-    audioTracks = event.stream.getAudioTracks();
-
-    if (videoTracks.length > 0) {
-        console.log('Incoming stream: ' + videoTracks.length + ' video tracks and ' + audioTracks.length + ' audio tracks');
-        getVideoElement().srcObject = event.stream;
-    } else {
-        handleIncomingError('Stream with unknown tracks added, resetting');
+function onRemoteTrack(event) {
+    if (getVideoElement().srcObject !== event.streams[0]) {
+        console.log('Incoming stream');
+        getVideoElement().srcObject = event.streams[0];
     }
 }
 
@@ -283,7 +278,7 @@ function createCall(msg) {
     send_channel.onerror = handleDataChannelError;
     send_channel.onclose = handleDataChannelClose;
     peer_connection.ondatachannel = onDataChannel;
-    peer_connection.onaddstream = onRemoteStreamAdded;
+    peer_connection.ontrack = onRemoteTrack;
     /* Send our video/audio to the other peer */
     local_stream_promise = getLocalStream().then((stream) => {
         console.log('Adding local stream');