added GPU bilateral filter + tests

[profile/ivi/opencv.git] / modules / gpu / perf / perf_video.cpp

diff --git a/modules/gpu/perf/perf_video.cpp b/modules/gpu/perf/perf_video.cpp
index 8346d25..7a64034 100644 (file)
--- a/modules/gpu/perf/perf_video.cpp
+++ b/modules/gpu/perf/perf_video.cpp
@@ -219,7 +219,7 @@ PERF_TEST_P(ImagePair_Gray_NPts_WinSz_Levels_Iters, Video_PyrLKOpticalFlowSparse
 \r
     if (runOnGpu)\r
     {\r
-        cv::gpu::GpuMat d_pts(pts);\r
+        cv::gpu::GpuMat d_pts(pts.reshape(2, 1));\r
 \r
         cv::gpu::PyrLKOpticalFlow d_pyrLK;\r
         d_pyrLK.winSize = cv::Size(winSize, winSize);\r
@@ -423,7 +423,7 @@ PERF_TEST_P(Video, Video_FGDStatModel, Values("gpu/video/768x576.avi", "gpu/vide
 \r
 DEF_PARAM_TEST(Video_Cn_LearningRate, string, int, double);\r
 \r
-PERF_TEST_P(Video_Cn_LearningRate, Video_MOG, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Values(1, 3, 4), Values(0.0, 0.01)))\r
+PERF_TEST_P(Video_Cn_LearningRate, Video_MOG, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), GPU_CHANNELS_1_3_4, Values(0.0, 0.01)))\r
 {\r
     string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));\r
     int cn = GET_PARAM(1);\r
@@ -511,7 +511,7 @@ PERF_TEST_P(Video_Cn_LearningRate, Video_MOG, Combine(Values("gpu/video/768x576.
 \r
 DEF_PARAM_TEST(Video_Cn, string, int);\r
 \r
-PERF_TEST_P(Video_Cn, Video_MOG2, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Values(1, 3, 4)))\r
+PERF_TEST_P(Video_Cn, Video_MOG2, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), GPU_CHANNELS_1_3_4))\r
 {\r
     string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));\r
     int cn = GET_PARAM(1);\r
@@ -596,7 +596,7 @@ PERF_TEST_P(Video_Cn, Video_MOG2, Combine(Values("gpu/video/768x576.avi", "gpu/v
 //////////////////////////////////////////////////////\r
 // MOG2GetBackgroundImage\r
 \r
-PERF_TEST_P(Video_Cn, Video_MOG2GetBackgroundImage, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Values(1, 3, 4)))\r
+PERF_TEST_P(Video_Cn, Video_MOG2GetBackgroundImage, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), GPU_CHANNELS_1_3_4))\r
 {\r
     string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));\r
     int cn = GET_PARAM(1);\r
@@ -676,7 +676,7 @@ PERF_TEST_P(Video_Cn, Video_MOG2GetBackgroundImage, Combine(Values("gpu/video/76
 //////////////////////////////////////////////////////\r
 // VIBE\r
 \r
-PERF_TEST_P(Video_Cn, Video_VIBE, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Values(1, 3, 4)))\r
+PERF_TEST_P(Video_Cn, Video_VIBE, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), GPU_CHANNELS_1_3_4))\r
 {\r
     string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));\r
     int cn = GET_PARAM(1);\r
@@ -739,7 +739,7 @@ PERF_TEST_P(Video_Cn, Video_VIBE, Combine(Values("gpu/video/768x576.avi", "gpu/v
 \r
 DEF_PARAM_TEST(Video_Cn_MaxFeatures, string, int, int);\r
 \r
-PERF_TEST_P(Video_Cn_MaxFeatures, Video_GMG, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Values(1, 3, 4), Values(20, 40, 60)))\r
+PERF_TEST_P(Video_Cn_MaxFeatures, Video_GMG, Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), GPU_CHANNELS_1_3_4, Values(20, 40, 60)))\r
 {\r
     std::string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));\r
     int cn = GET_PARAM(1);\r