opencv: Allow building against 4.6.x

Replace the broken version checks with one modeled after
`GLIB_CHECK_VERSION`.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2557>

diff --git a/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.cpp b/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.cpp
index 492c9cf..0c5dfda 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.cpp
+++ b/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.cpp
@@ -233,7 +233,7 @@ gst_cvtracker_init (GstCVTracker * filter)
   filter->y = DEFAULT_PROP_INITIAL_Y;
   filter->width = DEFAULT_PROP_INITIAL_WIDTH;
   filter->height = DEFAULT_PROP_INITIAL_HEIGHT;
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
   filter->tracker = cv::legacy::upgradeTrackingAPI(
       cv::legacy::TrackerMedianFlow::create());
 #else
@@ -283,7 +283,7 @@ create_cvtracker (GstCVTracker * filter)
 {
   switch (filter->algorithm) {
     case GST_OPENCV_TRACKER_ALGORITHM_BOOSTING:
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
       filter->tracker = cv::legacy::upgradeTrackingAPI(
           cv::legacy::TrackerBoosting::create());
 #else
@@ -297,7 +297,7 @@ create_cvtracker (GstCVTracker * filter)
       filter->tracker = cv::TrackerKCF::create ();
       break;
     case GST_OPENCV_TRACKER_ALGORITHM_MEDIANFLOW:
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
       filter->tracker = cv::legacy::upgradeTrackingAPI(
           cv::legacy::TrackerMedianFlow::create());
 #else
@@ -308,7 +308,7 @@ create_cvtracker (GstCVTracker * filter)
       filter->tracker = cv::TrackerMIL::create ();
       break;
     case GST_OPENCV_TRACKER_ALGORITHM_MOSSE:
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
       filter->tracker = cv::legacy::upgradeTrackingAPI(
           cv::legacy::TrackerMOSSE::create());
 #else
@@ -316,7 +316,7 @@ create_cvtracker (GstCVTracker * filter)
 #endif
       break;
     case GST_OPENCV_TRACKER_ALGORITHM_TLD:
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
       filter->tracker = cv::legacy::upgradeTrackingAPI(
           cv::legacy::TrackerTLD::create());
 #else
@@ -366,7 +366,7 @@ gst_cvtracker_transform_ip (GstOpencvVideoFilter * base,
   GstMessage *msg;
 
   if (filter->roi.empty ()) {
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
     filter->roi = new (cv::Rect);
 #else
     filter->roi = new (cv::Rect2d);
@@ -378,7 +378,7 @@ gst_cvtracker_transform_ip (GstOpencvVideoFilter * base,
     create_cvtracker (filter);
     filter->tracker->init (img, *filter->roi);
   } else if (filter->tracker->update (img, *filter->roi)) {
-#if (!(CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1))
+#if !GST_OPENCV_CHECK_VERSION(4, 5, 1)
     /* Round values to avoid inconsistencies depending on the OpenCV version. */
     filter->roi->x = cvRound (filter->roi->x);
     filter->roi->y = cvRound (filter->roi->y);

diff --git a/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.h b/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.h
index d3531ef..1a06111 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.h
+++ b/subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.h
@@ -50,7 +50,14 @@
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/tracking.hpp>
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+
+#define GST_OPENCV_CHECK_VERSION(major,minor,revision) \
+  (CV_VERSION_MAJOR > (major) || \
+   (CV_VERSION_MAJOR == (major) && CV_VERSION_MINOR > (minor)) || \
+   (CV_VERSION_MAJOR == (major) && CV_VERSION_MINOR == (minor) && \
+    CV_VERSION_REVISION >= (revision)))
+
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
 #include <opencv2/tracking/tracking_legacy.hpp>
 #endif
 
@@ -84,7 +91,7 @@ struct _GstCVTracker
   gboolean post_debug_info;
 
   cv::Ptr<cv::Tracker> tracker;
-#if CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR >= 5 && CV_VERSION_REVISION >= 1
+#if GST_OPENCV_CHECK_VERSION(4, 5, 1)
   cv::Ptr<cv::Rect> roi;
 #else
   cv::Ptr<cv::Rect2d> roi;

diff --git a/subprojects/gst-plugins-bad/ext/opencv/meson.build b/subprojects/gst-plugins-bad/ext/opencv/meson.build
index 1d86b90..3962cff 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/opencv/meson.build
+++ b/subprojects/gst-plugins-bad/ext/opencv/meson.build
@@ -71,7 +71,7 @@ if opencv_found
 endif
 
 if not opencv_found
-  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.6.0'], required : false)
+  opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.7.0'], required : false)
   opencv_found = opencv_dep.found()
   if opencv_found
     foreach h : libopencv4_headers