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

Merge pull request #6798 from tomoaki0705:featureSSEvideoAcc

Browse Source
This commit is contained in:
Maksim Shabunin
2016-07-15 12:31:18 +00:00
parent 63d8290491 3c2f7ecc97
commit 91d80d0309
2 changed files with 1367 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1364
modules/imgproc/src/accum.cpp
View File

File diff suppressed because it is too large Load Diff

6
modules/video/test/test_accum.cpp
View File

@@ -72,11 +72,11 @@ void CV_AccumBaseTest::get_test_array_types_and_sizes( int test_case_idx,
vector<vector<Size> >& sizes, vector<vector<int> >& types ) vector<vector<Size> >& sizes, vector<vector<int> >& types )
{ {
RNG& rng = ts->get_rng(); RNG& rng = ts->get_rng();
int depth = cvtest::randInt(rng) % 3, cn = cvtest::randInt(rng) & 1 ? 3 : 1; int depth = cvtest::randInt(rng) % 4, cn = cvtest::randInt(rng) & 1 ? 3 : 1;
int accdepth = std::max((int)(cvtest::randInt(rng) % 2 + 1), depth); int accdepth = (int)(cvtest::randInt(rng) % 2 + 1);
int i, input_count = (int)test_array[INPUT].size(); int i, input_count = (int)test_array[INPUT].size();
cvtest::ArrayTest::get_test_array_types_and_sizes( test_case_idx, sizes, types ); cvtest::ArrayTest::get_test_array_types_and_sizes( test_case_idx, sizes, types );
depth = depth == 0 ? CV_8U : depth == 1 ? CV_32F : CV_64F; depth = depth == 0 ? CV_8U : depth == 1 ? CV_16U : depth == 2 ? CV_32F : CV_64F;
accdepth = accdepth == 1 ? CV_32F : CV_64F; accdepth = accdepth == 1 ? CV_32F : CV_64F;
accdepth = MAX(accdepth, depth); accdepth = MAX(accdepth, depth);