lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #108 from thecodingmachine/bugFixes

Browse source 
fixed a game crash on firefox on http
This commit is contained in:
David Négrier 2020-05-13 21:48:09 +02:00 committed by GitHub
parent dd5a0c9933 e2531343d1
commit 4cd2141785
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
front/src/WebRtc/MediaManager.ts
View file

@ -115,23 +115,29 @@ export class MediaManager {
//get camera //get camera
getCamera() { getCamera() {
return this.getCameraPromise = navigator.mediaDevices.getUserMedia(this.constraintsMedia) let promise = null;
.then((stream: MediaStream) => { try {
this.localStream = stream; promise = navigator.mediaDevices.getUserMedia(this.constraintsMedia)
this.myCamVideo.srcObject = this.localStream; .then((stream: MediaStream) => {
this.localStream = stream;
this.myCamVideo.srcObject = this.localStream;
//TODO resize remote cam //TODO resize remote cam
/*console.log(this.localStream.getTracks()); /*console.log(this.localStream.getTracks());
let videoMediaStreamTrack = this.localStream.getTracks().find((media : MediaStreamTrack) => media.kind === "video"); let videoMediaStreamTrack = this.localStream.getTracks().find((media : MediaStreamTrack) => media.kind === "video");
let {width, height} = videoMediaStreamTrack.getSettings(); let {width, height} = videoMediaStreamTrack.getSettings();
console.info(`${width}x${height}`); // 6*/ console.info(`${width}x${height}`); // 6*/
return stream; return stream;
}).catch((err) => { }).catch((err) => {
console.error(err); console.error(err);
this.localStream = null; this.localStream = null;
throw err; throw err;
}); });
} catch (e) {
promise = Promise.reject(false);
}
return this.getCameraPromise = promise;
} }
/** /**