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

openvidu-browser: fix wrong screen audio track management

pull/828/head
pabloFuente 2023-10-16 13:04:19 +02:00
parent ff8605ef85
commit 50a07ed203
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,6 +568,7 @@ export class OpenVidu {
// getDisplayMedia supported // getDisplayMedia supported
try { try {
const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: options.audioSource === 'screen' }); const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: options.audioSource === 'screen' });
this.removeScreenAudioTrackIfNotAvailable(mediaStream);
this.addAlreadyProvidedTracks(myConstraints, mediaStream); this.addAlreadyProvidedTracks(myConstraints, mediaStream);
if (mustAskForAudioTrackLater) { if (mustAskForAudioTrackLater) {
return await askForAudioStreamOnly(mediaStream, <MediaStreamConstraints>myConstraints.constraints); return await askForAudioStreamOnly(mediaStream, <MediaStreamConstraints>myConstraints.constraints);
@ -1161,6 +1162,21 @@ 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 * @hidden
*/ */
@ -1298,4 +1314,5 @@ export class OpenVidu {
private isScreenShare(videoSource: string) { private isScreenShare(videoSource: string) {
return videoSource === 'screen' || videoSource === 'window' || (platform.isElectron() && videoSource.startsWith('screen:')); return videoSource === 'screen' || videoSource === 'window' || (platform.isElectron() && videoSource.startsWith('screen:'));
} }
} }

1
openvidu-browser/src/OpenVidu/Publisher.ts
View File

@ -645,6 +645,7 @@ export class Publisher extends StreamManager {
try { try {
if (this.stream.isSendScreen() && navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) { if (this.stream.isSendScreen() && navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) {
const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: this.properties.audioSource === 'screen' }); const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: this.properties.audioSource === 'screen' });
this.openvidu.removeScreenAudioTrackIfNotAvailable(mediaStream);
this.openvidu.addAlreadyProvidedTracks(myConstraints, mediaStream); this.openvidu.addAlreadyProvidedTracks(myConstraints, mediaStream);
await getMediaSuccess(mediaStream, definedAudioConstraint); await getMediaSuccess(mediaStream, definedAudioConstraint);
} else { } else {