potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

unrolled changes from r7601 (problems with Android,...)

Browse Source
This commit is contained in:
Alexander Shishkov
2012-03-22 13:36:07 +00:00
parent 23619718ed
commit fc68c18c92
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/test/test_video_io.cpp
+18
View File
@@ -633,6 +633,9 @@ void CV_SpecificImageTest::run(int)
void CV_VideoTest::run(int)
{
#if defined WIN32 || (defined __linux__ && !defined ANDROID)
#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
const char codecs[][4] = { {'I', 'Y', 'U', 'V'},
{'X', 'V', 'I', 'D'},
{'M', 'P', 'G', '2'},
@@ -646,10 +649,16 @@ void CV_VideoTest::run(int)
{
VideoTest(ts->get_data_path(), CV_FOURCC(codecs[i][0], codecs[i][1], codecs[i][2], codecs[i][3]));
}
#endif
#endif
}
void CV_SpecificVideoFileTest::run(int)
{
#if defined WIN32 || (defined __linux__ && !defined ANDROID)
#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
const char codecs[][4] = { {'M', 'P', 'G', '2'},
{'X', 'V', 'I', 'D'},
{'M', 'J', 'P', 'G'},
@@ -661,10 +670,16 @@ void CV_SpecificVideoFileTest::run(int)
{
SpecificVideoFileTest(ts->get_data_path(), codecs[i]);
}
#endif
#endif
}
void CV_SpecificVideoCameraTest::run(int)
{
#if defined WIN32 || (defined __linux__ && !defined ANDROID)
#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
const char codecs[][4] = { {'M', 'P', 'G', '2'},
{'X', 'V', 'I', 'D'},
{'M', 'J', 'P', 'G'},
@@ -676,6 +691,9 @@ void CV_SpecificVideoCameraTest::run(int)
{
SpecificVideoCameraTest(ts->get_data_path(), codecs[i]);
}
#endif
#endif
}
TEST(Highgui_Image, regression) { CV_ImageTest test; test.safe_run(); }