Commit e77bc24b authored by Arek's avatar Arek Committed by Alexander Alekhin

Merge pull request #7518 from ArkadiuszRaj:aravis-buffer-status

Aravis several updates

* Fix adressing camera with id=0

* Aravis buffer property control & status added

* Modify of autoexposure algorith, ream frame ID from aravis + new properites

* Change of macro name

* VideoCapture now returns no frame on camera disconnecion

* Allow aravis-0.4 usage, proper camera object release.
parent 44e5d263
...@@ -1125,7 +1125,7 @@ if(DEFINED WITH_GIGEAPI) ...@@ -1125,7 +1125,7 @@ if(DEFINED WITH_GIGEAPI)
endif(DEFINED WITH_GIGEAPI) endif(DEFINED WITH_GIGEAPI)
if(DEFINED WITH_ARAVIS) if(DEFINED WITH_ARAVIS)
status(" Aravis SDK:" HAVE_ARAVIS_API THEN YES ELSE NO) status(" Aravis SDK:" HAVE_ARAVIS_API THEN "YES (${ARAVIS_LIBRARIES})" ELSE NO)
endif(DEFINED WITH_ARAVIS) endif(DEFINED WITH_ARAVIS)
if(DEFINED APPLE) if(DEFINED APPLE)
......
...@@ -129,9 +129,9 @@ ocv_clear_vars(HAVE_ARAVIS_API) ...@@ -129,9 +129,9 @@ ocv_clear_vars(HAVE_ARAVIS_API)
if(WITH_ARAVIS) if(WITH_ARAVIS)
find_path(ARAVIS_INCLUDE_PATH "arv.h" find_path(ARAVIS_INCLUDE_PATH "arv.h"
PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432 PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
PATH_SUFFIXES include "aravis-0.6" PATH_SUFFIXES include "aravis-0.6" "aravis-0.4"
DOC "The path to Aravis SDK headers") DOC "The path to Aravis SDK headers")
find_library(ARAVIS_LIBRARIES "aravis-0.6") find_library(ARAVIS_LIBRARIES NAMES "aravis-0.6" "aravis-0.4" )
if(ARAVIS_LIBRARIES AND ARAVIS_INCLUDE_PATH) if(ARAVIS_LIBRARIES AND ARAVIS_INCLUDE_PATH)
set(HAVE_ARAVIS_API TRUE) set(HAVE_ARAVIS_API TRUE)
endif() endif()
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment