mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 05:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24244 from alexlyulkov:al/update-dnn-js-face-recognition-sample

Browse Source 
Replaced torch7 by onnx model in js_face_recognition dnn sample #24244

Changed face recognition model in js_face_recognition dnn sample: replaced torch7 model from https://github.com/pyannote/pyannote-data by ONNX model from https://github.com/opencv/opencv_zoo/tree/main/models/face_recognition_sface
This commit is contained in:
alexlyulkov 2023-09-08 19:36:01 +07:00 committed by GitHub
parent e60825e75b
commit 91cf0d1843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/dnn/js_face_recognition.html
View File

@ -40,7 +40,7 @@ function detectFaces(img) {
//! [Get 128 floating points feature vector] //! [Get 128 floating points feature vector]
function face2vec(face) { function face2vec(face) {
var blob = cv.blobFromImage(face, 1.0 / 255, {width: 96, height: 96}, [0, 0, 0, 0], true, false) var blob = cv.blobFromImage(face, 1.0, {width: 112, height: 112}, [0, 0, 0, 0], true, false)
netRecogn.setInput(blob); netRecogn.setInput(blob);
var vec = netRecogn.forward(); var vec = netRecogn.forward();
blob.delete(); blob.delete();
@ -71,15 +71,15 @@ function loadModels(callback) {
var utils = new Utils(''); var utils = new Utils('');
var proto = 'https://raw.githubusercontent.com/opencv/opencv/4.x/samples/dnn/face_detector/deploy_lowres.prototxt'; var proto = 'https://raw.githubusercontent.com/opencv/opencv/4.x/samples/dnn/face_detector/deploy_lowres.prototxt';
var weights = 'https://raw.githubusercontent.com/opencv/opencv_3rdparty/dnn_samples_face_detector_20180205_fp16/res10_300x300_ssd_iter_140000_fp16.caffemodel'; var weights = 'https://raw.githubusercontent.com/opencv/opencv_3rdparty/dnn_samples_face_detector_20180205_fp16/res10_300x300_ssd_iter_140000_fp16.caffemodel';
var recognModel = 'https://raw.githubusercontent.com/pyannote/pyannote-data/master/openface.nn4.small2.v1.t7'; var recognModel = 'https://media.githubusercontent.com/media/opencv/opencv_zoo/main/models/face_recognition_sface/face_recognition_sface_2021dec.onnx';
utils.createFileFromUrl('face_detector.prototxt', proto, () => { utils.createFileFromUrl('face_detector.prototxt', proto, () => {
document.getElementById('status').innerHTML = 'Downloading face_detector.caffemodel'; document.getElementById('status').innerHTML = 'Downloading face_detector.caffemodel';
utils.createFileFromUrl('face_detector.caffemodel', weights, () => { utils.createFileFromUrl('face_detector.caffemodel', weights, () => {
document.getElementById('status').innerHTML = 'Downloading OpenFace model'; document.getElementById('status').innerHTML = 'Downloading OpenFace model';
utils.createFileFromUrl('face_recognition.t7', recognModel, () => { utils.createFileFromUrl('face_recognition_sface_2021dec.onnx', recognModel, () => {
document.getElementById('status').innerHTML = ''; document.getElementById('status').innerHTML = '';
netDet = cv.readNetFromCaffe('face_detector.prototxt', 'face_detector.caffemodel'); netDet = cv.readNetFromCaffe('face_detector.prototxt', 'face_detector.caffemodel');
netRecogn = cv.readNetFromTorch('face_recognition.t7'); netRecogn = cv.readNet('face_recognition_sface_2021dec.onnx');
callback(); callback();
}); });
}); });
@ -121,8 +121,8 @@ function main() {
persons[name] = face2vec(face).clone(); persons[name] = face2vec(face).clone();
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
canvas.setAttribute("width", 96); canvas.setAttribute("width", 112);
canvas.setAttribute("height", 96); canvas.setAttribute("height", 112);
var cell = document.getElementById("targetImgs").insertCell(0); var cell = document.getElementById("targetImgs").insertCell(0);
cell.appendChild(canvas); cell.appendChild(canvas);