Skip to content

Landmark model Replace and adjust #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glaba13 wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Landmark model Replace and adjust #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added data/SL_SP_v1.2.dat
View file
Open in desktop
Binary file not shown.
3 changes: 0 additions & 3 deletions data/shape_predictor_68_face_landmarks.dat
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions smll/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ namespace smll {

AddParam(CONFIG_BOOL_KALMAN_ENABLE,true);
AddParam(CONFIG_FLOAT_SMOOTHING_FACTOR, 0.666, 0.0, 10.0, 0.1);
AddParam(CONFIG_KF_0, 1e-4, 0.0, 10.0, 2*1e-4);
AddParam(CONFIG_KF_1, 1e-4, 0.0, 10.0, 1e-4);
AddParam(CONFIG_KF_2, 1e-2, 0.0, 10.0, 1e-2);
AddParam(CONFIG_KF_3, 1e-4, 0.0, 10.0, 1e-4);
AddParam(CONFIG_KF_4, 1e-4, 0.0, 10.0, 1e-4);
AddParam(CONFIG_KF_5, 1e-4, 0.0, 10.0, 1e-4);


AddParam(CONFIG_DOUBLE_MOVEMENT_THRESHOLD, 50, 0, 200, 1);
AddParam(CONFIG_DOUBLE_BLUR_FACTOR, 3, 1, 7, 2);
Expand Down
7 changes: 7 additions & 0 deletions smll/Config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ namespace smll {
static const char* const CONFIG_FLOAT_SMOOTHING_FACTOR =
"smoothingFactor";

static const char* const CONFIG_KF_0 = "KF0";
static const char* const CONFIG_KF_1 = "KF1";
static const char* const CONFIG_KF_2 = "KF2";
static const char* const CONFIG_KF_3 = "KF3";
static const char* const CONFIG_KF_4 = "KF4";
static const char* const CONFIG_KF_5 = "KF5";

// Face Detection Vars ----------
// Movement threshold
static const char* const CONFIG_DOUBLE_MOVEMENT_THRESHOLD =
Expand Down
9 changes: 7 additions & 2 deletions smll/DetectionResults.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,13 @@ namespace smll {
if (Config::singleton().get_bool(CONFIG_BOOL_KALMAN_ENABLE)) {
kalmanFilter.init(nStates, nMeasurements, nInputs, CV_64F); // init Kalman Filter

cv::setIdentity(kalmanFilter.processNoiseCov, cv::Scalar::all(1e-5)); // set process noise
cv::setIdentity(kalmanFilter.measurementNoiseCov, cv::Scalar::all(1e-4)); // set measurement noise
cv::setIdentity(kalmanFilter.processNoiseCov, cv::Scalar::all(1e-4)); // set process noise
kalmanFilter.measurementNoiseCov.at<double>(0, 0) = Config::singleton().get_double(CONFIG_KF_0); // set measurement noise
kalmanFilter.measurementNoiseCov.at<double>(1, 1) = Config::singleton().get_double(CONFIG_KF_1); // set measurement noise
kalmanFilter.measurementNoiseCov.at<double>(2, 2) = Config::singleton().get_double(CONFIG_KF_2); // set measurement noise
kalmanFilter.measurementNoiseCov.at<double>(3, 3) = Config::singleton().get_double(CONFIG_KF_3); // set measurement noise
kalmanFilter.measurementNoiseCov.at<double>(4, 4) = Config::singleton().get_double(CONFIG_KF_4); // set measurement noise
kalmanFilter.measurementNoiseCov.at<double>(5, 5) = Config::singleton().get_double(CONFIG_KF_5); // set measurement noise
cv::setIdentity(kalmanFilter.errorCovPost, cv::Scalar::all(1)); // error covariance

/* DYNAMIC MODEL*/
Expand Down
3 changes: 1 addition & 2 deletions smll/FaceDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
typedef void(*facemask_init_face_detector)(dlib::frontal_face_detector&);
typedef std::vector<dlib::rectangle>(*facemask_detect_faces)(dlib::frontal_face_detector&, dlib::cv_image<unsigned char>&);

static const char* const kFileShapePredictor68 = "shape_predictor_68_face_landmarks.dat";

static const char* const kFileShapePredictor68 = "SL_SP_v1.2.dat";

using namespace dlib;
using namespace std;
Expand Down