Skip to content

Commit d27009c

Browse files
mshabuninmshabunin
committed
Merge pull request opencv#8856 from mshabunin:media-tests-upgrade
2 parents 4eb5242 + 87b569d commit d27009c

28 files changed

+1134
-2316
lines changed

‎cmake/templates/cvconfig.h.in

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,26 @@
220220
/* OpenVX */
221221
#cmakedefine HAVE_OPENVX
222222

223+
#if defined(HAVE_XINE) || \
224+
defined(HAVE_GSTREAMER) || \
225+
defined(HAVE_QUICKTIME) || \
226+
defined(HAVE_QTKIT) || \
227+
defined(HAVE_AVFOUNDATION) || \
228+
/*defined(HAVE_OPENNI) || too specialized */ \
229+
defined(HAVE_FFMPEG) || \
230+
defined(HAVE_MSMF)
231+
#define HAVE_VIDEO_INPUT
232+
#endif
233+
234+
#if /*defined(HAVE_XINE) || */\
235+
defined(HAVE_GSTREAMER) || \
236+
defined(HAVE_QUICKTIME) || \
237+
defined(HAVE_QTKIT) || \
238+
defined(HAVE_AVFOUNDATION) || \
239+
defined(HAVE_FFMPEG) || \
240+
defined(HAVE_MSMF)
241+
#define HAVE_VIDEO_OUTPUT
242+
#endif
223243

224244

225245
#endif // OPENCV_CVCONFIG_H_INCLUDED

‎modules/cudabgsegm/perf/perf_bgsegm.cpp

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,10 @@ using namespace std;
4646
using namespace testing;
4747
using namespace perf;
4848

49-
#if defined(HAVE_XINE) || \
50-
defined(HAVE_GSTREAMER) || \
51-
defined(HAVE_QUICKTIME) || \
52-
defined(HAVE_QTKIT) || \
53-
defined(HAVE_AVFOUNDATION) || \
54-
defined(HAVE_FFMPEG) || \
55-
defined(WIN32) /* assume that we have ffmpeg */
56-
57-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 1
58-
#else
59-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 0
60-
#endif
61-
6249
//////////////////////////////////////////////////////
6350
// MOG
6451

65-
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
52+
#ifdef HAVE_VIDEO_INPUT
6653

6754
DEF_PARAM_TEST(Video_Cn_LearningRate, string, MatCn, double);
6855

@@ -167,7 +154,7 @@ PERF_TEST_P(Video_Cn_LearningRate, MOG,
167154
//////////////////////////////////////////////////////
168155
// MOG2
169156

170-
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
157+
#ifdef HAVE_VIDEO_INPUT
171158

172159
DEF_PARAM_TEST(Video_Cn, string, int);
173160

@@ -324,7 +311,7 @@ PERF_TEST_P(Video_Cn, DISABLED_MOG2,
324311
//////////////////////////////////////////////////////
325312
// MOG2GetBackgroundImage
326313

327-
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
314+
#ifdef HAVE_VIDEO_INPUT
328315

329316
PERF_TEST_P(Video_Cn, MOG2GetBackgroundImage,
330317
Combine(Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"),

‎modules/cudabgsegm/test/test_bgsegm.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,10 @@
4646

4747
using namespace cvtest;
4848

49-
#if defined(HAVE_XINE) || \
50-
defined(HAVE_GSTREAMER) || \
51-
defined(HAVE_QUICKTIME) || \
52-
defined(HAVE_QTKIT) || \
53-
defined(HAVE_AVFOUNDATION) || \
54-
defined(HAVE_FFMPEG) || \
55-
defined(WIN32) /* assume that we have ffmpeg */
56-
57-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 1
58-
#else
59-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 0
60-
#endif
61-
6249
//////////////////////////////////////////////////////
6350
// MOG2
6451

65-
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
52+
#ifdef HAVE_VIDEO_INPUT
6653

6754
namespace
6855
{

‎modules/cudacodec/perf/perf_video.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,12 @@ using namespace std;
4747
using namespace testing;
4848
using namespace perf;
4949

50-
#if defined(HAVE_XINE) || \
51-
defined(HAVE_GSTREAMER) || \
52-
defined(HAVE_QUICKTIME) || \
53-
defined(HAVE_QTKIT) || \
54-
defined(HAVE_AVFOUNDATION) || \
55-
defined(HAVE_FFMPEG) || \
56-
defined(WIN32) /* assume that we have ffmpeg */
57-
58-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 1
59-
#else
60-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 0
61-
#endif
62-
6350
DEF_PARAM_TEST_1(FileName, string);
6451

6552
//////////////////////////////////////////////////////
6653
// VideoReader
6754

68-
#if defined(HAVE_NVCUVID) && BUILD_WITH_VIDEO_INPUT_SUPPORT
55+
#if defined(HAVE_NVCUVID) && defined(HAVE_VIDEO_INPUT)
6956

7057
PERF_TEST_P(FileName, VideoReader, Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"))
7158
{

‎modules/cudalegacy/perf/perf_bgsegm.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,10 @@ using namespace std;
5050
using namespace testing;
5151
using namespace perf;
5252

53-
#if defined(HAVE_XINE) || \
54-
defined(HAVE_GSTREAMER) || \
55-
defined(HAVE_QUICKTIME) || \
56-
defined(HAVE_QTKIT) || \
57-
defined(HAVE_AVFOUNDATION) || \
58-
defined(HAVE_FFMPEG) || \
59-
defined(WIN32) /* assume that we have ffmpeg */
60-
61-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 1
62-
#else
63-
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 0
64-
#endif
65-
6653
//////////////////////////////////////////////////////
6754
// FGDStatModel
6855

69-
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
56+
#ifdef HAVE_VIDEO_INPUT
7057

7158
DEF_PARAM_TEST_1(Video, string);
7259

@@ -136,7 +123,7 @@ PERF_TEST_P(Video, FGDStatModel,
136123
//////////////////////////////////////////////////////
137124
// GMG
138125

139-
#if BUILD_WITH_VIDEO_INPUT_SUPPORT
126+
#ifdef HAVE_VIDEO_INPUT
140127

141128
DEF_PARAM_TEST(Video_Cn_MaxFeatures, string, MatCn, int);
142129

0 commit comments

Comments
 (0)