fix demo facecompare

pull/134/head
Vladimir Mandic 2021-05-26 08:52:31 -04:00
parent 20c2e74b81
commit f2edf6bd8c
2 changed files with 26 additions and 23 deletions

View File

@ -176,7 +176,7 @@ const compare = { enabled: false, original: null };
async function calcSimmilariry(result) {
document.getElementById('compare-container').style.display = compare.enabled ? 'block' : 'none';
if (!compare.enabled) return;
if (!result || !result.face || result.face[0].embedding) return;
if (!result || !result.face || !result.face[0].embedding) return;
if (!(result.face.length > 0) || (result.face[0].embedding.length <= 64)) return;
if (!compare.original) {
compare.original = result;
@ -274,6 +274,7 @@ async function drawResults(input) {
}
// setup webcam
let initialCameraAccess = true;
async function setupCamera() {
if (ui.busy) return null;
ui.busy = true;
@ -305,10 +306,11 @@ async function setupCamera() {
return msg;
}
// enumerate devices for diag purposes
if (initialCameraAccess) {
const devices = await navigator.mediaDevices.enumerateDevices();
log('enumerated devices:');
for (const device of devices) log(` kind:${device.kind} label:${device.label} id:${device.deviceId}`);
}
let stream;
const constraints = {
audio: false,
@ -349,9 +351,10 @@ async function setupCamera() {
}
const track = stream.getVideoTracks()[0];
const settings = track.getSettings();
log('selected camera:', track.label, 'id:', settings.deviceId);
if (initialCameraAccess) log('selected camera:', track.label, 'id:', settings.deviceId);
// log('camera constraints:', constraints, 'window:', { width: window.innerWidth, height: window.innerHeight }, 'settings:', settings, 'track:', track);
ui.camera = { name: track.label.toLowerCase(), width: settings.width, height: settings.height, facing: settings.facingMode === 'user' ? 'front' : 'back' };
initialCameraAccess = false;
return new Promise((resolve) => {
video.onloadeddata = async () => {
video.width = video.videoWidth;

View File

@ -1,17 +1,17 @@
2021-05-26 08:46:53 INFO:  @vladmandic/human version 1.9.3
2021-05-26 08:46:53 INFO:  User: vlado Platform: linux Arch: x64 Node: v16.0.0
2021-05-26 08:46:53 INFO:  Build: file startup all type: production config: {"minifyWhitespace":true,"minifyIdentifiers":true,"minifySyntax":true}
2021-05-26 08:46:53 STATE: Build for: node type: tfjs: {"imports":1,"importBytes":102,"outputBytes":1292,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:46:53 STATE: Build for: node type: node: {"imports":37,"importBytes":431051,"outputBytes":385549,"outputFiles":"dist/human.node.js"}
2021-05-26 08:46:53 STATE: Build for: nodeGPU type: tfjs: {"imports":1,"importBytes":110,"outputBytes":1300,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:46:53 STATE: Build for: nodeGPU type: node: {"imports":37,"importBytes":431059,"outputBytes":385553,"outputFiles":"dist/human.node-gpu.js"}
2021-05-26 08:46:53 STATE: Build for: nodeWASM type: tfjs: {"imports":1,"importBytes":149,"outputBytes":1367,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:46:53 STATE: Build for: nodeWASM type: node: {"imports":37,"importBytes":431126,"outputBytes":385625,"outputFiles":"dist/human.node-wasm.js"}
2021-05-26 08:46:53 STATE: Build for: browserNoBundle type: tfjs: {"imports":1,"importBytes":2478,"outputBytes":1394,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:46:53 STATE: Build for: browserNoBundle type: esm: {"imports":37,"importBytes":431153,"outputBytes":236268,"outputFiles":"dist/human.esm-nobundle.js"}
2021-05-26 08:46:54 STATE: Build for: browserBundle type: tfjs: {"modules":1274,"moduleBytes":4114813,"imports":7,"importBytes":2478,"outputBytes":1111414,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:46:54 STATE: Build for: browserBundle type: iife: {"imports":37,"importBytes":1541173,"outputBytes":1344154,"outputFiles":"dist/human.js"}
2021-05-26 08:46:55 STATE: Build for: browserBundle type: esm: {"imports":37,"importBytes":1541173,"outputBytes":1344146,"outputFiles":"dist/human.esm.js"}
2021-05-26 08:46:55 INFO:  Generate types: ["src/human.ts"]
2021-05-26 08:47:00 INFO:  Update Change log: ["/home/vlado/dev/human/CHANGELOG.md"]
2021-05-26 08:47:00 INFO:  Generate TypeDocs: ["src/human.ts"]
2021-05-26 08:51:59 INFO:  @vladmandic/human version 1.9.3
2021-05-26 08:51:59 INFO:  User: vlado Platform: linux Arch: x64 Node: v16.0.0
2021-05-26 08:51:59 INFO:  Build: file startup all type: production config: {"minifyWhitespace":true,"minifyIdentifiers":true,"minifySyntax":true}
2021-05-26 08:51:59 STATE: Build for: node type: tfjs: {"imports":1,"importBytes":102,"outputBytes":1292,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:51:59 STATE: Build for: node type: node: {"imports":37,"importBytes":431051,"outputBytes":385549,"outputFiles":"dist/human.node.js"}
2021-05-26 08:51:59 STATE: Build for: nodeGPU type: tfjs: {"imports":1,"importBytes":110,"outputBytes":1300,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:51:59 STATE: Build for: nodeGPU type: node: {"imports":37,"importBytes":431059,"outputBytes":385553,"outputFiles":"dist/human.node-gpu.js"}
2021-05-26 08:51:59 STATE: Build for: nodeWASM type: tfjs: {"imports":1,"importBytes":149,"outputBytes":1367,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:51:59 STATE: Build for: nodeWASM type: node: {"imports":37,"importBytes":431126,"outputBytes":385625,"outputFiles":"dist/human.node-wasm.js"}
2021-05-26 08:51:59 STATE: Build for: browserNoBundle type: tfjs: {"imports":1,"importBytes":2478,"outputBytes":1394,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:51:59 STATE: Build for: browserNoBundle type: esm: {"imports":37,"importBytes":431153,"outputBytes":236268,"outputFiles":"dist/human.esm-nobundle.js"}
2021-05-26 08:52:00 STATE: Build for: browserBundle type: tfjs: {"modules":1274,"moduleBytes":4114813,"imports":7,"importBytes":2478,"outputBytes":1111414,"outputFiles":"dist/tfjs.esm.js"}
2021-05-26 08:52:00 STATE: Build for: browserBundle type: iife: {"imports":37,"importBytes":1541173,"outputBytes":1344154,"outputFiles":"dist/human.js"}
2021-05-26 08:52:01 STATE: Build for: browserBundle type: esm: {"imports":37,"importBytes":1541173,"outputBytes":1344146,"outputFiles":"dist/human.esm.js"}
2021-05-26 08:52:01 INFO:  Generate types: ["src/human.ts"]
2021-05-26 08:52:06 INFO:  Update Change log: ["/home/vlado/dev/human/CHANGELOG.md"]
2021-05-26 08:52:06 INFO:  Generate TypeDocs: ["src/human.ts"]