Преглед изворни кода

Add RTCBrowserType.isAndroid().

master
Boris Grozev пре 10 година
родитељ
комит
9cc9e6132c
2 измењених фајлова са 16 додато и 8 уклоњено
  1. 10
    0
      modules/RTC/RTCBrowserType.js
  2. 6
    8
      modules/RTC/RTCUtils.js

+ 10
- 0
modules/RTC/RTCBrowserType.js Прегледај датотеку

3
 
3
 
4
 var browserVersion;
4
 var browserVersion;
5
 
5
 
6
+var isAndroid;
7
+
6
 var RTCBrowserType = {
8
 var RTCBrowserType = {
7
 
9
 
8
     RTC_BROWSER_CHROME: "rtc_browser.chrome",
10
     RTC_BROWSER_CHROME: "rtc_browser.chrome",
55
 
57
 
56
     usesUnifiedPlan: function() {
58
     usesUnifiedPlan: function() {
57
         return RTCBrowserType.isFirefox();
59
         return RTCBrowserType.isFirefox();
60
+    },
61
+
62
+    /**
63
+     * Whether the browser is running on an android device.
64
+     */
65
+    isAndroid: function() {
66
+        return isAndroid;
58
     }
67
     }
59
 
68
 
60
     // Add version getters for other browsers when needed
69
     // Add version getters for other browsers when needed
157
 }
166
 }
158
 
167
 
159
 browserVersion = detectBrowser();
168
 browserVersion = detectBrowser();
169
+isAndroid = navigator.userAgent.indexOf('Android') != -1;
160
 
170
 
161
 module.exports = RTCBrowserType;
171
 module.exports = RTCBrowserType;

+ 6
- 8
modules/RTC/RTCUtils.js Прегледај датотеку

22
     return resName;
22
     return resName;
23
 }
23
 }
24
 
24
 
25
-function setResolutionConstraints(constraints, resolution, isAndroid) {
25
+function setResolutionConstraints(constraints, resolution) {
26
+    var isAndroid = RTCBrowserType.isAndroid();
26
 
27
 
27
     if (Resolutions[resolution]) {
28
     if (Resolutions[resolution]) {
28
         constraints.video.mandatory.minWidth = Resolutions[resolution].width;
29
         constraints.video.mandatory.minWidth = Resolutions[resolution].width;
44
             constraints.video.mandatory.minHeight;
45
             constraints.video.mandatory.minHeight;
45
 }
46
 }
46
 
47
 
47
-function getConstraints(um, resolution, bandwidth, fps, desktopStream, isAndroid)
48
-{
48
+function getConstraints(um, resolution, bandwidth, fps, desktopStream) {
49
     var constraints = {audio: false, video: false};
49
     var constraints = {audio: false, video: false};
50
 
50
 
51
     if (um.indexOf('video') >= 0) {
51
     if (um.indexOf('video') >= 0) {
54
 
54
 
55
         constraints.video.optional.push({ googLeakyBucket: true });
55
         constraints.video.optional.push({ googLeakyBucket: true });
56
 
56
 
57
-        setResolutionConstraints(constraints, resolution, isAndroid);
57
+        setResolutionConstraints(constraints, resolution);
58
     }
58
     }
59
     if (um.indexOf('audio') >= 0) {
59
     if (um.indexOf('audio') >= 0) {
60
         if (!RTCBrowserType.isFirefox()) {
60
         if (!RTCBrowserType.isFirefox()) {
209
         };
209
         };
210
         // DTLS should now be enabled by default but..
210
         // DTLS should now be enabled by default but..
211
         this.pc_constraints = {'optional': [{'DtlsSrtpKeyAgreement': 'true'}]};
211
         this.pc_constraints = {'optional': [{'DtlsSrtpKeyAgreement': 'true'}]};
212
-        if (navigator.userAgent.indexOf('Android') != -1) {
212
+        if (RTCBrowserType.isAndroid()) {
213
             this.pc_constraints = {}; // disable DTLS on Android
213
             this.pc_constraints = {}; // disable DTLS on Android
214
         }
214
         }
215
         if (!webkitMediaStream.prototype.getVideoTracks) {
215
         if (!webkitMediaStream.prototype.getVideoTracks) {
286
     um, success_callback, failure_callback, resolution,bandwidth, fps,
286
     um, success_callback, failure_callback, resolution,bandwidth, fps,
287
     desktopStream) {
287
     desktopStream) {
288
     currentResolution = resolution;
288
     currentResolution = resolution;
289
-    // Check if we are running on Android device
290
-    var isAndroid = navigator.userAgent.indexOf('Android') != -1;
291
 
289
 
292
     var constraints = getConstraints(
290
     var constraints = getConstraints(
293
-        um, resolution, bandwidth, fps, desktopStream, isAndroid);
291
+        um, resolution, bandwidth, fps, desktopStream);
294
 
292
 
295
     console.info("Get media constraints", constraints);
293
     console.info("Get media constraints", constraints);
296
 
294
 

Loading…
Откажи
Сачувај