diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-05-11 08:19:01 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-05-11 08:19:01 +0200 |
| commit | 93d21b2556d86479ce8f67c15c65856799731ccf (patch) | |
| tree | f1367d9a5ecd54156e9541aa661af0cb59eebf84 /ftnoir_tracker_ht | |
| parent | 9f00ea01e6b438a1e5f242e68d90a8c23f772a06 (diff) | |
Merge newest HT
Diffstat (limited to 'ftnoir_tracker_ht')
| -rw-r--r-- | ftnoir_tracker_ht/ftnoir_tracker_ht.cpp | 20 | ||||
| -rw-r--r-- | ftnoir_tracker_ht/headtracker-ftnoir.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp index 37fef54d..a153670f 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp @@ -107,23 +107,23 @@ static void load_settings(ht_config_t* config, Tracker* tracker) config->classification_delay = 500; config->field_of_view = iniFile.value("fov", 52).toFloat(); config->pyrlk_pyramids = 0; - config->pyrlk_win_size_w = config->pyrlk_win_size_h = 21; + config->pyrlk_win_size_w = config->pyrlk_win_size_h = 35; config->max_keypoints = 300; config->keypoint_quality = 31; - config->keypoint_distance = 2; - config->keypoint_3distance = 5; - config->keypoint_9distance = 10; + config->keypoint_distance = 2.1; + config->keypoint_3distance = 4; + config->keypoint_9distance = 9; //config->force_width = 640; //config->force_height = 480; config->force_fps = iniFile.value("fps", 0).toInt(); config->camera_index = iniFile.value("camera-index", -1).toInt(); config->ransac_num_iters = 100; - config->ransac_max_reprojection_error = 4; - config->ransac_max_inlier_error = 4; - config->ransac_abs_max_mean_error = 7; - config->ransac_max_mean_error = 3.9; + config->ransac_max_reprojection_error = 4.5; + config->ransac_max_inlier_error = 4.5; + config->ransac_abs_max_mean_error = 12; + config->ransac_max_mean_error = 4; config->debug = 0; - config->ransac_min_features = 0.75; + config->ransac_min_features = 0.78; int res = iniFile.value("resolution", 0).toInt(); if (res < 0 || res >= (int)(sizeof(resolution_choices) / sizeof(resolution_tuple))) res = 0; @@ -131,7 +131,7 @@ static void load_settings(ht_config_t* config, Tracker* tracker) config->force_width = r.width; config->force_height = r.height; config->user_landmarks = false; //iniFile.value("use-bashed-coords").toBool(); - config->flandmark_delay = 25; + config->flandmark_delay = 32; #if 0 if (config->user_landmarks) { diff --git a/ftnoir_tracker_ht/headtracker-ftnoir.h b/ftnoir_tracker_ht/headtracker-ftnoir.h index 48510997..9a343bae 100644 --- a/ftnoir_tracker_ht/headtracker-ftnoir.h +++ b/ftnoir_tracker_ht/headtracker-ftnoir.h @@ -6,8 +6,8 @@ #define HT_SHM_NAME "ftnoir-tracker-ht-shm" #define HT_MUTEX_NAME "ftnoir-tracker-ht-mutex" -#define HT_MAX_VIDEO_WIDTH 2048 -#define HT_MAX_VIDEO_HEIGHT 1536 +#define HT_MAX_VIDEO_WIDTH 640 +#define HT_MAX_VIDEO_HEIGHT 480 #define HT_MAX_VIDEO_CHANNELS 3 typedef struct { |