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

openvidu-browser: fix getDisplayMedia audio bug

pull/820/head
pabloFuente 2023-10-05 16:42:21 +02:00
parent c8fd2090f2
commit ad96776571
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,7 +567,7 @@ export class OpenVidu {
if (navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) { if (navigator.mediaDevices['getDisplayMedia'] && !platform.isElectron()) {
// getDisplayMedia supported // getDisplayMedia supported
try { try {
const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true }); const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: options.audioSource === 'screen' });
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);
@ -1017,7 +1017,7 @@ export class OpenVidu {
) { ) {
const audioSource = publisherProperties.audioSource; const audioSource = publisherProperties.audioSource;
const videoSource = publisherProperties.videoSource; const videoSource = publisherProperties.videoSource;
if (typeof audioSource === 'string') { if (typeof audioSource === 'string' && audioSource !== 'screen') {
myConstraints.constraints!.audio = { deviceId: { exact: audioSource } }; myConstraints.constraints!.audio = { deviceId: { exact: audioSource } };
} }

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

@ -644,7 +644,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: true }); const mediaStream = await navigator.mediaDevices['getDisplayMedia']({ video: true, audio: this.properties.audioSource === 'screen' });
this.openvidu.addAlreadyProvidedTracks(myConstraints, mediaStream); this.openvidu.addAlreadyProvidedTracks(myConstraints, mediaStream);
await getMediaSuccess(mediaStream, definedAudioConstraint); await getMediaSuccess(mediaStream, definedAudioConstraint);
} else { } else {