haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2503 from jitsi/ss_fps 

feat(ss_framerate): Add config option for min/max frame rate.
This commit is contained in:
virtuacoplenny 2018-02-23 12:28:48 -08:00 committed by GitHub
parent 6fbe78eb34 b3431ab3e7
commit 1ef2e2ee7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 765 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.js
View File

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

1477
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

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

2
react/features/base/tracks/functions.js
View File

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