mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Android build of new videostab module

Browse Source
This commit is contained in:
Andrey Kamaev 2012-03-19 14:21:15 +00:00
parent 844bdea5ac
commit 14a1549dac
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videostab/CMakeLists.txt
View File

@ -1,3 +1,3 @@
set(the_description "Video stabilization")
ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video OPTIONAL opencv_gpu)
ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_highgui OPTIONAL opencv_gpu)

2
modules/videostab/include/opencv2/videostab/fast_marching.hpp
View File

@ -72,7 +72,7 @@ private:
float dist;
int x, y;
DXY() {}
DXY() : dist(0), x(0), y(0) {}
DXY(float dist, int x, int y) : dist(dist), x(x), y(y) {}
bool operator <(const DXY &dxy) const { return dist < dxy.dist; }
};

8
modules/videostab/include/opencv2/videostab/optical_flow.hpp
View File

@ -44,7 +44,11 @@
#define __OPENCV_VIDEOSTAB_OPTICAL_FLOW_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/opencv_modules.hpp"
#if HAVE_OPENCV_GPU
# include "opencv2/gpu/gpu.hpp"
#endif
namespace cv
{
@ -94,6 +98,7 @@ public:
OutputArray status, OutputArray errors);
};
#if HAVE_OPENCV_GPU
class DensePyrLkOptFlowEstimatorGpu
: public PyrLkOptFlowEstimatorBase, public IDenseOptFlowEstimator
{
@ -107,6 +112,7 @@ private:
gpu::PyrLKOpticalFlow optFlowEstimator_;
gpu::GpuMat frame0_, frame1_, flowX_, flowY_, errors_;
};
#endif
} // namespace videostab
} // namespace cv

4
modules/videostab/src/inpainting.cpp
View File

@ -246,7 +246,11 @@ public:
MotionInpainter::MotionInpainter()
{
#if HAVE_OPENCV_GPU
setOptFlowEstimator(new DensePyrLkOptFlowEstimatorGpu());
#else
CV_Error( CV_StsNotImplemented, "Current implementation of MotionInpainter requires GPU" );
#endif
setFlowErrorThreshold(1e-4f);
setBorderMode(BORDER_REPLICATE);
}

3
modules/videostab/src/optical_flow.cpp
View File

@ -41,7 +41,6 @@
//M*/
#include "precomp.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/video/video.hpp"
#include "opencv2/videostab/optical_flow.hpp"
@ -60,6 +59,7 @@ void SparsePyrLkOptFlowEstimator::run(
}
#if HAVE_OPENCV_GPU
DensePyrLkOptFlowEstimatorGpu::DensePyrLkOptFlowEstimatorGpu()
{
CV_Assert(gpu::getCudaEnabledDeviceCount() > 0);
@ -86,6 +86,7 @@ void DensePyrLkOptFlowEstimatorGpu::run(
flowX_.download(flowX.getMatRef());
flowY_.download(flowY.getMatRef());
}
#endif
} // namespace videostab