Fix multi video

This commit is contained in:
gparant 2020-04-25 20:29:03 +02:00
parent 89db8558f6
commit 575054fe4f
4 changed files with 65 additions and 22 deletions

View file

@ -1,7 +1,7 @@
export class MediaManager {
localStream: MediaStream;
remoteStream: MediaStream;
remoteVideo: any;
remoteVideo: Array<any> = new Array<any>();
myCamVideo: any;
cinemaClose: any = null;
cinema: any = null;
@ -11,7 +11,6 @@ export class MediaManager {
getCameraPromise : Promise<any> = null;
constructor() {
this.remoteVideo = document.getElementById('activeCamVideo');
this.myCamVideo = document.getElementById('myCamVideo');
this.microphoneClose = document.getElementById('microphone-close');
@ -112,4 +111,15 @@ export class MediaManager {
throw err;
});
}
/**
*
* @param userId
*/
addActiveVideo(userId : any){
let elementRemoteVideo = document.getElementById("activeCam");
elementRemoteVideo.insertAdjacentHTML('beforeend', '<video id="myCamVideo'+userId+'" autoplay></video>');
this.remoteVideo[userId] = document.getElementById('myCamVideo'+userId);
}
}

View file

@ -26,15 +26,14 @@ export class SimplePeer {
this.Connexion.sendWebrtcRomm(this.RoomId);
//receive message start
this.Connexion.receiveWebrtcStart((message : string) => {
this.Connexion.receiveWebrtcStart((message: string) => {
this.receiveWebrtcStart(message);
});
//receive signal by gemer
this.Connexion.receiveWebrtcSignal((message : string) => {
this.Connexion.receiveWebrtcSignal((message: string) => {
this.receiveWebrtcSignal(message);
});
}).catch((err) => {
console.error(err);
});
@ -60,6 +59,8 @@ export class SimplePeer {
if(this.PeerConnexionArray[userId]){
return;
}
this.MediaManager.addActiveVideo(userId);
this.PeerConnexion = new Peer({initiator: initiator});
this.PeerConnexion.on('signal', (data: any) => {
@ -67,7 +68,7 @@ export class SimplePeer {
});
this.PeerConnexion.on('stream', (stream: MediaStream) => {
this.stream(stream);
this.stream(userId, stream);
});
this.PeerConnexionArray[userId] = this.PeerConnexion;
@ -96,17 +97,17 @@ export class SimplePeer {
}
/**
* permit stream video
*
* @param userId
* @param stream
*/
stream(stream: MediaStream) {
this.MediaManager.remoteStream = stream;
this.MediaManager.remoteVideo.srcObject = this.MediaManager.remoteStream;
stream(userId : any, stream: MediaStream) {
this.MediaManager.remoteVideo[userId].srcObject = stream;
}
/**
* Permit to update stream
* @param stream
*
* @param userId
*/
addMedia (userId : any) {
this.PeerConnexionArray[userId].addStream(this.MediaManager.localStream) // <- add streams to peer dynamically