Fix nginx cache (#8558)

* Update go2rtc to 1.8.2

* Update docs for 1.8.2

.github/dependabot.yml

@@ -18,6 +18,12 @@ updates:
       interval: daily
     open-pull-requests-limit: 10
     target-branch: dev
+  - package-ecosystem: "pip"
+    directory: "/docker/tensorrt"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    target-branch: dev
   - package-ecosystem: "npm"
     directory: "/web"
     schedule:

.github/workflows/ci.yml

@@ -79,6 +79,15 @@ jobs:
             rpi.tags=${{ steps.setup.outputs.image-name }}-rpi
             *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-arm64
             *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-arm64,mode=max
+      - name: Build and push RockChip build
+        uses: docker/bake-action@v3
+        with:
+          push: true
+          targets: rk
+          files: docker/rockchip/rk.hcl
+          set: |
+            rk.tags=${{ steps.setup.outputs.image-name }}-rk
+            *.cache-from=type=gha
   jetson_jp4_build:
     runs-on: ubuntu-latest
     name: Jetson Jetpack 4
@@ -141,7 +150,7 @@ jobs:
       - arm64_build
     steps:
       - id: lowercaseRepo
-        uses: ASzc/change-string-case-action@v5
+        uses: ASzc/change-string-case-action@v6
         with:
           string: ${{ github.repository }}
       - name: Log in to the Container registry

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: On release
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -11,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - id: lowercaseRepo
-        uses: ASzc/change-string-case-action@v5
+        uses: ASzc/change-string-case-action@v6
         with:
           string: ${{ github.repository }}
       - name: Log in to the Container registry
@@ -22,41 +23,15 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Create tag variables
         run: |
+          BRANCH=$([[ "${{ github.ref_name }}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "master" || echo "dev")
           echo "BASE=ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}" >> $GITHUB_ENV
-          echo "BUILD_TAG=${{ github.ref_name }}-${GITHUB_SHA::7}" >> $GITHUB_ENV
+          echo "BUILD_TAG=${BRANCH}-${GITHUB_SHA::7}" >> $GITHUB_ENV
           echo "CLEAN_VERSION=$(echo ${GITHUB_REF##*/} | tr '[:upper:]' '[:lower:]' | sed 's/^[v]//')" >> $GITHUB_ENV
       - name: Tag and push the main image
         run: |
           VERSION_TAG=${BASE}:${CLEAN_VERSION}
           PULL_TAG=${BASE}:${BUILD_TAG}
-          docker pull ${PULL_TAG}
-          docker tag ${PULL_TAG} ${VERSION_TAG}
-          docker push ${VERSION_TAG}
-      - name: Tag and push standard arm64
-        run: |
-          VERSION_TAG=${BASE}:${CLEAN_VERSION}-standard-arm64
-          PULL_TAG=${BASE}:${BUILD_TAG}-standard-arm64
-          docker pull ${PULL_TAG}
-          docker tag ${PULL_TAG} ${VERSION_TAG}
-          docker push ${VERSION_TAG}
-      - name: Tag and push tensorrt
-        run: |
-          VERSION_TAG=${BASE}:${CLEAN_VERSION}-tensorrt
-          PULL_TAG=${BASE}:${BUILD_TAG}-tensorrt
-          docker pull ${PULL_TAG}
-          docker tag ${PULL_TAG} ${VERSION_TAG}
-          docker push ${VERSION_TAG}
-      - name: Tag and push tensorrt-jp4
-        run: |
-          VERSION_TAG=${BASE}:${CLEAN_VERSION}-tensorrt-jp4
-          PULL_TAG=${BASE}:${BUILD_TAG}-tensorrt-jp4
-          docker pull ${PULL_TAG}
-          docker tag ${PULL_TAG} ${VERSION_TAG}
-          docker push ${VERSION_TAG}
-      - name: Tag and push tensorrt-jp5
-        run: |
-          VERSION_TAG=${BASE}:${CLEAN_VERSION}-tensorrt-jp5
-          PULL_TAG=${BASE}:${BUILD_TAG}-tensorrt-jp5
-          docker pull ${PULL_TAG}
-          docker tag ${PULL_TAG} ${VERSION_TAG}
-          docker push ${VERSION_TAG}
+          docker run --rm -v $HOME/.docker/config.json:/config.json quay.io/skopeo/stable:latest copy --authfile /config.json --multi-arch all docker://${PULL_TAG} docker://${VERSION_TAG}
+          for variant in standard-amd64 tensorrt tensorrt-jp4 tensorrt-jp5 rk; do
+            docker run --rm -v $HOME/.docker/config.json:/config.json quay.io/skopeo/stable:latest copy --authfile /config.json --multi-arch all docker://${PULL_TAG}-${variant} docker://${VERSION_TAG}-${variant}
+          done

CODEOWNERS

@@ -2,3 +2,5 @@
 /docker/tensorrt/ @madsciencetist @NateMeyer
 /docker/tensorrt/*arm64* @madsciencetist
 /docker/tensorrt/*jetson* @madsciencetist
+
+/docker/rockchip/ @MarcA711

docker/main/Dockerfile

@@ -33,7 +33,7 @@ RUN --mount=type=tmpfs,target=/tmp --mount=type=tmpfs,target=/var/cache/apt \
 FROM scratch AS go2rtc
 ARG TARGETARCH
 WORKDIR /rootfs/usr/local/go2rtc/bin
-ADD --link --chmod=755 "https://github.com/AlexxIT/go2rtc/releases/download/v1.8.1/go2rtc_linux_${TARGETARCH}" go2rtc
+ADD --link --chmod=755 "https://github.com/AlexxIT/go2rtc/releases/download/v1.8.2/go2rtc_linux_${TARGETARCH}" go2rtc
 
 
 ####

docker/main/requirements-wheels.txt

@@ -13,9 +13,9 @@ psutil == 5.9.*
 pydantic == 1.10.*
 git+https://github.com/fbcotter/py3nvml#egg=py3nvml
 PyYAML == 6.0.*
-pytz == 2023.3
-ruamel.yaml == 0.17.*
-tzlocal == 5.1
+pytz == 2023.3.post1
+ruamel.yaml == 0.18.*
+tzlocal == 5.2
 types-PyYAML == 6.0.*
 requests == 2.31.*
 types-requests == 2.31.*

docker/main/rootfs/usr/local/go2rtc/create_config.py

@@ -3,6 +3,7 @@
 import json
 import os
 import sys
+from pathlib import Path
 
 import yaml
 
@@ -16,6 +17,14 @@ sys.path.remove("/opt/frigate")
 
 
 FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")}
+# read docker secret files as env vars too
+if os.path.isdir("/run/secrets"):
+    for secret_file in os.listdir("/run/secrets"):
+        if secret_file.startswith("FRIGATE_"):
+            FRIGATE_ENV_VARS[secret_file] = Path(
+                os.path.join("/run/secrets", secret_file)
+            ).read_text()
+
 config_file = os.environ.get("CONFIG_FILE", "/config/config.yml")
 
 # Check if we can use .yaml instead of .yml
@@ -49,7 +58,15 @@ if go2rtc_config.get("log") is None:
 elif go2rtc_config["log"].get("format") is None:
     go2rtc_config["log"]["format"] = "text"
 
-if not go2rtc_config.get("webrtc", {}).get("candidates", []):
+# ensure there is a default webrtc config
+if not go2rtc_config.get("webrtc"):
+    go2rtc_config["webrtc"] = {}
+
+# go2rtc should listen on 8555 tcp & udp by default
+if not go2rtc_config["webrtc"].get("listen"):
+    go2rtc_config["webrtc"]["listen"] = ":8555"
+
+if not go2rtc_config["webrtc"].get("candidates", []):
     default_candidates = []
     # use internal candidate if it was discovered when running through the add-on
     internal_candidate = os.environ.get(

docker/main/rootfs/usr/local/nginx/conf/nginx.conf

@@ -32,6 +32,13 @@ http {
     gzip_proxied no-cache no-store private expired auth;
     gzip_vary on;
 
+    proxy_cache_path /dev/shm/nginx_cache levels=1:2 keys_zone=api_cache:10m max_size=10m inactive=1m use_temp_path=off;
+
+    map $sent_http_content_type $should_not_cache {
+        'application/json' 0;
+        default 1;
+    }
+
     upstream frigate_api {
         server 127.0.0.1:5001;
         keepalive 1024;
@@ -185,6 +192,20 @@ http {
             proxy_pass http://frigate_api/;
             include proxy.conf;
 
+            proxy_cache api_cache;
+            proxy_cache_lock on;
+            proxy_cache_use_stale updating;
+            proxy_cache_valid 200 5s;
+            proxy_cache_bypass $http_x_cache_bypass;
+            proxy_no_cache $should_not_cache;
+            add_header X-Cache-Status $upstream_cache_status;
+
+            location /api/vod/ {
+                proxy_pass http://frigate_api/vod/;
+                include proxy.conf;
+                proxy_cache off;
+            }
+
             location /api/stats {
                 access_log off;
                 rewrite ^/api/(.*)$ $1 break;

docker/rockchip/Dockerfile

@@ -0,0 +1,24 @@
+# syntax=docker/dockerfile:1.6
+
+# https://askubuntu.com/questions/972516/debian-frontend-environment-variable
+ARG DEBIAN_FRONTEND=noninteractive
+
+FROM wheels as rk-wheels
+COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
+COPY docker/rockchip/requirements-wheels-rk.txt /requirements-wheels-rk.txt
+RUN sed -i "/https/d" /requirements-wheels.txt
+RUN pip3 wheel --wheel-dir=/rk-wheels -c /requirements-wheels.txt -r /requirements-wheels-rk.txt
+
+FROM wget as rk-libs
+RUN wget -qO librknnrt.so https://github.com/MarcA711/rknpu2/raw/master/runtime/RK3588/Linux/librknn_api/aarch64/librknnrt.so
+
+FROM deps AS rk-deps
+ARG TARGETARCH
+
+RUN --mount=type=bind,from=rk-wheels,source=/rk-wheels,target=/deps/rk-wheels \ 
+    pip3 install -U /deps/rk-wheels/*.whl 
+
+WORKDIR /opt/frigate/
+COPY --from=rootfs / /
+COPY --from=rk-libs /rootfs/librknnrt.so /usr/lib/
+COPY docker/rockchip/yolov8n-320x320.rknn /models/

docker/rockchip/requirements-wheels-rk.txt

@@ -0,0 +1,2 @@
+hide-warnings == 0.17
+rknn-toolkit-lite2 @ https://github.com/MarcA711/rknn-toolkit2/raw/master/rknn_toolkit_lite2/packages/rknn_toolkit_lite2-1.5.2-cp39-cp39-linux_aarch64.whl

docker/rockchip/rk.hcl

@@ -0,0 +1,34 @@
+target wget {
+  dockerfile = "docker/main/Dockerfile"
+  platforms = ["linux/arm64"]
+  target = "wget"
+}
+
+target wheels {
+  dockerfile = "docker/main/Dockerfile"
+  platforms = ["linux/arm64"]
+  target = "wheels"
+}
+
+target deps {
+  dockerfile = "docker/main/Dockerfile"
+  platforms = ["linux/arm64"]
+  target = "deps"
+}
+
+target rootfs {
+  dockerfile = "docker/main/Dockerfile"
+  platforms = ["linux/arm64"]
+  target = "rootfs"
+}
+
+target rk {
+  dockerfile = "docker/rockchip/Dockerfile"
+  contexts = {
+    wget = "target:wget",
+    wheels = "target:wheels",
+    deps = "target:deps",
+    rootfs = "target:rootfs"
+  }
+  platforms = ["linux/arm64"]
+}

docker/rockchip/rk.mk

@@ -0,0 +1,10 @@
+BOARDS += rk
+
+local-rk: version
+	docker buildx bake --load --file=docker/rockchip/rk.hcl --set rk.tags=frigate:latest-rk rk
+
+build-rk: version
+	docker buildx bake --file=docker/rockchip/rk.hcl --set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk rk
+
+push-rk: build-rk
+	docker buildx bake --push --file=docker/rockchip/rk.hcl --set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk rk

docs/docs/configuration/advanced.md

@@ -120,7 +120,7 @@ NOTE: The folder that is mapped from the host needs to be the folder that contai
 
 ## Custom go2rtc version
 
-Frigate currently includes go2rtc v1.8.1, there may be certain cases where you want to run a different version of go2rtc.
+Frigate currently includes go2rtc v1.8.2, there may be certain cases where you want to run a different version of go2rtc.
 
 To do this:
 

docs/docs/configuration/autotracking.md

@@ -31,7 +31,7 @@ First, set up a PTZ preset in your camera's firmware and give it a name. If you'
 
 Edit your Frigate configuration file and enter the ONVIF parameters for your camera. Specify the object types to track, a required zone the object must enter to begin autotracking, and the camera preset name you configured in your camera's firmware to return to when tracking has ended. Optionally, specify a delay in seconds before Frigate returns the camera to the preset.
 
-An [ONVIF connection](cameras.md) is required for autotracking to function.
+An [ONVIF connection](cameras.md) is required for autotracking to function. Also, a [motion mask](masks.md) over your camera's timestamp and any overlay text is recommended to ensure they are completely excluded from scene change calculations when the camera is moving.
 
 Note that `autotracking` is disabled by default but can be enabled in the configuration or by MQTT.
 
@@ -113,7 +113,7 @@ If you initially calibrate with zooming disabled and then enable zooming at a la
 
 Every PTZ camera is different, so autotracking may not perform ideally in every situation. This experimental feature was initially developed using an EmpireTech/Dahua SD1A404XB-GNR.
 
-The object tracker in Frigate estimates the motion of the PTZ so that tracked objects are preserved when the camera moves. In most cases (especially for faster moving objects), the default 5 fps is insufficient for the motion estimator to perform accurately. 10 fps is the current recommendation. Higher frame rates will likely not be more performant and will only slow down Frigate and the motion estimator. Adjust your camera to output at least 10 frames per second and change the `fps` parameter in the [detect configuration](index.md) of your configuration file.
+The object tracker in Frigate estimates the motion of the PTZ so that tracked objects are preserved when the camera moves. In most cases 5 fps is sufficient, but if you plan to track faster moving objects, you may want to increase this slightly. Higher frame rates (> 10fps) will only slow down Frigate and the motion estimator and may lead to dropped frames, especially if you are using experimental zooming.
 
 A fast [detector](object_detectors.md) is recommended. CPU detectors will not perform well or won't work at all. You can watch Frigate's debug viewer for your camera to see a thicker colored box around the object currently being autotracked.
 

docs/docs/configuration/camera_specific.md

@@ -140,7 +140,7 @@ go2rtc:
       - rtspx://192.168.1.1:7441/abcdefghijk
 ```
 
-[See the go2rtc docs for more information](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#source-rtsp)
+[See the go2rtc docs for more information](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#source-rtsp)
 
 In the Unifi 2.0 update Unifi Protect Cameras had a change in audio sample rate which causes issues for ffmpeg. The input rate needs to be set for record and rtmp if used directly with unifi protect.
 

docs/docs/configuration/ffmpeg_presets.md

@@ -13,7 +13,6 @@ See [the hwaccel docs](/configuration/hardware_acceleration.md) for more info on
 
 | Preset                | Usage                          | Other Notes                                           |
 | --------------------- | ------------------------------ | ----------------------------------------------------- |
-| preset-rpi-32-h264    | 32 bit Rpi with h264 stream    |                                                       |
 | preset-rpi-64-h264    | 64 bit Rpi with h264 stream    |                                                       |
 | preset-vaapi          | Intel & AMD VAAPI              | Check hwaccel docs to ensure correct driver is chosen |
 | preset-intel-qsv-h264 | Intel QSV with h264 stream     | If issues occur recommend using vaapi preset instead  |

docs/docs/configuration/index.md

@@ -75,11 +75,11 @@ mqtt:
   # NOTE: must be unique if you are running multiple instances
   client_id: frigate
   # Optional: user
-  # NOTE: MQTT user can be specified with an environment variables that must begin with 'FRIGATE_'.
+  # NOTE: MQTT user can be specified with an environment variables or docker secrets that must begin with 'FRIGATE_'.
   #       e.g. user: '{FRIGATE_MQTT_USER}'
   user: mqtt_user
   # Optional: password
-  # NOTE: MQTT password can be specified with an environment variables that must begin with 'FRIGATE_'.
+  # NOTE: MQTT password can be specified with an environment variables or docker secrets that must begin with 'FRIGATE_'.
   #       e.g. password: '{FRIGATE_MQTT_PASSWORD}'
   password: password
   # Optional: tls_ca_certs for enabling TLS using self-signed certs (default: None)
@@ -222,15 +222,17 @@ ffmpeg:
 # Optional: Detect configuration
 # NOTE: Can be overridden at the camera level
 detect:
-  # Optional: width of the frame for the input with the detect role (default: shown below)
+  # Optional: width of the frame for the input with the detect role (default: use native stream resolution)
   width: 1280
-  # Optional: height of the frame for the input with the detect role (default: shown below)
+  # Optional: height of the frame for the input with the detect role (default: use native stream resolution)
   height: 720
   # Optional: desired fps for your camera for the input with the detect role (default: shown below)
   # NOTE: Recommended value of 5. Ideally, try and reduce your FPS on the camera.
   fps: 5
   # Optional: enables detection for the camera (default: True)
   enabled: True
+  # Optional: Number of consecutive detection hits required for an object to be initialized in the tracker. (default: 1/2 the frame rate)
+  min_initialized: 2
   # Optional: Number of frames without a detection before Frigate considers an object to be gone. (default: 5x the frame rate)
   max_disappeared: 25
   # Optional: Configuration for stationary object tracking
@@ -436,7 +438,7 @@ rtmp:
   enabled: False
 
 # Optional: Restream configuration
-# Uses https://github.com/AlexxIT/go2rtc (v1.8.1)
+# Uses https://github.com/AlexxIT/go2rtc (v1.8.2)
 go2rtc:
 
 # Optional: jsmpeg stream configuration for WebUI
@@ -489,7 +491,7 @@ cameras:
       # Required: A list of input streams for the camera. See documentation for more information.
       inputs:
         # Required: the path to the stream
-        # NOTE: path may include environment variables, which must begin with 'FRIGATE_' and be referenced in {}
+        # NOTE: path may include environment variables or docker secrets, which must begin with 'FRIGATE_' and be referenced in {}
         - path: rtsp://viewer:{FRIGATE_RTSP_PASSWORD}@10.0.10.10:554/cam/realmonitor?channel=1&subtype=2
           # Required: list of roles for this stream. valid values are: audio,detect,record,rtmp
           # NOTICE: In addition to assigning the audio, record, and rtmp roles,
@@ -518,6 +520,9 @@ cameras:
     # to be replaced by a newer image. (default: shown below)
     best_image_timeout: 60
 
+    # Optional: URL to visit the camera web UI directly from the system page. Might not be available on every camera.
+    webui_url: ""
+
     # Optional: zones for this camera
     zones:
       # Required: name of the zone

docs/docs/configuration/live.md

@@ -10,7 +10,7 @@ Frigate has different live view options, some of which require the bundled `go2r
 Live view options can be selected while viewing the live stream. The options are:
 
 | Source | Latency | Frame Rate                            | Resolution     | Audio                        | Requires go2rtc | Other Limitations                                |
-| ------ | ------- | ------------------------------------- | -------------- | ---------------------------- | --------------- | ------------------------------------------------- |
+| ------ | ------- | ------------------------------------- | -------------- | ---------------------------- | --------------- | ------------------------------------------------ |
 | jsmpeg | low     | same as `detect -> fps`, capped at 10 | same as detect | no                           | no              | none                                             |
 | mse    | low     | native                                | native         | yes (depends on audio codec) | yes             | iPhone requires iOS 17.1+, Firefox is h.264 only |
 | webrtc | lowest  | native                                | native         | yes (depends on audio codec) | yes             | requires extra config, doesn't support h.265     |
@@ -104,6 +104,7 @@ If you are having difficulties getting WebRTC to work and you are running Frigat
 If not running in host mode, port 8555 will need to be mapped for the container:
 
 docker-compose.yml
+
 ```yaml
 services:
   frigate:
@@ -115,4 +116,4 @@ services:
 
 :::
 
-See [go2rtc WebRTC docs](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#module-webrtc) for more information about this.
+See [go2rtc WebRTC docs](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#module-webrtc) for more information about this.

docs/docs/configuration/motion_detection.md

@@ -0,0 +1,103 @@
+---
+id: motion_detection
+title: Motion Detection
+---
+
+# Tuning Motion Detection
+
+Frigate uses motion detection as a first line check to see if there is anything happening in the frame worth checking with object detection.
+
+Once motion is detected, it tries to group up nearby areas of motion together in hopes of identifying a rectangle in the image that will capture the area worth inspecting. These are the red "motion boxes" you see in the debug viewer.
+
+## The Goal
+
+The default motion settings should work well for the majority of cameras, however there are cases where tuning motion detection can lead to better and more optimal results. Each camera has its own environment with different variables that affect motion, this means that the same motion settings will not fit all of your cameras.
+
+Before tuning motion it is important to understand the goal. In an optimal configuration, motion from people and cars would be detected, but not grass moving, lighting changes, timestamps, etc. If your motion detection is too sensitive, you will experience higher CPU loads and greater false positives from the increased rate of object detection. If it is not sensitive enough, you will miss events.
+
+## Create Motion Masks
+
+First, mask areas with regular motion not caused by the objects you want to detect. The best way to find candidates for motion masks is by watching the debug stream with motion boxes enabled. Good use cases for motion masks are timestamps or tree limbs and large bushes that regularly move due to wind. When possible, avoid creating motion masks that would block motion detection for objects you want to track **even if they are in locations where you don't want events**. Motion masks should not be used to avoid detecting objects in specific areas. More details can be found [in the masks docs.](/configuration/masks.md). 
+
+## Prepare For Testing
+
+The easiest way to tune motion detection is to do it live, have one window / screen open with the frigate debug view and motion boxes enabled with another window / screen open allowing for configuring the motion settings. It is recommended to use Home Assistant or MQTT as they offer live configuration of some motion settings meaning that Frigate does not need to be restarted when values are changed.
+
+In Home Assistant the `Improve Contrast`, `Contour Area`, and `Threshold` configuration entities are disabled by default but can easily be enabled and used to tune live, otherwise MQTT can be used.
+
+## Tuning Motion Detection During The Day
+
+Now that things are set up, find a time to tune that represents normal circumstances. For example, if you tune your motion on a day that is sunny and windy you may find later that the motion settings are not sensitive enough on a cloudy and still day.
+
+:::note
+
+Remember that motion detection is just used to determine when object detection should be used. You should aim to have motion detection sensitive enough that you won't miss events from objects you want to detect with object detection. The goal is to prevent object detection from running constantly for every small pixel change in the image. Windy days are still going to result in lots of motion being detected.
+
+:::
+
+### Threshold
+
+The threshold value dictates how much of a change in a pixels luminance is required to be considered motion. 
+
+```yaml
+# default threshold value
+motion:
+  # Optional: The threshold passed to cv2.threshold to determine if a pixel is different enough to be counted as motion. (default: shown below)
+  # Increasing this value will make motion detection less sensitive and decreasing it will make motion detection more sensitive.
+  # The value should be between 1 and 255.
+  threshold: 30
+```
+
+Lower values mean motion detection is more sensitive to changes in color, making it more likely for example to detect motion when a brown dogs blends in with a brown fence or a person wearing a red shirt blends in with a red car. If the threshold is too low however, it may detect things like grass blowing in the wind, shadows, etc. to be detected as motion.
+
+Watching the motion boxes in the debug view, increase the threshold until you only see motion that is visible to the eye. Once this is done, it is important to test and ensure that desired motion is still detected.
+
+### Contour Area
+
+```yaml
+# default contour_area value
+motion:
+  # Optional: Minimum size in pixels in the resized motion image that counts as motion (default: shown below)
+  # Increasing this value will prevent smaller areas of motion from being detected. Decreasing will
+  # make motion detection more sensitive to smaller moving objects.
+  # As a rule of thumb:
+  #  - 10 - high sensitivity
+  #  - 30 - medium sensitivity
+  #  - 50 - low sensitivity
+  contour_area: 10
+```
+
+Once the threshold calculation is run, the pixels that have changed are grouped together. The contour area value is used to decide which groups of changed pixels qualify as motion. Smaller values are more sensitive meaning people that are far away, small animals, etc. are more likely to be detected as motion, but it also means that small changes in shadows, leaves, etc. are detected as motion. Higher values are less sensitive meaning these things won't be detected as motion but with the risk that desired motion won't be detected until closer to the camera.
+
+Watching the motion boxes in the debug view, adjust the contour area until there are no motion boxes smaller than the smallest you'd expect frigate to detect something moving. 
+
+### Improve Contrast
+
+At this point if motion is working as desired there is no reason to continue with tuning for the day. If you were unable to find a balance between desired and undesired motion being detected, you can try disabling improve contrast and going back to the threshold and contour area steps.
+
+## Tuning Motion Detection During The Night
+
+Once daytime motion detection is tuned, there is a chance that the settings will work well for motion detection during the night as well. If this is the case then the preferred settings can be written to the config file and left alone. 
+
+However, if the preferred day settings do not work well at night it is recommended to use HomeAssistant or some other solution to automate changing the settings. That way completely separate sets of motion settings can be used for optimal day and night motion detection.
+
+## Tuning For Large Changes In Motion
+
+```yaml
+# default lightning_threshold:
+motion:
+  # Optional: The percentage of the image used to detect lightning or other substantial changes where motion detection
+  #           needs to recalibrate. (default: shown below)
+  # Increasing this value will make motion detection more likely to consider lightning or ir mode changes as valid motion.
+  # Decreasing this value will make motion detection more likely to ignore large amounts of motion such as a person approaching
+  # a doorbell camera.
+  lightning_threshold: 0.8
+```
+
+:::tip
+
+Some cameras like doorbell cameras may have missed detections when someone walks directly in front of the camera and the lightning_threshold causes motion detection to be re-calibrated. In this case, it may be desirable to increase the `lightning_threshold` to ensure these events are not missed.
+
+:::
+
+Large changes in motion like PTZ moves and camera switches between Color and IR mode should result in no motion detection. This is done via the `lightning_threshold` configuration. It is defined as the percentage of the image used to detect lightning or other substantial changes where motion detection needs to recalibrate. Increasing this value will make motion detection more likely to consider lightning or IR mode changes as valid motion. Decreasing this value will make motion detection more likely to ignore large amounts of motion such as a person approaching a doorbell camera.

docs/docs/configuration/object_detectors.md

@@ -5,7 +5,7 @@ title: Object Detectors
 
 # Officially Supported Detectors
 
-Frigate provides the following builtin detector types: `cpu`, `edgetpu`, `openvino`, and `tensorrt`. By default, Frigate will use a single CPU detector. Other detectors may require additional configuration as described below. When using multiple detectors they will run in dedicated processes, but pull from a common queue of detection requests from across all cameras.
+Frigate provides the following builtin detector types: `cpu`, `edgetpu`, `openvino`, `tensorrt`, and `rknn`. By default, Frigate will use a single CPU detector. Other detectors may require additional configuration as described below. When using multiple detectors they will run in dedicated processes, but pull from a common queue of detection requests from across all cameras.
 
 ## CPU Detector (not recommended)
 
@@ -291,3 +291,38 @@ To verify that the integration is working correctly, start Frigate and observe t
 
 
 # Community Supported Detectors
+
+## Rockchip RKNN-Toolkit-Lite2
+
+This detector is only available if one of the following Rockchip SoCs is used:
+- RK3566/RK3568
+- RK3588/RK3588S
+- RV1103/RV1106
+- RK3562
+
+These SoCs come with a NPU that will highly speed up detection.
+
+### Setup
+
+RKNN support is provided using the `-rk` suffix for the docker image. Moreover, privileged mode must be enabled by adding the `--privileged` flag to your docker run command or `privileged: true` to your `docker-compose.yml` file.
+
+### Configuration
+
+This `config.yml` shows all relevant options to configure the detector and explains them. All values shown are the default values (except for one). Lines that are required at least to use the detector are labeled as required, all other lines are optional.
+```yaml
+detectors:                            # required
+  rknn:                               # required
+    type: rknn                        # required
+
+model:                                # required
+  # path to .rknn model file
+  path: /models/yolov8n-320x320.rknn
+  # width and height of detection frames
+  width: 320
+  height: 320
+  # pixel format of detection frame
+  # default value is rgb but yolov models usually use bgr format
+  input_pixel_format: bgr             # required
+  # shape of detection frame
+  input_tensor: nhwc
+```

docs/docs/configuration/restream.md

@@ -7,7 +7,7 @@ title: Restream
 
 Frigate can restream your video feed as an RTSP feed for other applications such as Home Assistant to utilize it at `rtsp://<frigate_host>:8554/<camera_name>`. Port 8554 must be open. [This allows you to use a video feed for detection in Frigate and Home Assistant live view at the same time without having to make two separate connections to the camera](#reduce-connections-to-camera). The video feed is copied from the original video feed directly to avoid re-encoding. This feed does not include any annotation by Frigate.
 
-Frigate uses [go2rtc](https://github.com/AlexxIT/go2rtc/tree/v1.8.1) to provide its restream and MSE/WebRTC capabilities. The go2rtc config is hosted at the `go2rtc` in the config, see [go2rtc docs](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#configuration) for more advanced configurations and features.
+Frigate uses [go2rtc](https://github.com/AlexxIT/go2rtc/tree/v1.8.2) to provide its restream and MSE/WebRTC capabilities. The go2rtc config is hosted at the `go2rtc` in the config, see [go2rtc docs](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#configuration) for more advanced configurations and features.
 
 :::note
 
@@ -18,6 +18,7 @@ You can access the go2rtc webUI at `http://frigate_ip:5000/live/webrtc` which ca
 ### Birdseye Restream
 
 Birdseye RTSP restream can be accessed at `rtsp://<frigate_host>:8554/birdseye`. Enabling the birdseye restream will cause birdseye to run 24/7 which may increase CPU usage somewhat.
+
 ```yaml
 birdseye:
   restream: true
@@ -32,8 +33,7 @@ go2rtc:
   rtsp:
     username: "admin"
     password: "pass"
-  streams:
-    ...
+  streams: ...
 ```
 
 **NOTE:** This does not apply to localhost requests, there is no need to provide credentials when using the restream as a source for frigate cameras.
@@ -138,7 +138,7 @@ cameras:
 
 ## Advanced Restream Configurations
 
-The [exec](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#source-exec) source in go2rtc can be used for custom ffmpeg commands. An example is below:
+The [exec](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#source-exec) source in go2rtc can be used for custom ffmpeg commands. An example is below:
 
 NOTE: The output will need to be passed with two curly braces `{{output}}`
 

docs/docs/frigate/hardware.md

@@ -95,6 +95,16 @@ Frigate supports all Jetson boards, from the inexpensive Jetson Nano to the powe
 
 Inference speed will vary depending on the YOLO model, jetson platform and jetson nvpmodel (GPU/DLA/EMC clock speed). It is typically 20-40 ms for most models. The DLA is more efficient than the GPU, but not faster, so using the DLA will reduce power consumption but will slightly increase inference time.
 
+#### Rockchip SoC
+
+Frigate supports SBCs with the following Rockchip SoCs:
+- RK3566/RK3568
+- RK3588/RK3588S
+- RV1103/RV1106
+- RK3562
+
+Using the yolov8n model and an Orange Pi 5 Plus with RK3588 SoC inference speeds vary between 25-40 ms.
+
 ## What does Frigate use the CPU for and what does it use a detector for? (ELI5 Version)
 
 This is taken from a [user question on reddit](https://www.reddit.com/r/homeassistant/comments/q8mgau/comment/hgqbxh5/?utm_source=share&utm_medium=web2x&context=3). Modified slightly for clarity.

docs/docs/frigate/installation.md

@@ -95,6 +95,7 @@ The following community supported builds are available:
 
 `ghcr.io/blakeblackshear/frigate:stable-tensorrt-jp5` - Frigate build optimized for nvidia Jetson devices running Jetpack 5
 `ghcr.io/blakeblackshear/frigate:stable-tensorrt-jp4` - Frigate build optimized for nvidia Jetson devices running Jetpack 4.6
+`ghcr.io/blakeblackshear/frigate:stable-rk` - Frigate build for SBCs with Rockchip SoC
 
 :::
 

docs/docs/guides/configuring_go2rtc.md

@@ -11,7 +11,7 @@ Use of the bundled go2rtc is optional. You can still configure FFmpeg to connect
 
 # Setup a go2rtc stream
 
-First, you will want to configure go2rtc to connect to your camera stream by adding the stream you want to use for live view in your Frigate config file. If you set the stream name under go2rtc to match the name of your camera, it will automatically be mapped and you will get additional live view options for the camera. Avoid changing any other parts of your config at this step. Note that go2rtc supports [many different stream types](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#module-streams), not just rtsp.
+First, you will want to configure go2rtc to connect to your camera stream by adding the stream you want to use for live view in your Frigate config file. If you set the stream name under go2rtc to match the name of your camera, it will automatically be mapped and you will get additional live view options for the camera. Avoid changing any other parts of your config at this step. Note that go2rtc supports [many different stream types](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#module-streams), not just rtsp.
 
 ```yaml
 go2rtc:
@@ -24,7 +24,7 @@ The easiest live view to get working is MSE. After adding this to the config, re
 
 ### What if my video doesn't play?
 
-If you are unable to see your video feed, first check the go2rtc logs in the Frigate UI under Logs in the sidebar. If go2rtc is having difficulty connecting to your camera, you should see some error messages in the log. If you do not see any errors, then the video codec of the stream may not be supported in your browser. If your camera stream is set to H265, try switching to H264. You can see more information about [video codec compatibility](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#codecs-madness) in the go2rtc documentation. If you are not able to switch your camera settings from H265 to H264 or your stream is a different format such as MJPEG, you can use go2rtc to re-encode the video using the [FFmpeg parameters](https://github.com/AlexxIT/go2rtc/tree/v1.8.1#source-ffmpeg). It supports rotating and resizing video feeds and hardware acceleration. Keep in mind that transcoding video from one format to another is a resource intensive task and you may be better off using the built-in jsmpeg view. Here is an example of a config that will re-encode the stream to H264 without hardware acceleration:
+If you are unable to see your video feed, first check the go2rtc logs in the Frigate UI under Logs in the sidebar. If go2rtc is having difficulty connecting to your camera, you should see some error messages in the log. If you do not see any errors, then the video codec of the stream may not be supported in your browser. If your camera stream is set to H265, try switching to H264. You can see more information about [video codec compatibility](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#codecs-madness) in the go2rtc documentation. If you are not able to switch your camera settings from H265 to H264 or your stream is a different format such as MJPEG, you can use go2rtc to re-encode the video using the [FFmpeg parameters](https://github.com/AlexxIT/go2rtc/tree/v1.8.2#source-ffmpeg). It supports rotating and resizing video feeds and hardware acceleration. Keep in mind that transcoding video from one format to another is a resource intensive task and you may be better off using the built-in jsmpeg view. Here is an example of a config that will re-encode the stream to H264 without hardware acceleration:
 
 ```yaml
 go2rtc:

docs/docs/integrations/api.md

@@ -263,6 +263,10 @@ Returns the snapshot image from the latest event for the given camera and label
 
 Returns the snapshot image from the specific point in that cameras recordings.
 
+### `GET /api/<camera_name>/grid.jpg`
+
+Returns the latest camera image with the regions grid overlaid.
+
 ### `GET /clips/<camera>-<id>.jpg`
 
 JPG snapshot for the given camera and event id.
@@ -361,3 +365,7 @@ Recording retention config still applies to manual events, if frigate is configu
 ### `PUT /api/events/<event_id>/end`
 
 End a specific manual event without a predetermined length.
+
+### `POST /api/restart`
+
+Restarts Frigate process.

docs/docs/integrations/mqtt.md

@@ -221,6 +221,10 @@ Topic to turn the PTZ autotracker for a camera on and off. Expected values are `
 
 Topic with current state of the PTZ autotracker for a camera. Published values are `ON` and `OFF`.
 
+### `frigate/<camera_name>/ptz_autotracker/active`
+
+Topic to determine if PTZ autotracker is actively tracking an object. Published values are `ON` and `OFF`.
+
 ### `frigate/<camera_name>/birdseye/set`
 
 Topic to turn Birdseye for a camera on and off. Expected values are `ON` and `OFF`. Birdseye mode

docs/docs/integrations/plus.md

@@ -19,7 +19,7 @@ Once logged in, you can generate an API key for Frigate in Settings.
 
 ### Set your API key
 
-In Frigate, you can set the `PLUS_API_KEY` environment variable to enable the `SEND TO FRIGATE+` buttons on the events page. You can set it in your Docker Compose file or in your Docker run command. Home Assistant Addon users can set it under Settings > Addons > Frigate NVR > Configuration > Options (be sure to toggle the "Show unused optional configuration options" switch).
+In Frigate, you can use an environment variable or a docker secret named `PLUS_API_KEY` to enable the `SEND TO FRIGATE+` buttons on the events page. Home Assistant Addon users can set it under Settings > Addons > Frigate NVR > Configuration > Options (be sure to toggle the "Show unused optional configuration options" switch).
 
 :::caution
 

docs/sidebars.js

@@ -21,7 +21,7 @@ module.exports = {
         {
           type: "link",
           label: "Go2RTC Configuration Reference",
-          href: "https://github.com/AlexxIT/go2rtc/tree/v1.8.1#configuration",
+          href: "https://github.com/AlexxIT/go2rtc/tree/v1.8.2#configuration",
         },
       ],
       Detectors: [
@@ -32,6 +32,7 @@ module.exports = {
         "configuration/cameras",
         "configuration/record",
         "configuration/snapshots",
+        "configuration/motion_detection",
         "configuration/birdseye",
         "configuration/live",
         "configuration/restream",

frigate/app.py

@@ -191,7 +191,8 @@ class FrigateApp:
                     "i",
                     self.config.cameras[camera_name].onvif.autotracking.enabled,
                 ),
-                "ptz_stopped": mp.Event(),
+                "ptz_tracking_active": mp.Event(),
+                "ptz_motor_stopped": mp.Event(),
                 "ptz_reset": mp.Event(),
                 "ptz_start_time": mp.Value("d", 0.0),  # type: ignore[typeddict-item]
                 # issue https://github.com/python/typeshed/issues/8799
@@ -212,7 +213,7 @@ class FrigateApp:
                 # issue https://github.com/python/typeshed/issues/8799
                 # from mypy 0.981 onwards
             }
-            self.ptz_metrics[camera_name]["ptz_stopped"].set()
+            self.ptz_metrics[camera_name]["ptz_motor_stopped"].set()
             self.feature_metrics[camera_name] = {
                 "audio_enabled": mp.Value(  # type: ignore[typeddict-item]
                     # issue https://github.com/python/typeshed/issues/8799
@@ -278,6 +279,17 @@ class FrigateApp:
             except PermissionError:
                 logger.error("Unable to write to /config to save DB state")
 
+        def cleanup_timeline_db(db: SqliteExtDatabase) -> None:
+            db.execute_sql(
+                "DELETE FROM timeline WHERE source_id NOT IN (SELECT id FROM event);"
+            )
+
+            try:
+                with open(f"{CONFIG_DIR}/.timeline", "w") as f:
+                    f.write(str(datetime.datetime.now().timestamp()))
+            except PermissionError:
+                logger.error("Unable to write to /config to save DB state")
+
         # Migrate DB location
         old_db_path = DEFAULT_DB_PATH
         if not os.path.isfile(self.config.database.path) and os.path.isfile(
@@ -293,6 +305,11 @@ class FrigateApp:
         router = Router(migrate_db)
         router.run()
 
+        # this is a temporary check to clean up user DB from beta
+        # will be removed before final release
+        if not os.path.exists(f"{CONFIG_DIR}/.timeline"):
+            cleanup_timeline_db(migrate_db)
+
         # check if vacuum needs to be run
         if os.path.exists(f"{CONFIG_DIR}/.vacuum"):
             with open(f"{CONFIG_DIR}/.vacuum") as f:
@@ -444,6 +461,7 @@ class FrigateApp:
             self.config,
             self.onvif_controller,
             self.ptz_metrics,
+            self.dispatcher,
             self.stop_event,
         )
         self.ptz_autotracker_thread.start()
@@ -485,7 +503,9 @@ class FrigateApp:
         # create or update region grids for each camera
         for camera in self.config.cameras.values():
             self.region_grids[camera.name] = get_camera_regions_grid(
-                camera.name, camera.detect
+                camera.name,
+                camera.detect,
+                max(self.config.model.width, self.config.model.height),
             )
 
     def start_camera_processors(self) -> None:

frigate/comms/dispatcher.py

@@ -96,7 +96,11 @@ class Dispatcher:
         elif topic == REQUEST_REGION_GRID:
             camera = payload
             self.camera_metrics[camera]["region_grid_queue"].put(
-                get_camera_regions_grid(camera, self.config.cameras[camera].detect)
+                get_camera_regions_grid(
+                    camera,
+                    self.config.cameras[camera].detect,
+                    max(self.config.model.width, self.config.model.height),
+                )
             )
         else:
             self.publish(topic, payload, retain=False)

frigate/comms/ws.py

@@ -1,5 +1,6 @@
 """Websocket communicator."""
 
+import errno
 import json
 import logging
 import threading
@@ -12,7 +13,7 @@ from ws4py.server.wsgirefserver import (
     WSGIServer,
 )
 from ws4py.server.wsgiutils import WebSocketWSGIApplication
-from ws4py.websocket import WebSocket
+from ws4py.websocket import WebSocket as WebSocket_
 
 from frigate.comms.dispatcher import Communicator
 from frigate.config import FrigateConfig
@@ -20,6 +21,18 @@ from frigate.config import FrigateConfig
 logger = logging.getLogger(__name__)
 
 
+class WebSocket(WebSocket_):
+    def unhandled_error(self, error):
+        """
+        Handles the unfriendly socket closures on the server side
+        without showing a confusing error message
+        """
+        if hasattr(error, "errno") and error.errno == errno.ECONNRESET:
+            pass
+        else:
+            logging.getLogger("ws4py").exception("Failed to receive data")
+
+
 class WebSocketClient(Communicator):  # type: ignore[misc]
     """Frigate wrapper for ws client."""
 

frigate/config.py

@@ -5,6 +5,7 @@ import json
 import logging
 import os
 from enum import Enum
+from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Union
 
 import matplotlib.pyplot as plt
@@ -16,6 +17,7 @@ from frigate.const import (
     ALL_ATTRIBUTE_LABELS,
     AUDIO_MIN_CONFIDENCE,
     CACHE_DIR,
+    CACHE_SEGMENT_FORMAT,
     DEFAULT_DB_PATH,
     REGEX_CAMERA_NAME,
     YAML_EXT,
@@ -47,6 +49,13 @@ DEFAULT_TIME_FORMAT = "%m/%d/%Y %H:%M:%S"
 # DEFAULT_TIME_FORMAT = "%d.%m.%Y %H:%M:%S"
 
 FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")}
+# read docker secret files as env vars too
+if os.path.isdir("/run/secrets"):
+    for secret_file in os.listdir("/run/secrets"):
+        if secret_file.startswith("FRIGATE_"):
+            FRIGATE_ENV_VARS[secret_file] = Path(
+                os.path.join("/run/secrets", secret_file)
+            ).read_text()
 
 DEFAULT_TRACKED_OBJECTS = ["person"]
 DEFAULT_LISTEN_AUDIO = ["bark", "fire_alarm", "scream", "speech", "yell"]
@@ -171,7 +180,7 @@ class PtzAutotrackConfig(FrigateBaseModel):
     timeout: int = Field(
         default=10, title="Seconds to delay before returning to preset."
     )
-    movement_weights: Optional[Union[float, List[float]]] = Field(
+    movement_weights: Optional[Union[str, List[str]]] = Field(
         default=[],
         title="Internal value used for PTZ movements based on the speed of your camera's motor.",
     )
@@ -352,6 +361,9 @@ class DetectConfig(FrigateBaseModel):
         default=5, title="Number of frames per second to process through detection."
     )
     enabled: bool = Field(default=True, title="Detection Enabled.")
+    min_initialized: Optional[int] = Field(
+        title="Minimum number of consecutive hits for an object to be initialized by the tracker."
+    )
     max_disappeared: Optional[int] = Field(
         title="Maximum number of frames the object can dissapear before detection ends."
     )
@@ -728,6 +740,9 @@ class CameraConfig(FrigateBaseModel):
         default=60,
         title="How long to wait for the image with the highest confidence score.",
     )
+    webui_url: Optional[str] = Field(
+        title="URL to visit the camera directly from system page",
+    )
     zones: Dict[str, ZoneConfig] = Field(
         default_factory=dict, title="Zone configuration."
     )
@@ -851,7 +866,7 @@ class CameraConfig(FrigateBaseModel):
 
             ffmpeg_output_args = (
                 record_args
-                + [f"{os.path.join(CACHE_DIR, self.name)}-%Y%m%d%H%M%S.mp4"]
+                + [f"{os.path.join(CACHE_DIR, self.name)}@{CACHE_SEGMENT_FORMAT}.mp4"]
                 + ffmpeg_output_args
             )
 
@@ -1143,6 +1158,11 @@ class FrigateConfig(FrigateBaseModel):
                             else DEFAULT_DETECT_DIMENSIONS["height"]
                         )
 
+            # Default min_initialized configuration
+            min_initialized = camera_config.detect.fps / 2
+            if camera_config.detect.min_initialized is None:
+                camera_config.detect.min_initialized = min_initialized
+
             # Default max_disappeared configuration
             max_disappeared = camera_config.detect.fps * 5
             if camera_config.detect.max_disappeared is None:

frigate/const.py

@@ -50,6 +50,7 @@ DRIVER_INTEL_iHD = "iHD"
 
 # Record Values
 
+CACHE_SEGMENT_FORMAT = "%Y%m%d%H%M%S%z"
 MAX_SEGMENT_DURATION = 600
 MAX_PLAYLIST_SECONDS = 7200  # support 2 hour segments for a single playlist to account for cameras with inconsistent segment times
 
@@ -60,7 +61,7 @@ REQUEST_REGION_GRID = "request_region_grid"
 
 # Autotracking
 
-AUTOTRACKING_MAX_AREA_RATIO = 0.5
+AUTOTRACKING_MAX_AREA_RATIO = 0.6
 AUTOTRACKING_MOTION_MIN_DISTANCE = 20
 AUTOTRACKING_MOTION_MAX_POINTS = 500
 AUTOTRACKING_MAX_MOVE_METRICS = 500

frigate/detectors/plugins/rknn.py

@@ -0,0 +1,122 @@
+import logging
+from typing import Literal
+
+import cv2
+import cv2.dnn
+import numpy as np
+
+try:
+    from hide_warnings import hide_warnings
+except:  # noqa: E722
+
+    def hide_warnings(func):
+        pass
+
+
+from pydantic import Field
+
+from frigate.detectors.detection_api import DetectionApi
+from frigate.detectors.detector_config import BaseDetectorConfig
+
+logger = logging.getLogger(__name__)
+
+DETECTOR_KEY = "rknn"
+
+
+class RknnDetectorConfig(BaseDetectorConfig):
+    type: Literal[DETECTOR_KEY]
+    score_thresh: float = Field(
+        default=0.5, ge=0, le=1, title="Minimal confidence for detection."
+    )
+    nms_thresh: float = Field(
+        default=0.45, ge=0, le=1, title="IoU threshold for non-maximum suppression."
+    )
+
+
+class Rknn(DetectionApi):
+    type_key = DETECTOR_KEY
+
+    def __init__(self, config: RknnDetectorConfig):
+        self.height = config.model.height
+        self.width = config.model.width
+        self.score_thresh = config.score_thresh
+        self.nms_thresh = config.nms_thresh
+
+        self.model_path = config.model.path or "/models/yolov8n-320x320.rknn"
+
+        from rknnlite.api import RKNNLite
+
+        self.rknn = RKNNLite(verbose=False)
+        if self.rknn.load_rknn(self.model_path) != 0:
+            logger.error("Error initializing rknn model.")
+        if self.rknn.init_runtime() != 0:
+            logger.error("Error initializing rknn runtime.")
+
+    def __del__(self):
+        self.rknn.release()
+
+    def postprocess(self, results):
+        """
+        Processes yolov8 output.
+
+        Args:
+        results: array with shape: (1, 84, n, 1) where n depends on yolov8 model size (for 320x320 model n=2100)
+
+        Returns:
+        detections: array with shape (20, 6) with 20 rows of (class, confidence, y_min, x_min, y_max, x_max)
+        """
+
+        results = np.transpose(results[0, :, :, 0])  # array shape (2100, 84)
+        classes = np.argmax(
+            results[:, 4:], axis=1
+        )  # array shape (2100,); index of class with max confidence of each row
+        scores = np.max(
+            results[:, 4:], axis=1
+        )  # array shape (2100,); max confidence of each row
+
+        # array shape (2100, 4); bounding box of each row
+        boxes = np.transpose(
+            np.vstack(
+                (
+                    results[:, 0] - 0.5 * results[:, 2],
+                    results[:, 1] - 0.5 * results[:, 3],
+                    results[:, 2],
+                    results[:, 3],
+                )
+            )
+        )
+
+        # indices of rows with confidence > SCORE_THRESH with Non-maximum Suppression (NMS)
+        result_boxes = cv2.dnn.NMSBoxes(
+            boxes, scores, self.score_thresh, self.nms_thresh, 0.5
+        )
+
+        detections = np.zeros((20, 6), np.float32)
+
+        for i in range(len(result_boxes)):
+            if i >= 20:
+                break
+
+            index = result_boxes[i]
+            detections[i] = [
+                classes[index],
+                scores[index],
+                (boxes[index][1]) / self.height,
+                (boxes[index][0]) / self.width,
+                (boxes[index][1] + boxes[index][3]) / self.height,
+                (boxes[index][0] + boxes[index][2]) / self.width,
+            ]
+
+        return detections
+
+    @hide_warnings
+    def inference(self, tensor_input):
+        return self.rknn.inference(inputs=tensor_input)
+
+    def detect_raw(self, tensor_input):
+        output = self.inference(
+            [
+                tensor_input,
+            ]
+        )
+        return self.postprocess(output[0])

frigate/detectors/plugins/tensorrt.py

@@ -303,6 +303,7 @@ class TensorRtDetector(DetectionApi):
         ordered[:, 3] = np.clip(ordered[:, 3] + ordered[:, 1], 0, 1)
         # put result into the correct order and limit to top 20
         detections = ordered[:, [5, 4, 1, 0, 3, 2]][:20]
+
         # pad to 20x6 shape
         append_cnt = 20 - len(detections)
         if append_cnt > 0:

frigate/events/audio.py

@@ -240,7 +240,10 @@ class AudioEventMaintainer(threading.Thread):
         rms = np.sqrt(np.mean(np.absolute(np.square(audio_as_float))))
 
         # Transform RMS to dBFS (decibels relative to full scale)
+        if rms > 0:
             dBFS = 20 * np.log10(np.abs(rms) / AUDIO_MAX_BIT_RANGE)
+        else:
+            dBFS = 0
 
         self.inter_process_communicator.queue.put(
             (f"{self.config.name}/audio/dBFS", float(dBFS))

frigate/events/external.py

@@ -106,10 +106,10 @@ class ExternalEventProcessor:
         # write jpg snapshot with optional annotations
         if draw.get("boxes") and isinstance(draw.get("boxes"), list):
             for box in draw.get("boxes"):
-                x = box["box"][0] * camera_config.detect.width
-                y = box["box"][1] * camera_config.detect.height
-                width = box["box"][2] * camera_config.detect.width
-                height = box["box"][3] * camera_config.detect.height
+                x = int(box["box"][0] * camera_config.detect.width)
+                y = int(box["box"][1] * camera_config.detect.height)
+                width = int(box["box"][2] * camera_config.detect.width)
+                height = int(box["box"][3] * camera_config.detect.height)
 
                 draw_box_with_label(
                     img_frame,

frigate/ffmpeg_presets.py

@@ -55,7 +55,6 @@ _user_agent_args = [
 ]
 
 PRESETS_HW_ACCEL_DECODE = {
-    "preset-rpi-32-h264": "-c:v:1 h264_v4l2m2m",
     "preset-rpi-64-h264": "-c:v:1 h264_v4l2m2m",
     "preset-vaapi": f"-hwaccel_flags allow_profile_mismatch -hwaccel vaapi -hwaccel_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format vaapi",
     "preset-intel-qsv-h264": f"-hwaccel qsv -qsv_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format qsv -c:v h264_qsv",
@@ -68,7 +67,6 @@ PRESETS_HW_ACCEL_DECODE = {
 }
 
 PRESETS_HW_ACCEL_SCALE = {
-    "preset-rpi-32-h264": "-r {0} -vf fps={0},scale={1}:{2}",
     "preset-rpi-64-h264": "-r {0} -vf fps={0},scale={1}:{2}",
     "preset-vaapi": "-r {0} -vf fps={0},scale_vaapi=w={1}:h={2},hwdownload,format=yuv420p",
     "preset-intel-qsv-h264": "-r {0} -vf vpp_qsv=framerate={0}:w={1}:h={2}:format=nv12,hwdownload,format=nv12,format=yuv420p",
@@ -81,7 +79,6 @@ PRESETS_HW_ACCEL_SCALE = {
 }
 
 PRESETS_HW_ACCEL_ENCODE_BIRDSEYE = {
-    "preset-rpi-32-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m {1}",
     "preset-rpi-64-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m {1}",
     "preset-vaapi": "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device {2} {0} -c:v h264_vaapi -g 50 -bf 0 -profile:v high -level:v 4.1 -sei:v 0 -an -vf format=vaapi|nv12,hwupload {1}",
     "preset-intel-qsv-h264": "ffmpeg -hide_banner {0} -c:v h264_qsv -g 50 -bf 0 -profile:v high -level:v 4.1 -async_depth:v 1 {1}",
@@ -94,8 +91,7 @@ PRESETS_HW_ACCEL_ENCODE_BIRDSEYE = {
 }
 
 PRESETS_HW_ACCEL_ENCODE_TIMELAPSE = {
-    "preset-rpi-32-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m {1}",
-    "preset-rpi-64-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m {1}",
+    "preset-rpi-64-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m -pix_fmt yuv420p {1}",
     "preset-vaapi": "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device {2} {0} -c:v h264_vaapi {1}",
     "preset-intel-qsv-h264": "ffmpeg -hide_banner {0} -c:v h264_qsv -profile:v high -level:v 4.1 -async_depth:v 1 {1}",
     "preset-intel-qsv-h265": "ffmpeg -hide_banner {0} -c:v hevc_qsv -profile:v high -level:v 4.1 -async_depth:v 1 {1}",

frigate/http.py

@@ -41,7 +41,7 @@ from frigate.const import (
     RECORD_DIR,
 )
 from frigate.events.external import ExternalEventProcessor
-from frigate.models import Event, Recordings, Timeline
+from frigate.models import Event, Recordings, Regions, Timeline
 from frigate.object_processing import TrackedObject
 from frigate.plus import PlusApi
 from frigate.ptz.onvif import OnvifController
@@ -115,7 +115,7 @@ def is_healthy():
 @bp.route("/events/summary")
 def events_summary():
     tz_name = request.args.get("timezone", default="utc", type=str)
-    hour_modifier, minute_modifier = get_tz_modifiers(tz_name)
+    hour_modifier, minute_modifier, seconds_offset = get_tz_modifiers(tz_name)
     has_clip = request.args.get("has_clip", type=int)
     has_snapshot = request.args.get("has_snapshot", type=int)
 
@@ -149,12 +149,7 @@ def events_summary():
             Event.camera,
             Event.label,
             Event.sub_label,
-            fn.strftime(
-                "%Y-%m-%d",
-                fn.datetime(
-                    Event.start_time, "unixepoch", hour_modifier, minute_modifier
-                ),
-            ),
+            (Event.start_time + seconds_offset).cast("int") / (3600 * 24),
             Event.zones,
         )
     )
@@ -726,6 +721,112 @@ def label_snapshot(camera_name, label):
         return response
 
 
+@bp.route("/<camera_name>/grid.jpg")
+def grid_snapshot(camera_name):
+    request.args.get("type", default="region")
+
+    if camera_name in current_app.frigate_config.cameras:
+        detect = current_app.frigate_config.cameras[camera_name].detect
+        frame = current_app.detected_frames_processor.get_current_frame(camera_name, {})
+        retry_interval = float(
+            current_app.frigate_config.cameras.get(camera_name).ffmpeg.retry_interval
+            or 10
+        )
+
+        if frame is None or datetime.now().timestamp() > (
+            current_app.detected_frames_processor.get_current_frame_time(camera_name)
+            + retry_interval
+        ):
+            return make_response(
+                jsonify({"success": False, "message": "Unable to get valid frame"}),
+                500,
+            )
+
+        try:
+            grid = (
+                Regions.select(Regions.grid)
+                .where(Regions.camera == camera_name)
+                .get()
+                .grid
+            )
+        except DoesNotExist:
+            return make_response(
+                jsonify({"success": False, "message": "Unable to get region grid"}),
+                500,
+            )
+
+        grid_size = len(grid)
+        grid_coef = 1.0 / grid_size
+        width = detect.width
+        height = detect.height
+        for x in range(grid_size):
+            for y in range(grid_size):
+                cell = grid[x][y]
+
+                if len(cell["sizes"]) == 0:
+                    continue
+
+                std_dev = round(cell["std_dev"] * width, 2)
+                mean = round(cell["mean"] * width, 2)
+                cv2.rectangle(
+                    frame,
+                    (int(x * grid_coef * width), int(y * grid_coef * height)),
+                    (
+                        int((x + 1) * grid_coef * width),
+                        int((y + 1) * grid_coef * height),
+                    ),
+                    (0, 255, 0),
+                    2,
+                )
+                cv2.putText(
+                    frame,
+                    f"#: {len(cell['sizes'])}",
+                    (
+                        int(x * grid_coef * width + 10),
+                        int((y * grid_coef + 0.02) * height),
+                    ),
+                    cv2.FONT_HERSHEY_SIMPLEX,
+                    fontScale=0.5,
+                    color=(0, 255, 0),
+                    thickness=2,
+                )
+                cv2.putText(
+                    frame,
+                    f"std: {std_dev}",
+                    (
+                        int(x * grid_coef * width + 10),
+                        int((y * grid_coef + 0.05) * height),
+                    ),
+                    cv2.FONT_HERSHEY_SIMPLEX,
+                    fontScale=0.5,
+                    color=(0, 255, 0),
+                    thickness=2,
+                )
+                cv2.putText(
+                    frame,
+                    f"avg: {mean}",
+                    (
+                        int(x * grid_coef * width + 10),
+                        int((y * grid_coef + 0.08) * height),
+                    ),
+                    cv2.FONT_HERSHEY_SIMPLEX,
+                    fontScale=0.5,
+                    color=(0, 255, 0),
+                    thickness=2,
+                )
+
+        ret, jpg = cv2.imencode(".jpg", frame, [int(cv2.IMWRITE_JPEG_QUALITY), 70])
+        response = make_response(jpg.tobytes())
+        response.headers["Content-Type"] = "image/jpeg"
+        response.headers["Cache-Control"] = "no-store"
+        return response
+    else:
+        return make_response(
+            jsonify({"success": False, "message": "Camera not found"}),
+            404,
+        )
+
+
 @bp.route("/events/<id>/clip.mp4")
 def event_clip(id):
     download = request.args.get("download", type=bool)
@@ -889,7 +990,7 @@ def events():
     if time_range != DEFAULT_TIME_RANGE:
         # get timezone arg to ensure browser times are used
         tz_name = request.args.get("timezone", default="utc", type=str)
-        hour_modifier, minute_modifier = get_tz_modifiers(tz_name)
+        hour_modifier, minute_modifier, _ = get_tz_modifiers(tz_name)
 
         times = time_range.split(",")
         time_after = times[0]
@@ -946,7 +1047,7 @@ def events():
     if is_submitted is not None:
         if is_submitted == 0:
             clauses.append((Event.plus_id.is_null()))
-        else:
+        elif is_submitted > 0:
             clauses.append((Event.plus_id != ""))
 
     if len(clauses) == 0:
@@ -1388,6 +1489,8 @@ def get_snapshot_from_recording(camera_name: str, frame_time: str):
             )
         )
         .where(Recordings.camera == camera_name)
+        .order_by(Recordings.start_time.desc())
+        .limit(1)
     )
 
     try:
@@ -1461,7 +1564,7 @@ def get_recordings_storage_usage():
 @bp.route("/<camera_name>/recordings/summary")
 def recordings_summary(camera_name):
     tz_name = request.args.get("timezone", default="utc", type=str)
-    hour_modifier, minute_modifier = get_tz_modifiers(tz_name)
+    hour_modifier, minute_modifier, seconds_offset = get_tz_modifiers(tz_name)
     recording_groups = (
         Recordings.select(
             fn.strftime(
@@ -1475,22 +1578,8 @@ def recordings_summary(camera_name):
             fn.SUM(Recordings.objects).alias("objects"),
         )
         .where(Recordings.camera == camera_name)
-        .group_by(
-            fn.strftime(
-                "%Y-%m-%d %H",
-                fn.datetime(
-                    Recordings.start_time, "unixepoch", hour_modifier, minute_modifier
-                ),
-            )
-        )
-        .order_by(
-            fn.strftime(
-                "%Y-%m-%d H",
-                fn.datetime(
-                    Recordings.start_time, "unixepoch", hour_modifier, minute_modifier
-                ),
-            ).desc()
-        )
+        .group_by((Recordings.start_time + seconds_offset).cast("int") / 3600)
+        .order_by(Recordings.start_time.desc())
         .namedtuples()
     )
 
@@ -1505,14 +1594,7 @@ def recordings_summary(camera_name):
             fn.COUNT(Event.id).alias("count"),
         )
         .where(Event.camera == camera_name, Event.has_clip)
-        .group_by(
-            fn.strftime(
-                "%Y-%m-%d %H",
-                fn.datetime(
-                    Event.start_time, "unixepoch", hour_modifier, minute_modifier
-                ),
-            ),
-        )
+        .group_by((Event.start_time + seconds_offset).cast("int") / 3600)
         .namedtuples()
     )
 
@@ -1995,3 +2077,30 @@ def logs(service: str):
             jsonify({"success": False, "message": "Could not find log file"}),
             500,
         )
+
+
+@bp.route("/restart", methods=["POST"])
+def restart():
+    try:
+        restart_frigate()
+    except Exception as e:
+        logging.error(f"Error restarting Frigate: {e}")
+        return make_response(
+            jsonify(
+                {
+                    "success": False,
+                    "message": "Unable to restart Frigate.",
+                }
+            ),
+            500,
+        )
+
+    return make_response(
+        jsonify(
+            {
+                "success": True,
+                "message": "Restarting (this can take up to one minute)...",
+            }
+        ),
+        200,
+    )

frigate/object_processing.py

@@ -248,10 +248,8 @@ class TrackedObject:
             if self.obj_data["frame_time"] - self.previous["frame_time"] > 60:
                 significant_change = True
 
-            # update autotrack at half fps
-            if self.obj_data["frame_time"] - self.previous["frame_time"] > (
-                1 / (self.camera_config.detect.fps / 2)
-            ):
+            # update autotrack at most 3 objects per second
+            if self.obj_data["frame_time"] - self.previous["frame_time"] >= (1 / 3):
                 autotracker_update = True
 
         self.obj_data.update(obj_data)

frigate/output.py

@@ -20,8 +20,8 @@ from ws4py.server.wsgirefserver import (
     WSGIServer,
 )
 from ws4py.server.wsgiutils import WebSocketWSGIApplication
-from ws4py.websocket import WebSocket
 
+from frigate.comms.ws import WebSocket
 from frigate.config import BirdseyeModeEnum, FrigateConfig
 from frigate.const import BASE_DIR, BIRDSEYE_PIPE
 from frigate.types import CameraMetricsTypes
@@ -63,8 +63,8 @@ def get_canvas_shape(width: int, height: int) -> tuple[int, int]:
     a_w, a_h = get_standard_aspect_ratio(width, height)
 
     if round(a_w / a_h, 2) != round(width / height, 2):
-        canvas_width = width
-        canvas_height = int((canvas_width / a_w) * a_h)
+        canvas_width = int(width // 4 * 4)
+        canvas_height = int((canvas_width / a_w * a_h) // 4 * 4)
         logger.warning(
             f"The birdseye resolution is a non-standard aspect ratio, forcing birdseye resolution to {canvas_width} x {canvas_height}"
         )
@@ -108,9 +108,12 @@ class Canvas:
         return camera_aspect
 
 
-class FFMpegConverter:
+class FFMpegConverter(threading.Thread):
     def __init__(
         self,
+        camera: str,
+        input_queue: queue.Queue,
+        stop_event: mp.Event,
         in_width: int,
         in_height: int,
         out_width: int,
@@ -118,6 +121,11 @@ class FFMpegConverter:
         quality: int,
         birdseye_rtsp: bool = False,
     ):
+        threading.Thread.__init__(self)
+        self.name = f"{camera}_output_converter"
+        self.camera = camera
+        self.input_queue = input_queue
+        self.stop_event = stop_event
         self.bd_pipe = None
 
         if birdseye_rtsp:
@@ -167,7 +175,7 @@ class FFMpegConverter:
         os.close(stdin)
         self.reading_birdseye = False
 
-    def write(self, b) -> None:
+    def __write(self, b) -> None:
         self.process.stdin.write(b)
 
         if self.bd_pipe:
@@ -203,9 +211,25 @@ class FFMpegConverter:
             self.process.kill()
             self.process.communicate()
 
+    def run(self) -> None:
+        while not self.stop_event.is_set():
+            try:
+                frame = self.input_queue.get(True, timeout=1)
+                self.__write(frame)
+            except queue.Empty:
+                pass
+
+        self.exit()
+
 
 class BroadcastThread(threading.Thread):
-    def __init__(self, camera, converter, websocket_server, stop_event):
+    def __init__(
+        self,
+        camera: str,
+        converter: FFMpegConverter,
+        websocket_server,
+        stop_event: mp.Event,
+    ):
         super(BroadcastThread, self).__init__()
         self.camera = camera
         self.converter = converter
@@ -463,7 +487,7 @@ class BirdsEyeFrameManager:
     def calculate_layout(self, cameras_to_add: list[str], coefficient) -> tuple[any]:
         """Calculate the optimal layout for 2+ cameras."""
 
-        def map_layout(row_height: int):
+        def map_layout(camera_layout: list[list[any]], row_height: int):
             """Map the calculated layout."""
             candidate_layout = []
             starting_x = 0
@@ -492,7 +516,7 @@ class BirdsEyeFrameManager:
                         x + scaled_width > self.canvas.width
                         or y + scaled_height > self.canvas.height
                     ):
-                        return 0, 0, None
+                        return x + scaled_width, y + scaled_height, None
 
                     final_row.append((cameras[0], (x, y, scaled_width, scaled_height)))
                     x += scaled_width
@@ -564,7 +588,21 @@ class BirdsEyeFrameManager:
             return None
 
         row_height = int(self.canvas.height / coefficient)
-        total_width, total_height, standard_candidate_layout = map_layout(row_height)
+        total_width, total_height, standard_candidate_layout = map_layout(
+            camera_layout, row_height
+        )
+
+        if not standard_candidate_layout:
+            # if standard layout didn't work
+            # try reducing row_height by the % overflow
+            scale_down_percent = max(
+                total_width / self.canvas.width,
+                total_height / self.canvas.height,
+            )
+            row_height = int(row_height / scale_down_percent)
+            total_width, total_height, standard_candidate_layout = map_layout(
+                camera_layout, row_height
+            )
 
             if not standard_candidate_layout:
                 return None
@@ -578,7 +616,7 @@ class BirdsEyeFrameManager:
             1 / (total_height / self.canvas.height),
         )
         row_height = int(row_height * scale_up_percent)
-        _, _, scaled_layout = map_layout(row_height)
+        _, _, scaled_layout = map_layout(camera_layout, row_height)
 
         if scaled_layout:
             return scaled_layout
@@ -664,15 +702,20 @@ def output_frames(
     websocket_server.initialize_websockets_manager()
     websocket_thread = threading.Thread(target=websocket_server.serve_forever)
 
+    inputs: dict[str, queue.Queue] = {}
     converters = {}
     broadcasters = {}
 
     for camera, cam_config in config.cameras.items():
+        inputs[camera] = queue.Queue(maxsize=cam_config.detect.fps)
         width = int(
             cam_config.live.height
             * (cam_config.frame_shape[1] / cam_config.frame_shape[0])
         )
         converters[camera] = FFMpegConverter(
+            camera,
+            inputs[camera],
+            stop_event,
             cam_config.frame_shape[1],
             cam_config.frame_shape[0],
             width,
@@ -684,7 +727,11 @@ def output_frames(
         )
 
     if config.birdseye.enabled:
+        inputs["birdseye"] = queue.Queue(maxsize=10)
         converters["birdseye"] = FFMpegConverter(
+            "birdseye",
+            inputs["birdseye"],
+            stop_event,
             config.birdseye.width,
             config.birdseye.height,
             config.birdseye.width,
@@ -701,6 +748,9 @@ def output_frames(
 
     websocket_thread.start()
 
+    for t in converters.values():
+        t.start()
+
     for t in broadcasters.values():
         t.start()
 
@@ -735,7 +785,11 @@ def output_frames(
             ws.environ["PATH_INFO"].endswith(camera) for ws in websocket_server.manager
         ):
             # write to the converter for the camera if clients are listening to the specific camera
-            converters[camera].write(frame.tobytes())
+            try:
+                inputs[camera].put_nowait(frame.tobytes())
+            except queue.Full:
+                # drop frames if queue is full
+                pass
 
         if config.birdseye.enabled and (
             config.birdseye.restream
@@ -756,7 +810,11 @@ def output_frames(
                 if config.birdseye.restream:
                     birdseye_buffer[:] = frame_bytes
 
-                converters["birdseye"].write(frame_bytes)
+                try:
+                    inputs["birdseye"].put_nowait(frame_bytes)
+                except queue.Full:
+                    # drop frames if queue is full
+                    pass
 
         if camera in previous_frames:
             frame_manager.delete(f"{camera}{previous_frames[camera]}")
@@ -776,10 +834,9 @@ def output_frames(
         frame = frame_manager.get(frame_id, config.cameras[camera].frame_shape_yuv)
         frame_manager.delete(frame_id)
 
-    for c in converters.values():
-        c.exit()
     for b in broadcasters.values():
         b.join()
+
     websocket_server.manager.close_all()
     websocket_server.manager.stop()
     websocket_server.manager.join()

frigate/plus.py

@@ -3,6 +3,7 @@ import json
 import logging
 import os
 import re
+from pathlib import Path
 from typing import Any, List
 
 import cv2
@@ -36,6 +37,10 @@ class PlusApi:
         self.key = None
         if PLUS_ENV_VAR in os.environ:
             self.key = os.environ.get(PLUS_ENV_VAR)
+        elif os.path.isdir("/run/secrets") and PLUS_ENV_VAR in os.listdir(
+            "/run/secrets"
+        ):
+            self.key = Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text()
         # check for the addon options file
         elif os.path.isfile("/data/options.json"):
             with open("/data/options.json") as f:

frigate/ptz/autotrack.py

@@ -18,6 +18,7 @@ from norfair.camera_motion import (
     TranslationTransformationGetter,
 )
 
+from frigate.comms.dispatcher import Dispatcher
 from frigate.config import CameraConfig, FrigateConfig, ZoomingModeEnum
 from frigate.const import (
     AUTOTRACKING_MAX_AREA_RATIO,
@@ -144,11 +145,12 @@ class PtzAutoTrackerThread(threading.Thread):
         config: FrigateConfig,
         onvif: OnvifController,
         ptz_metrics: dict[str, PTZMetricsTypes],
+        dispatcher: Dispatcher,
         stop_event: MpEvent,
     ) -> None:
         threading.Thread.__init__(self)
         self.name = "ptz_autotracker"
-        self.ptz_autotracker = PtzAutoTracker(config, onvif, ptz_metrics)
+        self.ptz_autotracker = PtzAutoTracker(config, onvif, ptz_metrics, dispatcher)
         self.stop_event = stop_event
         self.config = config
 
@@ -175,10 +177,12 @@ class PtzAutoTracker:
         config: FrigateConfig,
         onvif: OnvifController,
         ptz_metrics: PTZMetricsTypes,
+        dispatcher: Dispatcher,
     ) -> None:
         self.config = config
         self.onvif = onvif
         self.ptz_metrics = ptz_metrics
+        self.dispatcher = dispatcher
         self.tracked_object: dict[str, object] = {}
         self.tracked_object_history: dict[str, object] = {}
         self.tracked_object_metrics: dict[str, object] = {}
@@ -215,8 +219,8 @@ class PtzAutoTracker:
             maxlen=round(camera_config.detect.fps * 1.5)
         )
         self.tracked_object_metrics[camera] = {
-            "max_target_box": 1
-            - (AUTOTRACKING_MAX_AREA_RATIO ** self.zoom_factor[camera])
+            "max_target_box": AUTOTRACKING_MAX_AREA_RATIO
+            ** (1 / self.zoom_factor[camera])
         }
 
         self.calibrating[camera] = False
@@ -268,6 +272,10 @@ class PtzAutoTracker:
 
             if camera_config.onvif.autotracking.movement_weights:
                 if len(camera_config.onvif.autotracking.movement_weights) == 5:
+                    camera_config.onvif.autotracking.movement_weights = [
+                        float(val)
+                        for val in camera_config.onvif.autotracking.movement_weights
+                    ]
                     self.ptz_metrics[camera][
                         "ptz_min_zoom"
                     ].value = camera_config.onvif.autotracking.movement_weights[0]
@@ -290,6 +298,8 @@ class PtzAutoTracker:
             if camera_config.onvif.autotracking.calibrate_on_startup:
                 self._calibrate_camera(camera)
 
+        self.ptz_metrics[camera]["ptz_tracking_active"].clear()
+        self.dispatcher.publish(f"{camera}/ptz_autotracker/active", "OFF", retain=False)
         self.autotracker_init[camera] = True
 
     def _write_config(self, camera):
@@ -334,7 +344,7 @@ class PtzAutoTracker:
                     1,
                 )
 
-                while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+                while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                     self.onvif.get_camera_status(camera)
 
                 zoom_out_values.append(self.ptz_metrics[camera]["ptz_zoom_level"].value)
@@ -345,7 +355,7 @@ class PtzAutoTracker:
                     1,
                 )
 
-                while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+                while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                     self.onvif.get_camera_status(camera)
 
                 zoom_in_values.append(self.ptz_metrics[camera]["ptz_zoom_level"].value)
@@ -363,7 +373,7 @@ class PtzAutoTracker:
                         1,
                     )
 
-                    while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+                    while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                         self.onvif.get_camera_status(camera)
 
                     zoom_out_values.append(
@@ -379,7 +389,7 @@ class PtzAutoTracker:
                         1,
                     )
 
-                    while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+                    while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                         self.onvif.get_camera_status(camera)
 
                     zoom_in_values.append(
@@ -402,10 +412,10 @@ class PtzAutoTracker:
             self.config.cameras[camera].onvif.autotracking.return_preset.lower(),
         )
         self.ptz_metrics[camera]["ptz_reset"].set()
-        self.ptz_metrics[camera]["ptz_stopped"].clear()
+        self.ptz_metrics[camera]["ptz_motor_stopped"].clear()
 
         # Wait until the camera finishes moving
-        while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+        while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
             self.onvif.get_camera_status(camera)
 
         for step in range(num_steps):
@@ -416,7 +426,7 @@ class PtzAutoTracker:
             self.onvif._move_relative(camera, pan, tilt, 0, 1)
 
             # Wait until the camera finishes moving
-            while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+            while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                 self.onvif.get_camera_status(camera)
             stop_time = time.time()
 
@@ -434,10 +444,10 @@ class PtzAutoTracker:
                 self.config.cameras[camera].onvif.autotracking.return_preset.lower(),
             )
             self.ptz_metrics[camera]["ptz_reset"].set()
-            self.ptz_metrics[camera]["ptz_stopped"].clear()
+            self.ptz_metrics[camera]["ptz_motor_stopped"].clear()
 
             # Wait until the camera finishes moving
-            while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+            while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                 self.onvif.get_camera_status(camera)
 
             logger.info(
@@ -521,7 +531,11 @@ class PtzAutoTracker:
         camera_height = camera_config.frame_shape[0]
 
         # Extract areas and calculate weighted average
-        areas = [obj["area"] for obj in self.tracked_object_history[camera]]
+        # grab the largest dimension of the bounding box and create a square from that
+        areas = [
+            max(obj["box"][2] - obj["box"][0], obj["box"][3] - obj["box"][1]) ** 2
+            for obj in self.tracked_object_history[camera]
+        ]
 
         filtered_areas = (
             remove_outliers(areas)
@@ -598,7 +612,9 @@ class PtzAutoTracker:
                             self.onvif._move_relative(camera, pan, tilt, 0, 1)
 
                             # Wait until the camera finishes moving
-                            while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+                            while not self.ptz_metrics[camera][
+                                "ptz_motor_stopped"
+                            ].is_set():
                                 self.onvif.get_camera_status(camera)
 
                         if (
@@ -608,7 +624,7 @@ class PtzAutoTracker:
                             self.onvif._zoom_absolute(camera, zoom, 1)
 
                     # Wait until the camera finishes moving
-                    while not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+                    while not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                         self.onvif.get_camera_status(camera)
 
                     if self.config.cameras[camera].onvif.autotracking.movement_weights:
@@ -686,19 +702,20 @@ class PtzAutoTracker:
         camera_height = camera_config.frame_shape[0]
         camera_fps = camera_config.detect.fps
 
+        # estimate_velocity is a numpy array of bbox top,left and bottom,right velocities
         velocities = obj.obj_data["estimate_velocity"]
         logger.debug(f"{camera}: Velocities from norfair: {velocities}")
 
         # if we are close enough to zero, return right away
         if np.all(np.round(velocities) == 0):
-            return True, np.zeros((2, 2))
+            return True, np.zeros((4,))
 
         # Thresholds
         x_mags_thresh = camera_width / camera_fps / 2
         y_mags_thresh = camera_height / camera_fps / 2
         dir_thresh = 0.93
-        delta_thresh = 12
-        var_thresh = 5
+        delta_thresh = 20
+        var_thresh = 10
 
         # Check magnitude
         x_mags = np.abs(velocities[:, 0])
@@ -722,7 +739,6 @@ class PtzAutoTracker:
                 np.linalg.norm(velocities[0]) * np.linalg.norm(velocities[1])
             )
             dir_thresh = 0.6 if np.all(delta < delta_thresh / 2) else dir_thresh
-            print(f"cosine sim: {cosine_sim}")
             invalid_dirs = cosine_sim < dir_thresh
 
         # Combine
@@ -752,10 +768,10 @@ class PtzAutoTracker:
                 )
             )
             # invalid velocity
-            return False, np.zeros((2, 2))
+            return False, np.zeros((4,))
         else:
             logger.debug(f"{camera}: Valid velocity ")
-            return True, np.mean(velocities, axis=0)
+            return True, velocities.flatten()
 
     def _get_distance_threshold(self, camera, obj):
         # Returns true if Euclidean distance from object to center of frame is
@@ -836,7 +852,7 @@ class PtzAutoTracker:
         # ensure object is not moving quickly
         below_velocity_threshold = np.all(
             np.abs(average_velocity)
-            < np.array([velocity_threshold_x, velocity_threshold_y])
+            < np.tile([velocity_threshold_x, velocity_threshold_y], 2)
         ) or np.all(average_velocity == 0)
 
         below_area_threshold = (
@@ -847,21 +863,11 @@ class PtzAutoTracker:
         # introduce some hysteresis to prevent a yo-yo zooming effect
         zoom_out_hysteresis = (
             self.tracked_object_metrics[camera]["target_box"]
-            > (
-                self.tracked_object_metrics[camera]["original_target_box"]
-                * AUTOTRACKING_ZOOM_OUT_HYSTERESIS
-            )
-            or self.tracked_object_metrics[camera]["target_box"]
             > self.tracked_object_metrics[camera]["max_target_box"]
             * AUTOTRACKING_ZOOM_OUT_HYSTERESIS
         )
         zoom_in_hysteresis = (
             self.tracked_object_metrics[camera]["target_box"]
-            < (
-                self.tracked_object_metrics[camera]["original_target_box"]
-                * AUTOTRACKING_ZOOM_IN_HYSTERESIS
-            )
-            or self.tracked_object_metrics[camera]["target_box"]
             < self.tracked_object_metrics[camera]["max_target_box"]
             * AUTOTRACKING_ZOOM_IN_HYSTERESIS
         )
@@ -938,7 +944,7 @@ class PtzAutoTracker:
         camera_height = camera_config.frame_shape[0]
         camera_fps = camera_config.detect.fps
 
-        average_velocity = np.zeros((2, 2))
+        average_velocity = np.zeros((4,))
         predicted_box = obj.obj_data["box"]
 
         centroid_x = obj.obj_data["centroid"][0]
@@ -966,7 +972,6 @@ class PtzAutoTracker:
                 # this box could exceed the frame boundaries if velocity is high
                 # but we'll handle that in _enqueue_move() as two separate moves
                 current_box = np.array(obj.obj_data["box"])
-                average_velocity = np.tile(average_velocity, 2)
                 predicted_box = (
                     current_box
                     + camera_fps * predicted_movement_time * average_velocity
@@ -1010,7 +1015,10 @@ class PtzAutoTracker:
         zoom = 0
         result = None
         current_zoom_level = self.ptz_metrics[camera]["ptz_zoom_level"].value
-        target_box = obj.obj_data["area"] / (camera_width * camera_height)
+        target_box = max(
+            obj.obj_data["box"][2] - obj.obj_data["box"][0],
+            obj.obj_data["box"][3] - obj.obj_data["box"][1],
+        ) ** 2 / (camera_width * camera_height)
 
         # absolute zooming separately from pan/tilt
         if camera_config.onvif.autotracking.zooming == ZoomingModeEnum.absolute:
@@ -1055,30 +1063,20 @@ class PtzAutoTracker:
                     )
                 ) is not None:
                     # zoom value
-                    limit = (
-                        self.tracked_object_metrics[camera]["original_target_box"]
-                        if self.tracked_object_metrics[camera]["target_box"]
-                        < self.tracked_object_metrics[camera]["max_target_box"]
-                        else self.tracked_object_metrics[camera]["max_target_box"]
+                    ratio = (
+                        self.tracked_object_metrics[camera]["max_target_box"]
+                        / self.tracked_object_metrics[camera]["target_box"]
                     )
-                    zoom = (
-                        2
-                        * (
-                            limit
-                            / (
-                                self.tracked_object_metrics[camera]["target_box"]
-                                + limit
+                    zoom = (ratio - 1) / (ratio + 1)
+                    logger.debug(
+                        f'{camera}: limit: {self.tracked_object_metrics[camera]["max_target_box"]}, ratio: {ratio} zoom calculation: {zoom}'
                     )
-                        )
-                        - 1
-                    )
-                    logger.debug(f"{camera}: Zoom calculation: {zoom}")
                     if not result:
                         # zoom out with special condition if zooming out because of velocity, edges, etc.
-                        zoom = -(1 - zoom) if zoom > 0 else -(zoom + 1)
+                        zoom = -(1 - zoom) if zoom > 0 else -(zoom * 2 + 1)
                     if result:
                         # zoom in
-                        zoom = 1 - zoom if zoom > 0 else (zoom + 1)
+                        zoom = 1 - zoom if zoom > 0 else (zoom * 2 + 1)
 
         logger.debug(f"{camera}: Zooming: {result} Zoom amount: {zoom}")
 
@@ -1117,6 +1115,10 @@ class PtzAutoTracker:
                 logger.debug(
                     f"{camera}: New object: {obj.obj_data['id']} {obj.obj_data['box']} {obj.obj_data['frame_time']}"
                 )
+                self.ptz_metrics[camera]["ptz_tracking_active"].set()
+                self.dispatcher.publish(
+                    f"{camera}/ptz_autotracker/active", "ON", retain=False
+                )
                 self.tracked_object[camera] = obj
 
                 self.tracked_object_history[camera].append(copy.deepcopy(obj.obj_data))
@@ -1199,8 +1201,8 @@ class PtzAutoTracker:
                 )
                 self.tracked_object[camera] = None
                 self.tracked_object_metrics[camera] = {
-                    "max_target_box": 1
-                    - (AUTOTRACKING_MAX_AREA_RATIO ** self.zoom_factor[camera])
+                    "max_target_box": AUTOTRACKING_MAX_AREA_RATIO
+                    ** (1 / self.zoom_factor[camera])
                 }
 
     def camera_maintenance(self, camera):
@@ -1219,7 +1221,7 @@ class PtzAutoTracker:
         if not self.autotracker_init[camera]:
             self._autotracker_setup(self.config.cameras[camera], camera)
         # regularly update camera status
-        if not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+        if not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
             self.onvif.get_camera_status(camera)
 
         # return to preset if tracking is over
@@ -1242,7 +1244,7 @@ class PtzAutoTracker:
             while not self.move_queues[camera].empty():
                 self.move_queues[camera].get()
 
-            self.ptz_metrics[camera]["ptz_stopped"].wait()
+            self.ptz_metrics[camera]["ptz_motor_stopped"].wait()
             logger.debug(
                 f"{camera}: Time is {self.ptz_metrics[camera]['ptz_frame_time'].value}, returning to preset: {autotracker_config.return_preset}"
             )
@@ -1252,7 +1254,11 @@ class PtzAutoTracker:
             )
 
             # update stored zoom level from preset
-            if not self.ptz_metrics[camera]["ptz_stopped"].is_set():
+            if not self.ptz_metrics[camera]["ptz_motor_stopped"].is_set():
                 self.onvif.get_camera_status(camera)
 
+            self.ptz_metrics[camera]["ptz_tracking_active"].clear()
+            self.dispatcher.publish(
+                f"{camera}/ptz_autotracker/active", "OFF", retain=False
+            )
             self.ptz_metrics[camera]["ptz_reset"].set()

frigate/ptz/onvif.py

@@ -299,7 +299,7 @@ class OnvifController:
             return
 
         self.cams[camera_name]["active"] = True
-        self.ptz_metrics[camera_name]["ptz_stopped"].clear()
+        self.ptz_metrics[camera_name]["ptz_motor_stopped"].clear()
         logger.debug(
             f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name]['ptz_frame_time'].value}"
         )
@@ -366,7 +366,7 @@ class OnvifController:
             return
 
         self.cams[camera_name]["active"] = True
-        self.ptz_metrics[camera_name]["ptz_stopped"].clear()
+        self.ptz_metrics[camera_name]["ptz_motor_stopped"].clear()
         self.ptz_metrics[camera_name]["ptz_start_time"].value = 0
         self.ptz_metrics[camera_name]["ptz_stop_time"].value = 0
         move_request = self.cams[camera_name]["move_request"]
@@ -413,7 +413,7 @@ class OnvifController:
             return
 
         self.cams[camera_name]["active"] = True
-        self.ptz_metrics[camera_name]["ptz_stopped"].clear()
+        self.ptz_metrics[camera_name]["ptz_motor_stopped"].clear()
         logger.debug(
             f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name]['ptz_frame_time'].value}"
         )
@@ -543,8 +543,8 @@ class OnvifController:
             zoom_status is None or zoom_status.lower() == "idle"
         ):
             self.cams[camera_name]["active"] = False
-            if not self.ptz_metrics[camera_name]["ptz_stopped"].is_set():
-                self.ptz_metrics[camera_name]["ptz_stopped"].set()
+            if not self.ptz_metrics[camera_name]["ptz_motor_stopped"].is_set():
+                self.ptz_metrics[camera_name]["ptz_motor_stopped"].set()
 
                 logger.debug(
                     f"{camera_name}: PTZ stop time: {self.ptz_metrics[camera_name]['ptz_frame_time'].value}"
@@ -555,8 +555,8 @@ class OnvifController:
                 ]["ptz_frame_time"].value
         else:
             self.cams[camera_name]["active"] = True
-            if self.ptz_metrics[camera_name]["ptz_stopped"].is_set():
-                self.ptz_metrics[camera_name]["ptz_stopped"].clear()
+            if self.ptz_metrics[camera_name]["ptz_motor_stopped"].is_set():
+                self.ptz_metrics[camera_name]["ptz_motor_stopped"].clear()
 
                 logger.debug(
                     f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name]['ptz_frame_time'].value}"
@@ -586,7 +586,7 @@ class OnvifController:
 
         # some hikvision cams won't update MoveStatus, so warn if it hasn't changed
         if (
-            not self.ptz_metrics[camera_name]["ptz_stopped"].is_set()
+            not self.ptz_metrics[camera_name]["ptz_motor_stopped"].is_set()
             and not self.ptz_metrics[camera_name]["ptz_reset"].is_set()
             and self.ptz_metrics[camera_name]["ptz_start_time"].value != 0
             and self.ptz_metrics[camera_name]["ptz_frame_time"].value

frigate/record/cleanup.py

@@ -3,17 +3,15 @@
 import datetime
 import itertools
 import logging
-import os
 import threading
 from multiprocessing.synchronize import Event as MpEvent
 from pathlib import Path
 
-from peewee import DatabaseError, chunked
-
 from frigate.config import FrigateConfig, RetainModeEnum
 from frigate.const import CACHE_DIR, RECORD_DIR
-from frigate.models import Event, Recordings, RecordingsToDelete
-from frigate.record.util import remove_empty_directories
+from frigate.models import Event, Recordings
+from frigate.record.util import remove_empty_directories, sync_recordings
+from frigate.util.builtin import clear_and_unlink, get_tomorrow_at_time
 
 logger = logging.getLogger(__name__)
 
@@ -33,11 +31,7 @@ class RecordingCleanup(threading.Thread):
             logger.debug(f"Checking tmp clip {p}.")
             if p.stat().st_mtime < (datetime.datetime.now().timestamp() - 60 * 1):
                 logger.debug("Deleting tmp clip.")
-
-                # empty contents of file before unlinking https://github.com/blakeblackshear/frigate/issues/4769
-                with open(p, "w"):
-                    pass
-                p.unlink(missing_ok=True)
+                clear_and_unlink(p)
 
     def expire_recordings(self) -> None:
         """Delete recordings based on retention config."""
@@ -180,76 +174,25 @@ class RecordingCleanup(threading.Thread):
         logger.debug("End all cameras.")
         logger.debug("End expire recordings.")
 
-    def sync_recordings(self) -> None:
-        """Check the db for stale recordings entries that don't exist in the filesystem."""
-        logger.debug("Start sync recordings.")
-
-        # get all recordings in the db
-        recordings = Recordings.select(Recordings.id, Recordings.path)
-
-        # get all recordings files on disk and put them in a set
-        files_on_disk = {
-            os.path.join(root, file)
-            for root, _, files in os.walk(RECORD_DIR)
-            for file in files
-        }
-
-        # Use pagination to process records in chunks
-        page_size = 1000
-        num_pages = (recordings.count() + page_size - 1) // page_size
-        recordings_to_delete = set()
-
-        for page in range(num_pages):
-            for recording in recordings.paginate(page, page_size):
-                if recording.path not in files_on_disk:
-                    recordings_to_delete.add(recording.id)
-
-        # convert back to list of dictionaries for insertion
-        recordings_to_delete = [
-            {"id": recording_id} for recording_id in recordings_to_delete
-        ]
-
-        if len(recordings_to_delete) / max(1, recordings.count()) > 0.5:
-            logger.debug(
-                f"Deleting {(len(recordings_to_delete) / recordings.count()):2f}% of recordings could be due to configuration error. Aborting..."
-            )
-            return
-
-        logger.debug(
-            f"Deleting {len(recordings_to_delete)} recordings with missing files"
-        )
-
-        # create a temporary table for deletion
-        RecordingsToDelete.create_table(temporary=True)
-
-        # insert ids to the temporary table
-        max_inserts = 1000
-        for batch in chunked(recordings_to_delete, max_inserts):
-            RecordingsToDelete.insert_many(batch).execute()
-
-        try:
-            # delete records in the main table that exist in the temporary table
-            query = Recordings.delete().where(
-                Recordings.id.in_(RecordingsToDelete.select(RecordingsToDelete.id))
-            )
-            query.execute()
-        except DatabaseError as e:
-            logger.error(f"Database error during delete: {e}")
-
-        logger.debug("End sync recordings.")
-
     def run(self) -> None:
         # on startup sync recordings with disk if enabled
         if self.config.record.sync_on_startup:
-            self.sync_recordings()
+            sync_recordings(limited=False)
+
+        next_sync = get_tomorrow_at_time(3)
 
         # Expire tmp clips every minute, recordings and clean directories every hour.
         for counter in itertools.cycle(range(self.config.record.expire_interval)):
             if self.stop_event.wait(60):
                 logger.info("Exiting recording cleanup...")
                 break
+
             self.clean_tmp_clips()
 
+            if datetime.datetime.now().astimezone(datetime.timezone.utc) > next_sync:
+                sync_recordings(limited=True)
+                next_sync = get_tomorrow_at_time(3)
+
             if counter == 0:
                 self.expire_recordings()
                 remove_empty_directories(RECORD_DIR)

frigate/record/export.py

@@ -6,6 +6,7 @@ import os
 import subprocess as sp
 import threading
 from enum import Enum
+from pathlib import Path
 
 from frigate.config import FrigateConfig
 from frigate.const import EXPORT_DIR, MAX_PLAYLIST_SECONDS
@@ -121,6 +122,7 @@ class RecordingExporter(threading.Thread):
                 f"Failed to export recording for command {' '.join(ffmpeg_cmd)}"
             )
             logger.error(p.stderr)
+            Path(file_name).unlink(missing_ok=True)
             return
 
         logger.debug(f"Updating finalized export {file_name}")

frigate/record/maintainer.py

@@ -20,6 +20,7 @@ import psutil
 from frigate.config import FrigateConfig, RetainModeEnum
 from frigate.const import (
     CACHE_DIR,
+    CACHE_SEGMENT_FORMAT,
     INSERT_MANY_RECORDINGS,
     MAX_SEGMENT_DURATION,
     RECORD_DIR,
@@ -31,6 +32,8 @@ from frigate.util.services import get_video_properties
 
 logger = logging.getLogger(__name__)
 
+QUEUE_READ_TIMEOUT = 0.00001  # seconds
+
 
 class SegmentInfo:
     def __init__(
@@ -74,15 +77,13 @@ class RecordingMaintainer(threading.Thread):
         self.end_time_cache: dict[str, Tuple[datetime.datetime, float]] = {}
 
     async def move_files(self) -> None:
-        cache_files = sorted(
-            [
+        cache_files = [
             d
             for d in os.listdir(CACHE_DIR)
             if os.path.isfile(os.path.join(CACHE_DIR, d))
             and d.endswith(".mp4")
             and not d.startswith("clip_")
         ]
-        )
 
         files_in_use = []
         for process in psutil.process_iter():
@@ -106,8 +107,12 @@ class RecordingMaintainer(threading.Thread):
 
             cache_path = os.path.join(CACHE_DIR, cache)
             basename = os.path.splitext(cache)[0]
-            camera, date = basename.rsplit("-", maxsplit=1)
-            start_time = datetime.datetime.strptime(date, "%Y%m%d%H%M%S")
+            camera, date = basename.rsplit("@", maxsplit=1)
+
+            # important that start_time is utc because recordings are stored and compared in utc
+            start_time = datetime.datetime.strptime(
+                date, CACHE_SEGMENT_FORMAT
+            ).astimezone(datetime.timezone.utc)
 
             grouped_recordings[camera].append(
                 {
@@ -119,6 +124,11 @@ class RecordingMaintainer(threading.Thread):
         # delete all cached files past the most recent 5
         keep_count = 5
         for camera in grouped_recordings.keys():
+            # sort based on start time
+            grouped_recordings[camera] = sorted(
+                grouped_recordings[camera], key=lambda s: s["start_time"]
+            )
+
             segment_count = len(grouped_recordings[camera])
             if segment_count > keep_count:
                 logger.warning(
@@ -163,8 +173,6 @@ class RecordingMaintainer(threading.Thread):
                     Event.has_clip,
                 )
                 .order_by(Event.start_time)
-                .namedtuples()
-                .iterator()
             )
 
             tasks.extend(
@@ -218,7 +226,7 @@ class RecordingMaintainer(threading.Thread):
         # if cached file's start_time is earlier than the retain days for the camera
         if start_time <= (
             (
-                datetime.datetime.now()
+                datetime.datetime.now().astimezone(datetime.timezone.utc)
                 - datetime.timedelta(
                     days=self.config.cameras[camera].record.retain.days
                 )
@@ -260,8 +268,10 @@ class RecordingMaintainer(threading.Thread):
                 most_recently_processed_frame_time = (
                     camera_info[-1][0] if len(camera_info) > 0 else 0
                 )
-                retain_cutoff = most_recently_processed_frame_time - pre_capture
-                if end_time.timestamp() < retain_cutoff:
+                retain_cutoff = datetime.datetime.fromtimestamp(
+                    most_recently_processed_frame_time - pre_capture
+                ).astimezone(datetime.timezone.utc)
+                if end_time < retain_cutoff:
                     Path(cache_path).unlink(missing_ok=True)
                     self.end_time_cache.pop(cache_path, None)
         # else retain days includes this segment
@@ -273,7 +283,12 @@ class RecordingMaintainer(threading.Thread):
             )
 
             # ensure delayed segment info does not lead to lost segments
-            if most_recently_processed_frame_time >= end_time.timestamp():
+            if (
+                datetime.datetime.fromtimestamp(
+                    most_recently_processed_frame_time
+                ).astimezone(datetime.timezone.utc)
+                >= end_time
+            ):
                 record_mode = self.config.cameras[camera].record.retain.mode
                 return await self.move_segment(
                     camera, start_time, end_time, duration, cache_path, record_mode
@@ -339,18 +354,18 @@ class RecordingMaintainer(threading.Thread):
             self.end_time_cache.pop(cache_path, None)
             return
 
+        # directory will be in utc due to start_time being in utc
         directory = os.path.join(
             RECORD_DIR,
-            start_time.astimezone(tz=datetime.timezone.utc).strftime("%Y-%m-%d/%H"),
+            start_time.strftime("%Y-%m-%d/%H"),
             camera,
         )
 
         if not os.path.exists(directory):
             os.makedirs(directory)
 
-        file_name = (
-            f"{start_time.replace(tzinfo=datetime.timezone.utc).strftime('%M.%S.mp4')}"
-        )
+        # file will be in utc due to start_time being in utc
+        file_name = f"{start_time.strftime('%M.%S.mp4')}"
         file_path = os.path.join(directory, file_name)
 
         try:
@@ -437,7 +452,9 @@ class RecordingMaintainer(threading.Thread):
                         current_tracked_objects,
                         motion_boxes,
                         regions,
-                    ) = self.object_recordings_info_queue.get(True, timeout=0.01)
+                    ) = self.object_recordings_info_queue.get(
+                        True, timeout=QUEUE_READ_TIMEOUT
+                    )
 
                     if frame_time < run_start - stale_frame_count_threshold:
                         stale_frame_count += 1
@@ -473,7 +490,9 @@ class RecordingMaintainer(threading.Thread):
                             frame_time,
                             dBFS,
                             audio_detections,
-                        ) = self.audio_recordings_info_queue.get(True, timeout=0.01)
+                        ) = self.audio_recordings_info_queue.get(
+                            True, timeout=QUEUE_READ_TIMEOUT
+                        )
 
                         if frame_time < run_start - stale_frame_count_threshold:
                             stale_frame_count += 1

frigate/record/util.py

@@ -1,7 +1,16 @@
 """Recordings Utilities."""
 
+import datetime
+import logging
 import os
 
+from peewee import DatabaseError, chunked
+
+from frigate.const import RECORD_DIR
+from frigate.models import Recordings, RecordingsToDelete
+
+logger = logging.getLogger(__name__)
+
 
 def remove_empty_directories(directory: str) -> None:
     # list all directories recursively and sort them by path,
@@ -17,3 +26,107 @@ def remove_empty_directories(directory: str) -> None:
             continue
         if len(os.listdir(path)) == 0:
             os.rmdir(path)
+
+
+def sync_recordings(limited: bool) -> None:
+    """Check the db for stale recordings entries that don't exist in the filesystem."""
+
+    def delete_db_entries_without_file(files_on_disk: list[str]) -> bool:
+        """Delete db entries where file was deleted outside of frigate."""
+
+        if limited:
+            recordings = Recordings.select(Recordings.id, Recordings.path).where(
+                Recordings.start_time
+                >= (datetime.datetime.now() - datetime.timedelta(hours=36)).timestamp()
+            )
+        else:
+            # get all recordings in the db
+            recordings = Recordings.select(Recordings.id, Recordings.path)
+
+        # Use pagination to process records in chunks
+        page_size = 1000
+        num_pages = (recordings.count() + page_size - 1) // page_size
+        recordings_to_delete = set()
+
+        for page in range(num_pages):
+            for recording in recordings.paginate(page, page_size):
+                if recording.path not in files_on_disk:
+                    recordings_to_delete.add(recording.id)
+
+        # convert back to list of dictionaries for insertion
+        recordings_to_delete = [
+            {"id": recording_id} for recording_id in recordings_to_delete
+        ]
+
+        if float(len(recordings_to_delete)) / max(1, recordings.count()) > 0.5:
+            logger.debug(
+                f"Deleting {(float(len(recordings_to_delete)) / recordings.count()):2f}% of recordings DB entries, could be due to configuration error. Aborting..."
+            )
+            return False
+
+        logger.debug(
+            f"Deleting {len(recordings_to_delete)} recording DB entries with missing files"
+        )
+
+        # create a temporary table for deletion
+        RecordingsToDelete.create_table(temporary=True)
+
+        # insert ids to the temporary table
+        max_inserts = 1000
+        for batch in chunked(recordings_to_delete, max_inserts):
+            RecordingsToDelete.insert_many(batch).execute()
+
+        try:
+            # delete records in the main table that exist in the temporary table
+            query = Recordings.delete().where(
+                Recordings.id.in_(RecordingsToDelete.select(RecordingsToDelete.id))
+            )
+            query.execute()
+        except DatabaseError as e:
+            logger.error(f"Database error during recordings db cleanup: {e}")
+
+        return True
+
+    def delete_files_without_db_entry(files_on_disk: list[str]):
+        """Delete files where file is not inside frigate db."""
+        files_to_delete = []
+
+        for file in files_on_disk:
+            if not Recordings.select().where(Recordings.path == file).exists():
+                files_to_delete.append(file)
+
+        if float(len(files_to_delete)) / max(1, len(files_on_disk)) > 0.5:
+            logger.debug(
+                f"Deleting {(float(len(files_to_delete)) / len(files_on_disk)):2f}% of recordings DB entries, could be due to configuration error. Aborting..."
+            )
+            return
+
+        for file in files_to_delete:
+            os.unlink(file)
+
+    logger.debug("Start sync recordings.")
+
+    if limited:
+        # get recording files from last 36 hours
+        hour_check = f"{RECORD_DIR}/{(datetime.datetime.now().astimezone(datetime.timezone.utc) - datetime.timedelta(hours=36)).strftime('%Y-%m-%d/%H')}"
+        files_on_disk = {
+            os.path.join(root, file)
+            for root, _, files in os.walk(RECORD_DIR)
+            for file in files
+            if root > hour_check
+        }
+    else:
+        # get all recordings files on disk and put them in a set
+        files_on_disk = {
+            os.path.join(root, file)
+            for root, _, files in os.walk(RECORD_DIR)
+            for file in files
+        }
+
+    db_success = delete_db_entries_without_file(files_on_disk)
+
+    # only try to cleanup files if db cleanup was successful
+    if db_success:
+        delete_files_without_db_entry(files_on_disk)
+
+    logger.debug("End sync recordings.")

frigate/storage.py

@@ -10,6 +10,7 @@ from peewee import fn
 from frigate.config import FrigateConfig
 from frigate.const import RECORD_DIR
 from frigate.models import Event, Recordings
+from frigate.util.builtin import clear_and_unlink
 
 logger = logging.getLogger(__name__)
 bandwidth_equation = Recordings.segment_size / (
@@ -35,7 +36,7 @@ class StorageMaintainer(threading.Thread):
             if self.camera_storage_stats.get(camera, {}).get("needs_refresh", True):
                 self.camera_storage_stats[camera] = {
                     "needs_refresh": (
-                        Recordings.select(fn.COUNT(Recordings.id))
+                        Recordings.select(fn.COUNT("*"))
                         .where(Recordings.camera == camera, Recordings.segment_size > 0)
                         .scalar()
                         < 50
@@ -159,9 +160,13 @@ class StorageMaintainer(threading.Thread):
 
             # Delete recordings not retained indefinitely
             if not keep:
-                deleted_segments_size += recording.segment_size
-                Path(recording.path).unlink(missing_ok=True)
+                try:
+                    clear_and_unlink(Path(recording.path), missing_ok=False)
                     deleted_recordings.add(recording.id)
+                    deleted_segments_size += recording.segment_size
+                except FileNotFoundError:
+                    # this file was not found so we must assume no space was cleaned up
+                    pass
 
         # check if need to delete retained segments
         if deleted_segments_size < hourly_bandwidth:
@@ -183,9 +188,15 @@ class StorageMaintainer(threading.Thread):
                 if deleted_segments_size > hourly_bandwidth:
                     break
 
+                try:
+                    clear_and_unlink(Path(recording.path), missing_ok=False)
                     deleted_segments_size += recording.segment_size
-                Path(recording.path).unlink(missing_ok=True)
                     deleted_recordings.add(recording.id)
+                except FileNotFoundError:
+                    # this file was not found so we must assume no space was cleaned up
+                    pass
+        else:
+            logger.info(f"Cleaned up {deleted_segments_size} MB of recordings")
 
         logger.debug(f"Expiring {len(deleted_recordings)} recordings")
         # delete up to 100,000 at a time

frigate/test/test_config.py

@@ -1651,11 +1651,11 @@ class TestConfig(unittest.TestCase):
 
         runtime_config = frigate_config.runtime_config()
         assert runtime_config.cameras["back"].onvif.autotracking.movement_weights == [
-            0,
-            1,
-            1.23,
-            2.34,
-            0.50,
+            "0.0",
+            "1.0",
+            "1.23",
+            "2.34",
+            "0.5",
         ]
 
     def test_fails_invalid_movement_weights(self):

frigate/test/test_storage.py

@@ -1,6 +1,7 @@
 import datetime
 import logging
 import os
+import tempfile
 import unittest
 from unittest.mock import MagicMock
 
@@ -26,6 +27,7 @@ class TestHttp(unittest.TestCase):
         self.db = SqliteQueueDatabase(TEST_DB)
         models = [Event, Recordings]
         self.db.bind(models)
+        self.test_dir = tempfile.mkdtemp()
 
         self.minimal_config = {
             "mqtt": {"host": "mqtt"},
@@ -94,6 +96,7 @@ class TestHttp(unittest.TestCase):
         rec_bd_id = "1234568.backdoor"
         _insert_mock_recording(
             rec_fd_id,
+            os.path.join(self.test_dir, f"{rec_fd_id}.tmp"),
             time_keep,
             time_keep + 10,
             camera="front_door",
@@ -102,6 +105,7 @@ class TestHttp(unittest.TestCase):
         )
         _insert_mock_recording(
             rec_bd_id,
+            os.path.join(self.test_dir, f"{rec_bd_id}.tmp"),
             time_keep + 10,
             time_keep + 20,
             camera="back_door",
@@ -123,6 +127,7 @@ class TestHttp(unittest.TestCase):
         rec_fd_id = "1234567.frontdoor"
         _insert_mock_recording(
             rec_fd_id,
+            os.path.join(self.test_dir, f"{rec_fd_id}.tmp"),
             time_keep,
             time_keep + 10,
             camera="front_door",
@@ -141,13 +146,33 @@ class TestHttp(unittest.TestCase):
 
         id = "123456.keep"
         time_keep = datetime.datetime.now().timestamp()
-        _insert_mock_event(id, time_keep, time_keep + 30, True)
+        _insert_mock_event(
+            id,
+            time_keep,
+            time_keep + 30,
+            True,
+        )
         rec_k_id = "1234567.keep"
         rec_k2_id = "1234568.keep"
         rec_k3_id = "1234569.keep"
-        _insert_mock_recording(rec_k_id, time_keep, time_keep + 10)
-        _insert_mock_recording(rec_k2_id, time_keep + 10, time_keep + 20)
-        _insert_mock_recording(rec_k3_id, time_keep + 20, time_keep + 30)
+        _insert_mock_recording(
+            rec_k_id,
+            os.path.join(self.test_dir, f"{rec_k_id}.tmp"),
+            time_keep,
+            time_keep + 10,
+        )
+        _insert_mock_recording(
+            rec_k2_id,
+            os.path.join(self.test_dir, f"{rec_k2_id}.tmp"),
+            time_keep + 10,
+            time_keep + 20,
+        )
+        _insert_mock_recording(
+            rec_k3_id,
+            os.path.join(self.test_dir, f"{rec_k3_id}.tmp"),
+            time_keep + 20,
+            time_keep + 30,
+        )
 
         id2 = "7890.delete"
         time_delete = datetime.datetime.now().timestamp() - 360
@@ -155,9 +180,24 @@ class TestHttp(unittest.TestCase):
         rec_d_id = "78901.delete"
         rec_d2_id = "78902.delete"
         rec_d3_id = "78903.delete"
-        _insert_mock_recording(rec_d_id, time_delete, time_delete + 10)
-        _insert_mock_recording(rec_d2_id, time_delete + 10, time_delete + 20)
-        _insert_mock_recording(rec_d3_id, time_delete + 20, time_delete + 30)
+        _insert_mock_recording(
+            rec_d_id,
+            os.path.join(self.test_dir, f"{rec_d_id}.tmp"),
+            time_delete,
+            time_delete + 10,
+        )
+        _insert_mock_recording(
+            rec_d2_id,
+            os.path.join(self.test_dir, f"{rec_d2_id}.tmp"),
+            time_delete + 10,
+            time_delete + 20,
+        )
+        _insert_mock_recording(
+            rec_d3_id,
+            os.path.join(self.test_dir, f"{rec_d3_id}.tmp"),
+            time_delete + 20,
+            time_delete + 30,
+        )
 
         storage.calculate_camera_bandwidth()
         storage.reduce_storage_consumption()
@@ -176,18 +216,42 @@ class TestHttp(unittest.TestCase):
 
         id = "123456.keep"
         time_keep = datetime.datetime.now().timestamp()
-        _insert_mock_event(id, time_keep, time_keep + 30, True)
+        _insert_mock_event(
+            id,
+            time_keep,
+            time_keep + 30,
+            True,
+        )
         rec_k_id = "1234567.keep"
         rec_k2_id = "1234568.keep"
         rec_k3_id = "1234569.keep"
-        _insert_mock_recording(rec_k_id, time_keep, time_keep + 10)
-        _insert_mock_recording(rec_k2_id, time_keep + 10, time_keep + 20)
-        _insert_mock_recording(rec_k3_id, time_keep + 20, time_keep + 30)
+        _insert_mock_recording(
+            rec_k_id,
+            os.path.join(self.test_dir, f"{rec_k_id}.tmp"),
+            time_keep,
+            time_keep + 10,
+        )
+        _insert_mock_recording(
+            rec_k2_id,
+            os.path.join(self.test_dir, f"{rec_k2_id}.tmp"),
+            time_keep + 10,
+            time_keep + 20,
+        )
+        _insert_mock_recording(
+            rec_k3_id,
+            os.path.join(self.test_dir, f"{rec_k3_id}.tmp"),
+            time_keep + 20,
+            time_keep + 30,
+        )
 
         time_delete = datetime.datetime.now().timestamp() - 7200
         for i in range(0, 59):
+            id = f"{123456 + i}.delete"
             _insert_mock_recording(
-                f"{123456 + i}.delete", time_delete, time_delete + 600
+                id,
+                os.path.join(self.test_dir, f"{id}.tmp"),
+                time_delete,
+                time_delete + 600,
             )
 
         storage.calculate_camera_bandwidth()
@@ -219,13 +283,23 @@ def _insert_mock_event(id: str, start: int, end: int, retain: bool) -> Event:
 
 
 def _insert_mock_recording(
-    id: str, start: int, end: int, camera="front_door", seg_size=8, seg_dur=10
+    id: str,
+    file: str,
+    start: int,
+    end: int,
+    camera="front_door",
+    seg_size=8,
+    seg_dur=10,
 ) -> Event:
     """Inserts a basic recording model with a given id."""
+    # we must open the file so storage maintainer will delete it
+    with open(file, "w"):
+        pass
+
     return Recordings.insert(
         id=id,
         camera=camera,
-        path=f"/recordings/{id}",
+        path=file,
         start_time=start,
         end_time=end,
         duration=seg_dur,

frigate/timeline.py

@@ -102,5 +102,11 @@ class TimelineProcessor(threading.Thread):
                 )[0]
                 Timeline.insert(timeline_entry).execute()
         elif event_type == "end":
+            if event_data["has_clip"] or event_data["has_snapshot"]:
                 timeline_entry[Timeline.class_type] = "gone"
                 Timeline.insert(timeline_entry).execute()
+            else:
+                # if event was not saved then the timeline entries should be deleted
+                Timeline.delete().where(
+                    Timeline.source_id == event_data["id"]
+                ).execute()

frigate/track/norfair_tracker.py

@@ -68,7 +68,6 @@ class NorfairTracker(ObjectTracker):
         self.untracked_object_boxes: list[list[int]] = []
         self.disappeared = {}
         self.positions = {}
-        self.max_disappeared = config.detect.max_disappeared
         self.camera_config = config
         self.detect_config = config.detect
         self.ptz_metrics = ptz_metrics
@@ -81,8 +80,8 @@ class NorfairTracker(ObjectTracker):
         self.tracker = Tracker(
             distance_function=frigate_distance,
             distance_threshold=2.5,
-            initialization_delay=self.detect_config.fps / 2,
-            hit_counter_max=self.max_disappeared,
+            initialization_delay=self.detect_config.min_initialized,
+            hit_counter_max=self.detect_config.max_disappeared,
         )
         if self.ptz_autotracker_enabled.value:
             self.ptz_motion_estimator = PtzMotionEstimator(

frigate/types.py

@@ -31,7 +31,8 @@ class CameraMetricsTypes(TypedDict):
 
 class PTZMetricsTypes(TypedDict):
     ptz_autotracker_enabled: Synchronized
-    ptz_stopped: Event
+    ptz_tracking_active: Event
+    ptz_motor_stopped: Event
     ptz_reset: Event
     ptz_start_time: Synchronized
     ptz_stop_time: Synchronized

frigate/util/builtin.py

@@ -8,6 +8,7 @@ import shlex
 import urllib.parse
 from collections import Counter
 from collections.abc import Mapping
+from pathlib import Path
 from typing import Any, Tuple
 
 import numpy as np
@@ -114,10 +115,8 @@ def load_config_with_no_duplicates(raw_config) -> dict:
 
 def clean_camera_user_pass(line: str) -> str:
     """Removes user and password from line."""
-    if "rtsp://" in line:
-        return re.sub(REGEX_RTSP_CAMERA_USER_PASS, "://*:*@", line)
-    else:
-        return re.sub(REGEX_HTTP_CAMERA_USER_PASS, "user=*&password=*", line)
+    rtsp_cleaned = re.sub(REGEX_RTSP_CAMERA_USER_PASS, "://*:*@", line)
+    return re.sub(REGEX_HTTP_CAMERA_USER_PASS, "user=*&password=*", rtsp_cleaned)
 
 
 def escape_special_characters(path: str) -> str:
@@ -158,7 +157,7 @@ def load_labels(path, encoding="utf-8", prefill=91):
         return labels
 
 
-def get_tz_modifiers(tz_name: str) -> Tuple[str, str]:
+def get_tz_modifiers(tz_name: str) -> Tuple[str, str, int]:
     seconds_offset = (
         datetime.datetime.now(pytz.timezone(tz_name)).utcoffset().total_seconds()
     )
@@ -166,7 +165,7 @@ def get_tz_modifiers(tz_name: str) -> Tuple[str, str]:
     minutes_offset = int(seconds_offset / 60 - hours_offset * 60)
     hour_modifier = f"{hours_offset} hour"
     minute_modifier = f"{minutes_offset} minute"
-    return hour_modifier, minute_modifier
+    return hour_modifier, minute_modifier, seconds_offset
 
 
 def to_relative_box(
@@ -265,8 +264,21 @@ def find_by_key(dictionary, target_key):
     return None
 
 
-def get_tomorrow_at_2() -> datetime.datetime:
+def get_tomorrow_at_time(hour: int) -> datetime.datetime:
+    """Returns the datetime of the following day at 2am."""
     tomorrow = datetime.datetime.now(get_localzone()) + datetime.timedelta(days=1)
-    return tomorrow.replace(hour=2, minute=0, second=0).astimezone(
+    return tomorrow.replace(hour=hour, minute=0, second=0).astimezone(
         datetime.timezone.utc
     )
+
+
+def clear_and_unlink(file: Path, missing_ok: bool = True) -> None:
+    """clear file then unlink to avoid space retained by file descriptors."""
+    if not missing_ok and not file.exists():
+        raise FileNotFoundError()
+
+    # empty contents of file before unlinking https://github.com/blakeblackshear/frigate/issues/4769
+    with open(file, "w"):
+        pass
+
+    file.unlink(missing_ok=missing_ok)

frigate/util/object.py

@@ -30,7 +30,9 @@ GRID_SIZE = 8
 
 
 def get_camera_regions_grid(
-    name: str, detect: DetectConfig
+    name: str,
+    detect: DetectConfig,
+    min_region_size: int,
 ) -> list[list[dict[str, any]]]:
     """Build a grid of expected region sizes for a camera."""
     # get grid from db if available
@@ -99,7 +101,7 @@ def get_camera_regions_grid(
             box[1] * height,
             (box[0] + box[2]) * width,
             (box[1] + box[3]) * height,
-            320,
+            min_region_size,
             1.35,
         )
         # save width of region to grid as relative
@@ -174,9 +176,9 @@ def get_region_from_grid(
 
     cell = region_grid[grid_x][grid_y]
 
-    # if there is no known data, get standard region for motion box
+    # if there is no known data, use original region calculation
     if not cell or not cell["sizes"]:
-        return calculate_region(frame_shape, box[0], box[1], box[2], box[3], min_region)
+        return box
 
     # convert the calculated region size to relative
     calc_size = (box[2] - box[0]) / frame_shape[1]

frigate/video.py

@@ -16,6 +16,7 @@ from frigate.const import (
     ALL_ATTRIBUTE_LABELS,
     ATTRIBUTE_LABEL_MAP,
     CACHE_DIR,
+    CACHE_SEGMENT_FORMAT,
     REQUEST_REGION_GRID,
 )
 from frigate.log import LogPipe
@@ -26,7 +27,7 @@ from frigate.ptz.autotrack import ptz_moving_at_frame_time
 from frigate.track import ObjectTracker
 from frigate.track.norfair_tracker import NorfairTracker
 from frigate.types import PTZMetricsTypes
-from frigate.util.builtin import EventsPerSecond, get_tomorrow_at_2
+from frigate.util.builtin import EventsPerSecond, get_tomorrow_at_time
 from frigate.util.image import (
     FrameManager,
     SharedMemoryFrameManager,
@@ -233,14 +234,15 @@ class CameraWatchdog(threading.Thread):
                 poll = p["process"].poll()
 
                 if self.config.record.enabled and "record" in p["roles"]:
-                    latest_segment_time = self.get_latest_segment_timestamp(
+                    latest_segment_time = self.get_latest_segment_datetime(
                         p.get(
-                            "latest_segment_time", datetime.datetime.now().timestamp()
+                            "latest_segment_time",
+                            datetime.datetime.now().astimezone(datetime.timezone.utc),
                         )
                     )
 
-                    if datetime.datetime.now().timestamp() > (
-                        latest_segment_time + 120
+                    if datetime.datetime.now().astimezone(datetime.timezone.utc) > (
+                        latest_segment_time + datetime.timedelta(seconds=120)
                     ):
                         self.logger.error(
                             f"No new recording segments were created for {self.camera_name} in the last 120s. restarting the ffmpeg record process..."
@@ -288,7 +290,7 @@ class CameraWatchdog(threading.Thread):
         )
         self.capture_thread.start()
 
-    def get_latest_segment_timestamp(self, latest_timestamp) -> int:
+    def get_latest_segment_datetime(self, latest_segment: datetime.datetime) -> int:
         """Checks if ffmpeg is still writing recording segments to cache."""
         cache_files = sorted(
             [
@@ -299,17 +301,19 @@ class CameraWatchdog(threading.Thread):
                 and not d.startswith("clip_")
             ]
         )
-        newest_segment_timestamp = latest_timestamp
+        newest_segment_time = latest_segment
 
         for file in cache_files:
             if self.camera_name in file:
                 basename = os.path.splitext(file)[0]
-                _, date = basename.rsplit("-", maxsplit=1)
-                ts = datetime.datetime.strptime(date, "%Y%m%d%H%M%S").timestamp()
-                if ts > newest_segment_timestamp:
-                    newest_segment_timestamp = ts
+                _, date = basename.rsplit("@", maxsplit=1)
+                segment_time = datetime.datetime.strptime(
+                    date, CACHE_SEGMENT_FORMAT
+                ).astimezone(datetime.timezone.utc)
+                if segment_time > newest_segment_time:
+                    newest_segment_time = segment_time
 
-        return newest_segment_timestamp
+        return newest_segment_time
 
 
 class CameraCapture(threading.Thread):
@@ -525,7 +529,7 @@ def process_frames(
     fps = process_info["process_fps"]
     detection_fps = process_info["detection_fps"]
     current_frame_time = process_info["detection_frame"]
-    next_region_update = get_tomorrow_at_2()
+    next_region_update = get_tomorrow_at_time(2)
 
     fps_tracker = EventsPerSecond()
     fps_tracker.start()
@@ -547,7 +551,7 @@ def process_frames(
             except queue.Empty:
                 logger.error(f"Unable to get updated region grid for {camera_name}")
 
-            next_region_update = get_tomorrow_at_2()
+            next_region_update = get_tomorrow_at_time(2)
 
         try:
             if exit_on_empty:

migrations/020_update_index_recordings.py

@@ -0,0 +1,40 @@
+"""Peewee migrations -- 020_update_index_recordings.py.
+
+Some examples (model - class or model name)::
+
+    > Model = migrator.orm['model_name']            # Return model in current state by name
+
+    > migrator.sql(sql)                             # Run custom SQL
+    > migrator.python(func, *args, **kwargs)        # Run python code
+    > migrator.create_model(Model)                  # Create a model (could be used as decorator)
+    > migrator.remove_model(model, cascade=True)    # Remove a model
+    > migrator.add_fields(model, **fields)          # Add fields to a model
+    > migrator.change_fields(model, **fields)       # Change fields
+    > migrator.remove_fields(model, *field_names, cascade=True)
+    > migrator.rename_field(model, old_field_name, new_field_name)
+    > migrator.rename_table(model, new_table_name)
+    > migrator.add_index(model, *col_names, unique=False)
+    > migrator.drop_index(model, *col_names)
+    > migrator.add_not_null(model, *field_names)
+    > migrator.drop_not_null(model, *field_names)
+    > migrator.add_default(model, field_name, default)
+
+"""
+import peewee as pw
+
+SQL = pw.SQL
+
+
+def migrate(migrator, database, fake=False, **kwargs):
+    migrator.sql("DROP INDEX recordings_end_time_start_time")
+    migrator.sql(
+        'CREATE INDEX "recordings_camera_start_time_end_time" ON "recordings" ("camera", "start_time" DESC, "end_time" DESC)'
+    )
+    migrator.sql(
+        'CREATE INDEX "recordings_api_recordings_summary" ON "recordings" ("camera", "start_time" DESC, "duration", "motion", "objects")'
+    )
+    migrator.sql('CREATE INDEX "recordings_start_time" ON "recordings" ("start_time")')
+
+
+def rollback(migrator, database, fake=False, **kwargs):
+    pass

web/package-lock.json

@@ -1664,16 +1664,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz",
-      "integrity": "sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz",
+      "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/type-utils": "6.8.0",
-        "@typescript-eslint/utils": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
+        "@typescript-eslint/scope-manager": "6.9.1",
+        "@typescript-eslint/type-utils": "6.9.1",
+        "@typescript-eslint/utils": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -1870,15 +1870,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.8.0.tgz",
-      "integrity": "sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz",
+      "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
+        "@typescript-eslint/scope-manager": "6.9.1",
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/typescript-estree": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1898,13 +1898,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz",
-      "integrity": "sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
+      "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0"
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -1915,13 +1915,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz",
-      "integrity": "sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz",
+      "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "@typescript-eslint/utils": "6.8.0",
+        "@typescript-eslint/typescript-estree": "6.9.1",
+        "@typescript-eslint/utils": "6.9.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -1942,9 +1942,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.8.0.tgz",
-      "integrity": "sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
+      "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -1955,13 +1955,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz",
-      "integrity": "sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
+      "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -1997,17 +1997,17 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.8.0.tgz",
-      "integrity": "sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz",
+      "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/typescript-estree": "6.8.0",
+        "@typescript-eslint/scope-manager": "6.9.1",
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/typescript-estree": "6.9.1",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -2037,12 +2037,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz",
-      "integrity": "sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
+      "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.8.0",
+        "@typescript-eslint/types": "6.9.1",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -2060,17 +2060,17 @@
       "dev": true
     },
     "node_modules/@videojs/http-streaming": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.5.3.tgz",
-      "integrity": "sha512-dty8lsZk9QPc0i4It79tjWsmPiaC3FpgARFM0vJGko4k3yKNZIYkAk8kjiDRfkAQH/HZ3rYi5dDTriFNzwSsIg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.7.0.tgz",
+      "integrity": "sha512-5uLFKBL8CvD56dxxJyuxqB5CY0tdoa4SE9KbXakeiAy6iFBUEPvTr2YGLKEWvQ8Lojs1wl+FQndLdv+GO7t9Fw==",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "4.0.0",
         "aes-decrypter": "4.0.1",
         "global": "^4.4.0",
         "m3u8-parser": "^7.1.0",
-        "mpd-parser": "^1.1.1",
-        "mux.js": "7.0.0",
+        "mpd-parser": "^1.2.2",
+        "mux.js": "7.0.1",
         "video.js": "^7 || ^8"
       },
       "engines": {
@@ -2105,22 +2105,6 @@
         "npm": ">=5"
       }
     },
-    "node_modules/@videojs/http-streaming/node_modules/mux.js": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.0.0.tgz",
-      "integrity": "sha512-DeZmr+3NDrO02k4SREtl4VB5GyGPCz2fzMjDxBIlamkxffSTLge97rtNMoonnmFHTp96QggDucUtKv3fmyObrA==",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "global": "^4.4.0"
-      },
-      "bin": {
-        "muxjs-transmux": "bin/transmux.js"
-      },
-      "engines": {
-        "node": ">=8",
-        "npm": ">=5"
-      }
-    },
     "node_modules/@videojs/vhs-utils": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz",
@@ -2669,9 +2653,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -4078,9 +4062,9 @@
       }
     },
     "node_modules/eslint-plugin-jest": {
-      "version": "27.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.4.3.tgz",
-      "integrity": "sha512-7S6SmmsHsgIm06BAGCAxL+ABd9/IB3MWkz2pudj6Qqor2y1qQpWPfuFU4SG9pWj4xDjF0e+D7Llh5useuSzAZw==",
+      "version": "27.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.6.0.tgz",
+      "integrity": "sha512-MTlusnnDMChbElsszJvrwD1dN3x6nZl//s4JD23BxB6MgR66TZlL064su24xEIS3VACfAoHV1vgyMgPw8nkdng==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^5.10.0"
@@ -6126,9 +6110,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
+      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
@@ -6929,9 +6913,9 @@
       "dev": true
     },
     "node_modules/mux.js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz",
-      "integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.0.1.tgz",
+      "integrity": "sha512-Omz79uHqYpMP1V80JlvEdCiOW1hiw4mBvDh9gaZEpxvB+7WYb2soZSzfuSRrK2Kh9Pm6eugQNrIpY/Bnyhk4hw==",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
         "global": "^4.4.0"
@@ -8666,9 +8650,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
-      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
       "dev": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
@@ -8676,10 +8660,10 @@
         "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.0",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.18.2",
+        "jiti": "^1.19.1",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
@@ -9169,12 +9153,12 @@
       }
     },
     "node_modules/video.js": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.5.2.tgz",
-      "integrity": "sha512-6/uNXQV3xSaKLpaPf/bVvr7omd+82sKUp0RMBgIt4PxHIe28GtX+O+GcNfI2fuwBvcDRDqk5Ei5AG9bJJOpulA==",
+      "version": "8.6.1",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.6.1.tgz",
+      "integrity": "sha512-CNYVJ5WWIZ7bOhbkkfcKqLGoc6WsE3Ft2RfS1lXdQTWk8UiSsPW2Ssk2JzPCA8qnIlUG9os/faCFsYWjyu4JcA==",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "3.5.3",
+        "@videojs/http-streaming": "3.7.0",
         "@videojs/vhs-utils": "^4.0.0",
         "@videojs/xhr": "2.6.0",
         "aes-decrypter": "^4.0.1",
@@ -9182,7 +9166,7 @@
         "keycode": "2.2.0",
         "m3u8-parser": "^6.0.0",
         "mpd-parser": "^1.0.1",
-        "mux.js": "^6.2.0",
+        "mux.js": "^7.0.1",
         "safe-json-parse": "4.0.0",
         "videojs-contrib-quality-levels": "4.0.0",
         "videojs-font": "4.1.0",
@@ -10837,16 +10821,16 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz",
-      "integrity": "sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz",
+      "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/type-utils": "6.8.0",
-        "@typescript-eslint/utils": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
+        "@typescript-eslint/scope-manager": "6.9.1",
+        "@typescript-eslint/type-utils": "6.9.1",
+        "@typescript-eslint/utils": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -10960,54 +10944,54 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.8.0.tgz",
-      "integrity": "sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz",
+      "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
+        "@typescript-eslint/scope-manager": "6.9.1",
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/typescript-estree": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz",
-      "integrity": "sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz",
+      "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0"
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz",
-      "integrity": "sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz",
+      "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "@typescript-eslint/utils": "6.8.0",
+        "@typescript-eslint/typescript-estree": "6.9.1",
+        "@typescript-eslint/utils": "6.9.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       }
     },
     "@typescript-eslint/types": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.8.0.tgz",
-      "integrity": "sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz",
+      "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz",
-      "integrity": "sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz",
+      "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/visitor-keys": "6.9.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -11027,17 +11011,17 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.8.0.tgz",
-      "integrity": "sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz",
+      "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/typescript-estree": "6.8.0",
+        "@typescript-eslint/scope-manager": "6.9.1",
+        "@typescript-eslint/types": "6.9.1",
+        "@typescript-eslint/typescript-estree": "6.9.1",
         "semver": "^7.5.4"
       },
       "dependencies": {
@@ -11053,12 +11037,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz",
-      "integrity": "sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz",
+      "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "6.8.0",
+        "@typescript-eslint/types": "6.9.1",
         "eslint-visitor-keys": "^3.4.1"
       }
     },
@@ -11069,17 +11053,17 @@
       "dev": true
     },
     "@videojs/http-streaming": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.5.3.tgz",
-      "integrity": "sha512-dty8lsZk9QPc0i4It79tjWsmPiaC3FpgARFM0vJGko4k3yKNZIYkAk8kjiDRfkAQH/HZ3rYi5dDTriFNzwSsIg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.7.0.tgz",
+      "integrity": "sha512-5uLFKBL8CvD56dxxJyuxqB5CY0tdoa4SE9KbXakeiAy6iFBUEPvTr2YGLKEWvQ8Lojs1wl+FQndLdv+GO7t9Fw==",
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "4.0.0",
         "aes-decrypter": "4.0.1",
         "global": "^4.4.0",
         "m3u8-parser": "^7.1.0",
-        "mpd-parser": "^1.1.1",
-        "mux.js": "7.0.0",
+        "mpd-parser": "^1.2.2",
+        "mux.js": "7.0.1",
         "video.js": "^7 || ^8"
       },
       "dependencies": {
@@ -11104,15 +11088,6 @@
               }
             }
           }
-        },
-        "mux.js": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.0.0.tgz",
-          "integrity": "sha512-DeZmr+3NDrO02k4SREtl4VB5GyGPCz2fzMjDxBIlamkxffSTLge97rtNMoonnmFHTp96QggDucUtKv3fmyObrA==",
-          "requires": {
-            "@babel/runtime": "^7.11.2",
-            "global": "^4.4.0"
-          }
         }
       }
     },
@@ -11520,9 +11495,9 @@
       "dev": true
     },
     "axios": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -12598,9 +12573,9 @@
       }
     },
     "eslint-plugin-jest": {
-      "version": "27.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.4.3.tgz",
-      "integrity": "sha512-7S6SmmsHsgIm06BAGCAxL+ABd9/IB3MWkz2pudj6Qqor2y1qQpWPfuFU4SG9pWj4xDjF0e+D7Llh5useuSzAZw==",
+      "version": "27.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.6.0.tgz",
+      "integrity": "sha512-MTlusnnDMChbElsszJvrwD1dN3x6nZl//s4JD23BxB6MgR66TZlL064su24xEIS3VACfAoHV1vgyMgPw8nkdng==",
       "dev": true,
       "requires": {
         "@typescript-eslint/utils": "^5.10.0"
@@ -13962,9 +13937,9 @@
       }
     },
     "jiti": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
+      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
       "dev": true
     },
     "js-levenshtein": {
@@ -14565,9 +14540,9 @@
       "dev": true
     },
     "mux.js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz",
-      "integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.0.1.tgz",
+      "integrity": "sha512-Omz79uHqYpMP1V80JlvEdCiOW1hiw4mBvDh9gaZEpxvB+7WYb2soZSzfuSRrK2Kh9Pm6eugQNrIpY/Bnyhk4hw==",
       "requires": {
         "@babel/runtime": "^7.11.2",
         "global": "^4.4.0"
@@ -15814,9 +15789,9 @@
       }
     },
     "tailwindcss": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
-      "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
       "dev": true,
       "requires": {
         "@alloc/quick-lru": "^5.2.0",
@@ -15824,10 +15799,10 @@
         "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
+        "fast-glob": "^3.3.0",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.18.2",
+        "jiti": "^1.19.1",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
@@ -16203,12 +16178,12 @@
       }
     },
     "video.js": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.5.2.tgz",
-      "integrity": "sha512-6/uNXQV3xSaKLpaPf/bVvr7omd+82sKUp0RMBgIt4PxHIe28GtX+O+GcNfI2fuwBvcDRDqk5Ei5AG9bJJOpulA==",
+      "version": "8.6.1",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.6.1.tgz",
+      "integrity": "sha512-CNYVJ5WWIZ7bOhbkkfcKqLGoc6WsE3Ft2RfS1lXdQTWk8UiSsPW2Ssk2JzPCA8qnIlUG9os/faCFsYWjyu4JcA==",
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "3.5.3",
+        "@videojs/http-streaming": "3.7.0",
         "@videojs/vhs-utils": "^4.0.0",
         "@videojs/xhr": "2.6.0",
         "aes-decrypter": "^4.0.1",
@@ -16216,7 +16191,7 @@
         "keycode": "2.2.0",
         "m3u8-parser": "^6.0.0",
         "mpd-parser": "^1.0.1",
-        "mux.js": "^6.2.0",
+        "mux.js": "^7.0.1",
         "safe-json-parse": "4.0.0",
         "videojs-contrib-quality-levels": "4.0.0",
         "videojs-font": "4.1.0",

web/src/AppBar.jsx

@@ -40,7 +40,7 @@ export default function AppBar() {
     setShowDialog(false);
     setShowDialogWait(true);
     sendRestart();
-  }, [setShowDialog]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [setShowDialog, sendRestart]);
 
   const handleDismissRestartDialog = useCallback(() => {
     setShowDialog(false);

web/src/api/index.jsx

@@ -7,6 +7,7 @@ import axios from 'axios';
 axios.defaults.baseURL = `${baseUrl}api/`;
 axios.defaults.headers.common = {
   'X-CSRF-TOKEN': 1,
+  'X-CACHE-BYPASS': 1,
 };
 
 export function ApiProvider({ children, options }) {

web/src/components/Button.jsx

@@ -67,6 +67,7 @@ export default function Button({
   disabled = false,
   ariaCapitalize = false,
   href,
+  target,
   type = 'contained',
   ...attrs
 }) {
@@ -101,6 +102,7 @@ export default function Button({
         tabindex="0"
         className={classes}
         href={href}
+        target={target}
         ref={ref}
         onmouseenter={handleMousenter}
         onmouseleave={handleMouseleave}

web/src/icons/Submitted.jsx

@@ -0,0 +1,19 @@
+import { h } from 'preact';
+import { memo } from 'preact/compat';
+
+export function Submitted({ className = 'h-6 w-6', inner_fill = 'none', outer_stroke = 'currentColor', onClick = () => {} }) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+      viewBox="0 0 32 32"
+      onClick={onClick}
+    >
+    <rect x="10" y="15" fill={inner_fill} width="12" height="2"/>
+    <rect x="15" y="10" fill={inner_fill} width="2" height="12"/>
+    <circle fill="none" stroke={outer_stroke} stroke-width="2" stroke-miterlimit="10" cx="16" cy="16" r="12"/>
+  </svg>
+  );
+}
+
+export default memo(Submitted);

web/src/icons/WebUI.jsx

@@ -0,0 +1,21 @@
+import { h } from 'preact';
+import { memo } from 'preact/compat';
+
+export function WebUI({ className = 'h-6 w-6', stroke = 'currentColor', fill = 'none', onClick = () => {} }) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+      fill={fill}
+      viewBox="0 0 24 24"
+      stroke={stroke}
+      onClick={onClick}
+    >
+      <path
+        d="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z"
+      />
+    </svg>
+  );
+}
+
+export default memo(WebUI);

web/src/routes/CameraMap.jsx

@@ -353,6 +353,7 @@ ${Object.keys(objectMaskPoints)
             snap={snap}
             width={width}
             height={height}
+            setError={setError}
           />
         </div>
         <div className="max-w-xs">
@@ -434,7 +435,7 @@ function boundedSize(value, maxValue, snap) {
   return newValue;
 }
 
-function EditableMask({ onChange, points, scale, snap, width, height }) {
+function EditableMask({ onChange, points, scale, snap, width, height, setError }) {
   const boundingRef = useRef(null);
 
   const handleMovePoint = useCallback(
@@ -455,6 +456,11 @@ function EditableMask({ onChange, points, scale, snap, width, height }) {
   // Add a new point between the closest two other points
   const handleAddPoint = useCallback(
     (event) => {
+      if (!points) {
+        setError('You must choose an item to edit or add a new item before adding a point.');
+        return
+      }
+
       const { offsetX, offsetY } = event;
       const scaledX = boundedSize((offsetX - MaskInset) / scale, width, snap);
       const scaledY = boundedSize((offsetY - MaskInset) / scale, height, snap);
@@ -474,7 +480,7 @@ function EditableMask({ onChange, points, scale, snap, width, height }) {
       newPoints.splice(index, 0, newPoint);
       onChange(newPoints);
     },
-    [height, width, scale, points, onChange, snap]
+    [height, width, scale, points, onChange, snap, setError]
   );
 
   const handleRemovePoint = useCallback(

web/src/routes/Events.jsx

@@ -11,6 +11,7 @@ import axios from 'axios';
 import { useState, useRef, useCallback, useMemo } from 'preact/hooks';
 import VideoPlayer from '../components/VideoPlayer';
 import { StarRecording } from '../icons/StarRecording';
+import { Submitted } from '../icons/Submitted';
 import { Snapshot } from '../icons/Snapshot';
 import { UploadPlus } from '../icons/UploadPlus';
 import { Clip } from '../icons/Clip';
@@ -63,6 +64,7 @@ export default function Events({ path, ...props }) {
     time_range: '00:00,24:00',
     timezone,
     favorites: props.favorites ?? 0,
+    is_submitted: props.is_submitted ?? -1,
     event: props.event,
   });
   const [state, setState] = useState({
@@ -281,6 +283,16 @@ export default function Events({ path, ...props }) {
     [path, searchParams, setSearchParams]
   );
 
+  const onClickFilterSubmitted = useCallback(
+    () => {
+      if( ++searchParams.is_submitted > 1 ) {
+        searchParams.is_submitted = -1;
+      }
+      onFilter('is_submitted', searchParams.is_submitted);
+    },
+    [searchParams, onFilter]
+  );
+
   const isDone = (eventPages?.[eventPages.length - 1]?.length ?? 0) < API_LIMIT;
 
   // hooks for infinite scroll
@@ -394,11 +406,22 @@ export default function Events({ path, ...props }) {
           </Button>
         )}
 
+        <div className="ml-auto flex">
+          {config.plus.enabled && (
+            <Submitted
+              className="h-10 w-10 text-yellow-300 cursor-pointer ml-auto"
+              onClick={() => onClickFilterSubmitted()}
+              inner_fill={searchParams.is_submitted == 1 ? 'currentColor' : 'gray'}
+              outer_stroke={searchParams.is_submitted >= 0 ? 'currentColor' : 'gray'}
+            />
+          )}
+
           <StarRecording
             className="h-10 w-10 text-yellow-300 cursor-pointer ml-auto"
             onClick={() => onFilter('favorites', searchParams.favorites ? 0 : 1)}
             fill={searchParams.favorites == 1 ? 'currentColor' : 'none'}
           />
+        </div>
 
         <div ref={datePicker} className="ml-right">
           <CalendarIcon

web/src/routes/System.jsx

@@ -12,6 +12,7 @@ import Dialog from '../components/Dialog';
 import TimeAgo from '../components/TimeAgo';
 import copy from 'copy-to-clipboard';
 import { About } from '../icons/About';
+import { WebUI } from '../icons/WebUI';
 
 const emptyObject = Object.freeze({});
 
@@ -347,7 +348,17 @@ export default function System() {
                     >
                       <div className="capitalize text-lg flex justify-between p-4">
                         <Link href={`/cameras/${camera}`}>{camera.replaceAll('_', ' ')}</Link>
-                        <Button onClick={(e) => onHandleFfprobe(camera, e)}>ffprobe</Button>
+                        <div className="flex">
+                          {config.cameras[camera]['webui_url'] && (
+                            <Button 
+                              href={config.cameras[camera]['webui_url']}
+                              target="_blank"
+                            >
+                             Web UI<WebUI className="ml-1 h-4 w-4" fill="white" stroke="white" />
+                            </Button>
+                          )}
+                          <Button className="ml-2" onClick={(e) => onHandleFfprobe(camera, e)}>ffprobe</Button>
+                        </div>
                       </div>
                       <div className="p-2">
                         <Table className="w-full">

web/vite.config.ts

@@ -13,6 +13,12 @@ export default defineConfig({
     proxy: {
       '/api': {
         target: 'http://localhost:5000'
+      },
+      '/vod': {
+        target: 'http://localhost:5000'
+      },
+      '/exports': {
+        target: 'http://localhost:5000'
       }
     }
   },