summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cv/video-widget.cpp153
-rw-r--r--tracker-aruco/CMakeLists.txt2
-rw-r--r--tracker-aruco/ftnoir_tracker_aruco.cpp1
-rw-r--r--tracker-aruco/ftnoir_tracker_aruco.h2
-rw-r--r--tracker-kinect-face/CMakeLists.txt5
-rw-r--r--tracker-kinect-face/kinect_face_tracker.h2
-rw-r--r--tracker-pt/CMakeLists.txt2
-rw-r--r--tracker-pt/ftnoir_tracker_pt.cpp2
-rw-r--r--tracker-pt/ftnoir_tracker_pt_dialog.h2
-rw-r--r--variant/default/_variant.cmake1
-rw-r--r--video/CMakeLists.txt7
-rw-r--r--video/lang/nl_NL.ts4
-rw-r--r--video/lang/ru_RU.ts4
-rw-r--r--video/lang/stub.ts4
-rw-r--r--video/lang/zh_CN.ts4
-rw-r--r--video/video-widget.cpp172
-rw-r--r--video/video-widget.hpp (renamed from cv/video-widget.hpp)19
17 files changed, 215 insertions, 171 deletions
diff --git a/cv/video-widget.cpp b/cv/video-widget.cpp
deleted file mode 100644
index f2da8da7..00000000
--- a/cv/video-widget.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright (c) 2012 Patrick Ruoff
- * Copyright (c) 2014-2016 Stanislaw Halik <sthalik@misaki.pl>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-// XXX TODO remove hard opencv dependency -sh 20190210
-
-#include "video-widget.hpp"
-#include "compat/check-visible.hpp"
-#include "compat/math.hpp"
-
-#include <cstddef>
-#include <cstring>
-#include <opencv2/imgproc.hpp>
-
-cv_video_widget::cv_video_widget(QWidget* parent) : QWidget(parent)
-{
- texture = QImage(width(), height(), QImage::Format_ARGB32);
- texture.fill(Qt::gray);
- texture.setDevicePixelRatio(devicePixelRatioF());
-
- connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()), Qt::DirectConnection);
- timer.start(65);
-}
-
-void cv_video_widget::update_image(const cv::Mat& frame)
-{
- QMutexLocker l(&mtx);
-
- if (texture.width() != W || texture.height() != H)
- {
- frame2 = cv::Mat();
- frame3 = cv::Mat();
- }
-
- if (!freshp)
- {
- if (W < 1 || H < 1 || frame.rows < 1 || frame.cols < 1)
- return;
-
- freshp = true;
-
- if (frame2.cols != frame.cols || frame2.rows != frame.rows)
- frame2 = cv::Mat(frame.rows, frame.cols, CV_8UC4);
-
- if (frame3.cols != W || frame3.rows != H)
- frame3 = cv::Mat(H, W, CV_8UC4);
-
- const cv::Mat* argb = &frame2;
-
- switch (frame.channels())
- {
- case 1:
- cv::cvtColor(frame, frame2, cv::COLOR_GRAY2BGRA);
- break;
- case 3:
- cv::cvtColor(frame, frame2, cv::COLOR_BGR2BGRA);
- break;
- case 4:
- argb = &frame;
- break;
- default:
- unreachable();
- }
-
- const cv::Mat* img;
-
- if (argb->cols != W || argb->rows != H)
- {
- cv::resize(*argb, frame3, cv::Size(W, H), 0, 0, cv::INTER_NEAREST);
- img = &frame3;
- }
- else
- img = argb;
-
- int stride = (int)img->step.p[0];
-
- if (stride < img->cols)
- std::abort();
-
- unsigned nbytes = (unsigned)(4 * img->rows * stride);
- vec.resize(nbytes); vec.shrink_to_fit();
- std::memcpy(vec.data(), img->data, nbytes);
-
- texture = QImage((const unsigned char*) vec.data(), W, H, stride, QImage::Format_ARGB32);
- texture.setDevicePixelRatio(devicePixelRatioF());
- }
-}
-
-void cv_video_widget::update_image(const QImage& img)
-{
- QMutexLocker l(&mtx);
-
- if (freshp)
- return;
- freshp = true;
-
- unsigned nbytes = unsigned(img.bytesPerLine() * img.height());
- vec.resize(nbytes); vec.shrink_to_fit();
- std::memcpy(vec.data(), img.constBits(), nbytes);
-
- texture = QImage((const unsigned char*) vec.data(), img.width(), img.height(), img.bytesPerLine(), img.format());
- texture.setDevicePixelRatio(devicePixelRatioF());
-}
-
-void cv_video_widget::paintEvent(QPaintEvent*)
-{
- QMutexLocker foo(&mtx);
- QPainter painter(this);
-
- double dpr = devicePixelRatioF();
- W = iround(width() * dpr);
- H = iround(height() * dpr);
-
- painter.drawImage(rect(), texture);
-
- if (texture.width() != W || texture.height() != H)
- {
- texture = QImage(W, H, QImage::Format_ARGB32);
- texture.fill(Qt::gray);
- texture.setDevicePixelRatio(dpr);
- }
-}
-
-void cv_video_widget::update_and_repaint()
-{
- if (!check_is_visible())
- return;
-
- QMutexLocker l(&mtx);
-
- if (freshp)
- {
- freshp = false;
- repaint();
- }
-}
-
-void cv_video_widget::resizeEvent(QResizeEvent*)
-{
- QMutexLocker l(&mtx);
- W = iround(width() * devicePixelRatioF());
- H = iround(height() * devicePixelRatioF());
-}
-
-void cv_video_widget::get_preview_size(int& w, int& h)
-{
- QMutexLocker l(&mtx);
- w = W; h = H;
-}
diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt
index bfa7a348..f34b7420 100644
--- a/tracker-aruco/CMakeLists.txt
+++ b/tracker-aruco/CMakeLists.txt
@@ -39,6 +39,6 @@ if(OpenCV_FOUND)
otr_module(tracker-aruco)
target_include_directories(${self} SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS} "${dir}")
- target_link_libraries(${self} opentrack-cv ${modules})
+ target_link_libraries(${self} opentrack-cv opentrack-video ${modules})
endif()
endif()
diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index 986eb943..8928566f 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -5,7 +5,6 @@
* copyright notice and this permission notice appear in all copies.
*/
-#include "cv/video-widget.hpp"
#include "ftnoir_tracker_aruco.h"
#include "cv/video-property-page.hpp"
#include "compat/camera-names.hpp"
diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h
index 1d6fd107..0477c4da 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.h
+++ b/tracker-aruco/ftnoir_tracker_aruco.h
@@ -11,7 +11,7 @@
#include "options/options.hpp"
#include "cv/translation-calibrator.hpp"
#include "api/plugin-api.hpp"
-#include "cv/video-widget.hpp"
+#include "video/video-widget.hpp"
#include "compat/timer.hpp"
#include "aruco/markerdetector.h"
diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index 8e171a19..9cfede4d 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -1,7 +1,6 @@
# Kinect SDK is Windows only
if (WIN32 AND opentrack-intel)
- find_package(OpenCV QUIET)
- if(OpenCV_FOUND)
+ if(TRUE)
# Setup cache variable to Kinect SDK path
set(SDK_KINECT20 "$ENV{KINECTSDK20_DIR}" CACHE PATH "Kinect SDK path")
# If we have a valid SDK path, try build that tracker
@@ -29,7 +28,7 @@ if (WIN32 AND opentrack-intel)
# Link against Kinect SDK libraries
target_link_libraries(${self} "${SDK_KINECT20}/lib/${kinect-arch-dir}/Kinect20.lib" "${SDK_KINECT20}/lib/${kinect-arch-dir}/Kinect20.Face.lib")
# Link against OpenCV stuff, needed for video preview
- target_link_libraries(${self} opentrack-cv)
+ target_link_libraries(${self} opentrack-video)
# Install Kinect Face DLL
install(FILES "${SDK_KINECT20}/Redist/Face/${kinect-arch-dir}/Kinect20.Face.dll" DESTINATION "${opentrack-hier-pfx}" PERMISSIONS ${opentrack-perms-exec})
diff --git a/tracker-kinect-face/kinect_face_tracker.h b/tracker-kinect-face/kinect_face_tracker.h
index 6273cba1..672047b1 100644
--- a/tracker-kinect-face/kinect_face_tracker.h
+++ b/tracker-kinect-face/kinect_face_tracker.h
@@ -6,7 +6,7 @@
#include "api/plugin-api.hpp"
#include "compat/timer.hpp"
#include "compat/macros.hpp"
-#include "cv/video-widget.hpp"
+#include "video/video-widget.hpp"
// Kinect Header files
#include <Kinect.h>
diff --git a/tracker-pt/CMakeLists.txt b/tracker-pt/CMakeLists.txt
index f12f530b..94e0a9d5 100644
--- a/tracker-pt/CMakeLists.txt
+++ b/tracker-pt/CMakeLists.txt
@@ -2,7 +2,7 @@ find_package(OpenCV QUIET)
if(OpenCV_FOUND)
otr_module(tracker-pt-base STATIC)
target_include_directories(${self} SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
- target_link_libraries(${self} opencv_imgproc opentrack-cv opencv_core)
+ target_link_libraries(${self} opencv_imgproc opentrack-cv opentrack-video opencv_core)
set_property(TARGET ${self} PROPERTY OUTPUT_NAME "pt-base")
endif()
add_subdirectory(module)
diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp
index 2ba4498d..ed29906f 100644
--- a/tracker-pt/ftnoir_tracker_pt.cpp
+++ b/tracker-pt/ftnoir_tracker_pt.cpp
@@ -7,7 +7,7 @@
*/
#include "ftnoir_tracker_pt.h"
-#include "cv/video-widget.hpp"
+#include "video/video-widget.hpp"
#include "compat/camera-names.hpp"
#include "compat/math-imports.hpp"
diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.h b/tracker-pt/ftnoir_tracker_pt_dialog.h
index f36fe7b2..3bd1a561 100644
--- a/tracker-pt/ftnoir_tracker_pt_dialog.h
+++ b/tracker-pt/ftnoir_tracker_pt_dialog.h
@@ -12,7 +12,7 @@
#include "ftnoir_tracker_pt.h"
#include "tracker-pt/ui_FTNoIR_PT_Controls.h"
#include "cv/translation-calibrator.hpp"
-#include "cv/video-widget.hpp"
+#include "video/video-widget.hpp"
#include <QTimer>
#include <QMutex>
diff --git a/variant/default/_variant.cmake b/variant/default/_variant.cmake
index 04994dae..161fefda 100644
--- a/variant/default/_variant.cmake
+++ b/variant/default/_variant.cmake
@@ -23,6 +23,7 @@ function(otr_init_variant)
"cv"
"migration"
"main-window"
+ "video"
)
set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}")
diff --git a/video/CMakeLists.txt b/video/CMakeLists.txt
new file mode 100644
index 00000000..5720bf60
--- /dev/null
+++ b/video/CMakeLists.txt
@@ -0,0 +1,7 @@
+find_package(OpenCV QUIET)
+otr_module(video STATIC)
+if(OpenCV_FOUND)
+ target_compile_definitions(${self} PUBLIC -DOTR_HAS_OPENCV)
+ target_link_libraries(${self} opencv_videoio opencv_core)
+endif()
+
diff --git a/video/lang/nl_NL.ts b/video/lang/nl_NL.ts
new file mode 100644
index 00000000..6401616d
--- /dev/null
+++ b/video/lang/nl_NL.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>
diff --git a/video/lang/ru_RU.ts b/video/lang/ru_RU.ts
new file mode 100644
index 00000000..6401616d
--- /dev/null
+++ b/video/lang/ru_RU.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>
diff --git a/video/lang/stub.ts b/video/lang/stub.ts
new file mode 100644
index 00000000..6401616d
--- /dev/null
+++ b/video/lang/stub.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>
diff --git a/video/lang/zh_CN.ts b/video/lang/zh_CN.ts
new file mode 100644
index 00000000..6401616d
--- /dev/null
+++ b/video/lang/zh_CN.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>
diff --git a/video/video-widget.cpp b/video/video-widget.cpp
new file mode 100644
index 00000000..cbb77755
--- /dev/null
+++ b/video/video-widget.cpp
@@ -0,0 +1,172 @@
+/* Copyright (c) 2014-2016, 2019 Stanislaw Halik <sthalik@misaki.pl>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#ifdef OTR_HAS_OPENCV
+# include <opencv2/imgproc.hpp>
+#endif
+
+#include "video-widget.hpp"
+#include "compat/check-visible.hpp"
+#include "compat/math.hpp"
+
+#include <cstddef>
+#include <cstring>
+
+#ifdef OTR_VIDEO_HAS_OPENCV
+# include <opencv2/imgproc.hpp>
+#endif
+
+#include <QPainter>
+
+void cv_video_widget::init_image_nolock()
+{
+ texture = QImage(W, H, QImage::Format_ARGB32);
+ texture.setDevicePixelRatio(devicePixelRatioF());
+}
+
+cv_video_widget::cv_video_widget(QWidget* parent) : QWidget(parent)
+{
+ W = width(); H = height();
+ init_image_nolock(); texture.fill(Qt::gray);
+
+ connect(&timer, &QTimer::timeout, this, &cv_video_widget::update_and_repaint, Qt::DirectConnection);
+ timer.start(65);
+}
+
+#ifdef OTR_HAS_OPENCV
+void cv_video_widget::update_image(const cv::Mat& frame)
+{
+ QMutexLocker l(&mtx);
+
+ if (freshp)
+ return;
+
+ if (W < 1 || H < 1 || frame.rows < 1 || frame.cols < 1)
+ return;
+
+ cv::Mat const* __restrict frame_scaled = nullptr;
+
+ if (frame3.cols != W || frame3.rows != H)
+ {
+ frame3 = cv::Mat(H, W, frame.type());
+ frame2 = cv::Mat(H, W, CV_8UC4);
+
+ if (!frame2.isContinuous() || !frame3.isContinuous())
+ std::abort();
+ }
+
+ if (frame.cols != W || frame.rows != H)
+ {
+ cv::resize(frame, frame3, { W, H }, 0, 0, cv::INTER_NEAREST);
+ frame_scaled = &frame3;
+ }
+ else if (!frame.isContinuous())
+ {
+ frame.copyTo(frame3);
+ frame_scaled = &frame3;
+ }
+ else
+ frame_scaled = &frame;
+
+ freshp = true;
+
+ int color_cvt = 0;
+ constexpr int nchannels = 4;
+
+ switch (frame_scaled->channels())
+ {
+ case 1:
+ color_cvt = cv::COLOR_GRAY2BGRA;
+ break;
+ case 3:
+ color_cvt = cv::COLOR_BGR2BGRA;
+ break;
+ case nchannels:
+ break;
+ default:
+ unreachable();
+ break;
+ }
+
+ cv::Mat const* frame_color;
+
+ if (color_cvt != cv::COLOR_COLORCVT_MAX)
+ {
+ cv::cvtColor(*frame_scaled, frame2, color_cvt);
+ frame_color = &frame2;
+ }
+ else
+ frame_color = frame_scaled;
+
+ int stride = frame_color->step.p[0], rows = frame_color->rows;
+ int nbytes = rows * stride;
+ vec.resize(nbytes); vec.shrink_to_fit();
+ std::memcpy(vec.data(), frame_color->data, nbytes);
+
+ texture = QImage((const unsigned char*) vec.data(), W, H, stride, QImage::Format_ARGB32);
+ texture.setDevicePixelRatio(devicePixelRatioF());
+}
+#endif
+
+void cv_video_widget::update_image(const QImage& img)
+{
+ QMutexLocker l(&mtx);
+
+ if (freshp)
+ return;
+ freshp = true;
+
+ unsigned nbytes = (unsigned)(img.bytesPerLine() * img.height());
+ vec.resize(nbytes); vec.shrink_to_fit();
+ std::memcpy(vec.data(), img.constBits(), nbytes);
+
+ texture = QImage((const unsigned char*) vec.data(), img.width(), img.height(), img.bytesPerLine(), img.format());
+ texture.setDevicePixelRatio(devicePixelRatioF());
+}
+
+void cv_video_widget::paintEvent(QPaintEvent*)
+{
+ QMutexLocker foo(&mtx);
+
+ if (texture.width() != W || texture.height() != H)
+ {
+ init_image_nolock();
+ texture.fill(Qt::gray);
+ }
+
+ QPainter painter(this);
+ painter.drawImage(rect(), texture);
+}
+
+void cv_video_widget::update_and_repaint()
+{
+ if (!check_is_visible())
+ return;
+
+ QMutexLocker l(&mtx);
+
+ if (freshp)
+ {
+ freshp = false;
+ repaint();
+ }
+}
+
+void cv_video_widget::resizeEvent(QResizeEvent*)
+{
+ QMutexLocker l(&mtx);
+ double dpr = devicePixelRatioF();
+ W = iround(width() * dpr);
+ H = iround(height() * dpr);
+ init_image_nolock();
+}
+
+void cv_video_widget::get_preview_size(int& w, int& h)
+{
+ QMutexLocker l(&mtx);
+ w = W; h = H;
+}
diff --git a/cv/video-widget.hpp b/video/video-widget.hpp
index cad05a20..2393db2e 100644
--- a/cv/video-widget.hpp
+++ b/video/video-widget.hpp
@@ -10,20 +10,15 @@
#include "compat/math.hpp"
-#include <memory>
#include <vector>
-#include <opencv2/core.hpp>
+#ifdef OTR_HAS_OPENCV
+# include <opencv2/core.hpp>
+#endif
-#include <QObject>
#include <QWidget>
-#include <QPainter>
-#include <QtEvents>
#include <QTimer>
#include <QMutex>
-#include <QMutexLocker>
-#include <QSize>
-#include <QDebug>
class cv_video_widget final : public QWidget
{
@@ -31,7 +26,10 @@ class cv_video_widget final : public QWidget
public:
cv_video_widget(QWidget *parent);
+
+#ifdef OTR_HAS_OPENCV
void update_image(const cv::Mat& frame);
+#endif
void update_image(const QImage& image);
void get_preview_size(int& w, int& h);
void resizeEvent(QResizeEvent*) override;
@@ -43,9 +41,14 @@ private:
QImage texture;
std::vector<unsigned char> vec;
QTimer timer;
+
+#ifdef OTR_HAS_OPENCV
cv::Mat frame2, frame3;
+#endif
bool freshp = false;
int W = iround(QWidget::width() * devicePixelRatioF());
int H = iround(QWidget::height() * devicePixelRatioF());
+
+ void init_image_nolock();
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 10:17:37 +0000