Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
d84d3a51
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,发现更多精彩内容 >>
提交
d84d3a51
编写于
1月 15, 2015
作者:
S
soyer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow YUYV capture via libv4l
上级
b2a5e66f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
12 deletion
+21
-12
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/include/opencv2/videoio.hpp
+2
-1
modules/videoio/include/opencv2/videoio/videoio_c.h
modules/videoio/include/opencv2/videoio/videoio_c.h
+2
-1
modules/videoio/src/cap_libv4l.cpp
modules/videoio/src/cap_libv4l.cpp
+17
-10
未找到文件。
modules/videoio/include/opencv2/videoio.hpp
浏览文件 @
d84d3a51
...
...
@@ -136,7 +136,8 @@ enum { CAP_PROP_POS_MSEC =0,
// Currently, these are supported through the libv4l interface only.
enum
{
CAP_MODE_BGR
=
0
,
// BGR24 (default)
CAP_MODE_RGB
=
1
,
// RGB24
CAP_MODE_GRAY
=
2
// Y8
CAP_MODE_GRAY
=
2
,
// Y8
CAP_MODE_YUYV
=
3
// YUYV
};
...
...
modules/videoio/include/opencv2/videoio/videoio_c.h
浏览文件 @
d84d3a51
...
...
@@ -299,7 +299,8 @@ enum
{
CV_CAP_MODE_BGR
=
0
,
// BGR24 (default)
CV_CAP_MODE_RGB
=
1
,
// RGB24
CV_CAP_MODE_GRAY
=
2
// Y8
CV_CAP_MODE_GRAY
=
2
,
// Y8
CV_CAP_MODE_YUYV
=
3
// YUYV
};
enum
...
...
modules/videoio/src/cap_libv4l.cpp
浏览文件 @
d84d3a51
...
...
@@ -646,6 +646,8 @@ static inline int channels_for_mode(int mode)
switch
(
mode
)
{
case
CV_CAP_MODE_GRAY
:
return
1
;
case
CV_CAP_MODE_YUYV
:
return
2
;
default:
return
3
;
}
...
...
@@ -713,31 +715,26 @@ static int _capture_V4L2 (CvCaptureCAM_V4L *capture, char *deviceName)
/* libv4l will convert from any format to V4L2_PIX_FMT_BGR24,
V4L2_PIX_FMT_RGV24, or V4L2_PIX_FMT_YUV420 */
unsigned
int
requestedPixelFormat
;
int
width
;
int
height
;
switch
(
capture
->
mode
)
{
case
CV_CAP_MODE_RGB
:
requestedPixelFormat
=
V4L2_PIX_FMT_RGB24
;
width
=
capture
->
width
;
height
=
capture
->
height
;
break
;
case
CV_CAP_MODE_GRAY
:
requestedPixelFormat
=
V4L2_PIX_FMT_YUV420
;
width
=
capture
->
width
;
height
=
capture
->
height
;
break
;
case
CV_CAP_MODE_YUYV
:
requestedPixelFormat
=
V4L2_PIX_FMT_YUYV
;
break
;
default:
requestedPixelFormat
=
V4L2_PIX_FMT_BGR24
;
width
=
capture
->
width
;
height
=
capture
->
height
;
break
;
}
CLEAR
(
capture
->
form
);
capture
->
form
.
type
=
V4L2_BUF_TYPE_VIDEO_CAPTURE
;
capture
->
form
.
fmt
.
pix
.
pixelformat
=
requestedPixelFormat
;
capture
->
form
.
fmt
.
pix
.
field
=
V4L2_FIELD_ANY
;
capture
->
form
.
fmt
.
pix
.
width
=
width
;
capture
->
form
.
fmt
.
pix
.
height
=
height
;
capture
->
form
.
fmt
.
pix
.
width
=
capture
->
width
;
capture
->
form
.
fmt
.
pix
.
height
=
capture
->
height
;
if
(
-
1
==
xioctl
(
capture
->
deviceHandle
,
VIDIOC_S_FMT
,
&
capture
->
form
))
{
fprintf
(
stderr
,
"VIDEOIO ERROR: libv4l unable to ioctl S_FMT
\n
"
);
...
...
@@ -949,6 +946,10 @@ static int _capture_V4L (CvCaptureCAM_V4L *capture, char *deviceName)
requestedVideoPalette
=
VIDEO_PALETTE_YUV420
;
depth
=
8
;
break
;
case
CV_CAP_MODE_YUYV
:
requestedVideoPalette
=
VIDEO_PALETTE_YUYV
;
depth
=
16
;
break
;
default:
requestedVideoPalette
=
VIDEO_PALETTE_RGB24
;
depth
=
24
;
...
...
@@ -1319,6 +1320,7 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
switch
(
capture
->
imageProperties
.
palette
)
{
case
VIDEO_PALETTE_RGB24
:
case
VIDEO_PALETTE_YUV420
:
case
VIDEO_PALETTE_YUYV
:
memcpy
((
char
*
)
capture
->
frame
.
imageData
,
(
char
*
)(
capture
->
memoryMap
+
capture
->
memoryBuffer
.
offsets
[
capture
->
bufferIndex
]),
capture
->
frame
.
imageSize
);
...
...
@@ -1464,6 +1466,10 @@ static int icvSetVideoSize( CvCaptureCAM_V4L* capture, int w, int h) {
cropHeight
=
h
*
8
;
cropWidth
=
w
*
8
;
break
;
case
CV_CAP_MODE_YUYV
:
cropHeight
=
h
*
16
;
cropWidth
=
w
*
16
;
break
;
default:
cropHeight
=
h
*
24
;
cropWidth
=
w
*
24
;
...
...
@@ -1719,6 +1725,7 @@ static int icvSetPropertyCAM_V4L(CvCaptureCAM_V4L* capture, int property_id, dou
case
CV_CAP_MODE_BGR
:
case
CV_CAP_MODE_RGB
:
case
CV_CAP_MODE_GRAY
:
case
CV_CAP_MODE_YUYV
:
capture
->
mode
=
mode
;
/* recreate the capture buffer for the same output resolution
but a different pixel format */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录