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
1358c0ae
Commit
1358c0ae
authored
Jan 23, 2020
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made automated triggering for ARAVIS cameras optional.
parent
194304bb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1 deletion
+24
-1
videoio.hpp
modules/videoio/include/opencv2/videoio.hpp
+10
-0
cap_aravis.cpp
modules/videoio/src/cap_aravis.cpp
+14
-1
No files found.
modules/videoio/include/opencv2/videoio.hpp
View file @
1358c0ae
...
...
@@ -483,6 +483,16 @@ enum { CAP_PROP_XI_DOWNSAMPLING = 400, //!< Chan
//! @} XIMEA
/** @name XIMEA Camera API
* @{
*/
//! Properties of cameras available through ARAVIS backend
enum
{
CAP_PROP_ARAVIS_AUTOTRIGGER
=
600
//!< Automatically trigger frame capture if camera is configured with software trigger
};
//! @} ARAVIS
/** @name AVFoundation framework for iOS
OS X Lion will have the same API
@{
...
...
modules/videoio/src/cap_aravis.cpp
View file @
1358c0ae
...
...
@@ -149,6 +149,7 @@ protected:
bool
autoGain
;
double
targetGrey
;
// Target grey value (mid grey))
bool
softwareTriggered
;
// Flag if the camera is software triggered
bool
allowAutoTrigger
;
// Flag that user allowed to trigger software triggered cameras automatically
gint64
*
pixelFormats
;
guint
pixelFormatsCnt
;
...
...
@@ -190,6 +191,7 @@ CvCaptureCAM_Aravis::CvCaptureCAM_Aravis()
exposureCompensation
=
0
;
targetGrey
=
0
;
frameID
=
prevFrameID
=
0
;
allowAutoTrigger
=
false
;
num_buffers
=
10
;
frame
=
NULL
;
...
...
@@ -292,7 +294,7 @@ bool CvCaptureCAM_Aravis::grabFrame()
ArvBuffer
*
arv_buffer
=
NULL
;
int
max_tries
=
10
;
int
tries
=
0
;
if
(
softwareTriggered
)
{
if
(
softwareTriggered
&&
allowAutoTrigger
)
{
arv_camera_software_trigger
(
camera
);
}
for
(;
tries
<
max_tries
;
tries
++
)
{
...
...
@@ -499,6 +501,12 @@ double CvCaptureCAM_Aravis::getProperty( int property_id ) const
return
out
;
}
break
;
case
CAP_PROP_ARAVIS_AUTOTRIGGER
:
{
return
allowAutoTrigger
?
1.
:
0.
;
}
break
;
}
return
-
1.0
;
}
...
...
@@ -583,6 +591,11 @@ bool CvCaptureCAM_Aravis::setProperty( int property_id, double value )
}
break
;
case
CAP_PROP_ARAVIS_AUTOTRIGGER
:
{
allowAutoTrigger
=
(
bool
)
value
;
}
break
;
default
:
return
false
;
...
...
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