mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2024-12-24 06:52:40 -05:00
Use video provider instead of making call to getUserMedia directly.
This commit is contained in:
parent
cde801bc17
commit
5f4139cbe4
2 changed files with 32 additions and 297 deletions
325
src/io/video.js
325
src/io/video.js
|
@ -1,67 +1,7 @@
|
|||
const log = require('../util/log');
|
||||
|
||||
class Video {
|
||||
constructor (runtime) {
|
||||
/**
|
||||
* Reference to the owning Runtime.
|
||||
* @type{!Runtime}
|
||||
*/
|
||||
this.runtime = runtime;
|
||||
|
||||
/**
|
||||
* Default value for mirrored frames.
|
||||
* @type boolean
|
||||
*/
|
||||
this.mirror = true;
|
||||
|
||||
/**
|
||||
* Cache frames for this many ms.
|
||||
* @type number
|
||||
*/
|
||||
this._frameCacheTimeout = 16;
|
||||
|
||||
/**
|
||||
* DOM Video element
|
||||
* @private
|
||||
*/
|
||||
this._video = null;
|
||||
|
||||
/**
|
||||
* Usermedia stream track
|
||||
* @private
|
||||
*/
|
||||
this._track = null;
|
||||
|
||||
/**
|
||||
* Stores some canvas/frame data per resolution/mirror states
|
||||
*/
|
||||
this._workspace = [];
|
||||
|
||||
/**
|
||||
* Id representing a Scratch Renderer skin the video is rendered to for
|
||||
* previewing.
|
||||
* @type {number}
|
||||
*/
|
||||
this._skinId = -1;
|
||||
|
||||
/**
|
||||
* The Scratch Renderer Skin object.
|
||||
* @type {Skin}
|
||||
*/
|
||||
this._skin = null;
|
||||
|
||||
/**
|
||||
* Id for a drawable using the video's skin that will render as a video
|
||||
* preview.
|
||||
* @type {Drawable}
|
||||
*/
|
||||
this._drawable = -1;
|
||||
|
||||
/**
|
||||
* Store the last state of the video transparency ghost effect
|
||||
* @type {number}
|
||||
*/
|
||||
this._ghost = 0;
|
||||
this.provider = null;
|
||||
}
|
||||
|
||||
static get FORMAT_IMAGE_DATA () {
|
||||
|
@ -97,39 +37,17 @@ class Video {
|
|||
* @return {Promise.<Video>} resolves a promise to this IO device when video is ready.
|
||||
*/
|
||||
enableVideo () {
|
||||
this.enabled = true;
|
||||
return this._setupVideo();
|
||||
if (this.provider) return this.provider.enableVideo();
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable video stream (turn video off)
|
||||
* @return {void}
|
||||
*/
|
||||
disableVideo () {
|
||||
this.enabled = false;
|
||||
// If we have begun a setup process, call _teardown after it completes
|
||||
if (this._singleSetup) {
|
||||
this._singleSetup
|
||||
.then(this._teardown.bind(this))
|
||||
.catch(err => this.onError(err));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* async part of disableVideo
|
||||
* @private
|
||||
*/
|
||||
_teardown () {
|
||||
// we might be asked to re-enable before _teardown is called, just ignore it.
|
||||
if (this.enabled === false) {
|
||||
this._disablePreview();
|
||||
this._singleSetup = null;
|
||||
// by clearing refs to video and track, we should lose our hold over the camera
|
||||
this._video = null;
|
||||
if (this._track) {
|
||||
this._track.stop();
|
||||
}
|
||||
this._track = null;
|
||||
}
|
||||
if (this.provider) return this.provider.disableVideo();
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -151,233 +69,46 @@ class Video {
|
|||
format = Video.FORMAT_IMAGE_DATA,
|
||||
cacheTimeout = this._frameCacheTimeout
|
||||
}) {
|
||||
if (this.provider) return this.provider.getFrame({dimensions, mirror, format, cacheTimeout});
|
||||
if (!this.videoReady) {
|
||||
return null;
|
||||
}
|
||||
const [width, height] = dimensions;
|
||||
const workspace = this._getWorkspace({dimensions, mirror: Boolean(mirror)});
|
||||
const {videoWidth, videoHeight} = this._video;
|
||||
const {canvas, context, lastUpdate, cacheData} = workspace;
|
||||
const now = Date.now();
|
||||
|
||||
// if the canvas hasn't been updated...
|
||||
if (lastUpdate + cacheTimeout < now) {
|
||||
|
||||
if (mirror) {
|
||||
context.scale(-1, 1);
|
||||
context.translate(width * -1, 0);
|
||||
}
|
||||
|
||||
context.drawImage(this._video,
|
||||
// source x, y, width, height
|
||||
0, 0, videoWidth, videoHeight,
|
||||
// dest x, y, width, height
|
||||
0, 0, width, height
|
||||
);
|
||||
|
||||
context.resetTransform();
|
||||
workspace.lastUpdate = now;
|
||||
}
|
||||
|
||||
// each data type has it's own data cache, but the canvas is the same
|
||||
if (!cacheData[format]) {
|
||||
cacheData[format] = {lastUpdate: 0};
|
||||
}
|
||||
const formatCache = cacheData[format];
|
||||
|
||||
if (formatCache.lastUpdate + cacheTimeout < now) {
|
||||
if (format === Video.FORMAT_IMAGE_DATA) {
|
||||
formatCache.lastData = context.getImageData(0, 0, width, height);
|
||||
} else if (format === Video.FORMAT_CANVAS) {
|
||||
// this will never change
|
||||
formatCache.lastUpdate = Infinity;
|
||||
formatCache.lastData = canvas;
|
||||
} else {
|
||||
log.error(`video io error - unimplemented format ${format}`);
|
||||
// cache the null result forever, don't log about it again..
|
||||
formatCache.lastUpdate = Infinity;
|
||||
formatCache.lastData = null;
|
||||
}
|
||||
|
||||
// rather than set to now, this data is as stale as it's canvas is
|
||||
formatCache.lastUpdate = Math.max(workspace.lastUpdate, formatCache.lastUpdate);
|
||||
}
|
||||
|
||||
return formatCache.lastData;
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the preview ghost effect
|
||||
* @param {number} ghost from 0 (visible) to 100 (invisible) - ghost effect
|
||||
* @return {void}
|
||||
*/
|
||||
setPreviewGhost (ghost) {
|
||||
this._ghost = ghost;
|
||||
if (this._drawable) {
|
||||
this.runtime.renderer.updateDrawableProperties(this._drawable, {ghost});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Method called when an error happens. Default implementation is just to log error.
|
||||
*
|
||||
* @abstract
|
||||
* @param {Error} error An error object from getUserMedia or other source of error.
|
||||
*/
|
||||
onError (error) {
|
||||
log.error('Unhandled video io device error', error);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a video stream.
|
||||
* Should probably be moved to -render or somewhere similar later
|
||||
* @private
|
||||
* @return {Promise} When video has been received, rejected if video is not received
|
||||
*/
|
||||
_setupVideo () {
|
||||
// We cache the result of this setup so that we can only ever have a single
|
||||
// video/getUserMedia request happen at a time.
|
||||
if (this._singleSetup) {
|
||||
return this._singleSetup;
|
||||
}
|
||||
|
||||
this._singleSetup = navigator.mediaDevices.getUserMedia({
|
||||
audio: false,
|
||||
video: {
|
||||
width: {min: 480, ideal: 640},
|
||||
height: {min: 360, ideal: 480}
|
||||
}
|
||||
})
|
||||
.then(stream => {
|
||||
this._video = document.createElement('video');
|
||||
// Use the new srcObject API, falling back to createObjectURL
|
||||
try {
|
||||
this._video.srcObject = stream;
|
||||
} catch (error) {
|
||||
this._video.src = window.URL.createObjectURL(stream);
|
||||
}
|
||||
// Hint to the stream that it should load. A standard way to do this
|
||||
// is add the video tag to the DOM. Since this extension wants to
|
||||
// hide the video tag and instead render a sample of the stream into
|
||||
// the webgl rendered Scratch canvas, another hint like this one is
|
||||
// needed.
|
||||
this._video.play(); // Needed for Safari/Firefox, Chrome auto-plays.
|
||||
this._track = stream.getTracks()[0];
|
||||
this._setupPreview();
|
||||
return this;
|
||||
})
|
||||
.catch(error => {
|
||||
this._singleSetup = null;
|
||||
this.onError(error);
|
||||
});
|
||||
|
||||
return this._singleSetup;
|
||||
}
|
||||
|
||||
_disablePreview () {
|
||||
if (this._skin) {
|
||||
this._skin.clear();
|
||||
this.runtime.renderer.updateDrawableProperties(this._drawable, {visible: false});
|
||||
}
|
||||
this._renderPreviewFrame = null;
|
||||
}
|
||||
|
||||
_setupPreview () {
|
||||
const {renderer} = this.runtime;
|
||||
if (!renderer) return;
|
||||
|
||||
if (this._skinId === -1 && this._skin === null && this._drawable === -1) {
|
||||
this._skinId = renderer.createPenSkin();
|
||||
this._skin = renderer._allSkins[this._skinId];
|
||||
this._drawable = renderer.createDrawable();
|
||||
renderer.setDrawableOrder(
|
||||
this._drawable,
|
||||
Video.ORDER
|
||||
);
|
||||
renderer.updateDrawableProperties(this._drawable, {
|
||||
skinId: this._skinId
|
||||
});
|
||||
}
|
||||
|
||||
// if we haven't already created and started a preview frame render loop, do so
|
||||
if (!this._renderPreviewFrame) {
|
||||
renderer.updateDrawableProperties(this._drawable, {
|
||||
ghost: this._ghost,
|
||||
visible: true
|
||||
});
|
||||
|
||||
this._renderPreviewFrame = () => {
|
||||
clearTimeout(this._renderPreviewTimeout);
|
||||
if (!this._renderPreviewFrame) {
|
||||
return;
|
||||
}
|
||||
|
||||
this._renderPreviewTimeout = setTimeout(this._renderPreviewFrame, this.runtime.currentStepTime);
|
||||
|
||||
const canvas = this.getFrame({format: Video.FORMAT_CANVAS});
|
||||
|
||||
if (!canvas) {
|
||||
this._skin.clear();
|
||||
return;
|
||||
}
|
||||
|
||||
const xOffset = Video.DIMENSIONS[0] / -2;
|
||||
const yOffset = Video.DIMENSIONS[1] / 2;
|
||||
this._skin.drawStamp(canvas, xOffset, yOffset);
|
||||
this.runtime.requestRedraw();
|
||||
};
|
||||
|
||||
this._renderPreviewFrame();
|
||||
}
|
||||
if (this.provider) return this.provider.setPreviewGhost(ghost);
|
||||
return null;
|
||||
}
|
||||
|
||||
get videoReady () {
|
||||
if (!this.enabled) {
|
||||
return false;
|
||||
}
|
||||
if (!this._video) {
|
||||
return false;
|
||||
}
|
||||
if (!this._track) {
|
||||
return false;
|
||||
}
|
||||
const {videoWidth, videoHeight} = this._video;
|
||||
if (typeof videoWidth !== 'number' || typeof videoHeight !== 'number') {
|
||||
return false;
|
||||
}
|
||||
if (videoWidth === 0 || videoHeight === 0) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
if (this.provider) return this.provider.videoReady();
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* get an internal workspace for canvas/context/caches
|
||||
* this uses some document stuff to create a canvas and what not, probably needs abstraction
|
||||
* into the renderer layer?
|
||||
* @private
|
||||
* @return {object} A workspace for canvas/data storage. Internal format not documented intentionally
|
||||
* @typedef VideoProvider
|
||||
* @property {Function} enableVideo - Requests camera access from the user, and upon success,
|
||||
* enables the video feed
|
||||
* @property {Function} disableVideo - Turns off the video feed
|
||||
* @property {Function} setGhostPreview - Controls the transparency of a visual layer
|
||||
* over the video feed
|
||||
* @property {Function} getFrame - Return frame data from the video feed in
|
||||
* specified dimensions, format, and mirroring.
|
||||
*/
|
||||
_getWorkspace ({dimensions, mirror}) {
|
||||
let workspace = this._workspace.find(space => (
|
||||
space.dimensions.join('-') === dimensions.join('-') &&
|
||||
space.mirror === mirror
|
||||
));
|
||||
if (!workspace) {
|
||||
workspace = {
|
||||
dimensions,
|
||||
mirror,
|
||||
canvas: document.createElement('canvas'),
|
||||
lastUpdate: 0,
|
||||
cacheData: {}
|
||||
};
|
||||
workspace.canvas.width = dimensions[0];
|
||||
workspace.canvas.height = dimensions[1];
|
||||
workspace.context = workspace.canvas.getContext('2d');
|
||||
this._workspace.push(workspace);
|
||||
}
|
||||
return workspace;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a video provider for this device.
|
||||
* @param {VideoProvider} provider - Video provider to use
|
||||
*/
|
||||
setProvider (provider) {
|
||||
this.provider = provider;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -188,6 +188,10 @@ class VirtualMachine extends EventEmitter {
|
|||
}
|
||||
}
|
||||
|
||||
setVideoProvider (videoProvider) {
|
||||
this.runtime.ioDevices.video.setProvider(videoProvider);
|
||||
}
|
||||
|
||||
/**
|
||||
* Load a Scratch project from a .sb, .sb2, .sb3 or json string.
|
||||
* @param {string | object} input A json string, object, or ArrayBuffer representing the project to load.
|
||||
|
|
Loading…
Reference in a new issue