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
4 changed files with 765 additions and 722 deletions
+6
View File
@@ -167,6 +167,12 @@ var config = {
// The URL to the Firefox extension for desktop sharing.
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.
// startScreenSharing: false,
+756 -721
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -44,7 +44,7 @@
"jquery-i18next": "1.2.0",
"js-md5": "0.6.1",
"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",
"moment": "2.19.4",
"nuclear-js": "1.4.0",
+2
View File
@@ -47,6 +47,7 @@ export function createLocalTracksF(
const {
constraints,
desktopSharingFrameRate,
firefox_fake_device, // eslint-disable-line camelcase
resolution
} = store.getState()['features/base/config'];
@@ -58,6 +59,7 @@ export function createLocalTracksF(
constraints,
desktopSharingExtensionExternalInstallation:
options.desktopSharingExtensionExternalInstallation,
desktopSharingFrameRate,
desktopSharingSources: options.desktopSharingSources,
// Copy array to avoid mutations inside library.