summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-12 16:27:17 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-12 16:27:17 +0200
commita6b9d14524f2543f5b563352b8bdbca674317994 (patch)
tree04ebf4e363d20a7581b1aecaa70466d0ec58c0a7
parent30cafb02a28abba475205d94aebb6b2ae4e3f4bc (diff)
tweaks
-rw-r--r--bin/tracker-ht/bounding-box.raw172
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp18
2 files changed, 33 insertions, 157 deletions
diff --git a/bin/tracker-ht/bounding-box.raw b/bin/tracker-ht/bounding-box.raw
index 0c55a868..6609a9c5 100644
--- a/bin/tracker-ht/bounding-box.raw
+++ b/bin/tracker-ht/bounding-box.raw
@@ -1,148 +1,24 @@
--0.040713 -0.051295 0.080293 -0.048711 -0.031830 0.085126 -0.054813 -0.031478 0.079957
--0.035931 -0.062934 0.075895 -0.040713 -0.051295 0.080293 -0.054813 -0.031478 0.079957
--0.029640 -0.078248 0.063260 -0.035931 -0.062934 0.075895 -0.054813 -0.031478 0.079957
-0.002672 -0.030016 0.103921 -0.015352 -0.025221 0.103021 -0.015336 -0.030515 0.101994
-0.002888 -0.079747 0.065712 0.002832 -0.066959 0.080958 -0.015658 -0.066394 0.076543
-0.002672 -0.030016 0.103921 -0.015367 -0.017916 0.104303 -0.015352 -0.025221 0.103021
--0.048534 -0.012675 0.088987 -0.054813 -0.031478 0.079957 -0.048711 -0.031830 0.085126
-0.002888 -0.079747 0.065712 -0.015658 -0.066394 0.076543 -0.035931 -0.062934 0.075895
--0.035931 -0.062934 0.075895 -0.029640 -0.078248 0.063260 0.002888 -0.079747 0.065712
-0.002672 -0.030016 0.103921 0.001670 0.006133 0.107123 -0.014276 0.005748 0.105401
--0.014276 0.005748 0.105401 -0.015367 -0.017916 0.104303 0.002672 -0.030016 0.103921
--0.061298 -0.030116 0.066550 -0.060132 -0.037646 0.063512 -0.054813 -0.031478 0.079957
--0.048534 -0.012675 0.088987 -0.047971 0.005949 0.093232 -0.069636 0.009907 0.071326
--0.054813 -0.031478 0.079957 -0.048534 -0.012675 0.088987 -0.069636 0.009907 0.071326
--0.061298 -0.030116 0.066550 -0.054813 -0.031478 0.079957 -0.069636 0.009907 0.071326
--0.054813 -0.031478 0.079957 -0.060132 -0.037646 0.063512 -0.043659 -0.072999 0.057240
--0.043659 -0.072999 0.057240 -0.029640 -0.078248 0.063260 -0.054813 -0.031478 0.079957
--0.048534 -0.012675 0.088987 -0.029792 -0.019761 0.099878 -0.030001 -0.003968 0.102610
--0.030001 -0.003968 0.102610 -0.047971 0.005949 0.093232 -0.048534 -0.012675 0.088987
--0.030001 -0.003968 0.102610 -0.029228 0.005353 0.102979 -0.047971 0.005949 0.093232
--0.029792 -0.019761 0.099878 -0.048534 -0.012675 0.088987 -0.048711 -0.031830 0.085126
--0.048711 -0.031830 0.085126 -0.029592 -0.031077 0.097720 -0.029792 -0.019761 0.099878
--0.015367 -0.017916 0.104303 -0.030001 -0.003968 0.102610 -0.029792 -0.019761 0.099878
--0.029792 -0.019761 0.099878 -0.015352 -0.025221 0.103021 -0.015367 -0.017916 0.104303
--0.015367 -0.017916 0.104303 -0.014276 0.005748 0.105401 -0.029228 0.005353 0.102979
--0.029228 0.005353 0.102979 -0.030001 -0.003968 0.102610 -0.015367 -0.017916 0.104303
--0.015352 -0.025221 0.103021 -0.029792 -0.019761 0.099878 -0.029592 -0.031077 0.097720
--0.029592 -0.031077 0.097720 -0.015336 -0.030515 0.101994 -0.015352 -0.025221 0.103021
-0.002768 -0.052065 0.091317 0.002672 -0.030016 0.103921 -0.015336 -0.030515 0.101994
-0.002768 -0.052065 0.091317 -0.015336 -0.030515 0.101994 -0.029592 -0.031077 0.097720
-0.002768 -0.052065 0.091317 -0.029592 -0.031077 0.097720 -0.048711 -0.031830 0.085126
-0.002768 -0.052065 0.091317 -0.048711 -0.031830 0.085126 -0.030331 -0.051050 0.081676
--0.030331 -0.051050 0.081676 -0.048711 -0.031830 0.085126 -0.040713 -0.051295 0.080293
--0.015658 -0.066394 0.076543 -0.030331 -0.051050 0.081676 -0.040713 -0.051295 0.080293
--0.040713 -0.051295 0.080293 -0.035931 -0.062934 0.075895 -0.015658 -0.066394 0.076543
-0.002832 -0.066959 0.080958 0.002768 -0.052065 0.091317 -0.030331 -0.051050 0.081676
--0.030331 -0.051050 0.081676 -0.015658 -0.066394 0.076543 0.002832 -0.066959 0.080958
-0.054813 -0.031478 0.079957 0.048711 -0.031830 0.085126 0.040713 -0.051295 0.080293
-0.054813 -0.031478 0.079957 0.040713 -0.051295 0.080293 0.035931 -0.062934 0.075895
-0.029640 -0.078248 0.063260 0.054813 -0.031478 0.079957 0.035931 -0.062934 0.075895
-0.002672 -0.030016 0.103921 0.015336 -0.030515 0.101994 0.015352 -0.025221 0.103021
-0.002888 -0.079747 0.065712 0.015658 -0.066394 0.076543 0.002832 -0.066959 0.080958
-0.002672 -0.030016 0.103921 0.015352 -0.025221 0.103021 0.015367 -0.017916 0.104303
-0.048534 -0.012675 0.088987 0.048711 -0.031830 0.085126 0.054813 -0.031478 0.079957
-0.002888 -0.079747 0.065712 0.029640 -0.078248 0.063260 0.035931 -0.062934 0.075895
-0.035931 -0.062934 0.075895 0.015658 -0.066394 0.076543 0.002888 -0.079747 0.065712
-0.002672 -0.030016 0.103921 0.015367 -0.017916 0.104303 0.014276 0.005748 0.105401
-0.014276 0.005748 0.105401 0.001670 0.006133 0.107123 0.002672 -0.030016 0.103921
-0.061298 -0.030116 0.066550 0.054813 -0.031478 0.079957 0.060132 -0.037646 0.063512
-0.069636 0.009907 0.071326 0.047971 0.005949 0.093232 0.048534 -0.012675 0.088987
-0.069636 0.009907 0.071326 0.048534 -0.012675 0.088987 0.054813 -0.031478 0.079957
-0.061298 -0.030116 0.066550 0.069636 0.009907 0.071326 0.054813 -0.031478 0.079957
-0.054813 -0.031478 0.079957 0.029640 -0.078248 0.063260 0.043659 -0.072999 0.057240
-0.043659 -0.072999 0.057240 0.060132 -0.037646 0.063512 0.054813 -0.031478 0.079957
-0.030001 -0.003968 0.102610 0.029792 -0.019761 0.099878 0.048534 -0.012675 0.088987
-0.048534 -0.012675 0.088987 0.047971 0.005949 0.093232 0.030001 -0.003968 0.102610
-0.030001 -0.003968 0.102610 0.047971 0.005949 0.093232 0.029228 0.005353 0.102979
-0.029792 -0.019761 0.099878 0.029592 -0.031077 0.097720 0.048711 -0.031830 0.085126
-0.048711 -0.031830 0.085126 0.048534 -0.012675 0.088987 0.029792 -0.019761 0.099878
-0.015367 -0.017916 0.104303 0.015352 -0.025221 0.103021 0.029792 -0.019761 0.099878
-0.029792 -0.019761 0.099878 0.030001 -0.003968 0.102610 0.015367 -0.017916 0.104303
-0.015367 -0.017916 0.104303 0.030001 -0.003968 0.102610 0.029228 0.005353 0.102979
-0.029228 0.005353 0.102979 0.014276 0.005748 0.105401 0.015367 -0.017916 0.104303
-0.015352 -0.025221 0.103021 0.015336 -0.030515 0.101994 0.029592 -0.031077 0.097720
-0.029592 -0.031077 0.097720 0.029792 -0.019761 0.099878 0.015352 -0.025221 0.103021
-0.002768 -0.052065 0.091317 0.015336 -0.030515 0.101994 0.002672 -0.030016 0.103921
-0.002768 -0.052065 0.091317 0.029592 -0.031077 0.097720 0.015336 -0.030515 0.101994
-0.002768 -0.052065 0.091317 0.048711 -0.031830 0.085126 0.029592 -0.031077 0.097720
-0.002768 -0.052065 0.091317 0.030331 -0.051050 0.081676 0.048711 -0.031830 0.085126
-0.030331 -0.051050 0.081676 0.040713 -0.051295 0.080293 0.048711 -0.031830 0.085126
-0.015658 -0.066394 0.076543 0.035931 -0.062934 0.075895 0.040713 -0.051295 0.080293
-0.040713 -0.051295 0.080293 0.030331 -0.051050 0.081676 0.015658 -0.066394 0.076543
-0.002832 -0.066959 0.080958 0.015658 -0.066394 0.076543 0.030331 -0.051050 0.081676
-0.030331 -0.051050 0.081676 0.002768 -0.052065 0.091317 0.002832 -0.066959 0.080958
--0.054813 0.052232 0.086720 -0.048711 0.051750 0.091879 -0.040713 0.071738 0.090234
--0.054813 0.052232 0.086720 -0.040713 0.071738 0.090234 -0.035931 0.083932 0.087761
--0.029640 0.101076 0.077748 -0.054813 0.052232 0.086720 -0.035931 0.083932 0.087761
-0.002672 0.046942 0.110138 -0.015336 0.047744 0.108317 -0.015352 0.042354 0.108481
-0.002888 0.102162 0.080409 -0.015658 0.087243 0.088956 0.002832 0.087092 0.093404
-0.002672 0.046942 0.110138 -0.015352 0.042354 0.108481 -0.015367 0.034937 0.108573
--0.048534 0.032223 0.092614 -0.048711 0.051750 0.091879 -0.054813 0.052232 0.086720
-0.002888 0.102162 0.080409 -0.029640 0.101076 0.077748 -0.035931 0.083932 0.087761
--0.035931 0.083932 0.087761 -0.015658 0.087243 0.088956 0.002888 0.102162 0.080409
-0.002672 0.046942 0.110138 -0.015367 0.034937 0.108573 -0.014276 0.005748 0.105401
--0.014276 0.005748 0.105401 0.001670 0.006133 0.107123 0.002672 0.046942 0.110138
--0.061298 0.053040 0.073268 -0.054813 0.052232 0.086720 -0.060132 0.060960 0.071478
--0.069636 0.009907 0.071326 -0.047971 0.005949 0.093232 -0.048534 0.032223 0.092614
--0.069636 0.009907 0.071326 -0.048534 0.032223 0.092614 -0.054813 0.052232 0.086720
--0.061298 0.053040 0.073268 -0.069636 0.009907 0.071326 -0.054813 0.052232 0.086720
--0.054813 0.052232 0.086720 -0.029640 0.101076 0.077748 -0.043659 0.096862 0.070964
--0.043659 0.096862 0.070964 -0.060132 0.060960 0.071478 -0.054813 0.052232 0.086720
--0.030001 0.021442 0.104663 -0.029792 0.037469 0.104502 -0.048534 0.032223 0.092614
--0.048534 0.032223 0.092614 -0.047971 0.005949 0.093232 -0.030001 0.021442 0.104663
--0.030001 0.021442 0.104663 -0.047971 0.005949 0.093232 -0.029228 0.005353 0.102979
--0.029792 0.037469 0.104502 -0.029592 0.048984 0.104189 -0.048711 0.051750 0.091879
--0.048711 0.051750 0.091879 -0.048534 0.032223 0.092614 -0.029792 0.037469 0.104502
--0.015367 0.034937 0.108573 -0.015352 0.042354 0.108481 -0.029792 0.037469 0.104502
--0.029792 0.037469 0.104502 -0.030001 0.021442 0.104663 -0.015367 0.034937 0.108573
--0.015367 0.034937 0.108573 -0.030001 0.021442 0.104663 -0.029228 0.005353 0.102979
--0.029228 0.005353 0.102979 -0.014276 0.005748 0.105401 -0.015367 0.034937 0.108573
--0.015352 0.042354 0.108481 -0.015336 0.047744 0.108317 -0.029592 0.048984 0.104189
--0.029592 0.048984 0.104189 -0.029792 0.037469 0.104502 -0.015352 0.042354 0.108481
-0.002768 0.070729 0.101238 -0.015336 0.047744 0.108317 0.002672 0.046942 0.110138
-0.002768 0.070729 0.101238 -0.029592 0.048984 0.104189 -0.015336 0.047744 0.108317
-0.002768 0.070729 0.101238 -0.048711 0.051750 0.091879 -0.029592 0.048984 0.104189
-0.002768 0.070729 0.101238 -0.030331 0.071274 0.091559 -0.048711 0.051750 0.091879
--0.030331 0.071274 0.091559 -0.040713 0.071738 0.090234 -0.048711 0.051750 0.091879
--0.015658 0.087243 0.088956 -0.035931 0.083932 0.087761 -0.040713 0.071738 0.090234
--0.040713 0.071738 0.090234 -0.030331 0.071274 0.091559 -0.015658 0.087243 0.088956
-0.002832 0.087092 0.093404 -0.015658 0.087243 0.088956 -0.030331 0.071274 0.091559
--0.030331 0.071274 0.091559 0.002768 0.070729 0.101238 0.002832 0.087092 0.093404
-0.040713 0.071738 0.090234 0.048711 0.051750 0.091879 0.054813 0.052232 0.086720
-0.035931 0.083932 0.087761 0.040713 0.071738 0.090234 0.054813 0.052232 0.086720
-0.029640 0.101076 0.077748 0.035931 0.083932 0.087761 0.054813 0.052232 0.086720
-0.002672 0.046942 0.110138 0.015352 0.042354 0.108481 0.015336 0.047744 0.108317
-0.002888 0.102162 0.080409 0.002832 0.087092 0.093404 0.015658 0.087243 0.088956
-0.002672 0.046942 0.110138 0.015367 0.034937 0.108573 0.015352 0.042354 0.108481
-0.048534 0.032223 0.092614 0.054813 0.052232 0.086720 0.048711 0.051750 0.091879
-0.002888 0.102162 0.080409 0.015658 0.087243 0.088956 0.035931 0.083932 0.087761
-0.035931 0.083932 0.087761 0.029640 0.101076 0.077748 0.002888 0.102162 0.080409
-0.002672 0.046942 0.110138 0.001670 0.006133 0.107123 0.014276 0.005748 0.105401
-0.014276 0.005748 0.105401 0.015367 0.034937 0.108573 0.002672 0.046942 0.110138
-0.061298 0.053040 0.073268 0.060132 0.060960 0.071478 0.054813 0.052232 0.086720
-0.048534 0.032223 0.092614 0.047971 0.005949 0.093232 0.069636 0.009907 0.071326
-0.054813 0.052232 0.086720 0.048534 0.032223 0.092614 0.069636 0.009907 0.071326
-0.061298 0.053040 0.073268 0.054813 0.052232 0.086720 0.069636 0.009907 0.071326
-0.054813 0.052232 0.086720 0.060132 0.060960 0.071478 0.043659 0.096862 0.070964
-0.043659 0.096862 0.070964 0.029640 0.101076 0.077748 0.054813 0.052232 0.086720
-0.030001 0.021442 0.104663 0.047971 0.005949 0.093232 0.048534 0.032223 0.092614
-0.048534 0.032223 0.092614 0.029792 0.037469 0.104502 0.030001 0.021442 0.104663
-0.030001 0.021442 0.104663 0.029228 0.005353 0.102979 0.047971 0.005949 0.093232
-0.029792 0.037469 0.104502 0.048534 0.032223 0.092614 0.048711 0.051750 0.091879
-0.048711 0.051750 0.091879 0.029592 0.048984 0.104189 0.029792 0.037469 0.104502
-0.015367 0.034937 0.108573 0.030001 0.021442 0.104663 0.029792 0.037469 0.104502
-0.029792 0.037469 0.104502 0.015352 0.042354 0.108481 0.015367 0.034937 0.108573
-0.015367 0.034937 0.108573 0.014276 0.005748 0.105401 0.029228 0.005353 0.102979
-0.029228 0.005353 0.102979 0.030001 0.021442 0.104663 0.015367 0.034937 0.108573
-0.015352 0.042354 0.108481 0.029792 0.037469 0.104502 0.029592 0.048984 0.104189
-0.029592 0.048984 0.104189 0.015336 0.047744 0.108317 0.015352 0.042354 0.108481
-0.002768 0.070729 0.101238 0.002672 0.046942 0.110138 0.015336 0.047744 0.108317
-0.002768 0.070729 0.101238 0.015336 0.047744 0.108317 0.029592 0.048984 0.104189
-0.002768 0.070729 0.101238 0.029592 0.048984 0.104189 0.048711 0.051750 0.091879
-0.002768 0.070729 0.101238 0.048711 0.051750 0.091879 0.030331 0.071274 0.091559
-0.030331 0.071274 0.091559 0.048711 0.051750 0.091879 0.040713 0.071738 0.090234
-0.015658 0.087243 0.088956 0.030331 0.071274 0.091559 0.040713 0.071738 0.090234
-0.040713 0.071738 0.090234 0.035931 0.083932 0.087761 0.015658 0.087243 0.088956
-0.002832 0.087092 0.093404 0.002768 0.070729 0.101238 0.030331 0.071274 0.091559
-0.030331 0.071274 0.091559 0.015658 0.087243 0.088956 0.002832 0.087092 0.093404
+-0.029640 -0.078250 0.063781 0.002672 -0.028566 0.104123 -0.029228 0.004444 0.102992
+-0.029228 0.004444 0.102992 -0.063137 -0.035469 0.063785 -0.029640 -0.078250 0.063781
+-0.029228 0.004444 0.102992 -0.065357 0.009191 0.069258 -0.063137 -0.035469 0.063785
+-0.029640 -0.078250 0.063781 0.002888 -0.079662 0.066239 0.002672 -0.028566 0.104123
+-0.054178 -0.070235 0.057719 -0.029640 -0.078250 0.063781 -0.063137 -0.035469 0.063785
+0.001670 0.005150 0.107129 -0.029228 0.004444 0.102992 0.002672 -0.028566 0.104123
+0.029228 0.004444 0.102992 0.002672 -0.028566 0.104123 0.029640 -0.078250 0.063781
+0.029640 -0.078250 0.063781 0.063137 -0.035469 0.063785 0.029228 0.004444 0.102992
+0.029228 0.004444 0.102992 0.063137 -0.035469 0.063785 0.065357 0.009191 0.069258
+0.029640 -0.078250 0.063781 0.002672 -0.028566 0.104123 0.002888 -0.079662 0.066239
+0.063137 -0.035469 0.063785 0.029640 -0.078250 0.063781 0.054178 -0.070235 0.057719
+0.001670 0.005150 0.107129 0.002672 -0.028566 0.104123 0.029228 0.004444 0.102992
+-0.029228 0.004444 0.102992 0.002672 0.043215 0.109922 -0.029640 0.098732 0.078079
+-0.029640 0.098732 0.078079 -0.063137 0.056504 0.071216 -0.029228 0.004444 0.102992
+-0.029228 0.004444 0.102992 -0.063137 0.056504 0.071216 -0.065357 0.009191 0.069258
+-0.029640 0.098732 0.078079 0.002672 0.043215 0.109922 0.002888 0.099731 0.080732
+-0.063137 0.056504 0.071216 -0.029640 0.098732 0.078079 -0.054178 0.091794 0.070810
+0.001670 0.005150 0.107129 0.002672 0.043215 0.109922 -0.029228 0.004444 0.102992
+0.029228 0.004444 0.102992 0.063137 0.056504 0.071216 0.029640 0.098732 0.078079
+0.029640 0.098732 0.078079 0.002672 0.043215 0.109922 0.029228 0.004444 0.102992
+0.029228 0.004444 0.102992 0.065357 0.009191 0.069258 0.063137 0.056504 0.071216
+0.029640 0.098732 0.078079 0.002888 0.099731 0.080732 0.002672 0.043215 0.109922
+0.063137 0.056504 0.071216 0.054178 0.091794 0.070810 0.029640 0.098732 0.078079
+0.001670 0.005150 0.107129 0.029228 0.004444 0.102992 0.002672 0.043215 0.109922
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index 7bf6aad6..9673f487 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -111,18 +111,18 @@ static void load_settings(ht_config_t* config, Tracker* tracker)
config->pyrlk_win_size_w = config->pyrlk_win_size_h = 21;
config->max_keypoints = 200;
config->keypoint_quality = 2;
- config->keypoint_distance = 1.2;
- config->keypoint_3distance = 3;
- config->keypoint_9distance = 9;
+ config->keypoint_distance = 1;
+ config->keypoint_3distance = 2.9;
+ config->keypoint_9distance = 8;
//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 = 2.8;
- config->ransac_max_inlier_error = 2.9;
- config->ransac_max_mean_error = 2.7;
- config->ransac_abs_max_mean_error = 12;
+ config->ransac_num_iters = 50;
+ config->ransac_max_reprojection_error = 3.2;
+ config->ransac_max_inlier_error = 3.2;
+ config->ransac_max_mean_error = 3.1;
+ config->ransac_abs_max_mean_error = 10;
config->debug = 1;
config->ransac_min_features = 0.83;
int res = iniFile.value("resolution", 0).toInt();
@@ -132,7 +132,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 = 100;
+ config->flandmark_delay = 65;
#if 0
if (config->user_landmarks)
{