Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

L33T 995 #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

L33T 995 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfc54b5
Add mobile safari browser constrain in peer browser check
May 12, 2020
8d960b1
Merge remote-tracking branch 'origin/master' into L33T-995
May 12, 2020
81d3dc2
Merge remote-tracking branch 'origin/master' into L33T-995
May 12, 2020
e9b8116
Clean up SDP.js
May 12, 2020
b0ba0dd
Comments for special changes
May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion JitsiConference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,7 +3117,7 @@ JitsiConference.prototype._maybeStartOrStopP2P = function(userLeftEvent) {
sleep(8000);
}

// @FIXME safari can not start p2p session if other peer is chrome!
// @FIXME-JAMEDA safari can not start p2p session if other peer is chrome!
if (browser.isSafari() && browser.peerIsChrome()) {
myId = 99;
peersId = 1;
Expand Down
4 changes: 3 additions & 1 deletion deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/bash

npm install
echo "Start Deployment"
echo "Deploy local"
#cp lib-jitsi-meet.min.* ../../jameda-telemedicine/jitsi-meet/libs/
cp lib-jitsi-meet.min.* ~/.jitsi-meet-cfg/web/jitsi-meet/libs/

echo "Deploy devops"
cp lib-jitsi-meet.min.* ~/workspace/patientus/devops/roles/projects/jitsi-meet/files/
30 changes: 16 additions & 14 deletions modules/RTC/TraceablePeerConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2380,20 +2380,22 @@ const _fixAnswerRFC4145Setup = function(offer, answer) {
// establishment to exceed at least 1 second. To work around Chrome's
// idiosyncracy, don't allow it to send a ClientHello i.e. change its
// default choice of setup:active to setup:passive.
if (offer && answer
&& offer.media && answer.media
&& offer.media.length === answer.media.length) {
answer.media.forEach((a, i) => {
if (SDPUtil.findLine(
offer.media[i],
'a=setup:actpass',
offer.session)) {
answer.media[i]
= a.replace(/a=setup:active/g, 'a=setup:passive');
}
});
answer.raw = answer.session + answer.media.join('');
}

// @FIXME-JAMEDA We deactivate this behavior because we did not have WB
// if (offer && answer
// && offer.media && answer.media
// && offer.media.length === answer.media.length) {
// answer.media.forEach((a, i) => {
// if (SDPUtil.findLine(
// offer.media[i],
// 'a=setup:actpass',
// offer.session)) {
// answer.media[i]
// = a.replace(/a=setup:active/g, 'a=setup:passive');
// }
// });
// answer.raw = answer.session + answer.media.join('');
// }
};

TraceablePeerConnection.prototype.createAnswer = function(constraints) {
Expand Down
2 changes: 1 addition & 1 deletion modules/browser/BrowserCapabilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ export default class BrowserCapabilities extends BrowserDetection {
peerIsSafari() {
const browser = this._getPeerBrowserName();

return browser === 'Safari';
return browser === 'Safari' || browser === 'Mobile Safari';
}

/**
Expand Down