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
92e08c98
Commit
92e08c98
authored
Nov 13, 2014
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3412 from StevenPuttemans:ieee1934_camera_set_params
parents
773e6211
2b8229f7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
highgui_c.h
modules/highgui/include/opencv2/highgui/highgui_c.h
+1
-0
cap_dc1394_v2.cpp
modules/highgui/src/cap_dc1394_v2.cpp
+6
-0
No files found.
modules/highgui/include/opencv2/highgui/highgui_c.h
View file @
92e08c98
...
...
@@ -385,6 +385,7 @@ enum
CV_CAP_PROP_ROLL
=
35
,
CV_CAP_PROP_IRIS
=
36
,
CV_CAP_PROP_SETTINGS
=
37
,
CV_CAP_PROP_BUFFERSIZE
=
38
,
CV_CAP_PROP_AUTOGRAB
=
1024
,
// property for highgui class CvCapture_Android only
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING
=
1025
,
// readonly, tricky property, returns cpnst char* indeed
...
...
modules/highgui/src/cap_dc1394_v2.cpp
View file @
92e08c98
...
...
@@ -278,6 +278,7 @@ CvCaptureCAM_DC1394_v2_CPP::CvCaptureCAM_DC1394_v2_CPP()
dcCam
=
0
;
isoSpeed
=
400
;
fps
=
15
;
// Resetted the value here to 1 in order to ensure only a single frame is stored in the buffer!
nDMABufs
=
8
;
started
=
false
;
cameraId
=
0
;
...
...
@@ -732,6 +733,11 @@ bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value)
return
false
;
isoSpeed
=
cvRound
(
value
);
break
;
case
CV_CAP_PROP_BUFFERSIZE
:
if
(
started
)
return
false
;
nDMABufs
=
value
;
break
;
//The code below is based on coriander, callbacks.c:795, refer to case RANGE_MENU_MAN :
default
:
if
(
propId
<
CV_CAP_PROP_MAX_DC1394
&&
dc1394properties
[
propId
]
!=-
1
...
...
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