generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove second argument from VideoCapture_Reading perf test

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-10 19:40:19 +04:00
parent d40083a926
commit d6a8753124
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/highgui/perf/perf_input.cpp
View File

@ -6,18 +6,15 @@ using namespace perf;
using std::tr1::make_tuple; using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
typedef std::tr1::tuple<String, bool> VideoCapture_Reading_t; typedef perf::TestBaseWithParam<String> VideoCapture_Reading;
typedef perf::TestBaseWithParam<VideoCapture_Reading_t> VideoCapture_Reading;
PERF_TEST_P(VideoCapture_Reading, ReadFile, PERF_TEST_P(VideoCapture_Reading, ReadFile, testing::Values( "highgui/video/big_buck_bunny.avi",
testing::Combine( testing::Values( "highgui/video/big_buck_bunny.avi",
"highgui/video/big_buck_bunny.mov", "highgui/video/big_buck_bunny.mov",
"highgui/video/big_buck_bunny.mp4", "highgui/video/big_buck_bunny.mp4",
"highgui/video/big_buck_bunny.mpg", "highgui/video/big_buck_bunny.mpg",
"highgui/video/big_buck_bunny.wmv" ), "highgui/video/big_buck_bunny.wmv" ) )
testing::Values(true, true, true, true, true) ))
{ {
string filename = getDataPath(get<0>(GetParam())); string filename = getDataPath(GetParam());
VideoCapture cap; VideoCapture cap;