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

openvidu-components: Fixed missing device labels in Firefox

pull/734/head
csantosm 2022-06-03 11:34:39 +02:00
parent a9854649a4
commit 57c17b50ef
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts
View File

@ -217,24 +217,4 @@ export class PreJoinComponent implements OnInit, OnDestroy {
// this.cd.markForCheck(); // this.cd.markForCheck();
}); });
} }
//? After test in Chrome and Firefox, the devices always have labels.
//? It's not longer needed
// private handlePublisherSuccess(publisher: Publisher) {
// publisher.once('accessAllowed', async () => {
// if (this.deviceSrv.areEmptyLabels()) {
// await this.deviceSrv.forceUpdate();
// if (this.hasAudioDevices) {
// const audioLabel = publisher?.stream?.getMediaStream()?.getAudioTracks()[0]?.label;
// this.deviceSrv.setMicSelected(audioLabel);
// }
// if (this.hasVideoDevices) {
// const videoLabel = publisher?.stream?.getMediaStream()?.getVideoTracks()[0]?.label;
// this.deviceSrv.setCameraSelected(videoLabel);
// }
// this.setDevicesInfo();
// }
// });
// }
} }

22
openvidu-components-angular/projects/openvidu-angular/src/lib/components/videoconference/videoconference.component.ts
View File

@ -451,7 +451,10 @@ export class VideoconferenceComponent implements OnInit, OnDestroy, AfterViewIni
const publisher = await this.openviduService.initDefaultPublisher(undefined); const publisher = await this.openviduService.initDefaultPublisher(undefined);
if (publisher) { if (publisher) {
publisher.once('accessDenied', (e: any) => this.handlePublisherError(e)); publisher.once('accessDenied', (e: any) => this.handlePublisherError(e));
publisher.once('accessAllowed', () => (this.participantReady = true)); publisher.once('accessAllowed', async () => {
await this.handlePublisherSuccess();
this.participantReady = true;
});
publisher.once('streamPlaying', () => (this.streamPlaying = true)); publisher.once('streamPlaying', () => (this.streamPlaying = true));
} }
} catch (error) { } catch (error) {
@ -681,6 +684,23 @@ export class VideoconferenceComponent implements OnInit, OnDestroy, AfterViewIni
this.log.e(e.message); this.log.e(e.message);
} }
private async handlePublisherSuccess() {
// The devices are initialized without labels in Firefox.
// We need to force an update after publisher is allowed.
if (this.deviceSrv.areEmptyLabels()) {
await this.deviceSrv.forceUpdate();
if (this.deviceSrv.hasAudioDeviceAvailable()) {
const audioLabel = this.participantService.getMyCameraPublisher()?.stream?.getMediaStream()?.getAudioTracks()[0]?.label;
this.deviceSrv.setMicSelected(audioLabel);
}
if (this.deviceSrv.hasVideoDeviceAvailable()) {
const videoLabel = this.participantService.getMyCameraPublisher()?.stream?.getMediaStream()?.getVideoTracks()[0]?.label;
this.deviceSrv.setCameraSelected(videoLabel);
}
}
}
private subscribeToVideconferenceDirectives() { private subscribeToVideconferenceDirectives() {
this.prejoinSub = this.libService.prejoin.subscribe((value: boolean) => { this.prejoinSub = this.libService.prejoin.subscribe((value: boolean) => {
this.showPrejoin = value; this.showPrejoin = value;

2
openvidu-components-angular/projects/openvidu-angular/src/lib/services/device/device.service.ts
View File

@ -43,6 +43,8 @@ export class DeviceService {
} }
async forceUpdate() { async forceUpdate() {
this.cameras = [];
this.microphones = [];
await this.initializeDevices(); await this.initializeDevices();
} }