diff options
| -rw-r--r-- | bin/tracker-ht/head.raw | 64 | ||||
| -rw-r--r-- | bin/tracker-ht/headtracker-ftnoir.exe | bin | 2474496 -> 2473984 bytes | |||
| -rw-r--r-- | ftnoir_tracker_ht/ftnoir_tracker_ht.cpp | 20 | ||||
| -rw-r--r-- | ftnoir_tracker_ht/headtracker-ftnoir.h | 4 |
4 files changed, 44 insertions, 44 deletions
diff --git a/bin/tracker-ht/head.raw b/bin/tracker-ht/head.raw index 35568f93..2dddda9d 100644 --- a/bin/tracker-ht/head.raw +++ b/bin/tracker-ht/head.raw @@ -1,94 +1,94 @@ 0.000000 0.046381 0.102409 -0.004673 0.045937 0.102059 -0.005057 0.036518 0.104452 -0.041739 0.009398 0.086040 -0.038798 -0.004968 0.090329 -0.029317 0.006111 0.093098 -0.018384 0.071441 0.101492 -0.037933 0.072461 0.092862 -0.026911 0.048103 0.101535 -0.000000 0.051912 0.104081 0.000000 0.071376 0.101241 -0.011053 0.045272 0.102784 -0.000000 -0.004846 0.131352 -0.011024 -0.002516 0.124890 0.000000 -0.014635 0.110094 +0.000000 0.051912 0.104081 0.000000 0.071376 0.101241 -0.011053 0.048599 0.102784 +0.000000 -0.004846 0.131352 -0.011024 -0.002516 0.124890 0.000000 -0.014635 0.112559 0.000000 0.003099 0.131941 -0.011024 -0.002516 0.124890 0.000000 -0.004846 0.131352 -0.000000 0.071376 0.101241 -0.018384 0.071441 0.101492 -0.011053 0.045272 0.102784 +0.000000 0.071376 0.101241 -0.018384 0.071441 0.101492 -0.011053 0.048599 0.102784 -0.007717 0.025703 0.113210 0.000000 0.019987 0.121199 0.000000 0.034987 0.108182 -0.004673 0.045937 0.102059 0.000000 0.046381 0.102409 0.000000 0.051912 0.104081 -0.034447 -0.017321 0.093453 -0.025034 -0.014668 0.096344 -0.038798 -0.004968 0.090329 --0.009632 -0.036241 0.109342 0.000000 -0.036493 0.110999 0.000000 -0.014635 0.110094 +-0.009632 -0.036241 0.109342 0.000000 -0.036493 0.110999 0.000000 -0.014635 0.112559 -0.029317 0.006111 0.093098 -0.018583 0.010280 0.100619 -0.016963 0.030187 0.088877 -0.029984 -0.029247 0.098166 -0.016650 -0.036445 0.106242 -0.025034 -0.014668 0.096344 --0.018924 -0.008888 0.099257 -0.016650 -0.036445 0.106242 -0.009632 -0.036241 0.109342 --0.018583 0.010280 0.100619 -0.029317 0.006111 0.093098 -0.018924 -0.008888 0.099257 +-0.018924 -0.008888 0.098119 -0.016650 -0.036445 0.106242 -0.009632 -0.036241 0.109342 +-0.018583 0.010280 0.100619 -0.029317 0.006111 0.093098 -0.018924 -0.008888 0.098119 -0.011896 -0.047384 0.106074 0.000000 -0.047826 0.108257 -0.009632 -0.036241 0.109342 --0.004673 0.045937 0.102059 0.000000 0.051912 0.104081 -0.011053 0.045272 0.102784 +-0.004673 0.045937 0.102059 0.000000 0.051912 0.104081 -0.011053 0.048599 0.102784 -0.011024 -0.002516 0.124890 -0.007717 0.025703 0.113210 -0.012957 0.011201 0.112091 -0.029984 -0.029247 0.098166 -0.023842 -0.042492 0.103894 -0.016650 -0.036445 0.106242 -0.005057 0.036518 0.104452 -0.004673 0.045937 0.102059 -0.009974 0.039416 0.094960 0.000000 0.046381 0.102409 -0.005057 0.036518 0.104452 0.000000 0.034987 0.108182 --0.025034 -0.014668 0.096344 -0.018924 -0.008888 0.099257 -0.029317 0.006111 0.093098 +-0.025034 -0.014668 0.096344 -0.018924 -0.008888 0.098119 -0.029317 0.006111 0.093098 -0.016650 -0.036445 0.106242 -0.023842 -0.042492 0.103894 -0.011896 -0.047384 0.106074 --0.016650 -0.036445 0.106242 -0.018924 -0.008888 0.099257 -0.025034 -0.014668 0.096344 +-0.016650 -0.036445 0.106242 -0.018924 -0.008888 0.098119 -0.025034 -0.014668 0.096344 0.000000 0.019987 0.121199 -0.011024 -0.002516 0.124890 0.000000 0.003099 0.131941 -0.025034 -0.014668 0.096344 -0.029317 0.006111 0.093098 -0.038798 -0.004968 0.090329 --0.011024 -0.002516 0.124890 -0.018924 -0.008888 0.099257 0.000000 -0.014635 0.110094 +-0.011024 -0.002516 0.124890 -0.018924 -0.008888 0.098119 0.000000 -0.014635 0.112559 -0.025034 -0.014668 0.096344 -0.034447 -0.017321 0.093453 -0.029984 -0.029247 0.098166 -0.000000 -0.014635 0.110094 -0.018924 -0.008888 0.099257 -0.009632 -0.036241 0.109342 +0.000000 -0.014635 0.112559 -0.018924 -0.008888 0.098119 -0.009632 -0.036241 0.109342 -0.009632 -0.036241 0.109342 0.000000 -0.047826 0.108257 0.000000 -0.036493 0.110999 -0.012957 0.011201 0.112091 -0.007717 0.025703 0.113210 -0.016963 0.030187 0.088877 -0.009632 -0.036241 0.109342 -0.016650 -0.036445 0.106242 -0.011896 -0.047384 0.106074 -0.018583 0.010280 0.100619 -0.012957 0.011201 0.112091 -0.016963 0.030187 0.088877 -0.007717 0.025703 0.113210 -0.011024 -0.002516 0.124890 0.000000 0.019987 0.121199 -0.009974 0.039416 0.094960 -0.016963 0.030187 0.088877 -0.005057 0.036518 0.104452 --0.018924 -0.008888 0.099257 -0.011024 -0.002516 0.124890 -0.012957 0.011201 0.112091 --0.012957 0.011201 0.112091 -0.018583 0.010280 0.100619 -0.018924 -0.008888 0.099257 +-0.018924 -0.008888 0.098119 -0.011024 -0.002516 0.124890 -0.012957 0.011201 0.112091 +-0.012957 0.011201 0.112091 -0.018583 0.010280 0.100619 -0.018924 -0.008888 0.098119 -0.033545 0.023614 0.088450 -0.041739 0.009398 0.086040 -0.029317 0.006111 0.093098 -0.044430 0.023163 0.083050 -0.041739 0.009398 0.086040 -0.033545 0.023614 0.088450 -0.033545 0.023614 0.088450 -0.029317 0.006111 0.093098 -0.016963 0.030187 0.088877 -0.005057 0.036518 0.104452 -0.007717 0.025703 0.113210 0.000000 0.034987 0.108182 --0.004673 0.045937 0.102059 -0.011053 0.045272 0.102784 -0.009974 0.039416 0.094960 +-0.004673 0.045937 0.102059 -0.011053 0.048599 0.102784 -0.009974 0.039416 0.094960 -0.037933 0.072461 0.092862 -0.040919 0.049552 0.093603 -0.026911 0.048103 0.101535 --0.026911 0.048103 0.101535 -0.011053 0.045272 0.102784 -0.018384 0.071441 0.101492 +-0.026911 0.048103 0.101535 -0.011053 0.048599 0.102784 -0.018384 0.071441 0.101492 -0.016963 0.030187 0.088877 -0.007717 0.025703 0.113210 -0.005057 0.036518 0.104452 -0.040919 0.049552 0.093603 -0.037933 0.072461 0.092862 -0.044906 0.071680 0.087195 -0.044906 0.071680 0.087195 -0.047892 0.050158 0.087936 -0.040919 0.049552 0.093603 0.000000 0.046381 0.102409 0.005057 0.036518 0.104452 0.004673 0.045937 0.102059 0.041739 0.009398 0.086040 0.029317 0.006111 0.093098 0.038798 -0.004968 0.090329 0.018384 0.071441 0.101492 0.026911 0.048103 0.101535 0.037933 0.072461 0.092862 -0.000000 0.051912 0.104081 0.011053 0.045272 0.102784 0.000000 0.071376 0.101241 -0.000000 -0.004846 0.131352 0.000000 -0.014635 0.110094 0.011024 -0.002516 0.124890 +0.000000 0.051912 0.104081 0.011053 0.048599 0.102784 0.000000 0.071376 0.101241 +0.000000 -0.004846 0.131352 0.000000 -0.014635 0.112559 0.011024 -0.002516 0.124890 0.000000 0.003099 0.131941 0.000000 -0.004846 0.131352 0.011024 -0.002516 0.124890 -0.000000 0.071376 0.101241 0.011053 0.045272 0.102784 0.018384 0.071441 0.101492 +0.000000 0.071376 0.101241 0.011053 0.048599 0.102784 0.018384 0.071441 0.101492 0.007717 0.025703 0.113210 0.000000 0.034987 0.108182 0.000000 0.019987 0.121199 0.004673 0.045937 0.102059 0.000000 0.051912 0.104081 0.000000 0.046381 0.102409 0.034447 -0.017321 0.093453 0.038798 -0.004968 0.090329 0.025034 -0.014668 0.096344 -0.009632 -0.036241 0.109342 0.000000 -0.014635 0.110094 0.000000 -0.036493 0.110999 +0.009632 -0.036241 0.109342 0.000000 -0.014635 0.112559 0.000000 -0.036493 0.110999 0.029317 0.006111 0.093098 0.016963 0.030187 0.088877 0.018583 0.010280 0.100619 0.029984 -0.029247 0.098166 0.025034 -0.014668 0.096344 0.016650 -0.036445 0.106242 -0.018924 -0.008888 0.099257 0.009632 -0.036241 0.109342 0.016650 -0.036445 0.106242 -0.018583 0.010280 0.100619 0.018924 -0.008888 0.099257 0.029317 0.006111 0.093098 +0.018924 -0.008888 0.098119 0.009632 -0.036241 0.109342 0.016650 -0.036445 0.106242 +0.018583 0.010280 0.100619 0.018924 -0.008888 0.098119 0.029317 0.006111 0.093098 0.011896 -0.047384 0.106074 0.009632 -0.036241 0.109342 0.000000 -0.047826 0.108257 -0.004673 0.045937 0.102059 0.011053 0.045272 0.102784 0.000000 0.051912 0.104081 +0.004673 0.045937 0.102059 0.011053 0.048599 0.102784 0.000000 0.051912 0.104081 0.011024 -0.002516 0.124890 0.012957 0.011201 0.112091 0.007717 0.025703 0.113210 0.029984 -0.029247 0.098166 0.016650 -0.036445 0.106242 0.023842 -0.042492 0.103894 0.005057 0.036518 0.104452 0.009974 0.039416 0.094960 0.004673 0.045937 0.102059 0.000000 0.046381 0.102409 0.000000 0.034987 0.108182 0.005057 0.036518 0.104452 -0.025034 -0.014668 0.096344 0.029317 0.006111 0.093098 0.018924 -0.008888 0.099257 +0.025034 -0.014668 0.096344 0.029317 0.006111 0.093098 0.018924 -0.008888 0.098119 0.016650 -0.036445 0.106242 0.011896 -0.047384 0.106074 0.023842 -0.042492 0.103894 -0.016650 -0.036445 0.106242 0.025034 -0.014668 0.096344 0.018924 -0.008888 0.099257 +0.016650 -0.036445 0.106242 0.025034 -0.014668 0.096344 0.018924 -0.008888 0.098119 0.000000 0.019987 0.121199 0.000000 0.003099 0.131941 0.011024 -0.002516 0.124890 0.025034 -0.014668 0.096344 0.038798 -0.004968 0.090329 0.029317 0.006111 0.093098 -0.011024 -0.002516 0.124890 0.000000 -0.014635 0.110094 0.018924 -0.008888 0.099257 +0.011024 -0.002516 0.124890 0.000000 -0.014635 0.112559 0.018924 -0.008888 0.098119 0.025034 -0.014668 0.096344 0.029984 -0.029247 0.098166 0.034447 -0.017321 0.093453 -0.000000 -0.014635 0.110094 0.009632 -0.036241 0.109342 0.018924 -0.008888 0.099257 +0.000000 -0.014635 0.112559 0.009632 -0.036241 0.109342 0.018924 -0.008888 0.098119 0.009632 -0.036241 0.109342 0.000000 -0.036493 0.110999 0.000000 -0.047826 0.108257 0.012957 0.011201 0.112091 0.016963 0.030187 0.088877 0.007717 0.025703 0.113210 0.009632 -0.036241 0.109342 0.011896 -0.047384 0.106074 0.016650 -0.036445 0.106242 0.018583 0.010280 0.100619 0.016963 0.030187 0.088877 0.012957 0.011201 0.112091 0.007717 0.025703 0.113210 0.000000 0.019987 0.121199 0.011024 -0.002516 0.124890 0.009974 0.039416 0.094960 0.005057 0.036518 0.104452 0.016963 0.030187 0.088877 -0.018924 -0.008888 0.099257 0.012957 0.011201 0.112091 0.011024 -0.002516 0.124890 -0.012957 0.011201 0.112091 0.018924 -0.008888 0.099257 0.018583 0.010280 0.100619 +0.018924 -0.008888 0.098119 0.012957 0.011201 0.112091 0.011024 -0.002516 0.124890 +0.012957 0.011201 0.112091 0.018924 -0.008888 0.098119 0.018583 0.010280 0.100619 0.033545 0.023614 0.088450 0.029317 0.006111 0.093098 0.041739 0.009398 0.086040 0.044430 0.023163 0.083050 0.033545 0.023614 0.088450 0.041739 0.009398 0.086040 0.033545 0.023614 0.088450 0.016963 0.030187 0.088877 0.029317 0.006111 0.093098 0.005057 0.036518 0.104452 0.000000 0.034987 0.108182 0.007717 0.025703 0.113210 -0.004673 0.045937 0.102059 0.009974 0.039416 0.094960 0.011053 0.045272 0.102784 +0.004673 0.045937 0.102059 0.009974 0.039416 0.094960 0.011053 0.048599 0.102784 0.037933 0.072461 0.092862 0.026911 0.048103 0.101535 0.040919 0.049552 0.093603 -0.026911 0.048103 0.101535 0.018384 0.071441 0.101492 0.011053 0.045272 0.102784 +0.026911 0.048103 0.101535 0.018384 0.071441 0.101492 0.011053 0.048599 0.102784 0.016963 0.030187 0.088877 0.005057 0.036518 0.104452 0.007717 0.025703 0.113210 -0.040919 0.049552 0.093603 0.047892 0.050158 0.087936 0.044906 0.071680 0.087195 -0.044906 0.071680 0.087195 0.037933 0.072461 0.092862 0.040919 0.049552 0.093603 +0.040919 0.049552 0.093603 0.044906 0.071680 0.087195 0.037933 0.072461 0.092862 +0.044906 0.071680 0.087195 0.040919 0.049552 0.093603 0.047892 0.050158 0.087936 diff --git a/bin/tracker-ht/headtracker-ftnoir.exe b/bin/tracker-ht/headtracker-ftnoir.exe Binary files differindex 16a99886..df693060 100644 --- a/bin/tracker-ht/headtracker-ftnoir.exe +++ b/bin/tracker-ht/headtracker-ftnoir.exe 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 { |