Explorar el Código

Skips setting local track resolution in case of FF.

dev1
damencho hace 9 años
padre
commit
b96c4d1c12
Se han modificado 1 ficheros con 9 adiciones y 2 borrados
  1. 9
    2
      modules/RTC/JitsiLocalTrack.js

+ 9
- 2
modules/RTC/JitsiLocalTrack.js Ver fichero

@@ -39,6 +39,12 @@ function JitsiLocalTrack(stream, track, mediaType, videoType, resolution,
39 39
         mediaType, videoType, null /* ssrc */);
40 40
     this.dontFireRemoveEvent = false;
41 41
     this.resolution = resolution;
42
+
43
+    // FIXME: currently firefox is ignoring our constraints about resolutions
44
+    // so we do not store it, to avoid wrong reporting of local track resolution
45
+    if (RTCBrowserType.isFirefox())
46
+        this.resolution = null;
47
+
42 48
     this.deviceId = deviceId;
43 49
     this.startMuted = false;
44 50
     this.initialMSID = this.getMSID();
@@ -299,9 +305,10 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
299 305
             var streamOptions = {
300 306
                 cameraDeviceId: this.getDeviceId(),
301 307
                 devices: [ MediaType.VIDEO ],
302
-                facingMode: this.getCameraFacingMode(),
303
-                resolution: this.resolution
308
+                facingMode: this.getCameraFacingMode()
304 309
             };
310
+            if (this.resolution)
311
+                streamOptions.resolution = this.resolution;
305 312
 
306 313
             promise = RTCUtils.obtainAudioAndVideoPermissions(streamOptions)
307 314
                 .then(function (streamsInfo) {

Loading…
Cancelar
Guardar