ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-browser: new OpenVidu extension. Opera stats available

pull/88/merge
pabloFuente 2018-06-27 09:34:43 +02:00
parent 35dda59124
commit 63cd76306f
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvidu-browser/src/OpenVidu/OpenVidu.ts
View File

@ -447,7 +447,9 @@ export class OpenVidu {
screenSharingAuto.getScreenId((error, sourceId, screenConstraints) => { screenSharingAuto.getScreenId((error, sourceId, screenConstraints) => {
if (!!error) { if (!!error) {
if (error === 'not-installed') { if (error === 'not-installed') {
const error = new OpenViduError(OpenViduErrorName.SCREEN_EXTENSION_NOT_INSTALLED, 'https://chrome.google.com/webstore/detail/screen-capturing/ajhifddimkapgcifgcodmmfdlknahffk'); const extensionUrl = !!this.advancedConfiguration.screenShareChromeExtension ? this.advancedConfiguration.screenShareChromeExtension :
'https://chrome.google.com/webstore/detail/openvidu-screensharing/lfcgfepafnobdloecchnfaclibenjold';
const error = new OpenViduError(OpenViduErrorName.SCREEN_EXTENSION_NOT_INSTALLED, extensionUrl);
console.error(error); console.error(error);
reject(error); reject(error);
} else if (error === 'installed-disabled') { } else if (error === 'installed-disabled') {

2
openvidu-browser/src/OpenViduInternal/ScreenSharing/Screen-Capturing-Auto.js
View File

@ -173,7 +173,7 @@ function loadIFrame(loadCallback) {
iframe.isLoaded = true; iframe.isLoaded = true;
loadCallback(); loadCallback();
}; };
iframe.src = 'https://www.webrtc-experiment.com/getSourceId/'; // https://wwww.yourdomain.com/getScreenId.html iframe.src = 'https://openvidu.github.io/openvidu-screen-sharing-chrome-extension/';
iframe.style.display = 'none'; iframe.style.display = 'none';
(document.body || document.documentElement).appendChild(iframe); (document.body || document.documentElement).appendChild(iframe);
} }

2
openvidu-browser/src/OpenViduInternal/ScreenSharing/Screen-Capturing.js
View File

@ -83,7 +83,7 @@ function getChromeExtensionStatus(extensionid, callback) {
return callback('not-chrome'); return callback('not-chrome');
if (arguments.length != 2) { if (arguments.length != 2) {
callback = extensionid; callback = extensionid;
extensionid = 'ajhifddimkapgcifgcodmmfdlknahffk'; // default extension-id extensionid = 'lfcgfepafnobdloecchnfaclibenjold'; // default extension-id
} }
var image = document.createElement('img'); var image = document.createElement('img');
image.src = 'chrome-extension://' + extensionid + '/icon.png'; image.src = 'chrome-extension://' + extensionid + '/icon.png';

10
openvidu-browser/src/OpenViduInternal/WebRtcStats/WebRtcStats.ts
View File

@ -97,7 +97,7 @@ export class WebRtcStats {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.getStatsAgnostic(this.stream.getRTCPeerConnection(), this.getStatsAgnostic(this.stream.getRTCPeerConnection(),
(stats) => { (stats) => {
if (platform.name!.indexOf('Chrome') !== -1) { if ((platform.name!.indexOf('Chrome') !== -1) || (platform.name!.indexOf('Opera') !== -1)) {
let localCandidateId, remoteCandidateId, googCandidatePair; let localCandidateId, remoteCandidateId, googCandidatePair;
const localCandidates = {}; const localCandidates = {};
const remoteCandidates = {}; const remoteCandidates = {};
@ -124,7 +124,7 @@ export class WebRtcStats {
}); });
finalLocalCandidate.raw = !!cand[0] ? cand[0].candidate : 'ERROR: Cannot find local candidate in list of sent ICE candidates'; finalLocalCandidate.raw = !!cand[0] ? cand[0].candidate : 'ERROR: Cannot find local candidate in list of sent ICE candidates';
} else { } else {
finalLocalCandidate = 'ERROR: No active local ICE candidate. Probably ICE-TCP is being used' finalLocalCandidate = 'ERROR: No active local ICE candidate. Probably ICE-TCP is being used';
} }
let finalRemoteCandidate = remoteCandidates[remoteCandidateId]; let finalRemoteCandidate = remoteCandidates[remoteCandidateId];
@ -138,7 +138,7 @@ export class WebRtcStats {
}); });
finalRemoteCandidate.raw = !!cand[0] ? cand[0].candidate : 'ERROR: Cannot find remote candidate in list of received ICE candidates'; finalRemoteCandidate.raw = !!cand[0] ? cand[0].candidate : 'ERROR: Cannot find remote candidate in list of received ICE candidates';
} else { } else {
finalRemoteCandidate = 'ERROR: No active remote ICE candidate. Probably ICE-TCP is being used' finalRemoteCandidate = 'ERROR: No active remote ICE candidate. Probably ICE-TCP is being used';
} }
resolve({ resolve({
@ -272,7 +272,7 @@ export class WebRtcStats {
sendPost(JSON.stringify(json)); sendPost(JSON.stringify(json));
} }
}); });
} else if (platform.name!.indexOf('Chrome') !== -1) { } else if ((platform.name!.indexOf('Chrome') !== -1) || (platform.name!.indexOf('Opera') !== -1)) {
for (const key of Object.keys(stats)) { for (const key of Object.keys(stats)) {
const stat = stats[key]; const stat = stats[key];
if (stat.type === 'ssrc') { if (stat.type === 'ssrc') {
@ -400,7 +400,7 @@ export class WebRtcStats {
const report = this.standardizeReport(response); const report = this.standardizeReport(response);
successCb(report); successCb(report);
}).catch(failureCb); }).catch(failureCb);
} else if (platform.name!.indexOf('Chrome') !== -1) { } else if ((platform.name!.indexOf('Chrome') !== -1) || (platform.name!.indexOf('Opera') !== -1)) {
// In Chrome, the first two arguments are reversed // In Chrome, the first two arguments are reversed
return pc.getStats((response) => { return pc.getStats((response) => {
const report = this.standardizeReport(response); const report = this.standardizeReport(response);