浏览代码

Merge pull request #2503 from jitsi/ss_fps

feat(ss_framerate): Add config option for min/max frame rate.
master
virtuacoplenny 7 年前
父节点
当前提交
1ef2e2ee7e
没有帐户链接到提交者的电子邮件
共有 4 个文件被更改,包括 766 次插入723 次删除
  1. 6
    0
      config.js
  2. 757
    722
      package-lock.json
  3. 1
    1
      package.json
  4. 2
    0
      react/features/base/tracks/functions.js

+ 6
- 0
config.js 查看文件

@@ -167,6 +167,12 @@ var config = {
167 167
     // The URL to the Firefox extension for desktop sharing.
168 168
     desktopSharingFirefoxExtensionURL: null,
169 169
 
170
+    // Optional desktop sharing frame rate options. Default value: min:5, max:5.
171
+    // desktopSharingFrameRate: {
172
+    //     min: 5,
173
+    //     max: 5
174
+    // },
175
+
170 176
     // Try to start calls with screen-sharing instead of camera video.
171 177
     // startScreenSharing: false,
172 178
 

+ 757
- 722
package-lock.json
文件差异内容过多而无法显示
查看文件


+ 1
- 1
package.json 查看文件

@@ -44,7 +44,7 @@
44 44
     "jquery-i18next": "1.2.0",
45 45
     "js-md5": "0.6.1",
46 46
     "jwt-decode": "2.2.0",
47
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#f9644b5c7093d61690e36a008aa7fc96a793234d ",
47
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#0dcc8a04915c4fdb6aecabf1b036df58e7fe02fc",
48 48
     "lodash": "4.17.4",
49 49
     "moment": "2.19.4",
50 50
     "nuclear-js": "1.4.0",

+ 2
- 0
react/features/base/tracks/functions.js 查看文件

@@ -47,6 +47,7 @@ export function createLocalTracksF(
47 47
 
48 48
     const {
49 49
         constraints,
50
+        desktopSharingFrameRate,
50 51
         firefox_fake_device, // eslint-disable-line camelcase
51 52
         resolution
52 53
     } = store.getState()['features/base/config'];
@@ -58,6 +59,7 @@ export function createLocalTracksF(
58 59
                 constraints,
59 60
                 desktopSharingExtensionExternalInstallation:
60 61
                     options.desktopSharingExtensionExternalInstallation,
62
+                desktopSharingFrameRate,
61 63
                 desktopSharingSources: options.desktopSharingSources,
62 64
 
63 65
                 // Copy array to avoid mutations inside library.

正在加载...
取消
保存