1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2025-02-19 09:31:51 +03:00
130 changed files with 6998 additions and 3110 deletions
@@ -46,6 +46,9 @@
#include "opencv2/core.hpp"
#include "opencv2/imgproc.hpp"
#ifdef HAVE_OPENCV_DNN
# include "opencv2/dnn.hpp"
#endif
namespace cv
{
@@ -839,6 +842,16 @@ public:
static CV_WRAP
Ptr<TrackerDaSiamRPN> create(const TrackerDaSiamRPN::Params& parameters = TrackerDaSiamRPN::Params());
#ifdef HAVE_OPENCV_DNN
/** @brief Constructor
* @param siam_rpn pre-loaded SiamRPN model
* @param kernel_cls1 pre-loaded CLS model
* @param kernel_r1 pre-loaded R1 model
*/
static CV_WRAP
Ptr<TrackerDaSiamRPN> create(const dnn::Net& siam_rpn, const dnn::Net& kernel_cls1, const dnn::Net& kernel_r1);
#endif
//void init(InputArray image, const Rect& boundingBox) CV_OVERRIDE;
//bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
};
@@ -873,6 +886,15 @@ public:
static CV_WRAP
Ptr<TrackerNano> create(const TrackerNano::Params& parameters = TrackerNano::Params());
#ifdef HAVE_OPENCV_DNN
/** @brief Constructor
* @param backbone pre-loaded backbone model
* @param neckhead pre-loaded neckhead model
*/
static CV_WRAP
Ptr<TrackerNano> create(const dnn::Net& backbone, const dnn::Net& neckhead);
#endif
//void init(InputArray image, const Rect& boundingBox) CV_OVERRIDE;
//bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
};
@@ -907,6 +929,18 @@ public:
static CV_WRAP
Ptr<TrackerVit> create(const TrackerVit::Params& parameters = TrackerVit::Params());
#ifdef HAVE_OPENCV_DNN
/** @brief Constructor
* @param model pre-loaded DNN model
* @param meanvalue mean value for image preprocessing
* @param stdvalue std value for image preprocessing
* @param tracking_score_threshold threshold for tracking score
*/
static CV_WRAP
Ptr<TrackerVit> create(const dnn::Net& model, Scalar meanvalue = Scalar(0.485, 0.456, 0.406),
Scalar stdvalue = Scalar(0.229, 0.224, 0.225), float tracking_score_threshold = 0.20f);
#endif
// void init(InputArray image, const Rect& boundingBox) CV_OVERRIDE;
// bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
};