Selaa lähdekoodia

Fixes crash on Android when resolution is undefined in get user media.

master
paweldomas 11 vuotta sitten
vanhempi
commit
384eac3807
1 muutettua tiedostoa jossa 5 lisäystä ja 2 poistoa
  1. 5
    2
      libs/strophe/strophe.jingle.adapter.js

+ 5
- 2
libs/strophe/strophe.jingle.adapter.js Näytä tiedosto

537
         }
537
         }
538
     }
538
     }
539
 
539
 
540
-    if (resolution && !constraints.video) {
540
+    // Check if we are running on Android device
541
+    var isAndroid = navigator.userAgent.indexOf('Android') != -1;
542
+
543
+    if (resolution && !constraints.video || isAndroid) {
541
         constraints.video = {mandatory: {}};// same behaviour as true
544
         constraints.video = {mandatory: {}};// same behaviour as true
542
     }
545
     }
543
     // see https://code.google.com/p/chromium/issues/detail?id=143631#c9 for list of supported resolutions
546
     // see https://code.google.com/p/chromium/issues/detail?id=143631#c9 for list of supported resolutions
580
             constraints.video.mandatory.minHeight = 240;
583
             constraints.video.mandatory.minHeight = 240;
581
             break;
584
             break;
582
         default:
585
         default:
583
-            if (navigator.userAgent.indexOf('Android') != -1) {
586
+            if (isAndroid) {
584
                 constraints.video.mandatory.minWidth = 320;
587
                 constraints.video.mandatory.minWidth = 320;
585
                 constraints.video.mandatory.minHeight = 240;
588
                 constraints.video.mandatory.minHeight = 240;
586
                 constraints.video.mandatory.maxFrameRate = 15;
589
                 constraints.video.mandatory.maxFrameRate = 15;

Loading…
Peruuta
Tallenna