From b02e4971da2b9d6f290878b48d336bc9b0e9ec12 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 12 Oct 2020 22:03:55 -0400 Subject: [PATCH] enable all models by default --- demo/demo-esm.js | 12 ++++++------ demo/demo-iife.js | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/demo/demo-esm.js b/demo/demo-esm.js index 39b982fa..c3dfc9af 100644 --- a/demo/demo-esm.js +++ b/demo/demo-esm.js @@ -7,13 +7,13 @@ const config = { face: { enabled: true, detector: { maxFaces: 10, skipFrames: 5, minConfidence: 0.8, iouThreshold: 0.3, scoreThreshold: 0.75 }, - mesh: { enabled: false }, - iris: { enabled: false }, - age: { enabled: false, skipFrames: 5 }, - gender: { enabled: false }, + mesh: { enabled: true }, + iris: { enabled: true }, + age: { enabled: true, skipFrames: 5 }, + gender: { enabled: true }, }, - body: { enabled: false, maxDetections: 5, scoreThreshold: 0.75, nmsRadius: 20 }, - hand: { enabled: false, skipFrames: 5, minConfidence: 0.8, iouThreshold: 0.3, scoreThreshold: 0.75 }, + body: { enabled: true, maxDetections: 5, scoreThreshold: 0.75, nmsRadius: 20 }, + hand: { enabled: true, skipFrames: 5, minConfidence: 0.8, iouThreshold: 0.3, scoreThreshold: 0.75 }, }; let settings; diff --git a/demo/demo-iife.js b/demo/demo-iife.js index adc49ac9..9534639d 100644 --- a/demo/demo-iife.js +++ b/demo/demo-iife.js @@ -3,15 +3,15 @@ const config = { face: { - enabled: false, + enabled: true, detector: { maxFaces: 10, skipFrames: 5, minConfidence: 0.8, iouThreshold: 0.3, scoreThreshold: 0.75 }, - mesh: { enabled: false }, - iris: { enabled: false }, - age: { enabled: false, skipFrames: 5 }, - gender: { enabled: false }, + mesh: { enabled: true }, + iris: { enabled: true }, + age: { enabled: true, skipFrames: 5 }, + gender: { enabled: true }, }, - body: { enabled: false, maxDetections: 5, scoreThreshold: 0.75, nmsRadius: 20 }, - hand: { enabled: false, skipFrames: 5, minConfidence: 0.8, iouThreshold: 0.3, scoreThreshold: 0.75 }, + body: { enabled: true, maxDetections: 5, scoreThreshold: 0.75, nmsRadius: 20 }, + hand: { enabled: true, skipFrames: 5, minConfidence: 0.8, iouThreshold: 0.3, scoreThreshold: 0.75 }, }; let settings; @@ -159,7 +159,7 @@ async function runHumanDetect() { const video = document.getElementById('video'); const canvas = document.getElementById('canvas'); const log = document.getElementById('log'); - const live = video.srcObject ? ((video.srcObject.getVideoTracks()[0].readyState === 'live') && (video.readyState > 2) && (!video.paused)) : false; + const live = video.srcObject ? ((video.srcObject.getVideoTracks()[0].readyState === 'live') && (video.readyState > 2) && (!video.paused)) : true; if (live) { // perform detection const t0 = performance.now(); @@ -188,7 +188,7 @@ async function runHumanDetect() { function setupGUI() { settings.addRange('FPS', 0, 100, 0, 1); - settings.addBoolean('Pause', false, (val) => { + settings.addBoolean('Pause', true, (val) => { if (val) document.getElementById('video').pause(); else document.getElementById('video').play(); runHumanDetect(); @@ -241,7 +241,7 @@ async function setupCanvas() { async function setupCamera() { const video = document.getElementById('video'); const stream = await navigator.mediaDevices.getUserMedia({ - audio: false, + audio: true, video: { facingMode: 'user', width: window.innerWidth, height: window.innerHeight }, }); video.srcObject = stream;