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

Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat

Browse Source
This commit is contained in:
Roman Donchenko 2013-11-12 12:53:33 +04:00 committed by OpenCV Buildbot
commit 834705490e
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ocl/perf/perf_filters.cpp
View File

@ -366,8 +366,7 @@ PERF_TEST_P(BilateralFixture, Bilateral,
typedef Size_MatType adaptiveBilateralFixture;
PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral,
::testing::Combine(OCL_TYPICAL_MAT_SIZES,
OCL_PERF_ENUM(CV_8UC1, CV_8UC3)))
::testing::Combine(::testing::Values(OCL_SIZE_1000), OCL_PERF_ENUM(CV_8UC1, CV_8UC3)))
{
const Size_MatType_t params = GetParam();
const Size srcSize = get<0>(params);
@ -378,11 +377,6 @@ PERF_TEST_P(adaptiveBilateralFixture, adaptiveBilateral,
Mat src(srcSize, type), dst(srcSize, type);
declare.in(src, WARMUP_RNG).out(dst);
if (srcSize == OCL_SIZE_4000)
declare.time(type == CV_8UC3 ? 46 : 28);
else if (srcSize == OCL_SIZE_2000)
declare.time(type == CV_8UC3 ? 11 : 7);
if (RUN_OCL_IMPL)
{
ocl::oclMat oclSrc(src), oclDst(srcSize, type);