From 1e416325b658ef75cbad931b01d6712f2c60e01c Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 16 Oct 2023 16:49:26 +0200 Subject: [PATCH] Revert "openvidu-browser: fix wrong screen audio track management" This reverts commit 50a07ed203391281a94114d699e2cf9033c26439. --- openvidu-browser/src/OpenVidu/OpenVidu.ts | 17 ----------------- openvidu-browser/src/OpenVidu/Publisher.ts | 1 - 2 files changed, 18 deletions(-) diff --git a/openvidu-browser/src/OpenVidu/OpenVidu.ts b/openvidu-browser/src/OpenVidu/OpenVidu.ts index 7a507710..fa7f6191 100644 --- a/openvidu-browser/src/OpenVidu/OpenVidu.ts +++ b/openvidu-browser/src/OpenVidu/OpenVidu.ts @@ -568,7 +568,6 @@ export class OpenVidu { // getDisplayMedia supported try { const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: options.audioSource === 'screen' }); - this.removeScreenAudioTrackIfNotAvailable(mediaStream); this.addAlreadyProvidedTracks(myConstraints, mediaStream); if (mustAskForAudioTrackLater) { return await askForAudioStreamOnly(mediaStream, myConstraints.constraints); @@ -1162,21 +1161,6 @@ export class OpenVidu { } } - /** - * @hidden - */ - removeScreenAudioTrackIfNotAvailable(mediaStream: MediaStream) { - const [screenVideoTrack] = mediaStream.getVideoTracks(); - const displaySurface = (screenVideoTrack.getSettings() as any).displaySurface; - if (displaySurface !== 'browser') { - // tab screen share. This is the only way in CHromium right now that is possible to share the audio of a screen - mediaStream.getAudioTracks().forEach((screenAudioTrack) => { - mediaStream.removeTrack(screenAudioTrack); - screenAudioTrack.stop(); - }); - } - } - /** * @hidden */ @@ -1314,5 +1298,4 @@ export class OpenVidu { private isScreenShare(videoSource: string) { return videoSource === 'screen' || videoSource === 'window' || (platform.isElectron() && videoSource.startsWith('screen:')); } - } diff --git a/openvidu-browser/src/OpenVidu/Publisher.ts b/openvidu-browser/src/OpenVidu/Publisher.ts index e2c4bfbc..4623cf7f 100644 --- a/openvidu-browser/src/OpenVidu/Publisher.ts +++ b/openvidu-browser/src/OpenVidu/Publisher.ts @@ -645,7 +645,6 @@ export class Publisher extends StreamManager { try { if (this.stream.isSendScreen() && navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) { const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: this.properties.audioSource === 'screen' }); - this.openvidu.removeScreenAudioTrackIfNotAvailable(mediaStream); this.openvidu.addAlreadyProvidedTracks(myConstraints, mediaStream); await getMediaSuccess(mediaStream, definedAudioConstraint); } else {