Skip to content

Commit 2165d50

Browse files
EmmanuelPEmmanuelP
authored
Merge branch 'main' into main
2 parents aed72ff + f06f366 commit 2165d50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1153
-415
lines changed

‎.clang-format‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.clang-format-include‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/workflows/aravis-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: |
1818
pip3 install meson ninja Markdown toml typogrify
1919
sudo apt update
20-
sudo apt install python3 libusb-1.0-0-dev gobject-introspection valgrind libgstreamer-plugins-bad1.0-dev libgtk-3-dev libgirepository1.0-dev python3-gi
20+
sudo apt install python3 libusb-1.0-0-dev gobject-introspection valgrind libgstreamer-plugins-bad1.0-dev libgtk-3-dev libgirepository1.0-dev python3-gi libunwind-dev gettext
2121
- name: Build
2222
run: |
2323
meson --buildtype=plain -Ddocumentation=enabled -Dgst-plugin=enabled -Dintrospection=enabled -Dusb=disabled -Dviewer=enabled . ./build

‎.github/workflows/aravis-macos.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ jobs:
1616
- uses: actions/setup-python@v2
1717
with:
1818
python-version: '3.x'
19+
- name: Unbreak Python in Github Actions
20+
run: |
21+
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
22+
sudo rm -rf /Library/Frameworks/Python.framework/
23+
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
1924
- name: Install dependencies
2025
run: |
21-
pip install meson ninja
2226
brew update
23-
brew install gcc gettext intltool gtk-doc libxml2 libusb gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gnome-icon-theme gobject-introspection glib-utils
27+
brew install meson ninja gcc gettext intltool libxml2 libusb gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gnome-icon-theme gobject-introspection glib
2428
- name: Build
2529
run: |
2630
meson --buildtype=plain -Ddocumentation=disabled -Dgst-plugin=enabled -Dintrospection=disabled -Dusb=enabled -Dviewer=enabled . ./build

‎.github/workflows/aravis-msvc.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,28 @@ jobs:
2222
- name: pip
2323
run: |
2424
pip install conan
25+
- name: disable-perl
26+
run: |
27+
rm -r C:\Strawberry\perl
2528
- name: checkout
2629
uses: actions/checkout@v2
2730
- name: conan
2831
env:
2932
INPUT_CONANFILE: |
3033
[requires]
3134
libiconv/1.17
32-
glib/2.70.0
35+
glib/2.74.1
3336
#gobject-introspection/1.69.0
34-
#gstreamer/1.19.1
35-
#gst-plugins-base/1.19.1
37+
gstreamer/1.19.2
38+
gst-plugins-base/1.19.2
3639
#gtk/4.4.0
37-
libxml2/2.9.12
38-
zlib/1.2.11
39-
libusb/1.0.24
40+
libxml2/2.10.3
41+
zlib/1.2.13
42+
libusb/1.0.26
4043
4144
[build_requires]
4245
meson/0.59.2
46+
pkgconf/1.9.3
4347
4448
[generators]
4549
pkg_config
@@ -60,7 +64,7 @@ jobs:
6064
.\build\activate_build.ps1
6165
.\build\activate_run.ps1
6266
echo "::group::configure"
63-
meson --prefix ${{ github.workspace }}\install --buildtype ${{ matrix.build_type_meson }} --pkg-config-path ${{ github.workspace }}\build -Ddocumentation=disabled -Dgst-plugin=disabled -Dintrospection=disabled -Dusb=enabled -Dviewer=disabled -Dgv-n-buffers=1 . .\build
67+
meson --prefix ${{ github.workspace }}\install --buildtype ${{ matrix.build_type_meson }} --pkg-config-path ${{ github.workspace }}\build -Ddocumentation=disabled -Dgst-plugin=enabled -Dintrospection=disabled -Dusb=enabled -Dviewer=disabled -Dgv-n-buffers=1 . .\build
6468
echo "::endgroup::"
6569
echo "::group::compile"
6670
meson compile -C .\build -v

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ build/
33
*~
44
build-*/
55
.cache/
6+
.vscode/

