merged all the latest changes from 2.4 to trunk
This commit is contained in:
27
modules/highgui/perf/perf_input.cpp
Normal file
27
modules/highgui/perf/perf_input.cpp
Normal file
@@ -0,0 +1,27 @@
|
||||
#include "perf_precomp.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace cv;
|
||||
using namespace perf;
|
||||
using std::tr1::make_tuple;
|
||||
using std::tr1::get;
|
||||
|
||||
typedef std::tr1::tuple<String, bool> VideoCapture_Reading_t;
|
||||
typedef perf::TestBaseWithParam<VideoCapture_Reading_t> VideoCapture_Reading;
|
||||
|
||||
PERF_TEST_P(VideoCapture_Reading, ReadFile,
|
||||
testing::Combine( 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) ))
|
||||
{
|
||||
string filename = getDataPath(get<0>(GetParam()));
|
||||
|
||||
VideoCapture cap;
|
||||
|
||||
TEST_CYCLE() cap.open(filename);
|
||||
|
||||
SANITY_CHECK(cap.isOpened());
|
||||
}
|
3
modules/highgui/perf/perf_main.cpp
Normal file
3
modules/highgui/perf/perf_main.cpp
Normal file
@@ -0,0 +1,3 @@
|
||||
#include "perf_precomp.hpp"
|
||||
|
||||
CV_PERF_TEST_MAIN(highgui)
|
29
modules/highgui/perf/perf_output.cpp
Normal file
29
modules/highgui/perf/perf_output.cpp
Normal file
@@ -0,0 +1,29 @@
|
||||
#include "perf_precomp.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace cv;
|
||||
using namespace perf;
|
||||
using std::tr1::make_tuple;
|
||||
using std::tr1::get;
|
||||
|
||||
typedef std::tr1::tuple<String, bool> VideoWriter_Writing_t;
|
||||
typedef perf::TestBaseWithParam<VideoWriter_Writing_t> VideoWriter_Writing;
|
||||
|
||||
PERF_TEST_P(VideoWriter_Writing, WriteFrame,
|
||||
testing::Combine( testing::Values( "python/images/QCIF_00.bmp",
|
||||
"python/images/QCIF_01.bmp",
|
||||
"python/images/QCIF_02.bmp",
|
||||
"python/images/QCIF_03.bmp",
|
||||
"python/images/QCIF_04.bmp",
|
||||
"python/images/QCIF_05.bmp" ),
|
||||
testing::Bool()))
|
||||
{
|
||||
string filename = getDataPath(get<0>(GetParam()));
|
||||
bool isColor = get<1>(GetParam());
|
||||
|
||||
VideoWriter writer("perf_writer.avi", CV_FOURCC('X', 'V', 'I', 'D'), 25, cv::Size(640, 480), isColor);
|
||||
|
||||
TEST_CYCLE() { Mat image = imread(filename, 1); writer << image; }
|
||||
|
||||
SANITY_CHECK(writer.isOpened());
|
||||
}
|
1
modules/highgui/perf/perf_precomp.cpp
Normal file
1
modules/highgui/perf/perf_precomp.cpp
Normal file
@@ -0,0 +1 @@
|
||||
#include "perf_precomp.hpp"
|
11
modules/highgui/perf/perf_precomp.hpp
Normal file
11
modules/highgui/perf/perf_precomp.hpp
Normal file
@@ -0,0 +1,11 @@
|
||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||
#define __OPENCV_PERF_PRECOMP_HPP__
|
||||
|
||||
#include "opencv2/ts/ts.hpp"
|
||||
#include "opencv2/highgui/highgui.hpp"
|
||||
|
||||
#if GTEST_CREATE_SHARED_LIBRARY
|
||||
#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
|
||||
#endif
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user