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

feat(p2p): enable H.264 for P2P by default 

On mobile we got the extra step of overriding the option and always set it to
true.
This commit is contained in:
Saúl Ibarra Corretgé 2017-06-29 10:48:25 +02:00
parent 2b0563ad35
commit 8a3cec4a9d
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.js
View File

@ -102,7 +102,7 @@ var config = { // eslint-disable-line no-unused-vars
], ],
// If set to true, it will prefer to use H.264 for P2P calls (if H.264 // If set to true, it will prefer to use H.264 for P2P calls (if H.264
// is supported). // is supported).
preferH264: false preferH264: true
// How long we're going to wait, before going back to P2P after // How long we're going to wait, before going back to P2P after
// the 3rd participant has left the conference (to filter out page reload) // the 3rd participant has left the conference (to filter out page reload)
//backToP2PDelay: 5 //backToP2PDelay: 5

19
react/features/base/conference/actions.js
View File

@ -1,3 +1,4 @@
import _ from 'lodash';
import { JitsiConferenceEvents } from '../lib-jitsi-meet'; import { JitsiConferenceEvents } from '../lib-jitsi-meet';
import { setVideoMuted } from '../media'; import { setVideoMuted } from '../media';
import { import {
@ -255,22 +256,20 @@ export function createConference() {
dispatch(_conferenceWillJoin(room)); dispatch(_conferenceWillJoin(room));
const config = state['features/base/config']; const config = state['features/base/config'];
const configOverride = {
p2p: {
preferH264: true
}
};
const conference const conference
= connection.initJitsiConference( = connection.initJitsiConference(
// XXX Lib-jitsi-meet does not accept uppercase letters. // XXX Lib-jitsi-meet does not accept uppercase letters.
room.toLowerCase(), room.toLowerCase(),
{
...config,
openSctp: true // We use lodash's merge here because it will recursively merge
// objects allowing partial overrides.
// FIXME I tested H.264 from iPhone 6S during a morning _.merge({}, config, configOverride));
// standup but, unfortunately, the other participants who
// happened to be running the Web app saw only black.
//
// preferH264: true
});
_addConferenceListeners(conference, dispatch); _addConferenceListeners(conference, dispatch);