Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
a4a6ee34
Commit
a4a6ee34
authored
Aug 29, 2016
by
stbnps
Committed by
Gregory Kramida
Sep 15, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for V4L2_PIX_FMT_Y16
parent
32df09c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
2 deletions
+18
-2
cap_v4l.cpp
modules/videoio/src/cap_v4l.cpp
+18
-2
No files found.
modules/videoio/src/cap_v4l.cpp
View file @
a4a6ee34
...
...
@@ -466,12 +466,16 @@ static int autosetup_capture_mode_v4l2(CvCaptureCAM_V4L* capture) {
V4L2_PIX_FMT_SN9C10X
,
V4L2_PIX_FMT_SBGGR8
,
V4L2_PIX_FMT_SGBRG8
,
V4L2_PIX_FMT_RGB24
V4L2_PIX_FMT_RGB24
,
V4L2_PIX_FMT_Y16
};
for
(
size_t
i
=
0
;
i
<
sizeof
(
try_order
)
/
sizeof
(
__u32
);
i
++
)
{
capture
->
palette
=
try_order
[
i
];
if
(
try_palette_v4l2
(
capture
))
{
if
(
capture
->
palette
==
V4L2_PIX_FMT_Y16
)
{
capture
->
convert_rgb
=
false
;
}
return
0
;
}
}
...
...
@@ -558,6 +562,7 @@ static int v4l2_num_channels(__u32 palette) {
case
V4L2_PIX_FMT_YVU420
:
case
V4L2_PIX_FMT_MJPEG
:
case
V4L2_PIX_FMT_JPEG
:
case
V4L2_PIX_FMT_Y16
:
return
1
;
case
V4L2_PIX_FMT_YUYV
:
case
V4L2_PIX_FMT_UYVY
:
...
...
@@ -589,8 +594,14 @@ static void v4l2_create_frame(CvCaptureCAM_V4L *capture) {
}
/* Set up Image data */
cvInitImageHeader
(
&
capture
->
frame
,
size
,
IPL_DEPTH_8U
,
channels
);
switch
(
capture
->
palette
)
{
case
V4L2_PIX_FMT_Y16
:
cvInitImageHeader
(
&
capture
->
frame
,
size
,
IPL_DEPTH_16U
,
channels
);
break
;
default:
cvInitImageHeader
(
&
capture
->
frame
,
size
,
IPL_DEPTH_8U
,
channels
);
}
/* Allocate space for pixelformat we convert to.
* If we do not convert frame is just points to the buffer
*/
...
...
@@ -1546,6 +1557,11 @@ static IplImage* icvRetrieveFrameCAM_V4L( CvCaptureCAM_V4L* capture, int) {
(
unsigned
char
*
)
capture
->
buffers
[(
capture
->
bufferIndex
+
1
)
%
capture
->
req
.
count
].
start
,
(
unsigned
char
*
)
capture
->
frame
.
imageData
);
break
;
case
V4L2_PIX_FMT_Y16
:
memcpy
((
char
*
)
capture
->
frame
.
imageData
,
(
char
*
)
capture
->
buffers
[
capture
->
bufferIndex
].
start
,
capture
->
frame
.
imageSize
);
break
;
}
return
(
&
capture
->
frame
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment