Merge branch 'main' into discover-dhcp-camera-outside-subnet

Author: EmmanuelP

docs/reference/aravis/porting-0.10.md

@@ -21,11 +21,11 @@ replaced by a separate [[email protected]_buffers] function.
 ### arv_stream_create_buffers
 
 You should preferably use the new [[email protected]_buffers]
-function, has in some cases it enables zero copy operations.
+function, which creates interface native buffers if possible.
 
 #### arv_stream_get_n_owned_buffers
 
-`arv_stream_get_n_buffers` has bee renamed
+`arv_stream_get_n_buffers` has been renamed
 [[email protected]_n_owned_buffers] to better reflect what it does, and
 has a third out parameter returning the number of buffer owned by the stream
 receiving thread.

meson.build

@@ -63,8 +63,7 @@ xml2_dep = dependency ('libxml-2.0', required: true)
 libz_dep = dependency ('zlib', required: true)
 usb_dep = dependency ('libusb-1.0', required: get_option ('usb'))
 gmodule_dep = dependency ('gmodule-2.0', required: true)
-v4l2_dep = dependency('libv4l2', required: get_option('v4l2'))
-gudev_dep = dependency('gudev-1.0', required: get_option('v4l2'))
+gudev_dep = dependency ('gudev-1.0', required: get_option('v4l2'))
 
 aravis_public_dependencies = [glib_dep, gobject_dep, gio_dep]
 aravis_dependencies = [aravis_public_dependencies, xml2_dep, libz_dep, gmodule_dep]
@@ -77,8 +76,11 @@ if usb_dep.found()
   aravis_dependencies += usb_dep
 endif
 
-if v4l2_dep.found()
-  aravis_dependencies += [v4l2_dep, gudev_dep]
+if gudev_dep.found()
+  aravis_dependencies += gudev_dep
+  v4l2_enabled = true
+else
+  v4l2_enabled = false
 endif
 
 if host_machine.system()=='windows'

src/arv-test.cfg

@@ -100,6 +100,15 @@ Schema=Invalid
 SensorSize=2048;2048
 SoftwareTriggerSupport=true
 
+[uvcvideo:Integrated_Webcam_HD: Integrate]
+
+SensorSize=640;480
+SoftwareTriggerSupport=false
+ChunksSupport=false
+UseSystemTimestamp=true
+FrameRateA=16.0
+FrameRateB=16.0
+
 [Basler:acA1300-30gc]
 
 ChunkList=Timestamp Framecounter