Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ed4c687d
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ed4c687d
编写于
1月 16, 2013
作者:
A
Anna Kogan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Increased time limits, eliminated extra params
上级
acb2cb5b
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
59 addition
and
32 deletion
+59
-32
modules/core/perf/perf_addWeighted.cpp
modules/core/perf/perf_addWeighted.cpp
+1
-1
modules/core/perf/perf_arithm.cpp
modules/core/perf/perf_arithm.cpp
+1
-1
modules/core/perf/perf_bitwise.cpp
modules/core/perf/perf_bitwise.cpp
+1
-1
modules/core/perf/perf_compare.cpp
modules/core/perf/perf_compare.cpp
+1
-1
modules/core/perf/perf_convertTo.cpp
modules/core/perf/perf_convertTo.cpp
+1
-0
modules/core/perf/perf_norm.cpp
modules/core/perf/perf_norm.cpp
+2
-1
modules/imgproc/perf/perf_blur.cpp
modules/imgproc/perf/perf_blur.cpp
+2
-2
modules/imgproc/perf/perf_cvt_color.cpp
modules/imgproc/perf/perf_cvt_color.cpp
+37
-7
modules/imgproc/perf/perf_filter2d.cpp
modules/imgproc/perf/perf_filter2d.cpp
+1
-1
modules/imgproc/perf/perf_houghLines.cpp
modules/imgproc/perf/perf_houghLines.cpp
+1
-1
modules/imgproc/perf/perf_integral.cpp
modules/imgproc/perf/perf_integral.cpp
+4
-4
modules/imgproc/perf/perf_resize.cpp
modules/imgproc/perf/perf_resize.cpp
+1
-1
modules/imgproc/perf/perf_threshold.cpp
modules/imgproc/perf/perf_threshold.cpp
+1
-1
modules/imgproc/perf/perf_warp.cpp
modules/imgproc/perf/perf_warp.cpp
+1
-6
modules/photo/perf/perf_inpaint.cpp
modules/photo/perf/perf_inpaint.cpp
+1
-1
modules/stitching/perf/perf_stich.cpp
modules/stitching/perf/perf_stich.cpp
+1
-1
modules/video/perf/perf_optflowpyrlk.cpp
modules/video/perf/perf_optflowpyrlk.cpp
+2
-2
未找到文件。
modules/core/perf/perf_addWeighted.cpp
浏览文件 @
ed4c687d
...
...
@@ -6,7 +6,7 @@ using namespace perf;
using
std
::
tr1
::
make_tuple
;
using
std
::
tr1
::
get
;
#define TYPICAL_MAT_TYPES_ADWEIGHTED CV_8UC1, CV_8UC4, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1
, CV_32SC4
#define TYPICAL_MAT_TYPES_ADWEIGHTED CV_8UC1, CV_8UC4, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1
#define TYPICAL_MATS_ADWEIGHTED testing::Combine(testing::Values(szVGA, sz720p, sz1080p), testing::Values(TYPICAL_MAT_TYPES_ADWEIGHTED))
PERF_TEST_P
(
Size_MatType
,
addWeighted
,
TYPICAL_MATS_ADWEIGHTED
)
...
...
modules/core/perf/perf_arithm.cpp
浏览文件 @
ed4c687d
...
...
@@ -6,7 +6,7 @@ using namespace perf;
using
std
::
tr1
::
make_tuple
;
using
std
::
tr1
::
get
;
#define TYPICAL_MAT_SIZES_CORE_ARITHM
TYPICAL_MAT_SIZES
#define TYPICAL_MAT_SIZES_CORE_ARITHM
::szVGA, ::sz720p, ::sz1080p
#define TYPICAL_MAT_TYPES_CORE_ARITHM CV_8UC1, CV_8SC1, CV_16SC1, CV_16SC2, CV_16SC3, CV_16SC4, CV_8UC4, CV_32SC1, CV_32FC1
#define TYPICAL_MATS_CORE_ARITHM testing::Combine( testing::Values( TYPICAL_MAT_SIZES_CORE_ARITHM ), testing::Values( TYPICAL_MAT_TYPES_CORE_ARITHM ) )
...
...
modules/core/perf/perf_bitwise.cpp
浏览文件 @
ed4c687d
...
...
@@ -19,7 +19,7 @@ PERF_TEST_P(Size_MatType, bitwise_not, TYPICAL_MATS_BITW_ARITHM)
cv
::
Mat
c
=
Mat
(
sz
,
type
);
declare
.
in
(
a
,
WARMUP_RNG
).
out
(
c
);
declare
.
time
(
1
00
);
declare
.
iterations
(
2
00
);
TEST_CYCLE
()
cv
::
bitwise_not
(
a
,
c
);
...
...
modules/core/perf/perf_compare.cpp
浏览文件 @
ed4c687d
...
...
@@ -13,7 +13,7 @@ typedef perf::TestBaseWithParam<Size_MatType_CmpType_t> Size_MatType_CmpType;
PERF_TEST_P
(
Size_MatType_CmpType
,
compare
,
testing
::
Combine
(
testing
::
Values
(
TYPICAL_MAT_SIZES
),
testing
::
Values
(
::
perf
::
szVGA
,
::
perf
::
sz1080p
),
testing
::
Values
(
CV_8UC1
,
CV_8UC4
,
CV_8SC1
,
CV_16UC1
,
CV_16SC1
,
CV_32SC1
,
CV_32FC1
),
testing
::
ValuesIn
(
CmpType
::
all
())
)
...
...
modules/core/perf/perf_convertTo.cpp
浏览文件 @
ed4c687d
...
...
@@ -29,6 +29,7 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo,
Mat
src
(
sz
,
CV_MAKETYPE
(
depthSrc
,
channels
));
randu
(
src
,
0
,
255
);
Mat
dst
(
sz
,
CV_MAKETYPE
(
depthDst
,
channels
));
declare
.
iterations
(
500
);
TEST_CYCLE
()
src
.
convertTo
(
dst
,
depthDst
,
alpha
);
...
...
modules/core/perf/perf_norm.cpp
浏览文件 @
ed4c687d
...
...
@@ -131,7 +131,7 @@ PERF_TEST_P(Size_MatType_NormType, normalize,
PERF_TEST_P
(
Size_MatType_NormType
,
normalize_mask
,
testing
::
Combine
(
testing
::
Values
(
TYPICAL_MAT_SIZES
),
testing
::
Values
(
::
perf
::
szVGA
,
::
perf
::
sz1080p
),
testing
::
Values
(
TYPICAL_MAT_TYPES
),
testing
::
Values
((
int
)
NORM_INF
,
(
int
)
NORM_L1
,
(
int
)
NORM_L2
)
)
...
...
@@ -192,6 +192,7 @@ PERF_TEST_P( Size_MatType, normalize_minmax, TYPICAL_MATS )
Mat
dst
(
sz
,
matType
);
declare
.
in
(
src
,
WARMUP_RNG
).
out
(
dst
);
declare
.
time
(
30
);
TEST_CYCLE
()
normalize
(
src
,
dst
,
20.
,
100.
,
NORM_MINMAX
);
...
...
modules/imgproc/perf/perf_blur.cpp
浏览文件 @
ed4c687d
...
...
@@ -90,7 +90,7 @@ PERF_TEST_P(Size_MatType_BorderType3x3, blur3x3,
PERF_TEST_P
(
Size_MatType_BorderType
,
blur16x16
,
testing
::
Combine
(
testing
::
Values
(
sz
ODD
,
szQVGA
,
sz
VGA
,
sz720p
),
testing
::
Values
(
szVGA
,
sz720p
),
testing
::
Values
(
CV_8UC1
,
CV_8UC4
,
CV_16UC1
,
CV_16SC1
,
CV_32FC1
),
testing
::
ValuesIn
(
BorderType
::
all
())
)
...
...
@@ -184,7 +184,7 @@ PERF_TEST_P(Size_MatType_BorderType, gaussianBlur5x5,
PERF_TEST_P
(
Size_MatType_BorderType
,
blur5x5
,
testing
::
Combine
(
testing
::
Values
(
sz
ODD
,
szQVGA
,
sz
VGA
,
sz720p
),
testing
::
Values
(
szVGA
,
sz720p
),
testing
::
Values
(
CV_8UC1
,
CV_8UC4
,
CV_16UC1
,
CV_16SC1
,
CV_32FC1
,
CV_32FC3
),
testing
::
ValuesIn
(
BorderType
::
all
())
)
...
...
modules/imgproc/perf/perf_cvt_color.cpp
浏览文件 @
ed4c687d
...
...
@@ -56,11 +56,6 @@ enum
};
CV_ENUM
(
CvtMode
,
CV_BayerBG2BGR
,
CV_BayerBG2BGR_VNG
,
CV_BayerBG2GRAY
,
CV_BayerGB2BGR
,
CV_BayerGB2BGR_VNG
,
CV_BayerGB2GRAY
,
CV_BayerGR2BGR
,
CV_BayerGR2BGR_VNG
,
CV_BayerGR2GRAY
,
CV_BayerRG2BGR
,
CV_BayerRG2BGR_VNG
,
CV_BayerRG2GRAY
,
CV_BGR2BGR555
,
CV_BGR2BGR565
,
CV_BGR2BGRA
,
CV_BGR2GRAY
,
CV_BGR2HLS
,
CV_BGR2HLS_FULL
,
CV_BGR2HSV
,
CV_BGR2HSV_FULL
,
CV_BGR2Lab
,
CV_BGR2Luv
,
CV_BGR2RGB
,
CV_BGR2RGBA
,
CV_BGR2XYZ
,
...
...
@@ -106,6 +101,15 @@ CV_ENUM(CvtMode,
CV_YUV2BGR
,
CV_YUV2RGB
,
CX_YUV2BGRA
,
CX_YUV2RGBA
)
CV_ENUM
(
CvtModeBayer
,
CV_BayerBG2BGR
,
CV_BayerBG2BGR_VNG
,
CV_BayerBG2GRAY
,
CV_BayerGB2BGR
,
CV_BayerGB2BGR_VNG
,
CV_BayerGB2GRAY
,
CV_BayerGR2BGR
,
CV_BayerGR2BGR_VNG
,
CV_BayerGR2GRAY
,
CV_BayerRG2BGR
,
CV_BayerRG2BGR_VNG
,
CV_BayerRG2GRAY
)
CV_ENUM
(
CvtMode2
,
CV_YUV2BGR_NV12
,
CV_YUV2BGRA_NV12
,
CV_YUV2RGB_NV12
,
CV_YUV2RGBA_NV12
,
CV_YUV2BGR_NV21
,
CV_YUV2BGRA_NV21
,
CV_YUV2RGB_NV21
,
CV_YUV2RGBA_NV21
,
CV_YUV2BGR_YV12
,
CV_YUV2BGRA_YV12
,
CV_YUV2RGB_YV12
,
CV_YUV2RGBA_YV12
,
CV_YUV2BGR_IYUV
,
CV_YUV2BGRA_IYUV
,
CV_YUV2RGB_IYUV
,
CV_YUV2RGBA_IYUV
,
COLOR_YUV2GRAY_420
,
CV_YUV2RGB_UYVY
,
CV_YUV2BGR_UYVY
,
CV_YUV2RGBA_UYVY
,
CV_YUV2BGRA_UYVY
,
CV_YUV2RGB_YUY2
,
CV_YUV2BGR_YUY2
,
CV_YUV2RGB_YVYU
,
...
...
@@ -231,7 +235,7 @@ typedef perf::TestBaseWithParam<Size_CvtMode_t> Size_CvtMode;
PERF_TEST_P
(
Size_CvtMode
,
cvtColor8u
,
testing
::
Combine
(
testing
::
Values
(
TYPICAL_MAT_SIZES
),
testing
::
Values
(
::
perf
::
szODD
,
::
perf
::
szVGA
,
::
perf
::
sz1080p
),
testing
::
ValuesIn
(
CvtMode
::
all
())
)
)
...
...
@@ -252,12 +256,38 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u,
SANITY_CHECK
(
dst
,
1
);
}
typedef
std
::
tr1
::
tuple
<
Size
,
CvtModeBayer
>
Size_CvtMode_Bayer_t
;
typedef
perf
::
TestBaseWithParam
<
Size_CvtMode_Bayer_t
>
Size_CvtMode_Bayer
;
PERF_TEST_P
(
Size_CvtMode_Bayer
,
cvtColorBayer8u
,
testing
::
Combine
(
testing
::
Values
(
::
perf
::
szODD
,
::
perf
::
szVGA
),
testing
::
ValuesIn
(
CvtModeBayer
::
all
())
)
)
{
Size
sz
=
get
<
0
>
(
GetParam
());
int
mode
=
get
<
1
>
(
GetParam
());
ChPair
ch
=
getConversionInfo
(
mode
);
mode
%=
CV_COLORCVT_MAX
;
Mat
src
(
sz
,
CV_8UC
(
ch
.
scn
));
Mat
dst
(
sz
,
CV_8UC
(
ch
.
dcn
));
declare
.
time
(
100
);
declare
.
in
(
src
,
WARMUP_RNG
).
out
(
dst
);
TEST_CYCLE
()
cvtColor
(
src
,
dst
,
mode
,
ch
.
dcn
);
SANITY_CHECK
(
dst
,
1
);
}
typedef
std
::
tr1
::
tuple
<
Size
,
CvtMode2
>
Size_CvtMode2_t
;
typedef
perf
::
TestBaseWithParam
<
Size_CvtMode2_t
>
Size_CvtMode2
;
PERF_TEST_P
(
Size_CvtMode2
,
cvtColorYUV420
,
testing
::
Combine
(
testing
::
Values
(
szVGA
,
sz
720p
,
sz
1080p
,
Size
(
130
,
60
)),
testing
::
Values
(
szVGA
,
sz1080p
,
Size
(
130
,
60
)),
testing
::
ValuesIn
(
CvtMode2
::
all
())
)
)
...
...
modules/imgproc/perf/perf_filter2d.cpp
浏览文件 @
ed4c687d
...
...
@@ -15,7 +15,7 @@ typedef TestBaseWithParam< tr1::tuple<String, int> > Image_KernelSize;
PERF_TEST_P
(
TestFilter2d
,
Filter2d
,
Combine
(
Values
(
Size
(
320
,
240
),
sz
VGA
,
sz720p
,
sz
1080p
),
Values
(
Size
(
320
,
240
),
sz1080p
),
Values
(
3
,
5
),
ValuesIn
(
BorderMode
::
all
()
)
)
...
...
modules/imgproc/perf/perf_houghLines.cpp
浏览文件 @
ed4c687d
...
...
@@ -32,7 +32,7 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
Canny
(
image
,
image
,
0
,
0
);
Mat
lines
;
declare
.
time
(
4
0
);
declare
.
time
(
6
0
);
TEST_CYCLE
()
HoughLines
(
image
,
lines
,
rhoStep
,
thetaStep
,
threshold
);
...
...
modules/imgproc/perf/perf_integral.cpp
浏览文件 @
ed4c687d
...
...
@@ -33,9 +33,9 @@ PERF_TEST_P(Size_MatType_OutMatDepth, integral,
PERF_TEST_P
(
Size_MatType_OutMatDepth
,
integral_sqsum
,
testing
::
Combine
(
testing
::
Values
(
TYPICAL_MAT_SIZES
),
testing
::
Values
(
::
perf
::
szVGA
,
::
perf
::
sz1080p
),
testing
::
Values
(
CV_8UC1
,
CV_8UC4
),
testing
::
Values
(
CV_32S
,
CV_32F
,
CV_64F
)
testing
::
Values
(
CV_32S
,
CV_32F
)
)
)
{
...
...
@@ -58,9 +58,9 @@ PERF_TEST_P(Size_MatType_OutMatDepth, integral_sqsum,
PERF_TEST_P
(
Size_MatType_OutMatDepth
,
integral_sqsum_tilted
,
testing
::
Combine
(
testing
::
Values
(
TYPICAL_MAT_SIZES
),
testing
::
Values
(
::
perf
::
szVGA
,
::
perf
::
szODD
,
::
perf
::
sz1080p
),
testing
::
Values
(
CV_8UC1
,
CV_8UC4
),
testing
::
Values
(
CV_32S
,
CV_32F
,
CV_64F
)
testing
::
Values
(
CV_32S
,
CV_32F
)
)
)
{
...
...
modules/imgproc/perf/perf_resize.cpp
浏览文件 @
ed4c687d
...
...
@@ -97,7 +97,7 @@ typedef TestBaseWithParam<tr1::tuple<MatType, Size, double> > MatInfo_Size_Scale
PERF_TEST_P
(
MatInfo_Size_Scale_Area
,
ResizeArea
,
testing
::
Combine
(
testing
::
Values
(
CV_8UC1
,
CV_8UC4
),
testing
::
Values
(
szVGA
,
szqHD
,
sz720p
,
sz1080p
),
testing
::
Values
(
szVGA
,
szqHD
,
sz720p
),
testing
::
Values
(
2.4
,
3.4
,
1.3
)
)
)
...
...
modules/imgproc/perf/perf_threshold.cpp
浏览文件 @
ed4c687d
...
...
@@ -31,7 +31,7 @@ PERF_TEST_P(Size_MatType_ThreshType, threshold,
double
maxval
=
theRNG
().
uniform
(
1
,
254
);
declare
.
in
(
src
,
WARMUP_RNG
).
out
(
dst
);
declare
.
time
(
1
00
);
declare
.
iterations
(
5
00
);
TEST_CYCLE
()
threshold
(
src
,
dst
,
thresh
,
maxval
,
threshType
);
...
...
modules/imgproc/perf/perf_warp.cpp
浏览文件 @
ed4c687d
...
...
@@ -90,12 +90,7 @@ PERF_TEST_P( TestWarpPerspective, WarpPerspective,
PERF_TEST_P
(
TestWarpPerspectiveNear_t
,
WarpPerspectiveNear
,
Combine
(
Values
(
Size
(
176
,
144
),
Size
(
320
,
240
),
Size
(
352
,
288
),
Size
(
480
,
480
),
Size
(
640
,
480
),
Size
(
704
,
576
),
Size
(
720
,
408
),
Size
(
720
,
480
),
Size
(
720
,
576
),
Size
(
768
,
432
),
Size
(
800
,
448
),
Size
(
960
,
720
),
Size
(
1024
,
768
),
Size
(
1280
,
720
),
Size
(
1280
,
960
),
Size
(
1360
,
720
),
Size
(
1600
,
1200
),
Size
(
1920
,
1080
),
Size
(
2048
,
1536
),
Size
(
2592
,
1920
),
Size
(
2592
,
1944
),
Size
(
3264
,
2448
),
Size
(
4096
,
3072
),
Size
(
4208
,
3120
)
),
Values
(
Size
(
640
,
480
),
Size
(
1920
,
1080
),
Size
(
2592
,
1944
)
),
ValuesIn
(
InterType
::
all
()
),
ValuesIn
(
BorderMode
::
all
()
),
Values
(
CV_8UC1
,
CV_8UC4
)
...
...
modules/photo/perf/perf_inpaint.cpp
浏览文件 @
ed4c687d
...
...
@@ -13,7 +13,7 @@ typedef perf::TestBaseWithParam<InpaintArea_InpaintingMethod_t> InpaintArea_Inpa
PERF_TEST_P
(
InpaintArea_InpaintingMethod
,
inpaint
,
testing
::
Combine
(
SZ_ALL_SMALL
,
testing
::
Values
(
::
perf
::
szSmall24
,
::
perf
::
szSmall32
,
::
perf
::
szSmall64
)
,
testing
::
ValuesIn
(
InpaintingMethod
::
all
())
)
)
...
...
modules/stitching/perf/perf_stich.cpp
浏览文件 @
ed4c687d
...
...
@@ -154,7 +154,7 @@ PERF_TEST_P( match, bestOf2Nearest, TEST_DETECTORS)
PERF_TEST_P
(
matchVector
,
bestOf2NearestVectorFeatures
,
testing
::
Combine
(
TEST_DETECTORS
,
testing
::
Values
(
2
,
4
,
6
,
8
))
testing
::
Values
(
2
,
4
,
8
))
)
{
Mat
img1
,
img1_full
=
imread
(
getDataPath
(
"stitching/b1.png"
)
);
...
...
modules/video/perf/perf_optflowpyrlk.cpp
浏览文件 @
ed4c687d
...
...
@@ -33,7 +33,7 @@ PERF_TEST_P(Path_Idx_Cn_NPoints_WSize, OpticalFlowPyrLK_full, testing::Combine(
testing
::
Range
(
1
,
3
),
testing
::
Values
(
1
,
3
,
4
),
testing
::
Values
(
make_tuple
(
9
,
9
),
make_tuple
(
15
,
15
)),
testing
::
Values
(
7
,
11
,
25
)
testing
::
Values
(
7
,
11
)
)
)
{
...
...
@@ -105,7 +105,7 @@ PERF_TEST_P(Path_Idx_Cn_NPoints_WSize_Deriv, OpticalFlowPyrLK_self, testing::Com
testing
::
Range
(
1
,
3
),
testing
::
Values
(
1
,
3
,
4
),
testing
::
Values
(
make_tuple
(
9
,
9
),
make_tuple
(
15
,
15
)),
testing
::
Values
(
7
,
11
,
25
),
testing
::
Values
(
7
,
11
),
testing
::
Bool
()
)
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录