Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15263 from alalek:videoio_skip_msmf_tests3

Browse Source
pull/15292/head
Alexander Alekhin 6 years ago
parent 6f267be6f1 a77275e650
commit 596b8a5d06
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/videoio/test/test_video_io.cpp

4
modules/videoio/test/test_video_io.cpp
Unescape View File

@ -83,7 +83,7 @@ public:
{ {
if (!isBackendAvailable(apiPref, cv::videoio_registry::getStreamBackends())) if (!isBackendAvailable(apiPref, cv::videoio_registry::getStreamBackends()))
throw SkipTestException(cv::String("Backend is not available/disabled: ") + cv::videoio_registry::getBackendName(apiPref)); throw SkipTestException(cv::String("Backend is not available/disabled: ") + cv::videoio_registry::getBackendName(apiPref));
if (cvtest::skipUnstableTests && apiPref == CAP_MSMF && (ext == "h264" || ext == "h265")) if (cvtest::skipUnstableTests && apiPref == CAP_MSMF && (ext == "h264" || ext == "h265" || ext == "mpg"))
throw SkipTestException("Unstable MSMF test"); throw SkipTestException("Unstable MSMF test");
VideoCapture cap; VideoCapture cap;
ASSERT_NO_THROW(cap.open(video_file, apiPref)); ASSERT_NO_THROW(cap.open(video_file, apiPref));
@ -170,7 +170,7 @@ public:
{ {
if (!isBackendAvailable(apiPref, cv::videoio_registry::getStreamBackends())) if (!isBackendAvailable(apiPref, cv::videoio_registry::getStreamBackends()))
throw SkipTestException(cv::String("Backend is not available/disabled: ") + cv::videoio_registry::getBackendName(apiPref)); throw SkipTestException(cv::String("Backend is not available/disabled: ") + cv::videoio_registry::getBackendName(apiPref));
if (cvtest::skipUnstableTests && apiPref == CAP_MSMF && (ext == "h264" || ext == "h265")) if (cvtest::skipUnstableTests && apiPref == CAP_MSMF && (ext == "h264" || ext == "h265" || ext == "mpg"))
throw SkipTestException("Unstable MSMF test"); throw SkipTestException("Unstable MSMF test");
VideoCapture cap; VideoCapture cap;
EXPECT_NO_THROW(cap.open(video_file, apiPref)); EXPECT_NO_THROW(cap.open(video_file, apiPref));

Write Preview
Loading…
Cancel
Save