generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added farneback to superres module.

Browse Source
This commit is contained in:
Jin Ma 2013-07-26 14:14:26 +08:00
parent be8b3687f4
commit 027b8021b1
3 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/superres/include/opencv2/superres/optical_flow.hpp
View File

@ -58,6 +58,7 @@ namespace cv
CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Farneback(); CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Farneback();
CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Farneback_GPU(); CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Farneback_GPU();
CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Farneback_OCL();
CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Simple(); CV_EXPORTS Ptr<DenseOpticalFlowExt> createOptFlow_Simple();

5
modules/superres/perf/perf_superres_ocl.cpp
View File

@ -46,7 +46,6 @@
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
using namespace std; using namespace std;
using namespace std::tr1;
using namespace testing; using namespace testing;
using namespace perf; using namespace perf;
using namespace cv; using namespace cv;
@ -113,8 +112,8 @@ PERF_TEST_P(Size_MatType, SuperResolution_BTVL1_OCL,
declare.time(5 * 60); declare.time(5 * 60);
const Size size = get<0>(GetParam()); const Size size = std::tr1::get<0>(GetParam());
const int type = get<1>(GetParam()); const int type = std::tr1::get<1>(GetParam());
Mat frame(size, type); Mat frame(size, type);
declare.in(frame, WARMUP_RNG); declare.in(frame, WARMUP_RNG);

74
modules/superres/src/optical_flow.cpp
View File

@ -910,4 +910,78 @@ Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_DualTVL1_OCL()
return new DualTVL1_OCL; return new DualTVL1_OCL;
} }
///////////////////////////////////////////////////////////////////
// FarneBack
namespace
{
class FarneBack_OCL : public oclOpticalFlow
{
public:
AlgorithmInfo* info() const;
FarneBack_OCL();
void collectGarbage();
protected:
void impl(const cv::ocl::oclMat& input0, const cv::ocl::oclMat& input1, cv::ocl::oclMat& dst1, cv::ocl::oclMat& dst2);
private:
double pyrScale_;
int numLevels_;
int winSize_;
int numIters_;
int polyN_;
double polySigma_;
int flags_;
ocl::FarnebackOpticalFlow alg_;
};
CV_INIT_ALGORITHM(FarneBack_OCL, "DenseOpticalFlowExt.FarneBack_OCL",
obj.info()->addParam(obj, "pyrScale", obj.pyrScale_);
obj.info()->addParam(obj, "numLevels", obj.numLevels_);
obj.info()->addParam(obj, "winSize", obj.winSize_);
obj.info()->addParam(obj, "numIters", obj.numIters_);
obj.info()->addParam(obj, "polyN", obj.polyN_);
obj.info()->addParam(obj, "polySigma", obj.polySigma_);
obj.info()->addParam(obj, "flags", obj.flags_));
FarneBack_OCL::FarneBack_OCL() : oclOpticalFlow(CV_8UC1)
{
pyrScale_ = alg_.pyrScale;
numLevels_ = alg_.numLevels;
winSize_ = alg_.winSize;
numIters_ = alg_.numIters;
polyN_ = alg_.polyN;
polySigma_ = alg_.polySigma;
flags_ = alg_.flags;
}
void FarneBack_OCL::impl(const cv::ocl::oclMat& input0, const cv::ocl::oclMat& input1, cv::ocl::oclMat& dst1, cv::ocl::oclMat& dst2)
{
alg_.pyrScale = pyrScale_;
alg_.numLevels = numLevels_;
alg_.winSize = winSize_;
alg_.numIters = numIters_;
alg_.polyN = polyN_;
alg_.polySigma = polySigma_;
alg_.flags = flags_;
alg_(input0, input1, dst1, dst2);
}
void FarneBack_OCL::collectGarbage()
{
alg_.releaseMemory();
oclOpticalFlow::collectGarbage();
}
}
Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Farneback_OCL()
{
return new FarneBack_OCL;
}
#endif #endif