Add method KeypointBasedMotionEstimator::estimate(InputArray, InputArray) to support both cpu & opencl algorithm processing

the orignal estimate function has input parameters defined as "Mat", this prevent users to call into algorithm opencl path
pull/8522/head
zongwave 8 years ago
parent 1c53595817
commit 1fc60e6d64
  1. 1
      modules/videostab/include/opencv2/videostab/global_motion.hpp
  2. 8
      modules/videostab/src/global_motion.cpp

@ -236,6 +236,7 @@ public:
Ptr<IOutlierRejector> outlierRejector() const { return outlierRejector_; }
virtual Mat estimate(const Mat &frame0, const Mat &frame1, bool *ok = 0);
Mat estimate(InputArray frame0, InputArray frame1, bool *ok = 0);
private:
Ptr<MotionEstimatorBase> motionEstimator_;

@ -710,6 +710,14 @@ KeypointBasedMotionEstimator::KeypointBasedMotionEstimator(Ptr<MotionEstimatorBa
Mat KeypointBasedMotionEstimator::estimate(const Mat &frame0, const Mat &frame1, bool *ok)
{
InputArray image0 = frame0;
InputArray image1 = frame1;
return estimate(image0, image1, ok);
}
Mat KeypointBasedMotionEstimator::estimate(InputArray frame0, InputArray frame1, bool *ok)
{
// find keypoints
detector_->detect(frame0, keypointsPrev_);

Loading…
Cancel
Save