ambiser
/
human
mirror of https://github.com/vladmandic/human
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "optimized canvas handling" 

This reverts commit 9781699e95.
pull/50/head
Vladimir Mandic 2020-11-02 17:31:37 -05:00
parent 9781699e95
commit bdb22d3f15
15 changed files with 330 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dist/human.esm-nobundle.js vendored
View File

@ -5947,12 +5947,10 @@ class Human {
this.version = app.version;
this.defaults = defaults;
this.config = defaults;
this.fx = null;
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas() : null;
this.state = "idle";
this.numTensors = 0;
this.analyzeMemoryLeaks = false;
this.inCanvas = null;
this.outCanvas = null;
this.models = {
facemesh: null,
posenet: null,
@ -6029,14 +6027,12 @@ class Human {
}
}
tfImage(input) {
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
let filtered;
const originalWidth = input.naturalWidth || input.videoWidth || input.width || input.shape && input.shape[1] > 0;
const originalHeight = input.naturalHeight || input.videoHeight || input.height || input.shape && input.shape[2] > 0;
let targetWidth = originalWidth;
let targetHeight = originalHeight;
if (this.fx && this.config.filter.enabled && !(input instanceof tf.Tensor)) {
if (this.config.filter.width > 0)
targetWidth = this.config.filter.width;
else if (this.config.filter.height > 0)
@ -6045,28 +6041,16 @@ class Human {
targetHeight = this.config.filter.height;
else if (this.config.filter.width > 0)
targetHeight = originalHeight * (this.config.filter.width / originalWidth);
if (!this.inCanvas || this.inCanvas.width !== originalWidth || this.inCanvas.height !== originalHeight) {
this.inCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (this.inCanvas.width !== targetWidth)
this.inCanvas.width = targetWidth;
if (this.inCanvas.height !== targetHeight)
this.inCanvas.height = targetHeight;
}
const ctx = this.inCanvas.getContext("2d");
const offscreenCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (offscreenCanvas.width !== targetWidth)
offscreenCanvas.width = targetWidth;
if (offscreenCanvas.height !== targetHeight)
offscreenCanvas.height = targetHeight;
const ctx = offscreenCanvas.getContext("2d");
if (input instanceof ImageData)
ctx.putImageData(input, 0, 0);
else
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, this.inCanvas.width, this.inCanvas.height);
if (this.config.filter.enabled) {
if (!this.outCanvas || this.inCanvas.width !== this.outCanvas.width || this.inCanvas.height !== this.outCanvas.height) {
this.outCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(this.inCanvas.width, this.inCanvas.height) : document.createElement("canvas");
if (this.outCanvas.width !== this.inCanvas.width)
this.outCanvas.width = this.inCanvas.width;
if (this.outCanvas.height !== this.inCanvas.height)
this.outCanvas.height = this.inCanvas.height;
}
if (!this.fx)
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas({canvas: this.outCanvas}) : null;
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
this.fx.reset();
this.fx.addFilter("brightness", this.config.filter.brightness);
if (this.config.filter.contrast !== 0)
@ -6095,19 +6079,22 @@ class Human {
this.fx.addFilter("polaroid");
if (this.config.filter.pixelate !== 0)
this.fx.addFilter("pixelate", this.config.filter.pixelate);
this.outCanvas = this.fx.apply(this.inCanvas);
filtered = this.fx.apply(offscreenCanvas);
}
if (!this.outCanvas)
this.outCanvas = this.inCanvas;
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
const canvas = filtered || input;
let pixels;
if (this.config.backend === "webgl" || this.outCanvas instanceof ImageData) {
pixels = tf.browser.fromPixels(this.outCanvas);
if (this.config.backend === "webgl" || canvas instanceof ImageData) {
pixels = tf.browser.fromPixels(canvas);
} else {
const tempCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
tempCanvas.width = targetWidth;
tempCanvas.height = targetHeight;
const tempCtx = tempCanvas.getContext("2d");
tempCtx.drawImage(this.outCanvas, 0, 0);
tempCtx.drawImage(canvas, 0, 0);
const data = tempCtx.getImageData(0, 0, targetWidth, targetHeight);
pixels = tf.browser.fromPixels(data);
}
@ -6116,7 +6103,7 @@ class Human {
pixels.dispose();
casted.dispose();
}
return {tensor, canvas: this.config.filter.return ? this.outCanvas : null};
return {tensor, canvas: this.config.filter.return ? filtered : null};
}
async detect(input, userConfig = {}) {
this.state = "config";

4
dist/human.esm-nobundle.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/human.esm-nobundle.json vendored
View File

@ -120,7 +120,7 @@
"imports": []
},
"src/human.js": {
"bytes": 14560,
"bytes": 13768,
"imports": [
{
"path": "src/facemesh/facemesh.js"
@ -275,7 +275,7 @@
"dist/human.esm-nobundle.js.map": {
"imports": [],
"inputs": {},
"bytes": 255849
"bytes": 254548
},
"dist/human.esm-nobundle.js": {
"imports": [],
@ -374,13 +374,13 @@
"bytesInOutput": 3012
},
"src/human.js": {
"bytesInOutput": 12748
"bytesInOutput": 11904
},
"src/human.js": {
"bytesInOutput": 0
}
},
"bytes": 158991
"bytes": 158147
}
}
}

53
dist/human.esm.js vendored
View File

@ -72996,12 +72996,10 @@ class Human {
this.version = app.version;
this.defaults = defaults;
this.config = defaults;
this.fx = null;
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas() : null;
this.state = "idle";
this.numTensors = 0;
this.analyzeMemoryLeaks = false;
this.inCanvas = null;
this.outCanvas = null;
this.models = {
facemesh: null,
posenet: null,
@ -73078,14 +73076,12 @@ class Human {
}
}
tfImage(input) {
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
let filtered;
const originalWidth = input.naturalWidth || input.videoWidth || input.width || input.shape && input.shape[1] > 0;
const originalHeight = input.naturalHeight || input.videoHeight || input.height || input.shape && input.shape[2] > 0;
let targetWidth = originalWidth;
let targetHeight = originalHeight;
if (this.fx && this.config.filter.enabled && !(input instanceof tf.Tensor)) {
if (this.config.filter.width > 0)
targetWidth = this.config.filter.width;
else if (this.config.filter.height > 0)
@ -73094,28 +73090,16 @@ class Human {
targetHeight = this.config.filter.height;
else if (this.config.filter.width > 0)
targetHeight = originalHeight * (this.config.filter.width / originalWidth);
if (!this.inCanvas || this.inCanvas.width !== originalWidth || this.inCanvas.height !== originalHeight) {
this.inCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (this.inCanvas.width !== targetWidth)
this.inCanvas.width = targetWidth;
if (this.inCanvas.height !== targetHeight)
this.inCanvas.height = targetHeight;
}
const ctx = this.inCanvas.getContext("2d");
const offscreenCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (offscreenCanvas.width !== targetWidth)
offscreenCanvas.width = targetWidth;
if (offscreenCanvas.height !== targetHeight)
offscreenCanvas.height = targetHeight;
const ctx = offscreenCanvas.getContext("2d");
if (input instanceof ImageData)
ctx.putImageData(input, 0, 0);
else
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, this.inCanvas.width, this.inCanvas.height);
if (this.config.filter.enabled) {
if (!this.outCanvas || this.inCanvas.width !== this.outCanvas.width || this.inCanvas.height !== this.outCanvas.height) {
this.outCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(this.inCanvas.width, this.inCanvas.height) : document.createElement("canvas");
if (this.outCanvas.width !== this.inCanvas.width)
this.outCanvas.width = this.inCanvas.width;
if (this.outCanvas.height !== this.inCanvas.height)
this.outCanvas.height = this.inCanvas.height;
}
if (!this.fx)
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas({canvas: this.outCanvas}) : null;
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
this.fx.reset();
this.fx.addFilter("brightness", this.config.filter.brightness);
if (this.config.filter.contrast !== 0)
@ -73144,19 +73128,22 @@ class Human {
this.fx.addFilter("polaroid");
if (this.config.filter.pixelate !== 0)
this.fx.addFilter("pixelate", this.config.filter.pixelate);
this.outCanvas = this.fx.apply(this.inCanvas);
filtered = this.fx.apply(offscreenCanvas);
}
if (!this.outCanvas)
this.outCanvas = this.inCanvas;
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
const canvas = filtered || input;
let pixels;
if (this.config.backend === "webgl" || this.outCanvas instanceof ImageData) {
pixels = tf.browser.fromPixels(this.outCanvas);
if (this.config.backend === "webgl" || canvas instanceof ImageData) {
pixels = tf.browser.fromPixels(canvas);
} else {
const tempCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
tempCanvas.width = targetWidth;
tempCanvas.height = targetHeight;
const tempCtx = tempCanvas.getContext("2d");
tempCtx.drawImage(this.outCanvas, 0, 0);
tempCtx.drawImage(canvas, 0, 0);
const data = tempCtx.getImageData(0, 0, targetWidth, targetHeight);
pixels = tf.browser.fromPixels(data);
}
@ -73165,7 +73152,7 @@ class Human {
pixels.dispose();
casted.dispose();
}
return {tensor, canvas: this.config.filter.return ? this.outCanvas : null};
return {tensor, canvas: this.config.filter.return ? filtered : null};
}
async detect(input, userConfig = {}) {
this.state = "config";

4
dist/human.esm.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/human.esm.json vendored
View File

@ -294,7 +294,7 @@
"imports": []
},
"src/human.js": {
"bytes": 14560,
"bytes": 13768,
"imports": [
{
"path": "node_modules/@tensorflow/tfjs/dist/tf.node.js"
@ -481,7 +481,7 @@
"dist/human.esm.js.map": {
"imports": [],
"inputs": {},
"bytes": 5129155
"bytes": 5127854
},
"dist/human.esm.js": {
"imports": [],
@ -637,13 +637,13 @@
"bytesInOutput": 3012
},
"src/human.js": {
"bytesInOutput": 12738
"bytesInOutput": 11894
},
"src/human.js": {
"bytesInOutput": 0
}
},
"bytes": 2927957
"bytes": 2927113
}
}
}

53
dist/human.js vendored
View File

@ -73001,12 +73001,10 @@ var Human = (() => {
this.version = app.version;
this.defaults = defaults;
this.config = defaults;
this.fx = null;
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas() : null;
this.state = "idle";
this.numTensors = 0;
this.analyzeMemoryLeaks = false;
this.inCanvas = null;
this.outCanvas = null;
this.models = {
facemesh: null,
posenet: null,
@ -73083,14 +73081,12 @@ var Human = (() => {
}
}
tfImage(input) {
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
let filtered;
const originalWidth = input.naturalWidth || input.videoWidth || input.width || input.shape && input.shape[1] > 0;
const originalHeight = input.naturalHeight || input.videoHeight || input.height || input.shape && input.shape[2] > 0;
let targetWidth = originalWidth;
let targetHeight = originalHeight;
if (this.fx && this.config.filter.enabled && !(input instanceof tf.Tensor)) {
if (this.config.filter.width > 0)
targetWidth = this.config.filter.width;
else if (this.config.filter.height > 0)
@ -73099,28 +73095,16 @@ var Human = (() => {
targetHeight = this.config.filter.height;
else if (this.config.filter.width > 0)
targetHeight = originalHeight * (this.config.filter.width / originalWidth);
if (!this.inCanvas || this.inCanvas.width !== originalWidth || this.inCanvas.height !== originalHeight) {
this.inCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (this.inCanvas.width !== targetWidth)
this.inCanvas.width = targetWidth;
if (this.inCanvas.height !== targetHeight)
this.inCanvas.height = targetHeight;
}
const ctx = this.inCanvas.getContext("2d");
const offscreenCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (offscreenCanvas.width !== targetWidth)
offscreenCanvas.width = targetWidth;
if (offscreenCanvas.height !== targetHeight)
offscreenCanvas.height = targetHeight;
const ctx = offscreenCanvas.getContext("2d");
if (input instanceof ImageData)
ctx.putImageData(input, 0, 0);
else
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, this.inCanvas.width, this.inCanvas.height);
if (this.config.filter.enabled) {
if (!this.outCanvas || this.inCanvas.width !== this.outCanvas.width || this.inCanvas.height !== this.outCanvas.height) {
this.outCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(this.inCanvas.width, this.inCanvas.height) : document.createElement("canvas");
if (this.outCanvas.width !== this.inCanvas.width)
this.outCanvas.width = this.inCanvas.width;
if (this.outCanvas.height !== this.inCanvas.height)
this.outCanvas.height = this.inCanvas.height;
}
if (!this.fx)
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas({canvas: this.outCanvas}) : null;
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
this.fx.reset();
this.fx.addFilter("brightness", this.config.filter.brightness);
if (this.config.filter.contrast !== 0)
@ -73149,19 +73133,22 @@ var Human = (() => {
this.fx.addFilter("polaroid");
if (this.config.filter.pixelate !== 0)
this.fx.addFilter("pixelate", this.config.filter.pixelate);
this.outCanvas = this.fx.apply(this.inCanvas);
filtered = this.fx.apply(offscreenCanvas);
}
if (!this.outCanvas)
this.outCanvas = this.inCanvas;
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
const canvas = filtered || input;
let pixels;
if (this.config.backend === "webgl" || this.outCanvas instanceof ImageData) {
pixels = tf.browser.fromPixels(this.outCanvas);
if (this.config.backend === "webgl" || canvas instanceof ImageData) {
pixels = tf.browser.fromPixels(canvas);
} else {
const tempCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
tempCanvas.width = targetWidth;
tempCanvas.height = targetHeight;
const tempCtx = tempCanvas.getContext("2d");
tempCtx.drawImage(this.outCanvas, 0, 0);
tempCtx.drawImage(canvas, 0, 0);
const data = tempCtx.getImageData(0, 0, targetWidth, targetHeight);
pixels = tf.browser.fromPixels(data);
}
@ -73170,7 +73157,7 @@ var Human = (() => {
pixels.dispose();
casted.dispose();
}
return {tensor, canvas: this.config.filter.return ? this.outCanvas : null};
return {tensor, canvas: this.config.filter.return ? filtered : null};
}
async detect(input, userConfig = {}) {
this.state = "config";

4
dist/human.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/human.json vendored
View File

@ -294,7 +294,7 @@
"imports": []
},
"src/human.js": {
"bytes": 14560,
"bytes": 13768,
"imports": [
{
"path": "node_modules/@tensorflow/tfjs/dist/tf.node.js"
@ -481,7 +481,7 @@
"dist/human.js.map": {
"imports": [],
"inputs": {},
"bytes": 5133045
"bytes": 5131716
},
"dist/human.js": {
"imports": [],
@ -637,10 +637,10 @@
"bytesInOutput": 3144
},
"src/human.js": {
"bytesInOutput": 14131
"bytesInOutput": 13235
}
},
"bytes": 3074083
"bytes": 3073187
}
}
}

53
dist/human.node-nobundle.js vendored
View File

@ -5950,12 +5950,10 @@ class Human {
this.version = app.version;
this.defaults = defaults;
this.config = defaults;
this.fx = null;
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas() : null;
this.state = "idle";
this.numTensors = 0;
this.analyzeMemoryLeaks = false;
this.inCanvas = null;
this.outCanvas = null;
this.models = {
facemesh: null,
posenet: null,
@ -6032,14 +6030,12 @@ class Human {
}
}
tfImage(input) {
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
let filtered;
const originalWidth = input.naturalWidth || input.videoWidth || input.width || input.shape && input.shape[1] > 0;
const originalHeight = input.naturalHeight || input.videoHeight || input.height || input.shape && input.shape[2] > 0;
let targetWidth = originalWidth;
let targetHeight = originalHeight;
if (this.fx && this.config.filter.enabled && !(input instanceof tf.Tensor)) {
if (this.config.filter.width > 0)
targetWidth = this.config.filter.width;
else if (this.config.filter.height > 0)
@ -6048,28 +6044,16 @@ class Human {
targetHeight = this.config.filter.height;
else if (this.config.filter.width > 0)
targetHeight = originalHeight * (this.config.filter.width / originalWidth);
if (!this.inCanvas || this.inCanvas.width !== originalWidth || this.inCanvas.height !== originalHeight) {
this.inCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (this.inCanvas.width !== targetWidth)
this.inCanvas.width = targetWidth;
if (this.inCanvas.height !== targetHeight)
this.inCanvas.height = targetHeight;
}
const ctx = this.inCanvas.getContext("2d");
const offscreenCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (offscreenCanvas.width !== targetWidth)
offscreenCanvas.width = targetWidth;
if (offscreenCanvas.height !== targetHeight)
offscreenCanvas.height = targetHeight;
const ctx = offscreenCanvas.getContext("2d");
if (input instanceof ImageData)
ctx.putImageData(input, 0, 0);
else
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, this.inCanvas.width, this.inCanvas.height);
if (this.config.filter.enabled) {
if (!this.outCanvas || this.inCanvas.width !== this.outCanvas.width || this.inCanvas.height !== this.outCanvas.height) {
this.outCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(this.inCanvas.width, this.inCanvas.height) : document.createElement("canvas");
if (this.outCanvas.width !== this.inCanvas.width)
this.outCanvas.width = this.inCanvas.width;
if (this.outCanvas.height !== this.inCanvas.height)
this.outCanvas.height = this.inCanvas.height;
}
if (!this.fx)
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas({canvas: this.outCanvas}) : null;
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
this.fx.reset();
this.fx.addFilter("brightness", this.config.filter.brightness);
if (this.config.filter.contrast !== 0)
@ -6098,19 +6082,22 @@ class Human {
this.fx.addFilter("polaroid");
if (this.config.filter.pixelate !== 0)
this.fx.addFilter("pixelate", this.config.filter.pixelate);
this.outCanvas = this.fx.apply(this.inCanvas);
filtered = this.fx.apply(offscreenCanvas);
}
if (!this.outCanvas)
this.outCanvas = this.inCanvas;
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
const canvas = filtered || input;
let pixels;
if (this.config.backend === "webgl" || this.outCanvas instanceof ImageData) {
pixels = tf.browser.fromPixels(this.outCanvas);
if (this.config.backend === "webgl" || canvas instanceof ImageData) {
pixels = tf.browser.fromPixels(canvas);
} else {
const tempCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
tempCanvas.width = targetWidth;
tempCanvas.height = targetHeight;
const tempCtx = tempCanvas.getContext("2d");
tempCtx.drawImage(this.outCanvas, 0, 0);
tempCtx.drawImage(canvas, 0, 0);
const data = tempCtx.getImageData(0, 0, targetWidth, targetHeight);
pixels = tf.browser.fromPixels(data);
}
@ -6119,7 +6106,7 @@ class Human {
pixels.dispose();
casted.dispose();
}
return {tensor, canvas: this.config.filter.return ? this.outCanvas : null};
return {tensor, canvas: this.config.filter.return ? filtered : null};
}
async detect(input, userConfig = {}) {
this.state = "config";

4
dist/human.node-nobundle.js.map vendored
View File

File diff suppressed because one or more lines are too long

53
dist/human.node.js vendored
View File

@ -74041,12 +74041,10 @@ class Human {
this.version = app.version;
this.defaults = defaults;
this.config = defaults;
this.fx = null;
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas() : null;
this.state = "idle";
this.numTensors = 0;
this.analyzeMemoryLeaks = false;
this.inCanvas = null;
this.outCanvas = null;
this.models = {
facemesh: null,
posenet: null,
@ -74123,14 +74121,12 @@ class Human {
}
}
tfImage(input) {
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
let filtered;
const originalWidth = input.naturalWidth || input.videoWidth || input.width || input.shape && input.shape[1] > 0;
const originalHeight = input.naturalHeight || input.videoHeight || input.height || input.shape && input.shape[2] > 0;
let targetWidth = originalWidth;
let targetHeight = originalHeight;
if (this.fx && this.config.filter.enabled && !(input instanceof tf.Tensor)) {
if (this.config.filter.width > 0)
targetWidth = this.config.filter.width;
else if (this.config.filter.height > 0)
@ -74139,28 +74135,16 @@ class Human {
targetHeight = this.config.filter.height;
else if (this.config.filter.width > 0)
targetHeight = originalHeight * (this.config.filter.width / originalWidth);
if (!this.inCanvas || this.inCanvas.width !== originalWidth || this.inCanvas.height !== originalHeight) {
this.inCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (this.inCanvas.width !== targetWidth)
this.inCanvas.width = targetWidth;
if (this.inCanvas.height !== targetHeight)
this.inCanvas.height = targetHeight;
}
const ctx = this.inCanvas.getContext("2d");
const offscreenCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
if (offscreenCanvas.width !== targetWidth)
offscreenCanvas.width = targetWidth;
if (offscreenCanvas.height !== targetHeight)
offscreenCanvas.height = targetHeight;
const ctx = offscreenCanvas.getContext("2d");
if (input instanceof ImageData)
ctx.putImageData(input, 0, 0);
else
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, this.inCanvas.width, this.inCanvas.height);
if (this.config.filter.enabled) {
if (!this.outCanvas || this.inCanvas.width !== this.outCanvas.width || this.inCanvas.height !== this.outCanvas.height) {
this.outCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(this.inCanvas.width, this.inCanvas.height) : document.createElement("canvas");
if (this.outCanvas.width !== this.inCanvas.width)
this.outCanvas.width = this.inCanvas.width;
if (this.outCanvas.height !== this.inCanvas.height)
this.outCanvas.height = this.inCanvas.height;
}
if (!this.fx)
this.fx = tf.ENV.flags.IS_BROWSER && typeof document !== "undefined" ? new fxImage.Canvas({canvas: this.outCanvas}) : null;
ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
this.fx.reset();
this.fx.addFilter("brightness", this.config.filter.brightness);
if (this.config.filter.contrast !== 0)
@ -74189,19 +74173,22 @@ class Human {
this.fx.addFilter("polaroid");
if (this.config.filter.pixelate !== 0)
this.fx.addFilter("pixelate", this.config.filter.pixelate);
this.outCanvas = this.fx.apply(this.inCanvas);
filtered = this.fx.apply(offscreenCanvas);
}
if (!this.outCanvas)
this.outCanvas = this.inCanvas;
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
const canvas = filtered || input;
let pixels;
if (this.config.backend === "webgl" || this.outCanvas instanceof ImageData) {
pixels = tf.browser.fromPixels(this.outCanvas);
if (this.config.backend === "webgl" || canvas instanceof ImageData) {
pixels = tf.browser.fromPixels(canvas);
} else {
const tempCanvas = typeof OffscreenCanvas !== "undefined" ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement("canvas");
tempCanvas.width = targetWidth;
tempCanvas.height = targetHeight;
const tempCtx = tempCanvas.getContext("2d");
tempCtx.drawImage(this.outCanvas, 0, 0);
tempCtx.drawImage(canvas, 0, 0);
const data = tempCtx.getImageData(0, 0, targetWidth, targetHeight);
pixels = tf.browser.fromPixels(data);
}
@ -74210,7 +74197,7 @@ class Human {
pixels.dispose();
casted.dispose();
}
return {tensor, canvas: this.config.filter.return ? this.outCanvas : null};
return {tensor, canvas: this.config.filter.return ? filtered : null};
}
async detect(input, userConfig = {}) {
this.state = "config";

4
dist/human.node.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/human.node.json vendored
View File

@ -120,7 +120,7 @@
"imports": []
},
"src/human.js": {
"bytes": 14560,
"bytes": 13768,
"imports": [
{
"path": "src/facemesh/facemesh.js"
@ -275,7 +275,7 @@
"dist/human.node-nobundle.js.map": {
"imports": [],
"inputs": {},
"bytes": 270803
"bytes": 268701
},
"dist/human.node-nobundle.js": {
"imports": [],
@ -377,10 +377,10 @@
"bytesInOutput": 47
},
"src/human.js": {
"bytesInOutput": 12748
"bytesInOutput": 11904
}
},
"bytes": 159148
"bytes": 158304
}
}
}

47
src/human.js
View File

@ -61,13 +61,10 @@ class Human {
this.version = app.version;
this.defaults = defaults;
this.config = defaults;
this.fx = null;
this.fx = (tf.ENV.flags.IS_BROWSER && (typeof document !== 'undefined')) ? new fxImage.Canvas() : null;
this.state = 'idle';
this.numTensors = 0;
this.analyzeMemoryLeaks = false;
// internal temp canvases
this.inCanvas = null;
this.outCanvas = null;
// object that contains all initialized models
this.models = {
facemesh: null,
@ -163,33 +160,23 @@ class Human {
}
tfImage(input) {
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
// let imageData;
let filtered;
const originalWidth = input.naturalWidth || input.videoWidth || input.width || (input.shape && (input.shape[1] > 0));
const originalHeight = input.naturalHeight || input.videoHeight || input.height || (input.shape && (input.shape[2] > 0));
let targetWidth = originalWidth;
let targetHeight = originalHeight;
if (this.fx && this.config.filter.enabled && !(input instanceof tf.Tensor)) {
if (this.config.filter.width > 0) targetWidth = this.config.filter.width;
else if (this.config.filter.height > 0) targetWidth = originalWidth * (this.config.filter.height / originalHeight);
if (this.config.filter.height > 0) targetHeight = this.config.filter.height;
else if (this.config.filter.width > 0) targetHeight = originalHeight * (this.config.filter.width / originalWidth);
if (!this.inCanvas || (this.inCanvas.width !== originalWidth) || (this.inCanvas.height !== originalHeight)) {
this.inCanvas = (typeof OffscreenCanvas !== 'undefined') ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement('canvas');
if (this.inCanvas.width !== targetWidth) this.inCanvas.width = targetWidth;
if (this.inCanvas.height !== targetHeight) this.inCanvas.height = targetHeight;
}
const ctx = this.inCanvas.getContext('2d');
const offscreenCanvas = (typeof OffscreenCanvas !== 'undefined') ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement('canvas');
if (offscreenCanvas.width !== targetWidth) offscreenCanvas.width = targetWidth;
if (offscreenCanvas.height !== targetHeight) offscreenCanvas.height = targetHeight;
const ctx = offscreenCanvas.getContext('2d');
if (input instanceof ImageData) ctx.putImageData(input, 0, 0);
else ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, this.inCanvas.width, this.inCanvas.height);
if (this.config.filter.enabled) {
if (!this.outCanvas || (this.inCanvas.width !== this.outCanvas.width) || (this.inCanvas.height !== this.outCanvas.height)) {
this.outCanvas = (typeof OffscreenCanvas !== 'undefined') ? new OffscreenCanvas(this.inCanvas.width, this.inCanvas.height) : document.createElement('canvas');
if (this.outCanvas.width !== this.inCanvas.width) this.outCanvas.width = this.inCanvas.width;
if (this.outCanvas.height !== this.inCanvas.height) this.outCanvas.height = this.inCanvas.height;
}
if (!this.fx) this.fx = (tf.ENV.flags.IS_BROWSER && (typeof document !== 'undefined')) ? new fxImage.Canvas({ canvas: this.outCanvas }) : null;
else ctx.drawImage(input, 0, 0, originalWidth, originalHeight, 0, 0, offscreenCanvas.width, offscreenCanvas.height);
this.fx.reset();
this.fx.addFilter('brightness', this.config.filter.brightness); // must have at least one filter enabled
if (this.config.filter.contrast !== 0) this.fx.addFilter('contrast', this.config.filter.contrast);
@ -205,20 +192,24 @@ class Human {
if (this.config.filter.technicolor) this.fx.addFilter('technicolor');
if (this.config.filter.polaroid) this.fx.addFilter('polaroid');
if (this.config.filter.pixelate !== 0) this.fx.addFilter('pixelate', this.config.filter.pixelate);
this.outCanvas = this.fx.apply(this.inCanvas);
filtered = this.fx.apply(offscreenCanvas);
}
if (!this.outCanvas) this.outCanvas = this.inCanvas;
let tensor;
if (input instanceof tf.Tensor) {
tensor = tf.clone(input);
} else {
const canvas = filtered || input;
let pixels;
if ((this.config.backend === 'webgl') || (this.outCanvas instanceof ImageData)) {
if ((this.config.backend === 'webgl') || (canvas instanceof ImageData)) {
// tf kernel-optimized method to get imagedata, also if input is imagedata, just use it
pixels = tf.browser.fromPixels(this.outCanvas);
pixels = tf.browser.fromPixels(canvas);
} else {
// cpu and wasm kernel does not implement efficient fromPixels method nor we can use canvas as-is, so we do a silly one more canvas
const tempCanvas = (typeof OffscreenCanvas !== 'undefined') ? new OffscreenCanvas(targetWidth, targetHeight) : document.createElement('canvas');
tempCanvas.width = targetWidth;
tempCanvas.height = targetHeight;
const tempCtx = tempCanvas.getContext('2d');
tempCtx.drawImage(this.outCanvas, 0, 0);
tempCtx.drawImage(canvas, 0, 0);
const data = tempCtx.getImageData(0, 0, targetWidth, targetHeight);
pixels = tf.browser.fromPixels(data);
}
@ -227,7 +218,7 @@ class Human {
pixels.dispose();
casted.dispose();
}
return { tensor, canvas: this.config.filter.return ? this.outCanvas : null };
return { tensor, canvas: this.config.filter.return ? filtered : null };
}
async detect(input, userConfig = {}) {