‎.travis.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
Aravis
44
</h1>
55

6-
<p align="center"><strong>Your industrial vision library</strong></p>
7-
86
[![Aravis-Linux](https://github.com/AravisProject/aravis/actions/workflows/aravis-linux.yml/badge.svg)](https://github.com/AravisProject/aravis/actions/workflows/aravis-linux.yml)
97
[![Aravis-macOS](https://github.com/AravisProject/aravis/actions/workflows/aravis-macos.yml/badge.svg)](https://github.com/AravisProject/aravis/actions/workflows/aravis-macos.yml)
108
[![Aravis-MinGW](https://github.com/AravisProject/aravis/actions/workflows/aravis-mingw.yml/badge.svg)](https://github.com/AravisProject/aravis/actions/workflows/aravis-mingw.yml)

‎docs/arv-camera-test-0.8.1‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ARV-CAMERA-TEST-0.8 "1" "décembre 2022" "arv-camera-test-0.8 0.8.23" "User Commands"
3+
.SH NAME
4+
arv-camera-test-0.8 \- manual page for arv-camera-test-0.8 0.8.23
5+
.SH DESCRIPTION
6+
.SS "Usage:"
7+
.IP
8+
arv\-camera\-test\-0.8 [OPTION?]
9+
.PP
10+
Small utility for basic device checks.
11+
.SS "Help Options:"
12+
.TP
13+
\-?, \fB\-\-help\fR
14+
Show help options
15+
.SS "Application Options:"
16+
.TP
17+
\fB\-n\fR, \fB\-\-name=\fR<camera_id>
18+
Camera name
19+
.TP
20+
\fB\-f\fR, \fB\-\-frequency=\fR<Hz>
21+
Acquisition frequency
22+
.TP
23+
\fB\-t\fR, \fB\-\-trigger=\fR<trigger_id>
24+
External trigger
25+
.TP
26+
\fB\-o\fR, \fB\-\-software\-trigger=\fR<Hz>
27+
Emit software trigger
28+
.TP
29+
\fB\-w\fR, \fB\-\-width=\fR<n_pixels>
30+
Width
31+
.TP
32+
\fB\-h\fR, \fB\-\-height=\fR<n_pixels>
33+
Height
34+
.TP
35+
\fB\-\-h\-binning=\fR<n_pixels>
36+
Horizontal binning
37+
.TP
38+
\fB\-\-v\-binning=\fR<n_pixels>
39+
Vertical binning
40+
.TP
41+
\fB\-e\fR, \fB\-\-exposure=\fR<time_us>
42+
Exposure time
43+
.TP
44+
\fB\-g\fR, \fB\-\-gain=\fR<dB>
45+
Gain (dB)
46+
.TP
47+
\fB\-a\fR, \fB\-\-auto\fR
48+
Auto socket buffer size
49+
.TP
50+
\fB\-\-features\fR
51+
Additional configuration as a space separated list of features
52+
.TP
53+
\fB\-j\fR, \fB\-\-packet\-size\-adjustment=\fR{never|always|once|on\-failure|on\-failure\-once}
54+
Packet size adjustment
55+
.TP
56+
\fB\-r\fR, \fB\-\-no\-packet\-resend\fR
57+
No packet resend
58+
.TP
59+
\fB\-q\fR, \fB\-\-packet\-request\-ratio\fR=\fI\,[0\/\fR..2.0]
60+
Packet resend request limit as a frame packet ratio
61+
.TP
62+
\fB\-l\fR, \fB\-\-initial\-packet\-timeout=\fR<ms>
63+
Initial packet timeout
64+
.TP
65+
\fB\-p\fR, \fB\-\-packet\-timeout=\fR<ms>
66+
Packet timeout
67+
.TP
68+
\fB\-m\fR, \fB\-\-frame\-retention=\fR<ms>
69+
Frame retention
70+
.TP
71+
\fB\-c\fR, \fB\-\-gv\-stream\-channel=\fR<id>
72+
GigEVision stream channel id
73+
.TP
74+
\fB\-y\fR, \fB\-\-gv\-packet\-delay=\fR<ns>
75+
GigEVision packet delay
76+
.TP
77+
\fB\-i\fR, \fB\-\-gv\-packet\-size=\fR<n_bytes>
78+
GigEVision packet size
79+
.TP
80+
\fB\-s\fR, \fB\-\-usb\-mode=\fR{sync|async}
81+
USB device I/O mode
82+
.TP
83+
\fB\-u\fR, \fB\-\-chunks=\fR<chunk_id>[,<chunk_id>[...]]
84+
Chunks
85+
.TP
86+
\fB\-\-realtime\fR
87+
Make stream thread realtime
88+
.TP
89+
\fB\-\-high\-priority\fR
90+
Make stream thread high priority
91+
.TP
92+
\fB\-\-no\-packet\-socket\fR
93+
Disable use of packet socket
94+
.TP
95+
\fB\-\-register\-cache=\fR{disable|enable|debug}
96+
Register cache policy
97+
.TP
98+
\fB\-\-range\-check=\fR{disable|enable|debug}
99+
Range check policy
100+
.TP
101+
\fB\-\-access\-check=\fR{disable|enable}
102+
Feature access check policy
103+
.TP
104+
\fB\-b\fR, \fB\-\-bandwidth\-limit=\fR<limit>
105+
Desired USB3 Vision device bandwidth limit
106+
.TP
107+
\fB\-\-duration=\fR<s>
108+
Test duration (s)
109+
.TP
110+
\fB\-d\fR, \fB\-\-debug=\fR{<category>[:<level>][,...]|help}
111+
Debug output selection
112+
.TP
113+
\fB\-v\fR, \fB\-\-version\fR
114+
Show version
115+
.PP
116+
This tool configures a camera and starts video streaming, infinitely unless a duration is given.

‎docs/arv-test-0.8.1‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2+
.TH ARV-TEST-0.8 "1" "décembre 2022" "arv-test-0.8 0.8.23" "User Commands"
3+
.SH NAME
4+
arv-test-0.8 \- manual page for arv-test-0.8 0.8.23
5+
.SH DESCRIPTION
6+
.SS "Usage:"
7+
.IP
8+
arv\-test\-0.8 [OPTION?]
9+
.PP
10+
Automated test utillity.
11+
.SS "Help Options:"
12+
.TP
13+
\fB\-h\fR, \fB\-\-help\fR
14+
Show help options
15+
.SS "Application Options:"
16+
.TP
17+
\fB\-n\fR, \fB\-\-name=\fR<pattern>
18+
Device selection
19+
.TP
20+
\fB\-t\fR, \fB\-\-test=\fR<pattern>
21+
Test selection
22+
.TP
23+
\fB\-c\fR, \fB\-\-configuration=\fR<path>
24+
Alternative configuration
25+
.TP
26+
\fB\-i\fR, \fB\-\-iterations=\fR<n_iter>
27+
Number of test repetitions
28+
.TP
29+
\fB\-s\fR, \fB\-\-usb\-mode=\fR{sync|async}
30+
USB device I/O mode
31+
.TP
32+
\fB\-a\fR, \fB\-\-cache\-check\fR
33+
Register cache check
34+
.TP
35+
\fB\-\-packet\-socket\fR
36+
Enable use of packet socket
37+
.HP
38+
\fB\-d\fR, \fB\-\-debug=\fR{<category>[:<level>][,...]|help}
39+
.TP
40+
\fB\-v\fR, \fB\-\-version\fR
41+
Show version
42+
.PP
43+
arv\-test is an automated test utility that tries to exercise most of the
44+
Aravis functionalities. By default it runs all the tests on all the detected
45+
devices, but devices and tests can be selected using a glob pattern.
46+
.PP
47+
A default configuration file is bundled in the executable. An alternative
48+
one with entries specific to the camera you want to test can be specified.

0 commit comments

Comments
 (0)