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

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

View File

@@ -55,6 +55,9 @@ public:
void CV_FramecountTest::run(int)
{
#if defined WIN32 || (defined __linux__ && !defined ANDROID)
#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
const int time_sec = 5, fps = 25;
const string ext[] = {"avi", "mov", "mp4", "mpg", "wmv"};
@@ -123,6 +126,9 @@ void CV_FramecountTest::run(int)
ts->printf(cvtest::TS::LOG, "\nSuccessfull experiments: %d (%d%%)\n", n-failed, (n - failed)*100/n);
ts->printf(cvtest::TS::LOG, "Failed experiments: %d (%d%%)\n", failed, failed*100/n);
#endif
#endif
}
TEST(HighguiFramecount, regression) {CV_FramecountTest test; test.safe_run();}