diff options
-rw-r--r-- | bin/tracker-ht/bounding-box.raw | 12 | ||||
-rw-r--r-- | bin/tracker-ht/head.raw | 108 | ||||
-rw-r--r-- | ftnoir_tracker_ht/ftnoir_tracker_ht.cpp | 14 |
3 files changed, 69 insertions, 65 deletions
diff --git a/bin/tracker-ht/bounding-box.raw b/bin/tracker-ht/bounding-box.raw index 3ecab4e8..b474a8c6 100644 --- a/bin/tracker-ht/bounding-box.raw +++ b/bin/tracker-ht/bounding-box.raw @@ -1,6 +1,6 @@ --0.050980 0.100179 0.086986 -0.082712 -0.023377 0.055758 0.000000 -0.037029 0.112506 --0.082712 -0.023377 0.055758 0.000214 -0.071628 0.100245 0.000000 -0.037029 0.112506 -0.000585 0.098772 0.097715 -0.050980 0.100179 0.086986 0.000000 -0.037029 0.112506 -0.000000 -0.037029 0.112506 0.082712 -0.023377 0.055758 0.050980 0.100179 0.086986 -0.082712 -0.023377 0.055758 0.000000 -0.037029 0.112506 -0.000214 -0.071628 0.100245 --0.000585 0.098772 0.097715 0.000000 -0.037029 0.112506 0.050980 0.100179 0.086986 +-0.058849 0.100179 0.081221 -0.083487 -0.023377 0.063385 0.000000 -0.037029 0.112506 +-0.083487 -0.023377 0.063385 0.000214 -0.071628 0.100245 0.000000 -0.037029 0.112506 +0.000585 0.098772 0.097715 -0.058849 0.100179 0.081221 0.000000 -0.037029 0.112506 +0.000000 -0.037029 0.112506 0.083487 -0.023377 0.063385 0.058849 0.100179 0.081221 +0.083487 -0.023377 0.063385 0.000000 -0.037029 0.112506 -0.000214 -0.071628 0.100245 +-0.000585 0.098772 0.097715 0.000000 -0.037029 0.112506 0.058849 0.100179 0.081221 diff --git a/bin/tracker-ht/head.raw b/bin/tracker-ht/head.raw index 2dddda9d..fdf447b9 100644 --- a/bin/tracker-ht/head.raw +++ b/bin/tracker-ht/head.raw @@ -1,94 +1,98 @@ 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.048599 0.102784 -0.000000 -0.004846 0.131352 -0.011024 -0.002516 0.124890 0.000000 -0.014635 0.112559 +-0.018384 0.067506 0.100890 -0.037933 0.068526 0.092260 -0.026911 0.048103 0.101535 +0.000000 0.048693 0.103116 0.000000 0.067441 0.100639 -0.011053 0.048599 0.102784 +0.000000 -0.011541 0.111595 0.000000 -0.004846 0.131352 -0.006988 -0.006957 0.120376 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.048599 0.102784 +0.000000 0.067441 0.100639 -0.018384 0.067506 0.100890 -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.004673 0.045937 0.102059 0.000000 0.046381 0.102409 0.000000 0.048693 0.103116 -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.112559 +-0.009632 -0.033255 0.109342 0.000000 -0.033507 0.110999 0.000000 -0.011541 0.111595 -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.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.048599 0.102784 +-0.029984 -0.026261 0.098166 -0.016650 -0.033459 0.106242 -0.025034 -0.014668 0.096344 +-0.017683 -0.005274 0.101168 -0.016650 -0.033459 0.106242 -0.009632 -0.033255 0.109342 +-0.018583 0.010280 0.100619 -0.029317 0.006111 0.093098 -0.017683 -0.005274 0.101168 +-0.011896 -0.037101 0.108969 0.000000 -0.037543 0.111152 -0.009632 -0.033255 0.109342 +-0.004673 0.045937 0.102059 0.000000 0.048693 0.103116 -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.029984 -0.026261 0.098166 -0.023842 -0.033868 0.103894 -0.016650 -0.033459 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.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.098119 -0.025034 -0.014668 0.096344 +-0.025034 -0.014668 0.096344 -0.017683 -0.005274 0.101168 -0.029317 0.006111 0.093098 +-0.016650 -0.033459 0.106242 -0.023842 -0.033868 0.103894 -0.011896 -0.037101 0.108969 +-0.016650 -0.033459 0.106242 -0.017683 -0.005274 0.101168 -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.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.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.017683 -0.005274 0.101168 0.000000 -0.011541 0.111595 -0.006988 -0.006957 0.120376 +-0.025034 -0.014668 0.096344 -0.034447 -0.017321 0.093453 -0.029984 -0.026261 0.098166 +0.000000 -0.011541 0.111595 -0.017683 -0.005274 0.101168 -0.009632 -0.033255 0.109342 +-0.009632 -0.033255 0.109342 0.000000 -0.037543 0.111152 0.000000 -0.033507 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.009632 -0.033255 0.109342 -0.016650 -0.033459 0.106242 -0.011896 -0.037101 0.108969 -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.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.017683 -0.005274 0.101168 -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.017683 -0.005274 0.101168 -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.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.048599 0.102784 -0.018384 0.071441 0.101492 +-0.037933 0.068526 0.092260 -0.040919 0.049552 0.093603 -0.026911 0.048103 0.101535 +-0.026911 0.048103 0.101535 -0.011053 0.048599 0.102784 -0.018384 0.067506 0.100890 -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.040919 0.049552 0.093603 -0.037933 0.068526 0.092260 -0.044906 0.067745 0.086593 +-0.044906 0.067745 0.086593 -0.047892 0.050158 0.087936 -0.040919 0.049552 0.093603 +-0.011024 -0.002516 0.124890 -0.017683 -0.005274 0.101168 -0.006988 -0.006957 0.120376 +0.000000 -0.004846 0.131352 -0.011024 -0.002516 0.124890 -0.006988 -0.006957 0.120376 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.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.018384 0.067506 0.100890 0.026911 0.048103 0.101535 0.037933 0.068526 0.092260 +0.000000 0.048693 0.103116 0.011053 0.048599 0.102784 0.000000 0.067441 0.100639 +0.000000 -0.011541 0.111595 0.006988 -0.006957 0.120376 0.000000 -0.004846 0.131352 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.048599 0.102784 0.018384 0.071441 0.101492 +0.000000 0.067441 0.100639 0.011053 0.048599 0.102784 0.018384 0.067506 0.100890 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.004673 0.045937 0.102059 0.000000 0.048693 0.103116 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.112559 0.000000 -0.036493 0.110999 +0.009632 -0.033255 0.109342 0.000000 -0.011541 0.111595 0.000000 -0.033507 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.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.048599 0.102784 0.000000 0.051912 0.104081 +0.029984 -0.026261 0.098166 0.025034 -0.014668 0.096344 0.016650 -0.033459 0.106242 +0.017683 -0.005274 0.101168 0.009632 -0.033255 0.109342 0.016650 -0.033459 0.106242 +0.018583 0.010280 0.100619 0.017683 -0.005274 0.101168 0.029317 0.006111 0.093098 +0.011896 -0.037101 0.108969 0.009632 -0.033255 0.109342 0.000000 -0.037543 0.111152 +0.004673 0.045937 0.102059 0.011053 0.048599 0.102784 0.000000 0.048693 0.103116 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.029984 -0.026261 0.098166 0.016650 -0.033459 0.106242 0.023842 -0.033868 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.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.098119 +0.025034 -0.014668 0.096344 0.029317 0.006111 0.093098 0.017683 -0.005274 0.101168 +0.016650 -0.033459 0.106242 0.011896 -0.037101 0.108969 0.023842 -0.033868 0.103894 +0.016650 -0.033459 0.106242 0.025034 -0.014668 0.096344 0.017683 -0.005274 0.101168 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.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.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.017683 -0.005274 0.101168 0.006988 -0.006957 0.120376 0.000000 -0.011541 0.111595 +0.025034 -0.014668 0.096344 0.029984 -0.026261 0.098166 0.034447 -0.017321 0.093453 +0.000000 -0.011541 0.111595 0.009632 -0.033255 0.109342 0.017683 -0.005274 0.101168 +0.009632 -0.033255 0.109342 0.000000 -0.033507 0.110999 0.000000 -0.037543 0.111152 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.009632 -0.033255 0.109342 0.011896 -0.037101 0.108969 0.016650 -0.033459 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.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.017683 -0.005274 0.101168 0.012957 0.011201 0.112091 0.011024 -0.002516 0.124890 +0.012957 0.011201 0.112091 0.017683 -0.005274 0.101168 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.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.048599 0.102784 +0.037933 0.068526 0.092260 0.026911 0.048103 0.101535 0.040919 0.049552 0.093603 +0.026911 0.048103 0.101535 0.018384 0.067506 0.100890 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.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 +0.040919 0.049552 0.093603 0.044906 0.067745 0.086593 0.037933 0.068526 0.092260 +0.044906 0.067745 0.086593 0.040919 0.049552 0.093603 0.047892 0.050158 0.087936 +0.011024 -0.002516 0.124890 0.006988 -0.006957 0.120376 0.017683 -0.005274 0.101168 +0.000000 -0.004846 0.131352 0.006988 -0.006957 0.120376 0.011024 -0.002516 0.124890 diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp index a153670f..2689d8f2 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp @@ -110,9 +110,9 @@ static void load_settings(ht_config_t* config, Tracker* tracker) config->pyrlk_win_size_w = config->pyrlk_win_size_h = 35; config->max_keypoints = 300; config->keypoint_quality = 31; - config->keypoint_distance = 2.1; - config->keypoint_3distance = 4; - config->keypoint_9distance = 9; + config->keypoint_distance = 2.8; + config->keypoint_3distance = 7; + config->keypoint_9distance = 11; //config->force_width = 640; //config->force_height = 480; config->force_fps = iniFile.value("fps", 0).toInt(); @@ -120,10 +120,10 @@ static void load_settings(ht_config_t* config, Tracker* tracker) config->ransac_num_iters = 100; config->ransac_max_reprojection_error = 4.5; config->ransac_max_inlier_error = 4.5; - config->ransac_abs_max_mean_error = 12; + config->ransac_abs_max_mean_error = 10; config->ransac_max_mean_error = 4; - config->debug = 0; - config->ransac_min_features = 0.78; + config->debug = 1; + config->ransac_min_features = 0.77; 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 = 32; + config->flandmark_delay = 21; #if 0 if (config->user_landmarks) { |