Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
a782ee93
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
a782ee93
编写于
7月 30, 2014
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
上级
dce1824a
eaec1320
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
91 addition
and
8 deletion
+91
-8
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp
+11
-8
modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h
modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h
+3
-0
modules/imgcodecs/src/grfmt_jpeg.cpp
modules/imgcodecs/src/grfmt_jpeg.cpp
+52
-0
modules/imgcodecs/test/test_grfmt.cpp
modules/imgcodecs/test/test_grfmt.cpp
+25
-0
未找到文件。
modules/imgcodecs/include/opencv2/imgcodecs.hpp
浏览文件 @
a782ee93
...
...
@@ -56,14 +56,17 @@ enum { IMREAD_UNCHANGED = -1, // 8bit, color or not
IMREAD_ANYCOLOR
=
4
// ?, any color
};
enum
{
IMWRITE_JPEG_QUALITY
=
1
,
IMWRITE_JPEG_PROGRESSIVE
=
2
,
IMWRITE_JPEG_OPTIMIZE
=
3
,
IMWRITE_PNG_COMPRESSION
=
16
,
IMWRITE_PNG_STRATEGY
=
17
,
IMWRITE_PNG_BILEVEL
=
18
,
IMWRITE_PXM_BINARY
=
32
,
IMWRITE_WEBP_QUALITY
=
64
enum
{
IMWRITE_JPEG_QUALITY
=
1
,
IMWRITE_JPEG_PROGRESSIVE
=
2
,
IMWRITE_JPEG_OPTIMIZE
=
3
,
IMWRITE_JPEG_RST_INTERVAL
=
4
,
IMWRITE_JPEG_LUMA_QUALITY
=
5
,
IMWRITE_JPEG_CHROMA_QUALITY
=
6
,
IMWRITE_PNG_COMPRESSION
=
16
,
IMWRITE_PNG_STRATEGY
=
17
,
IMWRITE_PNG_BILEVEL
=
18
,
IMWRITE_PXM_BINARY
=
32
,
IMWRITE_WEBP_QUALITY
=
64
};
enum
{
IMWRITE_PNG_STRATEGY_DEFAULT
=
0
,
...
...
modules/imgcodecs/include/opencv2/imgcodecs/imgcodecs_c.h
浏览文件 @
a782ee93
...
...
@@ -76,6 +76,9 @@ enum
CV_IMWRITE_JPEG_QUALITY
=
1
,
CV_IMWRITE_JPEG_PROGRESSIVE
=
2
,
CV_IMWRITE_JPEG_OPTIMIZE
=
3
,
CV_IMWRITE_JPEG_RST_INTERVAL
=
4
,
CV_IMWRITE_JPEG_LUMA_QUALITY
=
5
,
CV_IMWRITE_JPEG_CHROMA_QUALITY
=
6
,
CV_IMWRITE_PNG_COMPRESSION
=
16
,
CV_IMWRITE_PNG_STRATEGY
=
17
,
CV_IMWRITE_PNG_BILEVEL
=
18
,
...
...
modules/imgcodecs/src/grfmt_jpeg.cpp
浏览文件 @
a782ee93
...
...
@@ -600,6 +600,9 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
int
quality
=
95
;
int
progressive
=
0
;
int
optimize
=
0
;
int
rst_interval
=
0
;
int
luma_quality
=
-
1
;
int
chroma_quality
=
-
1
;
for
(
size_t
i
=
0
;
i
<
params
.
size
();
i
+=
2
)
{
...
...
@@ -618,15 +621,64 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
{
optimize
=
params
[
i
+
1
];
}
if
(
params
[
i
]
==
CV_IMWRITE_JPEG_LUMA_QUALITY
)
{
if
(
params
[
i
+
1
]
>=
0
)
{
luma_quality
=
MIN
(
MAX
(
params
[
i
+
1
],
0
),
100
);
quality
=
luma_quality
;
if
(
chroma_quality
<
0
)
{
chroma_quality
=
luma_quality
;
}
}
}
if
(
params
[
i
]
==
CV_IMWRITE_JPEG_CHROMA_QUALITY
)
{
if
(
params
[
i
+
1
]
>=
0
)
{
chroma_quality
=
MIN
(
MAX
(
params
[
i
+
1
],
0
),
100
);
}
}
if
(
params
[
i
]
==
CV_IMWRITE_JPEG_RST_INTERVAL
)
{
rst_interval
=
params
[
i
+
1
];
rst_interval
=
MIN
(
MAX
(
rst_interval
,
0
),
65535L
);
}
}
jpeg_set_defaults
(
&
cinfo
);
cinfo
.
restart_interval
=
rst_interval
;
jpeg_set_quality
(
&
cinfo
,
quality
,
TRUE
/* limit to baseline-JPEG values */
);
if
(
progressive
)
jpeg_simple_progression
(
&
cinfo
);
if
(
optimize
)
cinfo
.
optimize_coding
=
TRUE
;
#if JPEG_LIB_VERSION >= 70
if
(
luma_quality
>=
0
&&
chroma_quality
>=
0
)
{
cinfo
.
q_scale_factor
[
0
]
=
jpeg_quality_scaling
(
luma_quality
);
cinfo
.
q_scale_factor
[
1
]
=
jpeg_quality_scaling
(
chroma_quality
);
if
(
luma_quality
!=
chroma_quality
)
{
/* disable subsampling - ref. Libjpeg.txt */
cinfo
.
comp_info
[
0
].
v_samp_factor
=
1
;
cinfo
.
comp_info
[
0
].
h_samp_factor
=
1
;
cinfo
.
comp_info
[
1
].
v_samp_factor
=
1
;
cinfo
.
comp_info
[
1
].
h_samp_factor
=
1
;
}
jpeg_default_qtables
(
&
cinfo
,
TRUE
);
}
#endif // #if JPEG_LIB_VERSION >= 70
jpeg_start_compress
(
&
cinfo
,
TRUE
);
if
(
channels
>
1
)
...
...
modules/imgcodecs/test/test_grfmt.cpp
浏览文件 @
a782ee93
...
...
@@ -431,6 +431,31 @@ TEST(Imgcodecs_Jpeg, encode_decode_optimize_jpeg)
remove
(
output_optimized
.
c_str
());
}
TEST
(
Imgcodecs_Jpeg
,
encode_decode_rst_jpeg
)
{
cvtest
::
TS
&
ts
=
*
cvtest
::
TS
::
ptr
();
string
input
=
string
(
ts
.
get_data_path
())
+
"../cv/shared/lena.png"
;
cv
::
Mat
img
=
cv
::
imread
(
input
);
ASSERT_FALSE
(
img
.
empty
());
std
::
vector
<
int
>
params
;
params
.
push_back
(
IMWRITE_JPEG_RST_INTERVAL
);
params
.
push_back
(
1
);
string
output_rst
=
cv
::
tempfile
(
".jpg"
);
EXPECT_NO_THROW
(
cv
::
imwrite
(
output_rst
,
img
,
params
));
cv
::
Mat
img_jpg_rst
=
cv
::
imread
(
output_rst
);
string
output_normal
=
cv
::
tempfile
(
".jpg"
);
EXPECT_NO_THROW
(
cv
::
imwrite
(
output_normal
,
img
));
cv
::
Mat
img_jpg_normal
=
cv
::
imread
(
output_normal
);
EXPECT_EQ
(
0
,
cvtest
::
norm
(
img_jpg_rst
,
img_jpg_normal
,
NORM_INF
));
remove
(
output_rst
.
c_str
());
}
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录