Skip to content

O
opencv
Commit e8ff5cac authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #14876 from dkurt:fix_js_face_recognition_v2

parents 5620306c d17d3b66
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
samples/dnn/js_face_recognition.html
View file @ e8ff5cac
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<html> <html>
<head> <head>
<script src="utils.js" type="text/javascript"></script> <script async src="../../opencv.js" type="text/javascript"></script>
<script src="../../utils.js" type="text/javascript"></script>
<script type='text/javascript'> <script type='text/javascript'>
var netDet = undefined, netRecogn = undefined; var netDet = undefined, netRecogn = undefined;
var persons = {}; var persons = {};
var utils = new Utils('');
//! [Run face detection model] //! [Run face detection model]
function detectFaces(img) { function detectFaces(img) {
...@@ -68,6 +68,7 @@ function recognize(face) { ...@@ -68,6 +68,7 @@ function recognize(face) {
//! [Recognize] //! [Recognize]
function loadModels(callback) { function loadModels(callback) {
var utils = new Utils('');
var proto = 'https://raw.githubusercontent.com/opencv/opencv/3.4/samples/dnn/face_detector/deploy.prototxt'; var proto = 'https://raw.githubusercontent.com/opencv/opencv/3.4/samples/dnn/face_detector/deploy.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://raw.githubusercontent.com/pyannote/pyannote-data/master/openface.nn4.small2.v1.t7';
...@@ -187,7 +188,7 @@ function main() { ...@@ -187,7 +188,7 @@ function main() {
}; };
// Load opencv.js // Load opencv.js
utils.loadOpenCv(() => { cv['onRuntimeInitialized']=()=>{
main(); main();
}); });
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment