From d6a87531249125c790c723f865f0e16f0c6f9794 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 10 Oct 2012 19:40:19 +0400 Subject: [PATCH] Remove second argument from VideoCapture_Reading perf test --- modules/highgui/perf/perf_input.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/highgui/perf/perf_input.cpp b/modules/highgui/perf/perf_input.cpp index 79f864c8e3..06e3c2c928 100644 --- a/modules/highgui/perf/perf_input.cpp +++ b/modules/highgui/perf/perf_input.cpp @@ -6,18 +6,15 @@ using namespace perf; using std::tr1::make_tuple; using std::tr1::get; -typedef std::tr1::tuple VideoCapture_Reading_t; -typedef perf::TestBaseWithParam VideoCapture_Reading; +typedef perf::TestBaseWithParam VideoCapture_Reading; -PERF_TEST_P(VideoCapture_Reading, ReadFile, - testing::Combine( testing::Values( "highgui/video/big_buck_bunny.avi", +PERF_TEST_P(VideoCapture_Reading, ReadFile, testing::Values( "highgui/video/big_buck_bunny.avi", "highgui/video/big_buck_bunny.mov", "highgui/video/big_buck_bunny.mp4", "highgui/video/big_buck_bunny.mpg", - "highgui/video/big_buck_bunny.wmv" ), - testing::Values(true, true, true, true, true) )) + "highgui/video/big_buck_bunny.wmv" ) ) { - string filename = getDataPath(get<0>(GetParam())); + string filename = getDataPath(GetParam()); VideoCapture cap;