mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

opencv: Allow building against 4.6.x

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

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2557>
This commit is contained in:
Jan Alexander Steffens (heftig) 2022-06-06 00:30:15 +02:00
parent a02f0ea392
commit d86ad30be2
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.cpp
View file

@ -233,7 +233,7 @@ gst_cvtracker_init (GstCVTracker * filter)
filter->y = DEFAULT_PROP_INITIAL_Y; filter->y = DEFAULT_PROP_INITIAL_Y;
filter->width = DEFAULT_PROP_INITIAL_WIDTH; filter->width = DEFAULT_PROP_INITIAL_WIDTH;
filter->height = DEFAULT_PROP_INITIAL_HEIGHT; 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( filter->tracker = cv::legacy::upgradeTrackingAPI(
cv::legacy::TrackerMedianFlow::create()); cv::legacy::TrackerMedianFlow::create());
#else #else
@ -283,7 +283,7 @@ create_cvtracker (GstCVTracker * filter)
{ {
switch (filter->algorithm) { switch (filter->algorithm) {
case GST_OPENCV_TRACKER_ALGORITHM_BOOSTING: 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( filter->tracker = cv::legacy::upgradeTrackingAPI(
cv::legacy::TrackerBoosting::create()); cv::legacy::TrackerBoosting::create());
#else #else
@ -297,7 +297,7 @@ create_cvtracker (GstCVTracker * filter)
filter->tracker = cv::TrackerKCF::create (); filter->tracker = cv::TrackerKCF::create ();
break; break;
case GST_OPENCV_TRACKER_ALGORITHM_MEDIANFLOW: 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( filter->tracker = cv::legacy::upgradeTrackingAPI(
cv::legacy::TrackerMedianFlow::create()); cv::legacy::TrackerMedianFlow::create());
#else #else
@ -308,7 +308,7 @@ create_cvtracker (GstCVTracker * filter)
filter->tracker = cv::TrackerMIL::create (); filter->tracker = cv::TrackerMIL::create ();
break; break;
case GST_OPENCV_TRACKER_ALGORITHM_MOSSE: 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( filter->tracker = cv::legacy::upgradeTrackingAPI(
cv::legacy::TrackerMOSSE::create()); cv::legacy::TrackerMOSSE::create());
#else #else
@ -316,7 +316,7 @@ create_cvtracker (GstCVTracker * filter)
#endif #endif
break; break;
case GST_OPENCV_TRACKER_ALGORITHM_TLD: 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( filter->tracker = cv::legacy::upgradeTrackingAPI(
cv::legacy::TrackerTLD::create()); cv::legacy::TrackerTLD::create());
#else #else
@ -366,7 +366,7 @@ gst_cvtracker_transform_ip (GstOpencvVideoFilter * base,
GstMessage *msg; GstMessage *msg;
if (filter->roi.empty ()) { 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); filter->roi = new (cv::Rect);
#else #else
filter->roi = new (cv::Rect2d); filter->roi = new (cv::Rect2d);
@ -378,7 +378,7 @@ gst_cvtracker_transform_ip (GstOpencvVideoFilter * base,
create_cvtracker (filter); create_cvtracker (filter);
filter->tracker->init (img, *filter->roi); filter->tracker->init (img, *filter->roi);
} else if (filter->tracker->update (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. */ /* Round values to avoid inconsistencies depending on the OpenCV version. */
filter->roi->x = cvRound (filter->roi->x); filter->roi->x = cvRound (filter->roi->x);
filter->roi->y = cvRound (filter->roi->y); filter->roi->y = cvRound (filter->roi->y);

11
subprojects/gst-plugins-bad/ext/opencv/gstcvtracker.h
View file

@ -50,7 +50,14 @@
#include <opencv2/core.hpp> #include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp> #include <opencv2/imgproc.hpp>
#include <opencv2/tracking.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> #include <opencv2/tracking/tracking_legacy.hpp>
#endif #endif
@ -84,7 +91,7 @@ struct _GstCVTracker
gboolean post_debug_info; gboolean post_debug_info;
cv::Ptr<cv::Tracker> tracker; 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; cv::Ptr<cv::Rect> roi;
#else #else
cv::Ptr<cv::Rect2d> roi; cv::Ptr<cv::Rect2d> roi;

2
subprojects/gst-plugins-bad/ext/opencv/meson.build
View file

@ -71,7 +71,7 @@ if opencv_found
endif endif
if not opencv_found 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() opencv_found = opencv_dep.found()
if opencv_found if opencv_found
foreach h : libopencv4_headers foreach h : libopencv4_headers