Skip to content

Commit

Permalink
Merge pull request #500 from roflcoopter/dev
Browse files Browse the repository at this point in the history 
v2.1.1
  • Loading branch information
@roflcoopter
roflcoopter authored Mar 6, 2023
2 parents ed55649 + 4ef7985 commit 9d07193
Show file tree
Hide file tree
Showing 50 changed files with 1,567 additions and 900 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repos:
- --in-place
- --remove-all-unused-imports
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.11.5
hooks:
- id: isort
- repo: https://github.com/psf/black
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/.env
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
UBUNTU_VERSION="focal"
UBUNTU_VERSION_NUMBER="20.04"
BASE_VERSION="1.4"
BASE_VERSION="1.4.1"
OPENCV_VERSION="4.6.0"
OPENVINO_VERSION="2022.2.0"
FFMPEG_VERSION="4.4"
Expand Down
5 changes: 4 additions & 1 deletion docker/aarch64/Dockerfile.base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ARG UBUNTU_VERSION
FROM roflcoopter/viseron-models:latest as models
FROM balenalib/aarch64-ubuntu:${UBUNTU_VERSION}-run

COPY --from=models /detectors/models/darknet /detectors/models/darknet
COPY --from=models /detectors/models/edgetpu /detectors/models/edgetpu
COPY --from=models /classifiers/models/edgetpu /classifiers/models/edgetpu

Expand All @@ -21,4 +22,6 @@ RUN \
liblapacke \
libopenexr24 \
libpng16-16 \
libatomic1
libatomic1 && \
ln -s /detectors/models/darknet/yolov7-tiny.weights /detectors/models/darknet/default.weights && \
ln -s /detectors/models/darknet/yolov7-tiny.cfg /detectors/models/darknet/default.cfg
3 changes: 2 additions & 1 deletion docs/src/pages/components-explorer/_components/ComponentConfiguration/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,9 @@ function buildHeader(item: any) {
{item.name ? (
<span className={styles.configVariablesName}>{getName(item)}</span>
) : null}
{/* Zero width space to prevent selecting type when double clicking the name */}
&#8203;
<span className={styles.configVariablesType}>{item.type}</span>

<span className={styles.configVariablesRequired}>
{item.optional ? " (" : null}
<span
Expand Down
1 change: 1 addition & 0 deletions docs/src/pages/components-explorer/_domains/camera/mjpeg_streams.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ http://localhost:8888/<camera name slug>/mjpeg-stream?<parameter1>=<value>&<para
| width | int | frame will be resized to this width |
| height | int | frame will be resized to this height |
| draw_objects | any | If this query parameter is set to a truthy value (`true`, `1` etc), found objects will be drawn |
| draw_object_mask | any | If this query parameter is set to a truthy value (`true`, `1` etc), configured object masks will be drawn |
| draw_motion | any | If this query parameter is set to a truthy value (`true`, `1` etc), detected motion will be drawn |
| draw_motion_mask | any | If this query parameter is set to a truthy value (`true`, `1` etc), configured motion masks will be drawn |
| draw_zones | any | If this query parameter is set to a truthy value (`true`, `1` etc), configured zones will be drawn |
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components-explorer/components/background_subtractor/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "integer",
"valueMin": 0,
"name": "max_recorder_keepalive",
"description": "Value in seconds for how long motion is allowed to keep the recorder going when no objects are detected.<br>This is to prevent never-ending recordings.<br>Only applicable if <code>recorder_keepalive: true</code>.",
"description": "Value in seconds for how long motion is allowed to keep the recorder going when no objects are detected.<br>Use this to prevent never-ending recordings.<br>Only applicable if <code>recorder_keepalive: true</code>.<br><b>A value of <code>0</code> disables this functionality.</b>",
"optional": true,
"default": 30
},
Expand Down
17 changes: 16 additions & 1 deletion docs/src/pages/components-explorer/components/ffmpeg/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,10 @@
"default": [
"error while decoding MB",
"Application provided invalid, non monotonically increasing dts to muxer in stream",
"Last message repeated"
"Last message repeated",
"non-existing PPS 0 referenced",
"no frame!",
"decode_slice_header error"
]
},
{
Expand Down Expand Up @@ -711,6 +714,18 @@
"optional": true,
"default": []
},
{
"type": "list",
"values": [
{
"type": "string"
}
],
"name": "output_args",
"description": "FFmpeg encoder output arguments.",
"optional": true,
"default": []
},
{
"type": "string",
"name": "segments_folder",
Expand Down
22 changes: 18 additions & 4 deletions docs/src/pages/components-explorer/components/gstreamer/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,14 @@
"description": "GStreamer sometimes print errors that are not fatal, but are preventing Viseron from reading the stream.<br>If you get errors like <code>Error starting decoder pipe!</code>, see <a href=#recoverable-errors>recoverable errors</a> below.",
"optional": true,
"default": [
"Last message repeated",
"dconf will not work properly",
"decode_slice_header error",
"no frame!",
"left block unavailable for requested intra mode",
"error while decoding MB",
"decreasing DTS value"
"decreasing DTS value",
"non-existing PPS 0 referenced"
]
},
{
Expand Down Expand Up @@ -420,21 +422,21 @@
}
],
"name": "hwaccel_args",
"description": "<b>FFmpeg</b> encoder hardware acceleration arguments.",
"description": "FFmpeg encoder hardware acceleration arguments.",
"optional": true,
"default": []
},
{
"type": "string",
"name": "codec",
"description": "<b>FFmpeg</b> video encoder codec, eg <code>h264_nvenc</code>.",
"description": "FFmpeg video encoder codec, eg <code>h264_nvenc</code>.",
"optional": true,
"default": "copy"
},
{
"type": "string",
"name": "audio_codec",
"description": "<b>FFmpeg</b> audio encoder codec, eg <code>aac</code>.",
"description": "FFmpeg audio encoder codec, eg <code>aac</code>.",
"optional": true,
"default": "copy"
},
Expand Down Expand Up @@ -462,6 +464,18 @@
"optional": true,
"default": []
},
{
"type": "list",
"values": [
{
"type": "string"
}
],
"name": "output_args",
"description": "FFmpeg encoder output arguments.",
"optional": true,
"default": []
},
{
"type": "string",
"name": "segments_folder",
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/components-explorer/components/mog2/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "integer",
"valueMin": 0,
"name": "max_recorder_keepalive",
"description": "Value in seconds for how long motion is allowed to keep the recorder going when no objects are detected.<br>This is to prevent never-ending recordings.<br>Only applicable if <code>recorder_keepalive: true</code>.",
"description": "Value in seconds for how long motion is allowed to keep the recorder going when no objects are detected.<br>Use this to prevent never-ending recordings.<br>Only applicable if <code>recorder_keepalive: true</code>.<br><b>A value of <code>0</code> disables this functionality.</b>",
"optional": true,
"default": 30
},
Expand Down
Loading

0 comments on commit 9d07193

Please sign in to comment.