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

openvidu-browser: support stats in Safari

pull/621/head
pabloFuente 2021-03-24 22:54:04 +01:00
parent ef013ca5e0
commit e5a19c78a6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,10 +182,12 @@ export class WebRtcStats {
// - Microsoft Edge 89.0.774.54 // - Microsoft Edge 89.0.774.54
// - Electron 11.3.0 (Chromium 87.0.4280.141) // - Electron 11.3.0 (Chromium 87.0.4280.141)
// - MacOS Desktop: // - MacOS Desktop:
// - Chrome // - Chrome 89.0.4389.90
// - ¿Opera? // - Firefox 87.0
// - Firefox // - Opera 75.0.3969.93
// - ¿Electron? // - Microsoft Edge 89.0.774.57
// - Safari 14.0 (14610.1.28.1.9)
// - Electron 11.3.0 (Chromium 87.0.4280.141)
// - Android: // - Android:
// - Chrome Mobile 89.0.4389.90 // - Chrome Mobile 89.0.4389.90
// - Opera 62.3.3146.57763 // - Opera 62.3.3146.57763
@ -206,7 +208,7 @@ export class WebRtcStats {
const localCandidates: Map<string, any> = new Map(); const localCandidates: Map<string, any> = new Map();
const remoteCandidates: Map<string, any> = new Map(); const remoteCandidates: Map<string, any> = new Map();
statsReport.forEach((stat: any) => { statsReport.forEach((stat: any) => {
if ((platform.isChromium() || platform.isReactNative()) && stat.type === 'transport') { if (stat.type === 'transport' && (platform.isChromium() || platform.isSafariBrowser() || platform.isReactNative())) {
transportStat = stat; transportStat = stat;
} }
switch (stat.type) { switch (stat.type) {
@ -226,6 +228,7 @@ export class WebRtcStats {
const selectedCandidatePairId = transportStat.selectedCandidatePairId const selectedCandidatePairId = transportStat.selectedCandidatePairId
selectedCandidatePair = candidatePairs.get(selectedCandidatePairId); selectedCandidatePair = candidatePairs.get(selectedCandidatePairId);
} else { } else {
// This is basically Firefox
const length = candidatePairs.size; const length = candidatePairs.size;
const iterator = candidatePairs.values(); const iterator = candidatePairs.values();
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
@ -345,13 +348,19 @@ export class WebRtcStats {
const statsReport: any = await this.stream.getRTCPeerConnection().getStats(); const statsReport: any = await this.stream.getRTCPeerConnection().getStats();
const response = this.getWebRtcStatsResponseOutline(); const response = this.getWebRtcStatsResponseOutline();
const videoTrackStats = ['framesReceived', 'framesDropped', 'framesSent', 'frameHeight', 'frameWidth'];
statsReport.forEach((stat: any) => { statsReport.forEach((stat: any) => {
const mediaType = stat.mediaType != null ? stat.mediaType : stat.kind; let mediaType = stat.mediaType != null ? stat.mediaType : stat.kind;
const addStat = (direction: string, key: string): void => { const addStat = (direction: string, key: string): void => {
if (stat[key] != null && response[direction] != null) { if (stat[key] != null && response[direction] != null) {
response[direction][mediaType][key] = Number(stat[key]); if (!mediaType && (videoTrackStats.indexOf(key) > -1)) {
mediaType = 'video';
}
if (direction != null && mediaType != null && key != null && response[direction] != null && response[direction][mediaType] != null) {
response[direction][mediaType][key] = Number(stat[key]);
}
} }
} }