opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-18 00:01:17 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3049 from sturkmen72:clean_up_test_data

Browse Source
This commit is contained in:
Alexander Alekhin
2021-09-29 10:56:47 +00:00
parent 9358d75e30 07a9245847
commit 9278ed8d8a
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cudabgsegm/perf/perf_bgsegm.cpp
View File

@@ -52,7 +52,7 @@ namespace opencv_test { namespace {
DEF_PARAM_TEST(Video_Cn_LearningRate, string, MatCn, double); DEF_PARAM_TEST(Video_Cn_LearningRate, string, MatCn, double);
PERF_TEST_P(Video_Cn_LearningRate, MOG, PERF_TEST_P(Video_Cn_LearningRate, MOG,
Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Combine(Values("cv/video/768x576.avi", "cv/video/1920x1080.avi"),
CUDA_CHANNELS_1_3_4, CUDA_CHANNELS_1_3_4,
Values(0.0, 0.01))) Values(0.0, 0.01)))
{ {
@@ -157,7 +157,7 @@ PERF_TEST_P(Video_Cn_LearningRate, MOG,
DEF_PARAM_TEST(Video_Cn, string, int); DEF_PARAM_TEST(Video_Cn, string, int);
PERF_TEST_P(Video_Cn, DISABLED_MOG2, PERF_TEST_P(Video_Cn, DISABLED_MOG2,
Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Combine(Values("cv/video/768x576.avi", "cv/video/1920x1080.avi"),
CUDA_CHANNELS_1_3_4)) CUDA_CHANNELS_1_3_4))
{ {
const int numIters = 10; const int numIters = 10;
@@ -312,7 +312,7 @@ PERF_TEST_P(Video_Cn, DISABLED_MOG2,
#ifdef HAVE_VIDEO_INPUT #ifdef HAVE_VIDEO_INPUT
PERF_TEST_P(Video_Cn, MOG2GetBackgroundImage, PERF_TEST_P(Video_Cn, MOG2GetBackgroundImage,
Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), Combine(Values("cv/video/768x576.avi", "cv/video/1920x1080.avi"),
CUDA_CHANNELS_1_3_4)) CUDA_CHANNELS_1_3_4))
{ {
const string inputFile = perf::TestBase::getDataPath(GET_PARAM(0)); const string inputFile = perf::TestBase::getDataPath(GET_PARAM(0));

9
modules/cudacodec/perf/perf_video.cpp
View File

@@ -41,18 +41,17 @@
//M*/ //M*/
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#include "opencv2/highgui/highgui_c.h" #include "opencv2/videoio.hpp"
#include "opencv2/videoio/videoio_c.h"
namespace opencv_test { namespace { namespace opencv_test { namespace {
#if defined(HAVE_NVCUVID) #if defined(HAVE_NVCUVID)
#if defined(HAVE_FFMPEG_WRAPPER) // should this be set in preprocessor or in cvconfig.h #if defined(HAVE_FFMPEG_WRAPPER) // should this be set in preprocessor or in cvconfig.h
#define VIDEO_SRC Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi") #define VIDEO_SRC Values("cv/video/768x576.avi", "cv/video/1920x1080.avi")
#else #else
// CUDA demuxer has to fall back to ffmpeg to process "gpu/video/768x576.avi" // CUDA demuxer has to fall back to ffmpeg to process "cv/video/768x576.avi"
#define VIDEO_SRC Values( "gpu/video/1920x1080.avi") #define VIDEO_SRC Values( "cv/video/1920x1080.avi")
#endif #endif
DEF_PARAM_TEST_1(FileName, string); DEF_PARAM_TEST_1(FileName, string);

6
modules/cudacodec/test/test_video.cpp
View File

@@ -57,8 +57,8 @@ CUDA_TEST_P(Video, Reader)
{ {
cv::cuda::setDevice(GET_PARAM(0).deviceID()); cv::cuda::setDevice(GET_PARAM(0).deviceID());
// CUDA demuxer has to fall back to ffmpeg to process "gpu/video/768x576.avi" // CUDA demuxer has to fall back to ffmpeg to process "cv/video/768x576.avi"
if (GET_PARAM(1) == "gpu/video/768x576.avi" && !videoio_registry::hasBackend(CAP_FFMPEG)) if (GET_PARAM(1) == "cv/video/768x576.avi" && !videoio_registry::hasBackend(CAP_FFMPEG))
throw SkipTestException("FFmpeg backend not found"); throw SkipTestException("FFmpeg backend not found");
std::string inputFile = std::string(cvtest::TS::ptr()->get_data_path()) + "../" + GET_PARAM(1); std::string inputFile = std::string(cvtest::TS::ptr()->get_data_path()) + "../" + GET_PARAM(1);
@@ -125,7 +125,7 @@ CUDA_TEST_P(Video, Writer)
#endif // _WIN32, HAVE_NVCUVENC #endif // _WIN32, HAVE_NVCUVENC
#define VIDEO_SRC "gpu/video/768x576.avi", "gpu/video/1920x1080.avi", "highgui/video/big_buck_bunny.avi", \ #define VIDEO_SRC "cv/video/768x576.avi", "cv/video/1920x1080.avi", "highgui/video/big_buck_bunny.avi", \
"highgui/video/big_buck_bunny.h264", "highgui/video/big_buck_bunny.h265", "highgui/video/big_buck_bunny.mpg" "highgui/video/big_buck_bunny.h264", "highgui/video/big_buck_bunny.h265", "highgui/video/big_buck_bunny.mpg"
INSTANTIATE_TEST_CASE_P(CUDA_Codec, Video, testing::Combine( INSTANTIATE_TEST_CASE_P(CUDA_Codec, Video, testing::Combine(
ALL_DEVICES, ALL_DEVICES,

4
modules/cudalegacy/perf/perf_bgsegm.cpp
View File

@@ -56,7 +56,7 @@ namespace opencv_test { namespace {
DEF_PARAM_TEST_1(Video, string); DEF_PARAM_TEST_1(Video, string);
PERF_TEST_P(Video, FGDStatModel, PERF_TEST_P(Video, FGDStatModel,
Values(string("gpu/video/768x576.avi"))) Values(string("cv/video/768x576.avi")))
{ {
const int numIters = 10; const int numIters = 10;
@@ -126,7 +126,7 @@ PERF_TEST_P(Video, FGDStatModel,
DEF_PARAM_TEST(Video_Cn_MaxFeatures, string, MatCn, int); DEF_PARAM_TEST(Video_Cn_MaxFeatures, string, MatCn, int);
PERF_TEST_P(Video_Cn_MaxFeatures, GMG, PERF_TEST_P(Video_Cn_MaxFeatures, GMG,
Combine(Values(string("gpu/video/768x576.avi")), Combine(Values(string("cv/video/768x576.avi")),
CUDA_CHANNELS_1_3_4, CUDA_CHANNELS_1_3_4,
Values(20, 40, 60))) Values(20, 40, 60)))
{ {