Merge branch 'unstable' into trackhat

* unstable: (140 commits)
  tracker/pt: increase auto threshold bucket size again
  tracker/pt: limit max amount of extracted blobs
  gui: don't update main window if we're minimized
  tracker/pt: only show widget if the frame is visible
  tracker/pt: don't resize twice in widget
  freetrack/games: regen
  contrib/make-csv: perl sort isn't stable, don't ignore case
  tracker/pt: avoid widget temp QImage allocation
  spline-widget: oops, pass by reference
  tracker/pt: don't allocate temporary dynamic size arrays
  tracker/pt: don't copy points array needlessly
  tracker/pt: don't allocate temporary frame
  tracker/pt: cv::Mat::at<T> is slow, use cv::Mat::ptr
  tracker/pt: avoid widget malloc when able
  tracker/pt: optimize widget
  tracker/pt: update video widget at 40 -> 50 ms
  cmake/mingw-w64: update
  tracker/pt: reduce mutex contention
  gui: fix left margin
  tracker/pt: remove krap
  tracker/pt: move ctor out of the loop
  tracker/pt: nix unused
  tracker/pt: don't fill mask on frame
  pose-widget: also bilinear interpolation of alpha value
  ui: adjust margin
  ui: make more compact
  glwidget: use transparent octopus background
  api/mat: fix typos/breakage
  api/joy: refresh only manually on certain events
  pt: histogram more granular 6 -> 8
  cmake/api: link with strmiids.lib on win32
  tracker/pt: reduce auto thresholding histogram bucket size
  api/keys: prevent idempotent keys
  api/joy: move from header
  api/joy: prevent idempotent keypressed passed to receiver
  compat/options: get rid of std::string usage
  compat/options: move from header
  gui/settings: set parent, otherwise not modal
  gui/settings: don't forget to show a modal dialog before executing
  gui/main: don't raise a new window, it's enough to set visible
  api/joy: speed up poll_axis path
  api/joy: nix static, now that we're not a singleton
  tracker/joy: adapt to non-singleton joy worker
  joystick: no longer singleton, use fake window handle
  api/keys: use a fake window for DirectInput handle
  gui/keys: allow for pausing global keystrokes for options dialog
  api/keys: nix tautological #ifdef
  contrib/aruco: oops, right extension
  contrib/aruco: use @frost555's marker image
  api/camera-names: move to compat/
  ...

1 files changed, 7 insertions, 21 deletions

diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index 570c2e0d..316c7e13 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -16,7 +16,7 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/videoio.hpp>
-#include "opentrack/camera-names.hpp"
+#include "opentrack-compat/camera-names.hpp"
 #include "opentrack-compat/sleep.hpp"
 
 typedef struct {
@@ -43,6 +43,8 @@ Tracker::~Tracker()
         delete videoWidget;
     if(layout)
         delete layout;
+    // fast start/stop causes breakage
+    portable::sleep(1000);
     camera.release();
 }
 
@@ -121,20 +123,17 @@ void Tracker::run()
 
     aruco::MarkerDetector detector;
     detector.setDesiredSpeed(3);
+    detector._thresMethod = aruco::MarkerDetector::FIXED_THRES;
 
     cv::Rect last_roi(65535, 65535, 0, 0);
 
+    // XXX change to timer.hpp
     auto freq = cv::getTickFrequency();
     auto last_time = cv::getTickCount();
     double cur_fps = 0;
-    std::vector<int> box_sizes { 5, 7, 9, 11 };
-    int box_idx = 0;
-    double failed = 0;
-    const double max_failed = 1.25;
     cv::Vec3d rvec, tvec;
     cv::Mat intrinsics = cv::Mat::eye(3, 3, CV_32FC1);
     cv::Mat dist_coeffs = cv::Mat::zeros(5, 1, CV_32FC1);
-    bool otsu = false;
 
     while (!stop)
     {
@@ -145,12 +144,12 @@ void Tracker::run()
             if (!camera.read(color))
                 continue;
         }
-        static constexpr int thres_param2 = 5;
         cv::Mat grayscale;
         cv::cvtColor(color, grayscale, cv::COLOR_RGB2GRAY);
         
         const int scale = grayscale.cols > 480 ? 2 : 1;
-        detector.setThresholdParams(box_sizes[box_idx], thres_param2);
+        // param 2 ignored for Otsu thresholding. it's required to use our fork of Aruco.
+        detector.setThresholdParams(5, -1);
 
         static constexpr double pi = 3.1415926f;
         const int w = grayscale.cols, h = grayscale.rows;
@@ -180,7 +179,6 @@ void Tracker::run()
         
         if (last_roi.width > 0 && last_roi.height)
         {
-            detector.setThresholdParams(box_sizes[box_idx], thres_param2);
             detector.setMinMaxSize(std::max(0.01, size_min * grayscale.cols / last_roi.width),
                                    std::min(1.0, size_max * grayscale.cols / last_roi.width));
 
@@ -188,7 +186,6 @@ void Tracker::run()
             if (detector.detect(grayscale_, markers, cv::Mat(), cv::Mat(), -1, false),
                 markers.size() == 1 && markers[0].size() == 4)
             {
-                failed = std::max(0., failed - dt);
                 auto& m = markers.at(0);
                 for (int i = 0; i < 4; i++)
                 {
@@ -202,17 +199,6 @@ void Tracker::run()
 
         if (!roi_valid)
         {
-            otsu = !otsu;
-            detector._thresMethod = otsu ? aruco::MarkerDetector::FIXED_THRES : aruco::MarkerDetector::ADPT_THRES;
-            failed += dt;
-            if (failed > max_failed)
-            {
-                box_idx++;
-                box_idx %= box_sizes.size();
-                qDebug() << "aruco: box size now" << box_sizes[box_idx];
-                failed = 0;
-            }
-            detector.setThresholdParams(box_sizes[box_idx], thres_param2);
             detector.setMinMaxSize(size_min, size_max);
             detector.detect(grayscale, markers, cv::Mat(), cv::Mat(), -1, false);
         }