mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 06:49:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoio/MSMF: refactored format handling and selection, property reading and writing

Browse Source
This commit is contained in:
Maksim Shabunin 2020-02-07 15:03:20 +03:00
parent 6ad390a1cd
commit 6c8f50d1f3
2 changed files with 636 additions and 1132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1698
modules/videoio/src/cap_msmf.cpp
View File

File diff suppressed because it is too large Load Diff

10
modules/videoio/test/test_video_io.cpp
View File

@ -117,6 +117,8 @@ public:
for (int k = 0; k < n_frames; ++k) for (int k = 0; k < n_frames; ++k)
{ {
checkFrameRead(k, cap); checkFrameRead(k, cap);
if (::testing::Test::HasFailure() && k % 10 == 0)
break;
} }
} }
bool canSeek = false; bool canSeek = false;
@ -136,6 +138,8 @@ public:
for (int k = 0; k < n_frames; k += 20) for (int k = 0; k < n_frames; k += 20)
{ {
checkFrameSeek(k, cap); checkFrameSeek(k, cap);
if (::testing::Test::HasFailure() && k % 10 == 0)
break;
} }
} }
@ -148,6 +152,8 @@ public:
for (int k = 0; k < 10; ++k) for (int k = 0; k < 10; ++k)
{ {
checkFrameSeek(cvtest::TS::ptr()->get_rng().uniform(0, n_frames), cap); checkFrameSeek(cvtest::TS::ptr()->get_rng().uniform(0, n_frames), cap);
if (::testing::Test::HasFailure() && k % 10 == 0)
break;
} }
} }
} }
@ -215,6 +221,8 @@ public:
EXPECT_EQ(bunny_param.getWidth(), frame.cols); EXPECT_EQ(bunny_param.getWidth(), frame.cols);
EXPECT_EQ(bunny_param.getHeight(), frame.rows); EXPECT_EQ(bunny_param.getHeight(), frame.rows);
count_actual += 1; count_actual += 1;
if (::testing::Test::HasFailure() && count_actual % 10 == 0)
break;
} }
if (count_prop > 0) if (count_prop > 0)
{ {
@ -266,6 +274,8 @@ public:
{ {
generateFrame(i, frame_count, img); generateFrame(i, frame_count, img);
EXPECT_NO_THROW(writer << img); EXPECT_NO_THROW(writer << img);
if (::testing::Test::HasFailure() && i % 10 == 0)
break;
} }
EXPECT_NO_THROW(writer.release()); EXPECT_NO_THROW(writer.release());
} }