From 687b29fb8401b0a9b99db451cb29e8a120e36a29 Mon Sep 17 00:00:00 2001 From: isymchych Date: Wed, 11 Nov 2015 19:06:03 +0200 Subject: [PATCH] don't wait for permissions if use MediaStreamTrack --- modules/RTC/RTCUtils.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/RTC/RTCUtils.js b/modules/RTC/RTCUtils.js index a8168d713..19d8b6ea6 100644 --- a/modules/RTC/RTCUtils.js +++ b/modules/RTC/RTCUtils.js @@ -183,7 +183,7 @@ function wrapGetUserMedia(getUserMedia) { function promiseToCallbacks(promiser) { return function (successCallback, errorCallback) { - promiser.then(successCallback, errorCallback); + promiser().then(successCallback, errorCallback); }; } @@ -299,16 +299,18 @@ function RTCUtils(RTCService, onTemasysPluginReady) } else if (RTCBrowserType.isChrome() || RTCBrowserType.isOpera()) { this.peerconnection = webkitRTCPeerConnection; - this.getUserMedia = wrapGetUserMedia(navigator.webkitGetUserMedia.bind(navigator)); + var getUserMedia = navigator.webkitGetUserMedia.bind(navigator); if (navigator.mediaDevices) { - enumerateDevices = promiseToCallbacks( + this.getUserMedia = wrapGetUserMedia(getUserMedia); + enumerateDevices = wrapEnumerateDevices(promiseToCallbacks( navigator.mediaDevices.enumerateDevices.bind(navigator.mediaDevices) - ); + )); } else { + this.getUserMedia = getUserMedia; enumerateDevices = enumerateDevicesThroughMediaStreamTrack; } - this.enumerateDevices = wrapEnumerateDevices(enumerateDevices); + this.enumerateDevices = enumerateDevices; this.attachMediaStream = function (element, stream) { element.attr('src', webkitURL.createObjectURL(stream)); @@ -352,10 +354,8 @@ function RTCUtils(RTCService, onTemasysPluginReady) AdapterJS.webRTCReady(function (isPlugin) { self.peerconnection = RTCPeerConnection; - self.getUserMedia = wrapGetUserMedia(getUserMedia); - - var enumerateDevices = enumerateDevicesThroughMediaStreamTrack; - self.enumerateDevices = wrapEnumerateDevices(enumerateDevices); + self.getUserMedia = getUserMedia; + self.enumerateDevices = enumerateDevicesThroughMediaStreamTrack; self.attachMediaStream = function (elSel, stream) {