summary refs log tree commit diff
path: root/syweb/webclient/components
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-06 16:55:15 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-06 16:55:15 +0000
commit1a62f1299dcf986cd70573b77ed2c7f05afa28f9 (patch)
treeb4c943c54369a9dd83ecdf0495f6a08c3c22645e /syweb/webclient/components
parentDon't cache isWebRTCSupported because whether webRTC is supported might chang... (diff)
downloadsynapse-1a62f1299dcf986cd70573b77ed2c7f05afa28f9.tar.xz
Detect call type by examining the SDP always rather than just in Firefox as it seems Chrome's behaviour is the odd one out here.
Diffstat (limited to 'syweb/webclient/components')
-rw-r--r--syweb/webclient/components/matrix/matrix-call.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/syweb/webclient/components/matrix/matrix-call.js b/syweb/webclient/components/matrix/matrix-call.js
index c13083298e..0631649946 100644
--- a/syweb/webclient/components/matrix/matrix-call.js
+++ b/syweb/webclient/components/matrix/matrix-call.js
@@ -175,7 +175,8 @@ angular.module('MatrixCall', [])
         this.state = 'ringing';
         this.direction = 'inbound';
 
-        if (window.mozRTCPeerConnection) {
+        // This also applied to the Safari OpenWebRTC extension so let's just do this all the time at least for now
+        //if (window.mozRTCPeerConnection) {
             // firefox's RTCPeerConnection doesn't add streams until it starts getting media on them
             // so we need to figure out whether a video channel has been offered by ourselves.
             if (this.msg.offer.sdp.indexOf('m=video') > -1) {
@@ -183,7 +184,7 @@ angular.module('MatrixCall', [])
             } else {
                 this.type = 'voice';
             }
-        }
+        //}
 
         var self = this;
         $timeout(function() {