Commit fc21b15d authored by Alexander Alekhin's avatar Alexander Alekhin

samples(gpu): cleanup samples for legacy API

parent 850053f9
...@@ -21,7 +21,6 @@ set(OPENCV_CUDA_SAMPLES_REQUIRED_DEPS ...@@ -21,7 +21,6 @@ set(OPENCV_CUDA_SAMPLES_REQUIRED_DEPS
opencv_cudaoptflow opencv_cudaoptflow
opencv_cudabgsegm opencv_cudabgsegm
opencv_cudastereo opencv_cudastereo
opencv_cudalegacy
opencv_cudaobjdetect) opencv_cudaobjdetect)
ocv_check_dependencies(${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS}) ocv_check_dependencies(${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS})
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/cudabgsegm.hpp" #include "opencv2/cudabgsegm.hpp"
#include "opencv2/cudalegacy.hpp"
#include "opencv2/video.hpp" #include "opencv2/video.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
...@@ -16,8 +15,6 @@ enum Method ...@@ -16,8 +15,6 @@ enum Method
{ {
MOG, MOG,
MOG2, MOG2,
GMG,
FGD_STAT
}; };
int main(int argc, const char** argv) int main(int argc, const char** argv)
...@@ -25,7 +22,7 @@ int main(int argc, const char** argv) ...@@ -25,7 +22,7 @@ int main(int argc, const char** argv)
cv::CommandLineParser cmd(argc, argv, cv::CommandLineParser cmd(argc, argv,
"{ c camera | | use camera }" "{ c camera | | use camera }"
"{ f file | ../data/vtest.avi | input video file }" "{ f file | ../data/vtest.avi | input video file }"
"{ m method | mog | method (mog, mog2, gmg, fgd) }" "{ m method | mog | method (mog, mog2) }"
"{ h help | | print help message }"); "{ h help | | print help message }");
if (cmd.has("help") || !cmd.check()) if (cmd.has("help") || !cmd.check())
...@@ -40,9 +37,7 @@ int main(int argc, const char** argv) ...@@ -40,9 +37,7 @@ int main(int argc, const char** argv)
string method = cmd.get<string>("method"); string method = cmd.get<string>("method");
if (method != "mog" if (method != "mog"
&& method != "mog2" && method != "mog2")
&& method != "gmg"
&& method != "fgd")
{ {
cerr << "Incorrect method" << endl; cerr << "Incorrect method" << endl;
return -1; return -1;
...@@ -50,8 +45,8 @@ int main(int argc, const char** argv) ...@@ -50,8 +45,8 @@ int main(int argc, const char** argv)
Method m = method == "mog" ? MOG : Method m = method == "mog" ? MOG :
method == "mog2" ? MOG2 : method == "mog2" ? MOG2 :
method == "fgd" ? FGD_STAT : (Method)-1;
GMG; CV_Assert(m != (Method)-1);
VideoCapture cap; VideoCapture cap;
...@@ -73,8 +68,6 @@ int main(int argc, const char** argv) ...@@ -73,8 +68,6 @@ int main(int argc, const char** argv)
Ptr<BackgroundSubtractor> mog = cuda::createBackgroundSubtractorMOG(); Ptr<BackgroundSubtractor> mog = cuda::createBackgroundSubtractorMOG();
Ptr<BackgroundSubtractor> mog2 = cuda::createBackgroundSubtractorMOG2(); Ptr<BackgroundSubtractor> mog2 = cuda::createBackgroundSubtractorMOG2();
Ptr<BackgroundSubtractor> gmg = cuda::createBackgroundSubtractorGMG(40);
Ptr<BackgroundSubtractor> fgd = cuda::createBackgroundSubtractorFGD();
GpuMat d_fgmask; GpuMat d_fgmask;
GpuMat d_fgimg; GpuMat d_fgimg;
...@@ -93,23 +86,12 @@ int main(int argc, const char** argv) ...@@ -93,23 +86,12 @@ int main(int argc, const char** argv)
case MOG2: case MOG2:
mog2->apply(d_frame, d_fgmask); mog2->apply(d_frame, d_fgmask);
break; break;
case GMG:
gmg->apply(d_frame, d_fgmask);
break;
case FGD_STAT:
fgd->apply(d_frame, d_fgmask);
break;
} }
namedWindow("image", WINDOW_NORMAL); namedWindow("image", WINDOW_NORMAL);
namedWindow("foreground mask", WINDOW_NORMAL); namedWindow("foreground mask", WINDOW_NORMAL);
namedWindow("foreground image", WINDOW_NORMAL); namedWindow("foreground image", WINDOW_NORMAL);
if (m != GMG) namedWindow("mean background image", WINDOW_NORMAL);
{
namedWindow("mean background image", WINDOW_NORMAL);
}
for(;;) for(;;)
{ {
...@@ -132,15 +114,6 @@ int main(int argc, const char** argv) ...@@ -132,15 +114,6 @@ int main(int argc, const char** argv)
mog2->apply(d_frame, d_fgmask); mog2->apply(d_frame, d_fgmask);
mog2->getBackgroundImage(d_bgimg); mog2->getBackgroundImage(d_bgimg);
break; break;
case GMG:
gmg->apply(d_frame, d_fgmask);
break;
case FGD_STAT:
fgd->apply(d_frame, d_fgmask);
fgd->getBackgroundImage(d_bgimg);
break;
} }
double fps = cv::getTickFrequency() / (cv::getTickCount() - start); double fps = cv::getTickFrequency() / (cv::getTickCount() - start);
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment