scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rewrite the setup/disable process from review comments

Browse source
This commit is contained in:
Corey Frang 2018-04-03 15:07:50 -04:00 committed by Michael "Z" Goddard
parent eef88f6c2d
commit c10696f88c
No known key found for this signature in database
GPG key ID: 762CD40DD5349872
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/io/video.js
View file

@ -103,10 +103,7 @@ class Video {
io._requests.splice(index, 1); io._requests.splice(index, 1);
} }
if (io._requests.length === 0) { if (io._requests.length === 0) {
io._disablePreview(); io._disableVideo();
// by clearing refs to video and track, we should lose our hold over the camera
io._video = null;
io._track = null;
} }
} }
}; };
@ -116,26 +113,12 @@ class Video {
return Promise.resolve(request); return Promise.resolve(request);
} }
if (this._lastSetup) { return this._setupVideo().then(() => {
return this._lastSetup.then(() => {
this._requests.push(request); this._requests.push(request);
return request; return request;
}); });
} }
this._lastSetup = this._setupVideo()
.then(() => {
this._setupPreview();
this._requests.push(request);
this._lastSetup = null;
return request;
}, err => {
this._lastSetup = null;
throw err;
});
return this._lastSetup;
}
/** /**
* Create a video stream. * Create a video stream.
* Should probably be moved to -render or somewhere similar later * Should probably be moved to -render or somewhere similar later
@ -143,8 +126,12 @@ class Video {
* @return {Promise} When video has been received, rejected if video is not received * @return {Promise} When video has been received, rejected if video is not received
*/ */
_setupVideo () { _setupVideo () {
if (this._lastSetup) {
return this._lastSetup;
}
this._video = document.createElement('video'); this._video = document.createElement('video');
return new Promise((resolve, reject) => { const video = new Promise((resolve, reject) => {
navigator.getUserMedia({ navigator.getUserMedia({
audio: false, audio: false,
video: { video: {
@ -162,9 +149,20 @@ class Video {
resolve(this._video); resolve(this._video);
}, err => { }, err => {
// There are probably some error types we could handle gracefully here. // There are probably some error types we could handle gracefully here.
this._lastSetup = null;
reject(err); reject(err);
}); });
}); });
return video.then(() => this._setupPreview());
}
_disableVideo () {
this._disablePreview();
this._lastSetup = null;
// by clearing refs to video and track, we should lose our hold over the camera
this._video = null;
this._track = null;
} }
_disablePreview () { _disablePreview () {