Merge remote-tracking branch 'origin/master' into release-0.11.0

BUG: Fixes and cleanup around region / bounding box calculation (#3879 )
* -1 so ensure indexes are correct * Catch case of zero division * Due to the -1, it may be negative * Ignore source of error The error is occurring due to a detections bounding box starting beyond the frame, this should be immediately ignored * Formatting * Check horizontal placement as well * Remove original frame clamping
2022-09-22 18:42:20 -05:00 · 2022-09-22 08:07:16 -05:00 · 2022-09-20 06:05:43 -05:00 · 2022-09-16 10:47:22 -06:00 · 2022-09-15 06:36:32 -05:00 · 2022-09-15 06:35:51 -05:00
58 changed files with 1274 additions and 402 deletions
--- a/.github/ISSUE_TEMPLATE/edgetpu_support_request.yml
+++ b/.github/ISSUE_TEMPLATE/edgetpu_support_request.yml
@@ -0,0 +1,84 @@
+name: EdgeTpu Support Request
+description: Support for setting up EdgeTPU in Frigate
+title: "[EdgeTPU Support]: "
+labels: ["support", "triage"]
+assignees: []
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the problem you are having
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Visible on the Debug page in the Web UI
+    validations:
+      required: true
+  - type: textarea
+    id: config
+    attributes:
+      label: Frigate config file
+      description: This will be automatically formatted into code, so no need for backticks.
+      render: yaml
+    validations:
+      required: true
+  - type: textarea
+    id: docker
+    attributes:
+      label: docker-compose file or Docker CLI command
+      description: This will be automatically formatted into code, so no need for backticks.
+      render: yaml
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      options:
+        - HassOS
+        - Debian
+        - Other Linux
+        - Proxmox
+        - UNRAID
+        - Windows
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Install method
+      options:
+        - HassOS Addon
+        - Docker Compose
+        - Docker CLI
+    validations:
+      required: true
+  - type: dropdown
+    id: coral
+    attributes:
+      label: Coral version
+      options:
+        - USB
+        - PCIe
+        - M.2
+        - Dev Board
+        - Other
+        - CPU (no coral)
+    validations:
+      required: true
+  - type: textarea
+    id: other
+    attributes:
+      label: Any other information that may be helpful
--- a/.github/ISSUE_TEMPLATE/hwaccel_support_request.yml
+++ b/.github/ISSUE_TEMPLATE/hwaccel_support_request.yml
@@ -0,0 +1,96 @@
+name: Hardware Acceleration Support Request
+description: Support for setting up GPU hardware acceleration in Frigate
+title: "[HW Accel Support]: "
+labels: ["support", "triage"]
+assignees: []
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the problem you are having
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Visible on the Debug page in the Web UI
+    validations:
+      required: true
+  - type: textarea
+    id: config
+    attributes:
+      label: Frigate config file
+      description: This will be automatically formatted into code, so no need for backticks.
+      render: yaml
+    validations:
+      required: true
+  - type: textarea
+    id: docker
+    attributes:
+      label: docker-compose file or Docker CLI command
+      description: This will be automatically formatted into code, so no need for backticks.
+      render: yaml
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: ffprobe
+    attributes:
+      label: FFprobe output from your camera
+      description: Run `ffprobe <camera_url>` and provide output below
+      render: shell
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      options:
+        - HassOS
+        - Debian
+        - Other Linux
+        - Proxmox
+        - UNRAID
+        - Windows
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Install method
+      options:
+        - HassOS Addon
+        - Docker Compose
+        - Docker CLI
+    validations:
+      required: true
+  - type: dropdown
+    id: network
+    attributes:
+      label: Network connection
+      options:
+        - Wired
+        - Wireless
+        - Mixed
+    validations:
+      required: true
+  - type: input
+    id: camera
+    attributes:
+      label: Camera make and model
+      description: Dahua, hikvision, amcrest, reolink, etc and model number
+    validations:
+      required: true
+  - type: textarea
+    id: other
+    attributes:
+      label: Any other information that may be helpful
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 3
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -54,6 +54,7 @@ jobs:

  python_tests:
    runs-on: ubuntu-latest
+    name: Python Tests
    steps:
      - name: Check out code
        uses: actions/checkout@v2
@@ -69,6 +70,8 @@ jobs:
        uses: docker/setup-qemu-action@v1
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v1
+      - name: Create Version Module
+        run: make version
      - name: Build
        run: make
      - name: Run mypy
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,25 @@
+# Close Stale Issues
+# Warns and then closes issues and PRs that have had no activity for a specified amount of time.
+# https://github.com/actions/stale
+
+name: "Stalebot"
+on:
+  schedule:
+    - cron: "0 0 * * *" # run stalebot once a day
+    
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@main
+        id: stale
+        with:
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          close-issue-message: ''
+          days-before-stale: 30
+          days-before-close: 3
+          exempt-draft-pr: true
+          exempt-issue-labels: 'pinned,security'
+          exempt-pr-labels: 'pinned,security'
+      - name: Print outputs
+        run: echo ${{ join(steps.stale.outputs.*, ',') }}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
    # add groups from host for render, plugdev, video
    group_add:
      - "109" # render
+      - "110" # render
      - "44"  # video
      - "46"  # plugdev
    shm_size: "256mb"
@@ -23,6 +24,7 @@ services:
      - /dev/bus/usb:/dev/bus/usb
    ports:
      - "1935:1935"
+      - "3000:3000"
      - "5000:5000"
      - "5001:5001"
      - "8080:8080"
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,8 +11,8 @@ RUN apt-get -qq update \
    apt-transport-https \
    gnupg \
    wget \
-    && wget -O - http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add - \
-    && echo "deb http://archive.raspberrypi.org/debian/ bullseye main" | tee /etc/apt/sources.list.d/raspi.list \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E \
+    && echo "deb http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi" | tee /etc/apt/sources.list.d/raspi.list \
    && apt-get -qq update \
    && apt-get -qq install -y \
    python3 \
@@ -66,26 +66,48 @@ RUN apt-get -qq update \
    unzip tzdata libxml2 xz-utils \
    python3-pip \
    # add raspberry pi repo
-    && wget -O - http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add - \
-    && echo "deb http://archive.raspberrypi.org/debian/ bullseye main" | tee /etc/apt/sources.list.d/raspi.list \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E \
+    && echo "deb http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi" | tee /etc/apt/sources.list.d/raspi.list \
    # add coral repo
    && apt-key adv --fetch-keys https://packages.cloud.google.com/apt/doc/apt-key.gpg \
    && echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" > /etc/apt/sources.list.d/coral-edgetpu.list \
    && echo "libedgetpu1-max libedgetpu/accepted-eula select true" | debconf-set-selections \
-    # jellyfin-ffmpeg
-    && wget -O - https://repo.jellyfin.org/jellyfin_team.gpg.key | apt-key add - \
-    && echo "deb [arch=$( dpkg --print-architecture )] https://repo.jellyfin.org/$( awk -F'=' '/^ID=/{ print $NF }' /etc/os-release ) $( awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release ) main" | tee /etc/apt/sources.list.d/jellyfin.list \
+    # enable non-free repo
+    && sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list \
    && apt-get -qq update \
    && apt-get -qq install --no-install-recommends --no-install-suggests -y \
    # coral drivers
    libedgetpu1-max python3-tflite-runtime python3-pycoral \
    && pip3 install -U /wheels/*.whl \
+    # btbn-ffmpeg -> amd64 / arm64
+    && if [ "${TARGETARCH}" = "amd64" ] || [ "${TARGETARCH}" = "arm64" ]; then \
+    mkdir -p /usr/lib/btbn-ffmpeg \
+    && wget -O btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linux$( [ "$TARGETARCH" = "amd64" ] && echo "64" || echo "arm64" )-gpl-5.1.tar.xz" \
+    && tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1 \
+    && rm btbn-ffmpeg.tar.xz; \
+    fi \
+    # ffmpeg -> arm32
+    && if [ "${TARGETARCH}" = "arm" ]; then \
+    apt-get -qq install --no-install-recommends --no-install-suggests -y ffmpeg; \
+    fi \
    # arch specific packages
    && if [ "${TARGETARCH}" = "amd64" ]; then \
    apt-get -qq install --no-install-recommends --no-install-suggests -y \
-    mesa-va-drivers jellyfin-ffmpeg; else \
+    mesa-va-drivers libva-drm2 intel-media-va-driver-non-free i965-va-driver libmfx1; \
+    fi \
+    && if [ "${TARGETARCH}" = "arm64" ]; then \
    apt-get -qq install --no-install-recommends --no-install-suggests -y \
-    ffmpeg; \
+    libva-drm2 mesa-va-drivers; \
+    fi \
+    # not sure why 32bit arm requires all these
+    && if [ "${TARGETARCH}" = "arm" ]; then \
+    apt-get -qq install --no-install-recommends --no-install-suggests -y \
+    libgtk-3-dev \
+    libavcodec-dev libavformat-dev libswscale-dev libv4l-dev \
+    libxvidcore-dev libx264-dev libjpeg-dev libpng-dev libtiff-dev \
+    gfortran openexr libatlas-base-dev libssl-dev\
+    libtbb2 libtbb-dev libdc1394-22-dev libopenexr-dev \
+    libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev; \
    fi \
    && rm -rf /wheels \
    && apt-get remove gnupg apt-transport-https -y \
@@ -93,7 +115,7 @@ RUN apt-get -qq update \
    && apt-get autoremove -y \
    && rm -rf /var/lib/apt/lists/*

-ENV PATH=$PATH:/usr/lib/jellyfin-ffmpeg
+ENV PATH=$PATH:/usr/lib/btbn-ffmpeg/bin

 COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/

--- a/docker/rootfs/usr/local/nginx/conf/nginx.conf
+++ b/docker/rootfs/usr/local/nginx/conf/nginx.conf
@@ -55,6 +55,7 @@ http {
        vod_upstream_location /api;
        vod_align_segments_to_key_frames on;
        vod_manifest_segment_durations_mode accurate;
+        vod_ignore_edit_list on;

        # vod caches
        vod_metadata_cache metadata_cache 512m;
@@ -172,10 +173,11 @@ http {
            proxy_set_header Host $host;
        }

-        location ~* /api/(.*\.(jpg|jpeg|png)$) {
+        location ~* /api/.*\.(jpg|jpeg|png)$ {
            add_header 'Access-Control-Allow-Origin' '*';
            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
-            proxy_pass http://frigate_api/$1$is_args$args;
+            rewrite ^/api/(.*)$ $1 break;
+            proxy_pass http://frigate_api;
            proxy_pass_request_headers on;
            proxy_set_header Host $host;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -205,11 +207,13 @@ http {
                add_header Cache-Control "public";
            }

-            sub_filter 'href="/' 'href="$http_x_ingress_path/';
-            sub_filter 'url(/' 'url($http_x_ingress_path/';
-            sub_filter '"/dist/' '"$http_x_ingress_path/dist/';
-            sub_filter '"/js/' '"$http_x_ingress_path/js/';
-            sub_filter '<body>' '<body><script>window.baseUrl="$http_x_ingress_path";</script>';
+            sub_filter 'href="/BASE_PATH/' 'href="$http_x_ingress_path/';
+            sub_filter 'url(/BASE_PATH/' 'url($http_x_ingress_path/';
+            sub_filter '"/BASE_PATH/dist/' '"$http_x_ingress_path/dist/';
+            sub_filter '"/BASE_PATH/js/' '"$http_x_ingress_path/js/';
+            sub_filter '"/BASE_PATH/assets/' '"$http_x_ingress_path/assets/';
+            sub_filter '="/BASE_PATH/"' '=window.baseUrl';
+            sub_filter '<body>' '<body><script>window.baseUrl="$http_x_ingress_path/";</script>';
            sub_filter_types text/css application/javascript;
            sub_filter_once off;

--- a/docs/docs/configuration/advanced.md
+++ b/docs/docs/configuration/advanced.md
@@ -67,3 +67,14 @@ model:
 ```

 Note that if you rename objects in the labelmap, you will also need to update your `objects -> track` list as well.
+
+## Custom ffmpeg build
+
+Included with Frigate is a build of ffmpeg that works for the vast majority of users. However, there exists some hardware setups which have incompatibilities with the included build. In this case, a docker volume mapping can be used to overwrite the included ffmpeg build with an ffmpeg build that works for your specific hardware setup.
+
+To do this:
+1. Download your ffmpeg build and uncompress to a folder on the host (let's use `/home/appdata/frigate/custom-ffmpeg` for this example).
+2. Update your docker-compose or docker CLI to include `'/home/appdata/frigate/custom-ffmpeg':'/usr/lib/btbn-ffmpeg':'ro'` in the volume mappings.
+3. Restart frigate and the custom version will be used if the mapping was done correctly.
+
+NOTE: The folder that is mapped from the host needs to be the folder that contains `/bin`. So if the full structure is `/home/appdata/frigate/custom-ffmpeg/bin/ffmpeg` then `/home/appdata/frigate/custom-ffmpeg` needs to be mapped to `/usr/lib/btbn-ffmpeg`.
--- a/docs/docs/configuration/camera_specific.md
+++ b/docs/docs/configuration/camera_specific.md
@@ -58,18 +58,17 @@ ffmpeg:

 ### Reolink 410/520 (possibly others)

-According to [this discussion](https://github.com/blakeblackshear/frigate/issues/1713#issuecomment-932976305), the http video streams seem to be the most reliable for Reolink.
+According to [this discussion](https://github.com/blakeblackshear/frigate/issues/3235#issuecomment-1135876973), the http video streams seem to be the most reliable for Reolink.

 ```yaml
 cameras:
  reolink:
    ffmpeg:
-      hwaccel_args:
      input_args:
        - -avoid_negative_ts
        - make_zero
        - -fflags
-        - nobuffer+genpts+discardcorrupt
+        - +genpts+discardcorrupt
        - -flags
        - low_delay
        - -strict
@@ -102,7 +101,7 @@ You will need to remove `nobuffer` flag for Blue Iris RTSP cameras

 ```yaml
 ffmpeg:
-  input_args: -avoid_negative_ts make_zero -flags low_delay -strict experimental -fflags +genpts+discardcorrupt -rtsp_transport tcp -stimeout 5000000 -use_wallclock_as_timestamps 1
+  input_args: -avoid_negative_ts make_zero -flags low_delay -strict experimental -fflags +genpts+discardcorrupt -rtsp_transport tcp -timeout 5000000 -use_wallclock_as_timestamps 1
 ```

 ### UDP Only Cameras
@@ -111,5 +110,16 @@ If your cameras do not support TCP connections for RTSP, you can use UDP.

 ```yaml
 ffmpeg:
-  input_args: -avoid_negative_ts make_zero -fflags +genpts+discardcorrupt -rtsp_transport udp -stimeout 5000000 -use_wallclock_as_timestamps 1
+  input_args: -avoid_negative_ts make_zero -fflags +genpts+discardcorrupt -rtsp_transport udp -timeout 5000000 -use_wallclock_as_timestamps 1
+```
+
+### Unifi Protect Cameras
+
+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.
+
+```yaml
+ffmpeg:
+  output_args:
+    record: -f segment -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c:v copy -ar 44100 -c:a aac
+    rtmp: -c:v copy -f flv -ar 44100 -c:a aac
 ```
--- a/docs/docs/configuration/hardware_acceleration.md
+++ b/docs/docs/configuration/hardware_acceleration.md
@@ -12,33 +12,22 @@ Ensure you increase the allocated RAM for your GPU to at least 128 (raspi-config

 ```yaml
 ffmpeg:
-  hwaccel_args:
-    - -c:v
-    - h264_v4l2m2m
+  hwaccel_args: -c:v h264_v4l2m2m
 ```

 ### Intel-based CPUs (<10th Generation) via Quicksync

 ```yaml
 ffmpeg:
-  hwaccel_args:
-    - -hwaccel
-    - vaapi
-    - -hwaccel_device
-    - /dev/dri/renderD128
-    - -hwaccel_output_format
-    - yuv420p
+  hwaccel_args: -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format yuv420p
 ```
+**NOTICE**: With some of the processors, like the J4125, the default driver `iHD` doesn't seem to work correctly for hardware acceleration. You may need to change the driver to `i965` by adding the following environment variable `LIBVA_DRIVER_NAME=i965` to your docker-compose file.   

 ### Intel-based CPUs (>=10th Generation) via Quicksync

 ```yaml
 ffmpeg:
-  hwaccel_args:
-    - -hwaccel
-    - qsv
-    - -qsv_device
-    - /dev/dri/renderD128
+  hwaccel_args: -c:v h264_qsv
 ```

 ### AMD/ATI GPUs (Radeon HD 2000 and newer GPUs) via libva-mesa-driver
@@ -47,15 +36,13 @@ ffmpeg:

 ```yaml
 ffmpeg:
-  hwaccel_args:
-    - -hwaccel
-    - vaapi
-    - -hwaccel_device
-    - /dev/dri/renderD128
+  hwaccel_args: -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format yuv420p
 ```

 ### NVIDIA GPU

+[Supported Nvidia GPUs for Decoding](https://developer.nvidia.com/video-encode-and-decode-gpu-support-matrix-new)
+
 These instructions are based on the [jellyfin documentation](https://jellyfin.org/docs/general/administration/hardware-acceleration.html#nvidia-hardware-acceleration-on-docker-linux)

 Add `--gpus all` to your docker run command or update your compose file.
@@ -69,7 +56,9 @@ services:
    resources:
      reservations:
        devices:
-        - capabilities: [gpu]
+          - driver: nvidia
+            count: 1
+            capabilities: [gpu]
 ```

 The decoder you need to pass in the `hwaccel_args` will depend on the input video.
@@ -89,13 +78,11 @@ A list of supported codecs (you can use `ffmpeg -decoders | grep cuvid` in the c
 V..... vp9_cuvid            Nvidia CUVID VP9 decoder (codec vp9)
 ```

-For example, for H265 video (hevc), you'll select `hevc_cuvid`.
+For example, for H264 video, you'll select `h264_cuvid`.

 ```yaml
 ffmpeg:
-  hwaccel_args:
-    - -c:v
-    - hevc_cuvid
+  hwaccel_args: -c:v h264_cuvid
 ```

 If everything is working correctly, you should see a significant improvement in performance.
--- a/docs/docs/configuration/index.md
+++ b/docs/docs/configuration/index.md
@@ -25,6 +25,10 @@ cameras:
      height: 720
 ```

+### VSCode Configuration Schema
+
+VSCode (and VSCode addon) supports the JSON schemas which will automatically validate the config. This can be added by adding `# yaml-language-server: $schema=http://frigate_host:5000/api/config/schema` to the top of the config file. `frigate_host` being the IP address of frigate or `ccab4aaf-frigate` if running in the addon.
+
 ### Full configuration reference:

 :::caution
@@ -135,7 +139,7 @@ ffmpeg:
  # NOTE: See hardware acceleration docs for your specific device
  hwaccel_args: []
  # Optional: global input args (default: shown below)
-  input_args: -avoid_negative_ts make_zero -fflags +genpts+discardcorrupt -rtsp_transport tcp -stimeout 5000000 -use_wallclock_as_timestamps 1
+  input_args: -avoid_negative_ts make_zero -fflags +genpts+discardcorrupt -rtsp_transport tcp -timeout 5000000 -use_wallclock_as_timestamps 1
  # Optional: global output args
  output_args:
    # Optional: output args for detect streams (default: shown below)
@@ -278,10 +282,6 @@ record:
    mode: all
  # Optional: Event recording settings
  events:
-    # Optional: Maximum length of time to retain video during long events. (default: shown below)
-    # NOTE: If an object is being tracked for longer than this amount of time, the retained recordings
-    #       will be the last x seconds of the event unless retain->days under record is > 0.
-    max_seconds: 300
    # Optional: Number of seconds before the event to include (default: shown below)
    pre_capture: 5
    # Optional: Number of seconds after the event to include (default: shown below)
@@ -315,6 +315,8 @@ snapshots:
  # Optional: Enable writing jpg snapshot to /media/frigate/clips (default: shown below)
  # This value can be set via MQTT and will be updated in startup based on retained value
  enabled: False
+  # Optional: save a clean PNG copy of the snapshot image (default: shown below)
+  clean_copy: True
  # Optional: print a timestamp on the snapshots (default: shown below)
  timestamp: False
  # Optional: draw bounding box on the snapshots (default: shown below)
--- a/docs/docs/configuration/record.md
+++ b/docs/docs/configuration/record.md
@@ -42,3 +42,35 @@ The same options are available with events. Let's consider a scenario where you
 - With the `all` option all segments for the duration of the event would be saved for the event. This event would have 4 hours of footage.
 - With the `motion` option all segments for the duration of the event with motion would be saved. This means any segment where a car drove by in the street, person walked by, lighting changed, etc. would be saved. 
 - With the `active_objects` it would only keep segments where the object was active. In this case the only segments that would be saved would be the ones where the car was driving up, you going inside, you coming outside, and the car driving away. Essentially reducing the 4 hours to a minute or two of event footage. 
+
+A configuration example of the above retain modes where all `motion` segments are stored for 7 days and `active objects` are stored for 14 days would be as follows:
+```yaml
+record:
+  enabled: True
+  retain:
+    days: 7
+    mode: motion
+  events:
+    retain:
+      default: 14
+      mode: active_objects
+```
+The above configuration example can be added globally or on a per camera basis.
+
+### Object Specific Retention
+
+You can also set specific retention length for an object type. The below configuration example builds on from above but also specifies that recordings of dogs only need to be kept for 2 days and recordings of cars should be kept for 7 days.
+```yaml
+record:
+  enabled: True
+  retain:
+    days: 7
+    mode: motion
+  events:
+    retain:
+      default: 14
+      mode: active_objects
+      objects:
+        dog: 2
+        car: 7
+```
--- a/docs/docs/configuration/rtmp.md
+++ b/docs/docs/configuration/rtmp.md
@@ -5,4 +5,4 @@ title: RTMP

 Frigate can re-stream your video feed as a RTMP feed for other applications such as Home Assistant to utilize it at `rtmp://<frigate_host>/live/<camera_name>`. Port 1935 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. The video feed is copied from the original video feed directly to avoid re-encoding. This feed does not include any annotation by Frigate.

-Some video feeds are not compatible with RTMP. If you are experiencing issues, check to make sure your camera feed is h264 with AAC audio. If your camera doesn't support a compatible format for RTMP, you can use the ffmpeg args to re-encode it on the fly at the expense of increased CPU utilization. Some more information about it can be found [here](../faqs#audio-in-recordings). 
+Some video feeds are not compatible with RTMP. If you are experiencing issues, check to make sure your camera feed is h264 with AAC audio. If your camera doesn't support a compatible format for RTMP, you can use the ffmpeg args to re-encode it on the fly at the expense of increased CPU utilization. Some more information about it can be found [here](/faqs#audio-in-recordings). 
--- a/docs/docs/contributing.md
+++ b/docs/docs/contributing.md
@@ -108,6 +108,18 @@ ffmpeg -c:v h264_v4l2m2m -re -stream_loop -1 -i https://streams.videolan.org/ffm
 ffmpeg -c:v h264_cuvid -re -stream_loop -1 -i https://streams.videolan.org/ffmpeg/incoming/720p60.mp4 -f rawvideo -pix_fmt yuv420p pipe: > /dev/null
 ```

+**VAAPI**
+
+```shell
+ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format yuv420p -re -stream_loop -1 -i https://streams.videolan.org/ffmpeg/incoming/720p60.mp4 -f rawvideo -pix_fmt yuv420p pipe: > /dev/null
+```
+
+**QSV**
+
+```shell
+ffmpeg -c:v h264_qsv -re -stream_loop -1 -i https://streams.videolan.org/ffmpeg/incoming/720p60.mp4 -f rawvideo -pix_fmt yuv420p pipe: > /dev/null
+```
+
 ## Web Interface

 ### Prerequisites
@@ -196,3 +208,16 @@ npm run build
 ```

 This command generates static content into the `build` directory and can be served using any static contents hosting service.
+
+## Official builds
+
+Setup buildx for multiarch
+
+```
+docker buildx stop builder && docker buildx rm builder # <---- if existing
+docker run --privileged --rm tonistiigi/binfmt --install all
+docker buildx create --name builder --driver docker-container --driver-opt network=host --use
+docker buildx inspect builder --bootstrap
+make build_web
+make push
+```
--- a/docs/docs/faqs.md
+++ b/docs/docs/faqs.md
@@ -47,3 +47,7 @@ These messages in the logs are expected in certain situations. Frigate checks th
 ### "On connect called"

 If you see repeated "On connect called" messages in your config, check for another instance of frigate. This happens when multiple frigate containers are trying to connect to mqtt with the same client_id.
+
+### Error: Database Is Locked
+
+sqlite does not work well on a network share, if the `/media` folder is mapped to a network share then [this guide](/configuration/advanced#database) should be used to move the database to a location on the internal drive.
--- a/docs/docs/guides/events_setup.md
+++ b/docs/docs/guides/events_setup.md
@@ -0,0 +1,10 @@
+---
+id: events_setup
+title: Setting Up Events
+---
+
+[Snapshots](../configuration/snapshots.md) and/or [Recordings](../configuration/record.md) must be enabled for events to be created for detected objects.
+
+## Limiting Events to Areas of Interest
+
+The best way to limit events to areas of interest is to use [zones](../configuration/zones.md) along with `required_zones` for events and snapshots to only have events created in areas of interest.
--- a/docs/docs/guides/getting_started.md
+++ b/docs/docs/guides/getting_started.md
@@ -45,6 +45,12 @@ More details on available detectors can be found [here](/configuration/detectors

 Now let's add the first camera:

+:::caution
+
+Note that passwords that contain special characters often cause issues with ffmpeg connecting to the cameara. If recieving `end-of-file` or `unauthorized` errors with a verified correct password, try changing the password to something simple to rule out the possibility that the password is the issue.
+
+:::
+
 ```yaml
 mqtt:
  host: <ip of your mqtt server>
--- a/docs/docs/guides/stationary_objects.md
+++ b/docs/docs/guides/stationary_objects.md
@@ -3,7 +3,7 @@ id: stationary_objects
 title: Avoiding stationary objects
 ---

-Many people use Frigate to detect cars entering their driveway, and they often run into an issue with repeated events of a parked car being repeatedly detected. This is because object tracking stops when motion ends and the event ends. Motion detection works by determining if a sufficient number of pixels have changed between frames. Shadows or other lighting changes will be detected as motion. This will often cause a new event for a parked car.
+Many people use Frigate to detect cars entering their driveway, and they often run into an issue with repeated events of a parked car being repeatedly detected over the course of multiple days (for example if the car is lost at night and detected again the following morning.

 You can use zones to restrict events and notifications to objects that have entered specific areas.

--- a/docs/docs/hardware.md
+++ b/docs/docs/hardware.md
@@ -23,15 +23,15 @@ I may earn a small commission for my endorsement, recommendation, testimonial, o

 My current favorite is the Minisforum GK41 because of the dual NICs that allow you to setup a dedicated private network for your cameras where they can be blocked from accessing the internet. There are many used workstation options on eBay that work very well. Anything with an Intel CPU and capable of running Debian should work fine. As a bonus, you may want to look for devices with a M.2 or PCIe express slot that is compatible with the Google Coral. I may earn a small commission for my endorsement, recommendation, testimonial, or link to any products or services from this website.

-| Name                                                                                                                            | Inference Speed | Coral Compatibility | Notes                                                                                                                                   |
-| ------------------------------------------------------------------------------------------------------------------------------- | --------------- | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| <a href="https://amzn.to/3oH4BKi" target="_blank" rel="nofollow noopener sponsored">Odyssey X86 Blue J4125</a> (affiliate link) | 9-10ms          | M.2 B+M             | Dual gigabit NICs for easy isolated camera network. Easily handles several 1080p cameras.                                               |
-| <a href="https://amzn.to/3ptnb8D" target="_blank" rel="nofollow noopener sponsored">Minisforum GK41</a> (affiliate link)        | 9-10ms          | USB                 | Dual gigabit NICs for easy isolated camera network. Easily handles several 1080p cameras.                                               |
-| <a href="https://amzn.to/35E79BC" target="_blank" rel="nofollow noopener sponsored">Beelink GK55</a> (affiliate link)           | 9-10ms          | USB                 | Dual gigabit NICs for easy isolated camera network. Easily handles several 1080p cameras.                                               |
-| <a href="https://amzn.to/3psFlHi" target="_blank" rel="nofollow noopener sponsored">Intel NUC</a> (affiliate link)              | 8-10ms          | USB                 | Overkill for most, but great performance. Can handle many cameras at 5fps depending on typical amounts of motion. Requires extra parts. |
-| <a href="https://amzn.to/3a6TBh8" target="_blank" rel="nofollow noopener sponsored">BMAX B2 Plus</a> (affiliate link)           | 10-12ms         | USB                 | Good balance of performance and cost. Also capable of running many other services at the same time as frigate.                          |
-| <a href="https://amzn.to/2YjpY9m" target="_blank" rel="nofollow noopener sponsored">Atomic Pi</a> (affiliate link)              | 16ms            | USB                 | Good option for a dedicated low power board with a small number of cameras. Can leverage Intel QuickSync for stream decoding.           |
-| <a href="https://amzn.to/2YhSGHH" target="_blank" rel="nofollow noopener sponsored">Raspberry Pi 4 (64bit)</a> (affiliate link) | 10-15ms         | USB                 | Can handle a small number of cameras.                                                                                                   |
+| Name                                                                                                                                                                                                                                                                                                              | Inference Speed | Coral Compatibility | Notes                                                                                                                                   |
+| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
+| Odyssey X86 Blue J4125 (<a href="https://amzn.to/3oH4BKi" target="_blank" rel="nofollow noopener sponsored">Amazon</a>) (<a href="https://www.seeedstudio.com/Frigate-NVR-with-Odyssey-Blue-and-Coral-USB-Accelerator.html?utm_source=Frigate" target="_blank" rel="nofollow noopener sponsored">SeeedStudio</a>) | 9-10ms          | M.2 B+M, USB        | Dual gigabit NICs for easy isolated camera network. Easily handles several 1080p cameras.                                               |
+| Minisforum GK41 (<a href="https://amzn.to/3ptnb8D" target="_blank" rel="nofollow noopener sponsored">Amazon</a>)                                                                                                                                                                                                  | 9-10ms          | USB                 | Dual gigabit NICs for easy isolated camera network. Easily handles several 1080p cameras.                                               |
+| Beelink GK55 (<a href="https://amzn.to/35E79BC" target="_blank" rel="nofollow noopener sponsored">Amazon</a>)                                                                                                                                                                                                     | 9-10ms          | USB                 | Dual gigabit NICs for easy isolated camera network. Easily handles several 1080p cameras.                                               |
+| Intel NUC (<a href="https://amzn.to/3psFlHi" target="_blank" rel="nofollow noopener sponsored">Amazon</a>)                                                                                                                                                                                                        | 8-10ms          | USB                 | Overkill for most, but great performance. Can handle many cameras at 5fps depending on typical amounts of motion. Requires extra parts. |
+| BMAX B2 Plus (<a href="https://amzn.to/3a6TBh8" target="_blank" rel="nofollow noopener sponsored">Amazon</a>)                                                                                                                                                                                                     | 10-12ms         | USB                 | Good balance of performance and cost. Also capable of running many other services at the same time as frigate.                          |
+| Atomic Pi (<a href="https://amzn.to/2YjpY9m" target="_blank" rel="nofollow noopener sponsored">Amazon</a>)                                                                                                                                                                                                        | 16ms            | USB                 | Good option for a dedicated low power board with a small number of cameras. Can leverage Intel QuickSync for stream decoding.           |
+| Raspberry Pi 4 (64bit) (<a href="https://amzn.to/2YhSGHH" target="_blank" rel="nofollow noopener sponsored">Amazon</a>)                                                                                                                                                                                           | 10-15ms         | USB                 | Can handle a small number of cameras.                                                                                                   |

 ## Google Coral TPU

--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -100,18 +100,7 @@ Additionally, the USB Coral draws a considerable amount of power. If using any o

 ## Docker

-Running in Docker directly is the recommended install method.
-
-Make sure you choose the right image for your architecture:
-
-| Arch        | Image Name                                 |
-| ----------- | ------------------------------------------ |
-| amd64       | blakeblackshear/frigate:stable-amd64       |
-| amd64nvidia | blakeblackshear/frigate:stable-amd64nvidia |
-| armv7       | blakeblackshear/frigate:stable-armv7       |
-| aarch64     | blakeblackshear/frigate:stable-aarch64     |
-
-It is recommended to run with docker-compose:
+Running in Docker with compose is the recommended install method:

 ```yaml
 version: "3.9"
@@ -120,7 +109,7 @@ services:
    container_name: frigate
    privileged: true # this may not be necessary for all setups
    restart: unless-stopped
-    image: blakeblackshear/frigate:<specify_version_tag>
+    image: blakeblackshear/frigate:stable
    shm_size: "64mb" # update for your cameras based on calculation above
    devices:
      - /dev/bus/usb:/dev/bus/usb # passes the USB Coral, needs to be modified for other versions
@@ -157,7 +146,7 @@ docker run -d \
  -e FRIGATE_RTSP_PASSWORD='password' \
  -p 5000:5000 \
  -p 1935:1935 \
-  blakeblackshear/frigate:<specify_version_tag>
+  blakeblackshear/frigate:stable
 ```

 ## Home Assistant Operating System (HassOS)
--- a/docs/docs/integrations/api.md
+++ b/docs/docs/integrations/api.md
@@ -183,6 +183,10 @@ Permanently deletes the event along with any clips/snapshots.

 Sets retain to true for the event id.

+### `POST /api/events/<id>/plus`
+
+Submits the snapshot of the event to Frigate+ for labeling.
+
 ### `DELETE /api/events/<id>/retain`

 Sets retain to false for the event id (event may be deleted quickly after removing).
--- a/docs/docs/integrations/home-assistant.md
+++ b/docs/docs/integrations/home-assistant.md
@@ -85,6 +85,17 @@ The integration provides:

 This is accessible via "Media Browser" on the left menu panel in Home Assistant.

+## Casting Clips To Media Devices
+
+The integration supports casting clips and camera streams to supported media devices.
+
+:::tip
+For clips to be castable to media devices, audio is required and may need to be [enabled for recordings](../faqs.md#audio-in-recordings).
+
+**NOTE: Even if you camera does not support audio, audio will need to be enabled for Casting to be accepted.**
+
+:::
+
 <a name="api"></a>

 ## Notification API
--- a/docs/docs/integrations/mqtt.md
+++ b/docs/docs/integrations/mqtt.md
@@ -140,3 +140,19 @@ Topic to turn improve_contrast for a camera on and off. Expected values are `ON`
 ### `frigate/<camera_name>/improve_contrast/state`

 Topic with current state of improve_contrast for a camera. Published values are `ON` and `OFF`.
+
+### `frigate/<camera_name>/motion_threshold/set`
+
+Topic to adjust motion threshold for a camera. Expected value is an integer.
+
+### `frigate/<camera_name>/motion_threshold/state`
+
+Topic with current motion threshold for a camera. Published value is an integer.
+
+### `frigate/<camera_name>/motion_contour_area/set`
+
+Topic to adjust motion contour area for a camera. Expected value is an integer.
+
+### `frigate/<camera_name>/motion_contour_area/state`
+
+Topic with current motion contour area for a camera. Published value is an integer.
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -4,6 +4,7 @@ module.exports = {
    Guides: [
      "guides/camera_setup",
      "guides/getting_started",
+      "guides/events_setup",
      "guides/false_positives",
      "guides/ha_notifications",
      "guides/stationary_objects",
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -95,6 +95,12 @@ class FrigateApp:
                "improve_contrast_enabled": mp.Value(
                    "i", self.config.cameras[camera_name].motion.improve_contrast
                ),
+                "motion_threshold": mp.Value(
+                    "i", self.config.cameras[camera_name].motion.threshold
+                ),
+                "motion_contour_area": mp.Value(
+                    "i", self.config.cameras[camera_name].motion.contour_area
+                ),
                "detection_fps": mp.Value("d", 0.0),
                "detection_frame": mp.Value("d", 0.0),
                "read_start": mp.Value("d", 0.0),
--- a/frigate/config.py
+++ b/frigate/config.py
@@ -83,7 +83,6 @@ class RetainConfig(FrigateBaseModel):


 class EventsConfig(FrigateBaseModel):
-    max_seconds: int = Field(default=300, title="Maximum event duration.")
    pre_capture: int = Field(default=5, title="Seconds to retain before event starts.")
    post_capture: int = Field(default=5, title="Seconds to retain after event ends.")
    required_zones: List[str] = Field(
@@ -347,7 +346,7 @@ FFMPEG_INPUT_ARGS_DEFAULT = [
    "+genpts+discardcorrupt",
    "-rtsp_transport",
    "tcp",
-    "-stimeout",
+    "-timeout",
    "5000000",
    "-use_wallclock_as_timestamps",
    "1",
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -2,18 +2,15 @@ import base64
 from collections import OrderedDict
 from datetime import datetime, timedelta
 import copy
-import json
-import glob
 import logging
 import os
-import re
 import subprocess as sp
 import time
 from functools import reduce
 from pathlib import Path
+from urllib.parse import unquote

 import cv2
-from flask.helpers import send_file

 import numpy as np
 from flask import (
@@ -26,13 +23,12 @@ from flask import (
    request,
 )

-from peewee import SqliteDatabase, operator, fn, DoesNotExist, Value
+from peewee import SqliteDatabase, operator, fn, DoesNotExist
 from playhouse.shortcuts import model_to_dict

-from frigate.const import CLIPS_DIR, PLUS_ENV_VAR
+from frigate.const import CLIPS_DIR
 from frigate.models import Event, Recordings
 from frigate.stats import stats_snapshot
-from frigate.util import calculate_region
 from frigate.version import VERSION

 logger = logging.getLogger(__name__)
@@ -251,6 +247,23 @@ def set_sub_label(id):
    )


+@bp.route("/sub_labels")
+def get_sub_labels():
+    try:
+        events = Event.select(Event.sub_label).distinct()
+    except Exception as e:
+        return jsonify(
+            {"success": False, "message": f"Failed to get sub_labels: {e}"}, "404"
+        )
+
+    sub_labels = [e.sub_label for e in events]
+
+    if None in sub_labels:
+        sub_labels.remove(None)
+
+    return jsonify(sub_labels)
+
+
@bp.route("/events/<id>", methods=("DELETE",))
 def delete_event(id):
    try:
@@ -329,6 +342,7 @@ def event_thumbnail(id, max_cache_age=2592000):
@bp.route("/<camera_name>/<label>/best.jpg")
@bp.route("/<camera_name>/<label>/thumbnail.jpg")
 def label_thumbnail(camera_name, label):
+    label = unquote(label)
    if label == "any":
        event_query = (
            Event.select()
@@ -412,6 +426,7 @@ def event_snapshot(id):

@bp.route("/<camera_name>/<label>/snapshot.jpg")
 def label_snapshot(camera_name, label):
+    label = unquote(label)
    if label == "any":
        event_query = (
            Event.select()
@@ -479,7 +494,8 @@ def event_clip(id):
 def events():
    limit = request.args.get("limit", 100)
    camera = request.args.get("camera", "all")
-    label = request.args.get("label", "all")
+    label = unquote(request.args.get("label", "all"))
+    sub_label = request.args.get("sub_label", "all")
    zone = request.args.get("zone", "all")
    after = request.args.get("after", type=float)
    before = request.args.get("before", type=float)
@@ -511,6 +527,9 @@ def events():
    if label != "all":
        clauses.append((Event.label == label))

+    if sub_label != "all":
+        clauses.append((Event.sub_label == sub_label))
+
    if zone != "all":
        clauses.append((Event.zones.cast("text") % f'*"{zone}"*'))

@@ -555,7 +574,7 @@ def config():
        for cmd in camera_dict["ffmpeg_cmds"]:
            cmd["cmd"] = " ".join(cmd["cmd"])

-    config["plus"] = {"enabled": PLUS_ENV_VAR in os.environ}
+    config["plus"] = {"enabled": current_app.plus_api.is_active()}

    return jsonify(config)

@@ -737,9 +756,9 @@ def recordings(camera_name):
    return jsonify([e for e in recordings.dicts()])


-@bp.route("/<camera>/start/<int:start_ts>/end/<int:end_ts>/clip.mp4")
-@bp.route("/<camera>/start/<float:start_ts>/end/<float:end_ts>/clip.mp4")
-def recording_clip(camera, start_ts, end_ts):
+@bp.route("/<camera_name>/start/<int:start_ts>/end/<int:end_ts>/clip.mp4")
+@bp.route("/<camera_name>/start/<float:start_ts>/end/<float:end_ts>/clip.mp4")
+def recording_clip(camera_name, start_ts, end_ts):
    download = request.args.get("download", type=bool)

    recordings = (
@@ -749,7 +768,7 @@ def recording_clip(camera, start_ts, end_ts):
            | (Recordings.end_time.between(start_ts, end_ts))
            | ((start_ts > Recordings.start_time) & (end_ts < Recordings.end_time))
        )
-        .where(Recordings.camera == camera)
+        .where(Recordings.camera == camera_name)
        .order_by(Recordings.start_time.asc())
    )

@@ -764,36 +783,41 @@ def recording_clip(camera, start_ts, end_ts):
        if clip.end_time > end_ts:
            playlist_lines.append(f"outpoint {int(end_ts - clip.start_time)}")

-    file_name = f"clip_{camera}_{start_ts}-{end_ts}.mp4"
+    file_name = f"clip_{camera_name}_{start_ts}-{end_ts}.mp4"
    path = f"/tmp/cache/{file_name}"

-    ffmpeg_cmd = [
-        "ffmpeg",
-        "-y",
-        "-protocol_whitelist",
-        "pipe,file",
-        "-f",
-        "concat",
-        "-safe",
-        "0",
-        "-i",
-        "/dev/stdin",
-        "-c",
-        "copy",
-        "-movflags",
-        "+faststart",
-        path,
-    ]
+    if not os.path.exists(path):
+        ffmpeg_cmd = [
+            "ffmpeg",
+            "-y",
+            "-protocol_whitelist",
+            "pipe,file",
+            "-f",
+            "concat",
+            "-safe",
+            "0",
+            "-i",
+            "/dev/stdin",
+            "-c",
+            "copy",
+            "-movflags",
+            "+faststart",
+            path,
+        ]
+        p = sp.run(
+            ffmpeg_cmd,
+            input="\n".join(playlist_lines),
+            encoding="ascii",
+            capture_output=True,
+        )

-    p = sp.run(
-        ffmpeg_cmd,
-        input="\n".join(playlist_lines),
-        encoding="ascii",
-        capture_output=True,
-    )
-    if p.returncode != 0:
-        logger.error(p.stderr)
-        return f"Could not create clip from recordings for {camera}.", 500
+        if p.returncode != 0:
+            logger.error(p.stderr)
+            return f"Could not create clip from recordings for {camera_name}.", 500
+    else:
+        logger.debug(
+            f"Ignoring subsequent request for {path} as it already exists in the cache."
+        )

    response = make_response()
    response.headers["Content-Description"] = "File Transfer"
@@ -809,9 +833,9 @@ def recording_clip(camera, start_ts, end_ts):
    return response


-@bp.route("/vod/<camera>/start/<int:start_ts>/end/<int:end_ts>")
-@bp.route("/vod/<camera>/start/<float:start_ts>/end/<float:end_ts>")
-def vod_ts(camera, start_ts, end_ts):
+@bp.route("/vod/<camera_name>/start/<int:start_ts>/end/<int:end_ts>")
+@bp.route("/vod/<camera_name>/start/<float:start_ts>/end/<float:end_ts>")
+def vod_ts(camera_name, start_ts, end_ts):
    recordings = (
        Recordings.select()
        .where(
@@ -819,7 +843,7 @@ def vod_ts(camera, start_ts, end_ts):
            | Recordings.end_time.between(start_ts, end_ts)
            | ((start_ts > Recordings.start_time) & (end_ts < Recordings.end_time))
        )
-        .where(Recordings.camera == camera)
+        .where(Recordings.camera == camera_name)
        .order_by(Recordings.start_time.asc())
    )

@@ -830,16 +854,13 @@ def vod_ts(camera, start_ts, end_ts):
    for recording in recordings:
        clip = {"type": "source", "path": recording.path}
        duration = int(recording.duration * 1000)
-        # Determine if offset is needed for first clip
-        if recording.start_time < start_ts:
-            offset = int((start_ts - recording.start_time) * 1000)
-            clip["clipFrom"] = offset
-            duration -= offset
+
        # Determine if we need to end the last clip early
        if recording.end_time > end_ts:
            duration -= int((recording.end_time - end_ts) * 1000)

        if duration > 0:
+            clip["keyFrameDurations"] = [duration]
            clips.append(clip)
            durations.append(duration)
        else:
@@ -860,14 +881,14 @@ def vod_ts(camera, start_ts, end_ts):
    )


-@bp.route("/vod/<year_month>/<day>/<hour>/<camera>")
-def vod_hour(year_month, day, hour, camera):
+@bp.route("/vod/<year_month>/<day>/<hour>/<camera_name>")
+def vod_hour(year_month, day, hour, camera_name):
    start_date = datetime.strptime(f"{year_month}-{day} {hour}", "%Y-%m-%d %H")
    end_date = start_date + timedelta(hours=1) - timedelta(milliseconds=1)
    start_ts = start_date.timestamp()
    end_ts = end_date.timestamp()

-    return vod_ts(camera, start_ts, end_ts)
+    return vod_ts(camera_name, start_ts, end_ts)


@bp.route("/vod/event/<id>")
--- a/frigate/motion.py
+++ b/frigate/motion.py
@@ -5,7 +5,14 @@ from frigate.config import MotionConfig


 class MotionDetector:
-    def __init__(self, frame_shape, config: MotionConfig, improve_contrast_enabled):
+    def __init__(
+        self,
+        frame_shape,
+        config: MotionConfig,
+        improve_contrast_enabled,
+        motion_threshold,
+        motion_contour_area,
+    ):
        self.config = config
        self.frame_shape = frame_shape
        self.resize_factor = frame_shape[0] / config.frame_height
@@ -25,6 +32,8 @@ class MotionDetector:
        self.mask = np.where(resized_mask == [0])
        self.save_images = False
        self.improve_contrast = improve_contrast_enabled
+        self.threshold = motion_threshold
+        self.contour_area = motion_contour_area

    def detect(self, frame):
        motion_boxes = []
@@ -69,7 +78,7 @@ class MotionDetector:

            # compute the threshold image for the current frame
            current_thresh = cv2.threshold(
-                frameDelta, self.config.threshold, 255, cv2.THRESH_BINARY
+                frameDelta, self.threshold.value, 255, cv2.THRESH_BINARY
            )[1]

            # black out everything in the avg_delta where there isnt motion in the current frame
@@ -79,7 +88,7 @@ class MotionDetector:
            # then look for deltas above the threshold, but only in areas where there is a delta
            # in the current frame. this prevents deltas from previous frames from being included
            thresh = cv2.threshold(
-                avg_delta_image, self.config.threshold, 255, cv2.THRESH_BINARY
+                avg_delta_image, self.threshold.value, 255, cv2.THRESH_BINARY
            )[1]

            # dilate the thresholded image to fill in holes, then find contours
@@ -94,7 +103,7 @@ class MotionDetector:
            for c in cnts:
                # if the contour is big enough, count it as motion
                contour_area = cv2.contourArea(c)
-                if contour_area > self.config.contour_area:
+                if contour_area > self.contour_area.value:
                    x, y, w, h = cv2.boundingRect(c)
                    motion_boxes.append(
                        (
@@ -111,8 +120,7 @@ class MotionDetector:
                # print(self.frame_counter)
                for c in cnts:
                    contour_area = cv2.contourArea(c)
-                    # print(contour_area)
-                    if contour_area > self.config.contour_area:
+                    if contour_area > self.contour_area.value:
                        x, y, w, h = cv2.boundingRect(c)
                        cv2.rectangle(
                            thresh_dilated,
--- a/frigate/mqtt.py
+++ b/frigate/mqtt.py
@@ -145,6 +145,52 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
        state_topic = f"{message.topic[:-4]}/state"
        client.publish(state_topic, payload, retain=True)

+    def on_motion_threshold_command(client, userdata, message):
+        try:
+            payload = int(message.payload.decode())
+        except ValueError:
+            logger.warning(
+                f"Received unsupported value at {message.topic}: {message.payload.decode()}"
+            )
+            return
+
+        logger.debug(f"on_motion_threshold_toggle: {message.topic} {payload}")
+
+        camera_name = message.topic.split("/")[-3]
+
+        motion_settings = config.cameras[camera_name].motion
+
+        logger.info(f"Setting motion threshold for {camera_name} via mqtt: {payload}")
+        camera_metrics[camera_name]["motion_threshold"].value = payload
+        motion_settings.threshold = payload
+
+        state_topic = f"{message.topic[:-4]}/state"
+        client.publish(state_topic, payload, retain=True)
+
+    def on_motion_contour_area_command(client, userdata, message):
+        try:
+            payload = int(message.payload.decode())
+        except ValueError:
+            logger.warning(
+                f"Received unsupported value at {message.topic}: {message.payload.decode()}"
+            )
+            return
+
+        logger.debug(f"on_motion_contour_area_toggle: {message.topic} {payload}")
+
+        camera_name = message.topic.split("/")[-3]
+
+        motion_settings = config.cameras[camera_name].motion
+
+        logger.info(
+            f"Setting motion contour area for {camera_name} via mqtt: {payload}"
+        )
+        camera_metrics[camera_name]["motion_contour_area"].value = payload
+        motion_settings.contour_area = payload
+
+        state_topic = f"{message.topic[:-4]}/state"
+        client.publish(state_topic, payload, retain=True)
+
    def on_restart_command(client, userdata, message):
        restart_frigate()

@@ -195,6 +241,14 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
            f"{mqtt_config.topic_prefix}/{name}/improve_contrast/set",
            on_improve_contrast_command,
        )
+        client.message_callback_add(
+            f"{mqtt_config.topic_prefix}/{name}/motion_threshold/set",
+            on_motion_threshold_command,
+        )
+        client.message_callback_add(
+            f"{mqtt_config.topic_prefix}/{name}/motion_contour_area/set",
+            on_motion_contour_area_command,
+        )

    client.message_callback_add(
        f"{mqtt_config.topic_prefix}/restart", on_restart_command
@@ -250,6 +304,21 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
            "ON" if config.cameras[name].motion.improve_contrast else "OFF",
            retain=True,
        )
+        client.publish(
+            f"{mqtt_config.topic_prefix}/{name}/motion_threshold/state",
+            config.cameras[name].motion.threshold,
+            retain=True,
+        )
+        client.publish(
+            f"{mqtt_config.topic_prefix}/{name}/motion_contour_area/state",
+            config.cameras[name].motion.contour_area,
+            retain=True,
+        )
+        client.publish(
+            f"{mqtt_config.topic_prefix}/{name}/motion",
+            "OFF",
+            retain=False,
+        )

    return client

--- a/frigate/plus.py
+++ b/frigate/plus.py
@@ -1,6 +1,8 @@
 import datetime
+import json
 import logging
 import os
+import re
 import requests
 from frigate.const import PLUS_ENV_VAR, PLUS_API_HOST
 from requests.models import Response
@@ -28,10 +30,23 @@ def get_jpg_bytes(image: ndarray, max_dim: int, quality: int) -> bytes:
 class PlusApi:
    def __init__(self) -> None:
        self.host = PLUS_API_HOST
+        self.key = None
        if PLUS_ENV_VAR in os.environ:
            self.key = os.environ.get(PLUS_ENV_VAR)
-        else:
+        # check for the addon options file
+        elif os.path.isfile("/data/options.json"):
+            with open("/data/options.json") as f:
+                raw_options = f.read()
+            options = json.loads(raw_options)
+            self.key = options.get("plus_api_key")
+
+        if self.key is not None and not re.match(
+            r"[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}:[a-z0-9]{40}",
+            self.key,
+        ):
+            logger.error("Plus API Key is not formatted correctly.")
            self.key = None
+
        self._is_active: bool = self.key is not None
        self._token_data: dict = {}

--- a/frigate/record.py
+++ b/frigate/record.py
@@ -99,11 +99,23 @@ class RecordingMaintainer(threading.Thread):
        # delete all cached files past the most recent 5
        keep_count = 5
        for camera in grouped_recordings.keys():
-            if len(grouped_recordings[camera]) > keep_count:
+            segment_count = len(grouped_recordings[camera])
+            if segment_count > keep_count:
+                ####
+                # Need to find a way to tell if these are aging out based on retention settings or if the system is overloaded.
+                ####
+                # logger.warning(
+                #     f"Too many recording segments in cache for {camera}. Keeping the {keep_count} most recent segments out of {segment_count}, discarding the rest..."
+                # )
                to_remove = grouped_recordings[camera][:-keep_count]
                for f in to_remove:
-                    Path(f["cache_path"]).unlink(missing_ok=True)
-                    self.end_time_cache.pop(f["cache_path"], None)
+                    cache_path = f["cache_path"]
+                    ####
+                    # Need to find a way to tell if these are aging out based on retention settings or if the system is overloaded.
+                    ####
+                    # logger.warning(f"Discarding a recording segment: {cache_path}")
+                    Path(cache_path).unlink(missing_ok=True)
+                    self.end_time_cache.pop(cache_path, None)
                grouped_recordings[camera] = grouped_recordings[camera][-keep_count:]

        for camera, recordings in grouped_recordings.items():
@@ -377,16 +389,11 @@ class RecordingCleanup(threading.Thread):
        logger.debug("Start all cameras.")
        for camera, config in self.config.cameras.items():
            logger.debug(f"Start camera: {camera}.")
-            # When deleting recordings without events, we have to keep at LEAST the configured max clip duration
-            min_end = (
-                datetime.datetime.now()
-                - datetime.timedelta(seconds=config.record.events.max_seconds)
-            ).timestamp()
+            # Get the timestamp for cutoff of retained days
            expire_days = config.record.retain.days
-            expire_before = (
+            expire_date = (
                datetime.datetime.now() - datetime.timedelta(days=expire_days)
            ).timestamp()
-            expire_date = min(min_end, expire_before)

            # Get recordings to check for expiration
            recordings: Recordings = (
--- a/frigate/stats.py
+++ b/frigate/stats.py
@@ -20,9 +20,13 @@ logger = logging.getLogger(__name__)


 def get_latest_version() -> str:
-    request = requests.get(
-        "https://api.github.com/repos/blakeblackshear/frigate/releases/latest"
-    )
+    try:
+        request = requests.get(
+            "https://api.github.com/repos/blakeblackshear/frigate/releases/latest"
+        )
+    except:
+        return "unknown"
+
    response = request.json()

    if request.ok and response and "tag_name" in response:
--- a/frigate/test/const.py
+++ b/frigate/test/const.py
@@ -0,0 +1,4 @@
+"""Consts for testing."""
+
+TEST_DB = "test.db"
+TEST_DB_CLEANUPS = ["test.db", "test.db-shm", "test.db-wal"]
--- a/frigate/test/test_http.py
+++ b/frigate/test/test_http.py
@@ -0,0 +1,328 @@
+import datetime
+import json
+import logging
+import os
+import unittest
+from unittest.mock import patch
+
+from peewee_migrate import Router
+from playhouse.sqlite_ext import SqliteExtDatabase
+from playhouse.sqliteq import SqliteQueueDatabase
+from playhouse.shortcuts import model_to_dict
+
+from frigate.config import FrigateConfig
+from frigate.http import create_app
+from frigate.models import Event, Recordings
+from frigate.plus import PlusApi
+
+from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS
+
+
+class TestHttp(unittest.TestCase):
+    def setUp(self):
+        # setup clean database for each test run
+        migrate_db = SqliteExtDatabase("test.db")
+        del logging.getLogger("peewee_migrate").handlers[:]
+        router = Router(migrate_db)
+        router.run()
+        migrate_db.close()
+        self.db = SqliteQueueDatabase(TEST_DB)
+        models = [Event, Recordings]
+        self.db.bind(models)
+
+        self.minimal_config = {
+            "mqtt": {"host": "mqtt"},
+            "cameras": {
+                "front_door": {
+                    "ffmpeg": {
+                        "inputs": [
+                            {"path": "rtsp://10.0.0.1:554/video", "roles": ["detect"]}
+                        ]
+                    },
+                    "detect": {
+                        "height": 1080,
+                        "width": 1920,
+                        "fps": 5,
+                    },
+                }
+            },
+        }
+        self.test_stats = {
+            "detection_fps": 13.7,
+            "detectors": {
+                "cpu1": {
+                    "detection_start": 0.0,
+                    "inference_speed": 91.43,
+                    "pid": 42,
+                },
+                "cpu2": {
+                    "detection_start": 0.0,
+                    "inference_speed": 84.99,
+                    "pid": 44,
+                },
+            },
+            "front_door": {
+                "camera_fps": 0.0,
+                "capture_pid": 53,
+                "detection_fps": 0.0,
+                "pid": 52,
+                "process_fps": 0.0,
+                "skipped_fps": 0.0,
+            },
+            "service": {
+                "storage": {
+                    "/dev/shm": {
+                        "free": 50.5,
+                        "mount_type": "tmpfs",
+                        "total": 67.1,
+                        "used": 16.6,
+                    },
+                    "/media/frigate/clips": {
+                        "free": 42429.9,
+                        "mount_type": "ext4",
+                        "total": 244529.7,
+                        "used": 189607.0,
+                    },
+                    "/media/frigate/recordings": {
+                        "free": 0.2,
+                        "mount_type": "ext4",
+                        "total": 8.0,
+                        "used": 7.8,
+                    },
+                    "/tmp/cache": {
+                        "free": 976.8,
+                        "mount_type": "tmpfs",
+                        "total": 1000.0,
+                        "used": 23.2,
+                    },
+                },
+                "uptime": 101113,
+                "version": "0.10.1",
+                "latest_version": "0.11",
+            },
+        }
+
+    def tearDown(self):
+        if not self.db.is_closed():
+            self.db.close()
+
+        try:
+            for file in TEST_DB_CLEANUPS:
+                os.remove(file)
+        except OSError:
+            pass
+
+    def test_get_event_list(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+        id2 = "7890.random"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            events = client.get(f"/events").json
+            assert events
+            assert len(events) == 1
+            assert events[0]["id"] == id
+            _insert_mock_event(id2)
+            events = client.get(f"/events").json
+            assert events
+            assert len(events) == 2
+            events = client.get(
+                f"/events",
+                query_string={"limit": 1},
+            ).json
+            assert events
+            assert len(events) == 1
+            events = client.get(
+                f"/events",
+                query_string={"has_clip": 0},
+            ).json
+            assert not events
+
+    def test_get_good_event(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            event = client.get(f"/events/{id}").json
+
+        assert event
+        assert event["id"] == id
+        assert event == model_to_dict(Event.get(Event.id == id))
+
+    def test_get_bad_event(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+        bad_id = "654321.other"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            event = client.get(f"/events/{bad_id}").json
+
+        assert not event
+
+    def test_delete_event(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            event = client.get(f"/events/{id}").json
+            assert event
+            assert event["id"] == id
+            client.delete(f"/events/{id}")
+            event = client.get(f"/events/{id}").json
+            assert not event
+
+    def test_event_retention(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            client.post(f"/events/{id}/retain")
+            event = client.get(f"/events/{id}").json
+            assert event
+            assert event["id"] == id
+            assert event["retain_indefinitely"] == True
+            client.delete(f"/events/{id}/retain")
+            event = client.get(f"/events/{id}").json
+            assert event
+            assert event["id"] == id
+            assert event["retain_indefinitely"] == False
+
+    def test_set_delete_sub_label(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+        sub_label = "sub"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            client.post(
+                f"/events/{id}/sub_label",
+                data=json.dumps({"subLabel": sub_label}),
+                content_type="application/json",
+            )
+            event = client.get(f"/events/{id}").json
+            assert event
+            assert event["id"] == id
+            assert event["sub_label"] == sub_label
+            client.post(
+                f"/events/{id}/sub_label",
+                data=json.dumps({"subLabel": ""}),
+                content_type="application/json",
+            )
+            event = client.get(f"/events/{id}").json
+            assert event
+            assert event["id"] == id
+            assert event["sub_label"] == ""
+
+    def test_sub_label_list(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config), self.db, None, None, PlusApi()
+        )
+        id = "123456.random"
+        sub_label = "sub"
+
+        with app.test_client() as client:
+            _insert_mock_event(id)
+            client.post(
+                f"/events/{id}/sub_label",
+                data=json.dumps({"subLabel": sub_label}),
+                content_type="application/json",
+            )
+            sub_labels = client.get("/sub_labels").json
+            assert sub_labels
+            assert sub_labels == [sub_label]
+
+    def test_config(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config).runtime_config,
+            self.db,
+            None,
+            None,
+            PlusApi(),
+        )
+
+        with app.test_client() as client:
+            config = client.get("/config").json
+            assert config
+            assert config["cameras"]["front_door"]
+
+    def test_recordings(self):
+        app = create_app(
+            FrigateConfig(**self.minimal_config).runtime_config,
+            self.db,
+            None,
+            None,
+            PlusApi(),
+        )
+        id = "123456.random"
+
+        with app.test_client() as client:
+            _insert_mock_recording(id)
+            recording = client.get("/front_door/recordings").json
+            assert recording
+            assert recording[0]["id"] == id
+
+    @patch("frigate.http.stats_snapshot")
+    def test_stats(self, mock_stats):
+        app = create_app(
+            FrigateConfig(**self.minimal_config).runtime_config,
+            self.db,
+            None,
+            None,
+            PlusApi(),
+        )
+        mock_stats.return_value = self.test_stats
+
+        with app.test_client() as client:
+            stats = client.get("/stats").json
+            assert stats == self.test_stats
+
+
+def _insert_mock_event(id: str) -> Event:
+    """Inserts a basic event model with a given id."""
+    return Event.insert(
+        id=id,
+        label="Mock",
+        camera="front_door",
+        start_time=datetime.datetime.now().timestamp(),
+        end_time=datetime.datetime.now().timestamp() + 20,
+        top_score=100,
+        false_positive=False,
+        zones=list(),
+        thumbnail="",
+        region=[],
+        box=[],
+        area=0,
+        has_clip=True,
+        has_snapshot=True,
+    ).execute()
+
+
+def _insert_mock_recording(id: str) -> Event:
+    """Inserts a basic recording model with a given id."""
+    return Recordings.insert(
+        id=id,
+        camera="front_door",
+        path=f"/recordings/{id}",
+        start_time=datetime.datetime.now().timestamp() - 50,
+        end_time=datetime.datetime.now().timestamp() - 60,
+        duration=10,
+        motion=True,
+        objects=True,
+    ).execute()
--- a/frigate/types.py
+++ b/frigate/types.py
@@ -16,6 +16,8 @@ class CameraMetricsTypes(TypedDict):
    frame_queue: Queue
    motion_enabled: Synchronized
    improve_contrast_enabled: Synchronized
+    motion_threshold: Synchronized
+    motion_contour_area: Synchronized
    process: Optional[Process]
    process_fps: Synchronized
    read_start: Synchronized
--- a/frigate/video.py
+++ b/frigate/video.py
@@ -363,13 +363,19 @@ def track_camera(
    detection_enabled = process_info["detection_enabled"]
    motion_enabled = process_info["motion_enabled"]
    improve_contrast_enabled = process_info["improve_contrast_enabled"]
+    motion_threshold = process_info["motion_threshold"]
+    motion_contour_area = process_info["motion_contour_area"]

    frame_shape = config.frame_shape
    objects_to_track = config.objects.track
    object_filters = config.objects.filters

    motion_detector = MotionDetector(
-        frame_shape, config.motion, improve_contrast_enabled
+        frame_shape,
+        config.motion,
+        improve_contrast_enabled,
+        motion_threshold,
+        motion_contour_area,
    )
    object_detector = RemoteObjectDetector(
        name, labelmap, detection_queue, result_connection, model_shape
@@ -434,7 +440,13 @@ def intersects_any(box_a, boxes):


 def detect(
-    object_detector, frame, model_shape, region, objects_to_track, object_filters
+    detect_config: DetectConfig,
+    object_detector,
+    frame,
+    model_shape,
+    region,
+    objects_to_track,
+    object_filters,
 ):
    tensor_input = create_tensor_input(frame, model_shape, region)

@@ -443,10 +455,15 @@ def detect(
    for d in region_detections:
        box = d[2]
        size = region[2] - region[0]
-        x_min = int((box[1] * size) + region[0])
-        y_min = int((box[0] * size) + region[1])
-        x_max = int((box[3] * size) + region[0])
-        y_max = int((box[2] * size) + region[1])
+        x_min = int(max(0, (box[1] * size) + region[0]))
+        y_min = int(max(0, (box[0] * size) + region[1]))
+        x_max = int(min(detect_config.width - 1, (box[3] * size) + region[0]))
+        y_max = int(min(detect_config.height - 1, (box[2] * size) + region[1]))
+
+        # ignore objects that were detected outside the frame
+        if (x_min >= detect_config.width - 1) or (y_min >= detect_config.height - 1):
+            continue
+
        width = x_max - x_min
        height = y_max - y_min
        area = width * height
@@ -614,6 +631,7 @@ def process_frames(
            for region in regions:
                detections.extend(
                    detect(
+                        detect_config,
                        object_detector,
                        frame,
                        model_shape,
@@ -641,6 +659,7 @@ def process_frames(

                    # apply non-maxima suppression to suppress weak, overlapping bounding boxes
                    # o[2] is the box of the object: xmin, ymin, xmax, ymax
+                    # apply max/min to ensure values do not exceed the known frame size
                    boxes = [
                        (
                            o[2][0],
@@ -672,6 +691,7 @@ def process_frames(

                            selected_objects.extend(
                                detect(
+                                    detect_config,
                                    object_detector,
                                    frame,
                                    model_shape,
--- a/web/config/handlers.js
+++ b/web/config/handlers.js
@@ -2,7 +2,7 @@ import { rest } from 'msw';
 import { API_HOST } from '../src/env';

 export const handlers = [
-  rest.get(`${API_HOST}/api/config`, (req, res, ctx) => {
+  rest.get(`${API_HOST}api/config`, (req, res, ctx) => {
    return res(
      ctx.status(200),
      ctx.json({
@@ -35,7 +35,7 @@ export const handlers = [
      })
    );
  }),
-  rest.get(`${API_HOST}/api/stats`, (req, res, ctx) => {
+  rest.get(`${API_HOST}api/stats`, (req, res, ctx) => {
    return res(
      ctx.status(200),
      ctx.json({
@@ -54,7 +54,7 @@ export const handlers = [
      })
    );
  }),
-  rest.get(`${API_HOST}/api/events`, (req, res, ctx) => {
+  rest.get(`${API_HOST}api/events`, (req, res, ctx) => {
    return res(
      ctx.status(200),
      ctx.json(
@@ -68,8 +68,18 @@ export const handlers = [
          top_score: Math.random(),
          zones: ['front_patio'],
          thumbnail: '/9j/4aa...',
+          camera: 'camera_name',
        }))
      )
    );
  }),
+  rest.get(`${API_HOST}api/sub_labels`, (req, res, ctx) => {
+    return res(
+      ctx.status(200),
+      ctx.json([
+        'one',
+        'two',
+      ])
+    );
+  }),
 ];
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -17,9 +17,9 @@
        "preact-async-route": "^2.2.1",
        "preact-router": "^4.0.1",
        "swr": "^1.2.2",
-        "video.js": "^7.17.0",
+        "video.js": "^7.20.2",
        "videojs-playlist": "^5.0.0",
-        "videojs-seek-buttons": "^2.2.0"
+        "videojs-seek-buttons": "^2.2.1"
      },
      "devDependencies": {
        "@babel/preset-env": "^7.16.11",
@@ -30,6 +30,7 @@
        "@testing-library/preact": "^2.0.1",
        "@testing-library/preact-hooks": "^1.1.0",
        "@testing-library/user-event": "^13.5.0",
+        "@types/video.js": "^7.3.44",
        "@typescript-eslint/eslint-plugin": "^5.18.0",
        "@typescript-eslint/parser": "^5.18.0",
        "autoprefixer": "^10.4.2",
@@ -3234,6 +3235,12 @@
        "@types/jest": "*"
      }
    },
+    "node_modules/@types/video.js": {
+      "version": "7.3.44",
+      "resolved": "https://registry.npmjs.org/@types/video.js/-/video.js-7.3.44.tgz",
+      "integrity": "sha512-ov1HXNOjUkt38al/ybw8cj1181I5P3sOXdrqBR8AkDCqQX6GYwxOCzdmsGn/LDwKHTZ/3veNC9Ad6BjR5wSq4g==",
+      "dev": true
+    },
    "node_modules/@types/yargs": {
      "version": "16.0.4",
      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
@@ -3867,17 +3874,17 @@
      }
    },
    "node_modules/@videojs/http-streaming": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.12.0.tgz",
-      "integrity": "sha512-vdQA0lDYBXGJqV2T02AGqg1w4dcgyRoN+bYG+G8uF4DpCEMhEtUI0BA4tRu4/Njar8w/9D5k0a1KX40pcvM3fA==",
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.2.tgz",
+      "integrity": "sha512-K1raSfO/pq5r8iUas3OSYni0kXOj91n8ealIpV02khghzGv9LQ6O3YUqYd/eAhJ1HIrmZWOnrYpK/P+mhUExXQ==",
      "dependencies": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "3.0.4",
-        "aes-decrypter": "3.1.2",
+        "@videojs/vhs-utils": "3.0.5",
+        "aes-decrypter": "3.1.3",
        "global": "^4.4.0",
-        "m3u8-parser": "4.7.0",
-        "mpd-parser": "0.19.2",
-        "mux.js": "5.14.1",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
        "video.js": "^6 || ^7"
      },
      "engines": {
@@ -3889,9 +3896,9 @@
      }
    },
    "node_modules/@videojs/vhs-utils": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz",
-      "integrity": "sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz",
+      "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==",
      "dependencies": {
        "@babel/runtime": "^7.12.5",
        "global": "^4.4.0",
@@ -3978,12 +3985,12 @@
      }
    },
    "node_modules/aes-decrypter": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.2.tgz",
-      "integrity": "sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
+      "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==",
      "dependencies": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "^3.0.0",
+        "@videojs/vhs-utils": "^3.0.5",
        "global": "^4.4.0",
        "pkcs7": "^1.0.4"
      }
@@ -9409,12 +9416,12 @@
      }
    },
    "node_modules/m3u8-parser": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz",
-      "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
      "dependencies": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "^3.0.0",
+        "@videojs/vhs-utils": "^3.0.5",
        "global": "^4.4.0"
      }
    },
@@ -9545,12 +9552,12 @@
      "dev": true
    },
    "node_modules/mpd-parser": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.19.2.tgz",
-      "integrity": "sha512-M5tAIdtBM2TN+OSTz/37T7V+h9ZLvhyNqq4TNIdtjAQ/Hg8UnMRf5nJQDjffcXag3POXi31yUJQEKOXdcAM/nw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
+      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
      "dependencies": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "^3.0.2",
+        "@videojs/vhs-utils": "^3.0.5",
        "@xmldom/xmldom": "^0.7.2",
        "global": "^4.4.0"
      },
@@ -9715,11 +9722,12 @@
      "dev": true
    },
    "node_modules/mux.js": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.14.1.tgz",
-      "integrity": "sha512-38kA/xjWRDzMbcpHQfhKbJAME8eTZVsb9U2Puk890oGvGqnyu8B/AkKdICKPHkigfqYX9MY20vje88TP14nhog==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz",
+      "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==",
      "dependencies": {
-        "@babel/runtime": "^7.11.2"
+        "@babel/runtime": "^7.11.2",
+        "global": "^4.4.0"
      },
      "bin": {
        "muxjs-transmux": "bin/transmux.js"
@@ -11755,20 +11763,20 @@
      }
    },
    "node_modules/video.js": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.17.0.tgz",
-      "integrity": "sha512-8RbLu9+Pdpep9OTPncUHIvZXFgn/7hKdPnSTE/lGSnlFSucXtTUBp41R7NDwncscMLQ0WgazUbmFlvr4MNWMbA==",
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.2.tgz",
+      "integrity": "sha512-hdvAHKAyaL6bCDkeu0pPtFYKi1EDaOUovm7FN1xqBDolUxgH8FKy1WIgTS+Ouuaw7R54SCTcSeXjZEizhy9ouQ==",
      "dependencies": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "2.12.0",
-        "@videojs/vhs-utils": "^3.0.3",
+        "@videojs/http-streaming": "2.14.2",
+        "@videojs/vhs-utils": "^3.0.4",
        "@videojs/xhr": "2.6.0",
-        "aes-decrypter": "3.1.2",
+        "aes-decrypter": "3.1.3",
        "global": "^4.4.0",
        "keycode": "^2.2.0",
-        "m3u8-parser": "4.7.0",
-        "mpd-parser": "0.19.2",
-        "mux.js": "5.14.1",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
        "safe-json-parse": "4.0.0",
        "videojs-font": "3.2.0",
        "videojs-vtt.js": "^0.15.3"
@@ -11792,9 +11800,9 @@
      }
    },
    "node_modules/videojs-seek-buttons": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/videojs-seek-buttons/-/videojs-seek-buttons-2.2.0.tgz",
-      "integrity": "sha512-yjCA6ntq+8fRKgZi/H6QJlghQWgA1x9oSRl6wfLODAcujhynDXetwMgRKGgl4NlV5af2bKY6erNtJ0kOBko/nQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/videojs-seek-buttons/-/videojs-seek-buttons-2.2.1.tgz",
+      "integrity": "sha512-tXInD8ElUddyc1vxkGsVNhxlFtz8JC4VagPOSyL8mj7LI7oXjLGxni2pjx2wqzsV3PaIBMMH47MBtsNWf+wbtw==",
      "dependencies": {
        "global": "^4.4.0",
        "video.js": "^6 || ^7"
@@ -14504,6 +14512,12 @@
        "@types/jest": "*"
      }
    },
+    "@types/video.js": {
+      "version": "7.3.44",
+      "resolved": "https://registry.npmjs.org/@types/video.js/-/video.js-7.3.44.tgz",
+      "integrity": "sha512-ov1HXNOjUkt38al/ybw8cj1181I5P3sOXdrqBR8AkDCqQX6GYwxOCzdmsGn/LDwKHTZ/3veNC9Ad6BjR5wSq4g==",
+      "dev": true
+    },
    "@types/yargs": {
      "version": "16.0.4",
      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
@@ -14881,24 +14895,24 @@
      }
    },
    "@videojs/http-streaming": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.12.0.tgz",
-      "integrity": "sha512-vdQA0lDYBXGJqV2T02AGqg1w4dcgyRoN+bYG+G8uF4DpCEMhEtUI0BA4tRu4/Njar8w/9D5k0a1KX40pcvM3fA==",
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.2.tgz",
+      "integrity": "sha512-K1raSfO/pq5r8iUas3OSYni0kXOj91n8ealIpV02khghzGv9LQ6O3YUqYd/eAhJ1HIrmZWOnrYpK/P+mhUExXQ==",
      "requires": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "3.0.4",
-        "aes-decrypter": "3.1.2",
+        "@videojs/vhs-utils": "3.0.5",
+        "aes-decrypter": "3.1.3",
        "global": "^4.4.0",
-        "m3u8-parser": "4.7.0",
-        "mpd-parser": "0.19.2",
-        "mux.js": "5.14.1",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
        "video.js": "^6 || ^7"
      }
    },
    "@videojs/vhs-utils": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz",
-      "integrity": "sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz",
+      "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==",
      "requires": {
        "@babel/runtime": "^7.12.5",
        "global": "^4.4.0",
@@ -14967,12 +14981,12 @@
      "dev": true
    },
    "aes-decrypter": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.2.tgz",
-      "integrity": "sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
+      "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==",
      "requires": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "^3.0.0",
+        "@videojs/vhs-utils": "^3.0.5",
        "global": "^4.4.0",
        "pkcs7": "^1.0.4"
      }
@@ -18873,12 +18887,12 @@
      "dev": true
    },
    "m3u8-parser": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.0.tgz",
-      "integrity": "sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
      "requires": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "^3.0.0",
+        "@videojs/vhs-utils": "^3.0.5",
        "global": "^4.4.0"
      }
    },
@@ -18979,12 +18993,12 @@
      "dev": true
    },
    "mpd-parser": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.19.2.tgz",
-      "integrity": "sha512-M5tAIdtBM2TN+OSTz/37T7V+h9ZLvhyNqq4TNIdtjAQ/Hg8UnMRf5nJQDjffcXag3POXi31yUJQEKOXdcAM/nw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
+      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
      "requires": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/vhs-utils": "^3.0.2",
+        "@videojs/vhs-utils": "^3.0.5",
        "@xmldom/xmldom": "^0.7.2",
        "global": "^4.4.0"
      }
@@ -19107,11 +19121,12 @@
      "dev": true
    },
    "mux.js": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.14.1.tgz",
-      "integrity": "sha512-38kA/xjWRDzMbcpHQfhKbJAME8eTZVsb9U2Puk890oGvGqnyu8B/AkKdICKPHkigfqYX9MY20vje88TP14nhog==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz",
+      "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==",
      "requires": {
-        "@babel/runtime": "^7.11.2"
+        "@babel/runtime": "^7.11.2",
+        "global": "^4.4.0"
      }
    },
    "nanoid": {
@@ -20599,20 +20614,20 @@
      }
    },
    "video.js": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.17.0.tgz",
-      "integrity": "sha512-8RbLu9+Pdpep9OTPncUHIvZXFgn/7hKdPnSTE/lGSnlFSucXtTUBp41R7NDwncscMLQ0WgazUbmFlvr4MNWMbA==",
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.2.tgz",
+      "integrity": "sha512-hdvAHKAyaL6bCDkeu0pPtFYKi1EDaOUovm7FN1xqBDolUxgH8FKy1WIgTS+Ouuaw7R54SCTcSeXjZEizhy9ouQ==",
      "requires": {
        "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "2.12.0",
-        "@videojs/vhs-utils": "^3.0.3",
+        "@videojs/http-streaming": "2.14.2",
+        "@videojs/vhs-utils": "^3.0.4",
        "@videojs/xhr": "2.6.0",
-        "aes-decrypter": "3.1.2",
+        "aes-decrypter": "3.1.3",
        "global": "^4.4.0",
        "keycode": "^2.2.0",
-        "m3u8-parser": "4.7.0",
-        "mpd-parser": "0.19.2",
-        "mux.js": "5.14.1",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
        "safe-json-parse": "4.0.0",
        "videojs-font": "3.2.0",
        "videojs-vtt.js": "^0.15.3"
@@ -20633,9 +20648,9 @@
      }
    },
    "videojs-seek-buttons": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/videojs-seek-buttons/-/videojs-seek-buttons-2.2.0.tgz",
-      "integrity": "sha512-yjCA6ntq+8fRKgZi/H6QJlghQWgA1x9oSRl6wfLODAcujhynDXetwMgRKGgl4NlV5af2bKY6erNtJ0kOBko/nQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/videojs-seek-buttons/-/videojs-seek-buttons-2.2.1.tgz",
+      "integrity": "sha512-tXInD8ElUddyc1vxkGsVNhxlFtz8JC4VagPOSyL8mj7LI7oXjLGxni2pjx2wqzsV3PaIBMMH47MBtsNWf+wbtw==",
      "requires": {
        "global": "^4.4.0",
        "video.js": "^6 || ^7"
--- a/web/package.json
+++ b/web/package.json
@@ -3,9 +3,9 @@
  "private": true,
  "version": "0.0.0",
  "scripts": {
-    "dev": "vite",
+    "dev": "vite --host",
    "lint": "eslint ./ --ext .jsx,.js,.tsx,.ts",
-    "build": "tsc && vite build",
+    "build": "tsc && vite build --base=/BASE_PATH/",
    "preview": "vite preview",
    "test": "jest"
  },
@@ -19,9 +19,9 @@
    "preact-async-route": "^2.2.1",
    "preact-router": "^4.0.1",
    "swr": "^1.2.2",
-    "video.js": "^7.17.0",
+    "video.js": "^7.20.2",
    "videojs-playlist": "^5.0.0",
-    "videojs-seek-buttons": "^2.2.0"
+    "videojs-seek-buttons": "^2.2.1"
  },
  "devDependencies": {
    "@babel/preset-env": "^7.16.11",
@@ -32,6 +32,7 @@
    "@testing-library/preact": "^2.0.1",
    "@testing-library/preact-hooks": "^1.1.0",
    "@testing-library/user-event": "^13.5.0",
+    "@types/video.js": "^7.3.44",
    "@typescript-eslint/eslint-plugin": "^5.18.0",
    "@typescript-eslint/parser": "^5.18.0",
    "autoprefixer": "^10.4.2",
--- a/web/src/Sidebar.jsx
+++ b/web/src/Sidebar.jsx
@@ -65,7 +65,7 @@ function CameraSection({ sortedCameras }) {
    <Fragment>
      <Separator />
      {sortedCameras.map(([camera]) => (
-        <Destination key={camera} href={`/cameras/${camera}`} text={camera} />
+        <Destination key={camera} href={`/cameras/${camera}`} text={camera.replaceAll('_', ' ')} />
      ))}
      <Separator />
    </Fragment>
@@ -83,7 +83,7 @@ function RecordingSection({ sortedCameras }) {
            key={camera}
            path={`/recording/${camera}/:date?/:hour?/:seconds?`}
            href={`/recording/${camera}`}
-            text={camera}
+            text={camera.replaceAll('_', ' ')}
          />
        );
      })}
--- a/web/src/mocks/env.js
+++ b/web/src/mocks/env.js
@@ -1,2 +1,2 @@
 export const ENV = 'test';
-export const API_HOST = 'http://base-url.local:5000';
+export const API_HOST = 'http://base-url.local:5000/';
--- a/web/src/api/tests/index.test.jsx
+++ b/web/src/api/tests/index.test.jsx
@@ -18,6 +18,6 @@ describe('useApiHost', () => {
        <Test />
      </ApiProvider>
    );
-    expect(screen.queryByText('http://base-url.local:5000')).toBeInTheDocument();
+    expect(screen.queryByText('http://base-url.local:5000/')).toBeInTheDocument();
  });
 });
--- a/web/src/api/baseUrl.js
+++ b/web/src/api/baseUrl.js
@@ -1,2 +1,2 @@
 import { API_HOST } from '../env';
-export const baseUrl = API_HOST || `${window.location.protocol}//${window.location.host}${window.baseUrl || ''}`;
+export const baseUrl = API_HOST || `${window.location.protocol}//${window.location.host}${window.baseUrl || '/'}`;
--- a/web/src/api/index.jsx
+++ b/web/src/api/index.jsx
@@ -4,7 +4,7 @@ import useSWR, { SWRConfig } from 'swr';
 import { MqttProvider } from './mqtt';
 import axios from 'axios';

-axios.defaults.baseURL = `${baseUrl}/api/`;
+axios.defaults.baseURL = `${baseUrl}api/`;

 export function ApiProvider({ children, options }) {
  return (
--- a/web/src/api/mqtt.jsx
+++ b/web/src/api/mqtt.jsx
@@ -34,7 +34,7 @@ export function MqttProvider({
  config,
  children,
  createWebsocket = defaultCreateWebsocket,
-  mqttUrl = `${baseUrl.replace(/^http/, 'ws')}/ws`,
+  mqttUrl = `${baseUrl.replace(/^http/, 'ws')}ws`,
 }) {
  const [state, dispatch] = useReducer(reducer, initialState);
  const wsRef = useRef();
--- a/web/src/components/HistoryViewer/HistoryVideo.tsx
+++ b/web/src/components/HistoryViewer/HistoryVideo.tsx
@@ -3,17 +3,17 @@ import { useCallback, useEffect, useRef, useState } from 'preact/hooks';
 import { useApiHost } from '../../api';
 import { isNullOrUndefined } from '../../utils/objectUtils';

+import 'videojs-seek-buttons';
+import 'video.js/dist/video-js.css';
+import 'videojs-seek-buttons/dist/videojs-seek-buttons.css';
+
+import videojs, { VideoJsPlayer } from 'video.js';
+
 interface OnTimeUpdateEvent {
  timestamp: number;
  isPlaying: boolean;
 }

-interface VideoProperties {
-  posterUrl: string;
-  videoUrl: string;
-  height: number;
-}
-
 interface HistoryVideoProps {
  id?: string;
  isPlaying: boolean;
@@ -32,68 +32,39 @@ export const HistoryVideo = ({
  onPlay,
 }: HistoryVideoProps) => {
  const apiHost = useApiHost();
-  const videoRef = useRef<HTMLVideoElement|null>(null);
-  const [videoHeight, setVideoHeight] = useState<number>(0);
-  const [videoProperties, setVideoProperties] = useState<VideoProperties>({
-    posterUrl: '',
-    videoUrl: '',
-    height: 0,
-  });
+  const videoRef = useRef<HTMLVideoElement>(null);

-  const currentVideo = videoRef.current;
-  if (currentVideo && !videoHeight) {
-    const currentVideoHeight = currentVideo.offsetHeight;
-    if (currentVideoHeight > 0) {
-      setVideoHeight(currentVideoHeight);
-    }
-  }
+  const [video, setVideo] = useState<VideoJsPlayer>();

  useEffect(() => {
-    const idExists = !isNullOrUndefined(id);
-    if (idExists) {
-      if (videoRef.current && !videoRef.current.paused) {
-        videoRef.current = null;
-      }
-
-      setVideoProperties({
-        posterUrl: `${apiHost}/api/events/${id}/snapshot.jpg`,
-        videoUrl: `${apiHost}/vod/event/${id}/index.m3u8`,
-        height: videoHeight,
-      });
-    } else {
-      setVideoProperties({
-        posterUrl: '',
-        videoUrl: '',
-        height: 0,
-      });
+    let video: VideoJsPlayer
+    if (videoRef.current) {
+      video = videojs(videoRef.current, {})
+      setVideo(video)
    }
-  }, [id, videoHeight, videoRef, apiHost]);
+    () => video?.dispose()
+  }, [videoRef]);

  useEffect(() => {
-    const playVideo = (video: HTMLMediaElement) => video.play();
-
-    const attemptPlayVideo = (video: HTMLMediaElement) => {
-      const videoHasNotLoaded = video.readyState <= 1;
-      if (videoHasNotLoaded) {
-        video.oncanplay = () => {
-          playVideo(video);
-        };
-        video.load();
-      } else {
-        playVideo(video);
-      }
-    };
-
-    const video = videoRef.current;
-    const videoExists = !isNullOrUndefined(video);
-    if (video && videoExists) {
-      if (videoIsPlaying) {
-        attemptPlayVideo(video);
-      } else {
-        video.pause();
-      }
+    if (!video) {
+      return
    }
-  }, [videoIsPlaying, videoRef]);
+
+
+    if (!id) {
+      video.pause()
+      return
+    }
+
+    video.src({
+      src: `${apiHost}/vod/event/${id}/master.m3u8`,
+      type: 'application/vnd.apple.mpegurl',
+    });
+    video.poster(`${apiHost}/api/events/${id}/snapshot.jpg`);
+    if (videoIsPlaying) {
+      video.play();
+    }
+  }, [video, id]);

  useEffect(() => {
    const video = videoRef.current;
@@ -111,32 +82,38 @@ export const HistoryVideo = ({
        isPlaying: videoIsPlaying,
        timestamp: target.currentTime,
      };
-
      onTimeUpdate && onTimeUpdate(timeUpdateEvent);
    },
    [videoIsPlaying, onTimeUpdate]
  );

-  const videoPropertiesIsUndefined = isNullOrUndefined(videoProperties);
-  if (videoPropertiesIsUndefined) {
-    return <div style={{ height: `${videoHeight}px`, width: '100%' }} />;
-  }
+  useEffect(() => {
+    if (video && video.readyState() >= 1) {
+      if (videoIsPlaying) {
+        video.play()
+      } else {
+        video.pause()
+      }
+    }
+  }, [video, videoIsPlaying])

-  const { posterUrl, videoUrl, height } = videoProperties;
+  const onLoad = useCallback(() => {
+    if (video && video.readyState() >= 1 && videoIsPlaying) {
+      video.play()
+    }
+  }, [video, videoIsPlaying])
+  
  return (
-    <video
-      ref={videoRef}
-      key={posterUrl}
-      onTimeUpdate={onTimeUpdateHandler}
-      onPause={onPause}
-      onPlay={onPlay}
-      poster={posterUrl}
-      preload='metadata'
-      controls
-      style={height ? { minHeight: `${height}px` } : {}}
-      playsInline
-    >
-      <source type='application/vnd.apple.mpegurl' src={videoUrl} />
-    </video>
+    <div data-vjs-player>
+      <video
+        ref={videoRef}
+        onTimeUpdate={onTimeUpdateHandler}
+        onLoadedMetadata={onLoad}
+        onPause={onPause}
+        onPlay={onPlay}
+        className="video-js vjs-fluid"
+        data-setup="{}"
+      />
+    </div>
  );
 };
--- a/web/src/components/JSMpegPlayer.jsx
+++ b/web/src/components/JSMpegPlayer.jsx
@@ -5,7 +5,7 @@ import JSMpeg from '@cycjimmy/jsmpeg-player';

 export default function JSMpegPlayer({ camera, width, height }) {
  const playerRef = useRef();
-  const url = `${baseUrl.replace(/^http/, 'ws')}/live/${camera}`;
+  const url = `${baseUrl.replace(/^http/, 'ws')}live/${camera}`;

  useEffect(() => {
    const video = new JSMpeg.VideoElement(
--- a/web/src/components/RecordingPlaylist.jsx
+++ b/web/src/components/RecordingPlaylist.jsx
@@ -44,12 +44,12 @@ export default function RecordingPlaylist({ camera, recordings, selectedDate })
    <div className="flex absolute inset-y-0 right-0 w-9/12 md:w-1/2 lg:w-3/5 max-w-md text-base text-white font-sans">
      <div
        onClick={toggle}
-        className={`absolute ${openClass} cursor-pointer items-center self-center rounded-tl-lg rounded-bl-lg border border-r-0 w-6 h-20 py-7 bg-gray-800 bg-opacity-70`}
+        className={`absolute ${openClass} cursor-pointer items-center self-center rounded-tl-lg rounded-bl-lg border border-r-0 w-6 h-20 py-7 bg-gray-800 bg-opacity-70 z-10`}
      >
        {active ? <Menu /> : <MenuOpen />}
      </div>
      <div
-        className={`w-full h-full bg-gray-800 bg-opacity-70 border-l overflow-x-hidden overflow-y-auto${
+        className={`w-full h-full bg-gray-800 bg-opacity-70 border-l overflow-x-hidden overflow-y-auto z-10${
          active ? '' : ' hidden'
        }`}
      >
--- a/web/src/components/Tabs.jsx
+++ b/web/src/components/Tabs.jsx
@@ -27,12 +27,14 @@ export function Tabs({ children, selectedIndex: selectedIndexProp, onChange, cla
  );
 }

-export function TextTab({ selected, text, onClick }) {
-  const selectedStyle = selected
-    ? 'text-white bg-blue-500 dark:text-black dark:bg-white'
-    : 'text-black dark:text-white bg-transparent';
+export function TextTab({ selected, text, onClick, disabled }) {
+  const selectedStyle = disabled
+    ? 'text-gray-400 dark:text-gray-600 bg-transparent'
+    : selected
+      ? 'text-white bg-blue-500 dark:text-black dark:bg-white'
+      : 'text-black dark:text-white bg-transparent';
  return (
-    <button onClick={onClick} className={`rounded-full px-4 py-2 ${selectedStyle}`}>
+    <button onClick={onClick} disabled={disabled} className={`rounded-full px-4 py-2 ${selectedStyle}`}>
      <span>{text}</span>
    </button>
  );
--- a/web/src/components/Timeline/TimelineBlocks.tsx
+++ b/web/src/components/Timeline/TimelineBlocks.tsx
@@ -20,11 +20,11 @@ export const TimelineBlocks = ({ timeline, firstBlockOffset, onEventClick }: Tim
      const timelineBlockOffset = (timelineContainerHeight - largestYOffsetInBlocks) / 2;
      return (
        <div
-          className='relative'
+          className="relative"
          style={{
            height: `${timelineContainerHeight}px`,
            width: `${timelineContainerWidth}px`,
-            background: "url('/marker.png')",
+            background: "url('/images/marker.png')",
            backgroundPosition: 'center',
            backgroundSize: '30px',
            backgroundRepeat: 'repeat',
@@ -41,7 +41,7 @@ export const TimelineBlocks = ({ timeline, firstBlockOffset, onEventClick }: Tim
        </div>
      );
    }
-    return <div />
+    return <div />;
  }, [timeline, onEventClick, firstBlockOffset]);

  return timelineEventBlocks;
--- a/web/src/components/VideoPlayer.jsx
+++ b/web/src/components/VideoPlayer.jsx
@@ -93,7 +93,8 @@ export default function VideoPlayer({ children, options, seekOptions = {}, onRea

  return (
    <div data-vjs-player>
-      <video ref={playerRef} className="small-player video-js vjs-default-skin" controls playsinline />
+      {/* Setting an empty data-setup is required to override the default values and allow video to be fit the size of its parent */}
+      <video ref={playerRef} className="small-player video-js vjs-default-skin" data-setup="{}" controls playsinline />
      {children}
    </div>
  );
--- a/web/src/env.js
+++ b/web/src/env.js
@@ -1,2 +1,2 @@
 export const ENV = import.meta.env.MODE;
-export const API_HOST = ENV === "production" ? "" : "http://localhost:5000";
+export const API_HOST = ENV === 'production' ? '' : 'http://localhost:5000/';
--- a/web/src/routes/Camera.jsx
+++ b/web/src/routes/Camera.jsx
@@ -120,7 +120,7 @@ export default function Camera({ camera }) {

  return (
    <div className="space-y-4 p-2 px-4">
-      <Heading size="2xl">{camera}</Heading>
+      <Heading size="2xl">{camera.replaceAll('_', ' ')}</Heading>
      <ButtonsTabbed viewModes={['live', 'debug']} setViewMode={setViewMode} />

      {player}
@@ -133,8 +133,8 @@ export default function Camera({ camera }) {
              className="mb-4 mr-4"
              key={objectType}
              header={objectType}
-              href={`/events?camera=${camera}&label=${objectType}`}
-              media={<img src={`${apiHost}/api/${camera}/${objectType}/thumbnail.jpg`} />}
+              href={`/events?camera=${camera}&label=${encodeURIComponent(objectType)}`}
+              media={<img src={`${apiHost}/api/${camera}/${encodeURIComponent(objectType)}/thumbnail.jpg`} />}
            />
          ))}
        </div>
--- a/web/src/routes/Cameras.jsx
+++ b/web/src/routes/Cameras.jsx
@@ -50,6 +50,10 @@ function Camera({ name }) {
      { name: 'Recordings', href: `/recording/${name}` },
    ];
  }, [name]);
+  const cleanName = useMemo(
+    () => { return `${name.replaceAll('_', ' ')}` },
+    [name]
+  );
  const icons = useMemo(
    () => [
      {
@@ -81,6 +85,6 @@ function Camera({ name }) {
  );

  return (
-    <Card buttons={buttons} href={href} header={name} icons={icons} media={<CameraImage camera={name} stretch />} />
+    <Card buttons={buttons} href={href} header={cleanName} icons={icons} media={<CameraImage camera={name} stretch />} />
  );
 }
--- a/web/src/routes/Debug.jsx
+++ b/web/src/routes/Debug.jsx
@@ -81,7 +81,7 @@ export default function Debug() {
                {cameraNames.map((camera, i) => (
                  <Tr key={i} index={i}>
                    <Td>
-                      <Link href={`/cameras/${camera}`}>{camera}</Link>
+                      <Link href={`/cameras/${camera}`}>{camera.replaceAll('_', ' ')}</Link>
                    </Td>
                    {cameraDataKeys.map((name) => (
                      <Td key={`${name}-${camera}`}>{cameras[camera][name]}</Td>
--- a/web/src/routes/Events.jsx
+++ b/web/src/routes/Events.jsx
@@ -2,6 +2,7 @@ import { h, Fragment } from 'preact';
 import { route } from 'preact-router';
 import ActivityIndicator from '../components/ActivityIndicator';
 import Heading from '../components/Heading';
+import { Tabs, TextTab } from '../components/Tabs';
 import { useApiHost } from '../api';
 import useSWR from 'swr';
 import useSWRInfinite from 'swr/infinite';
@@ -44,6 +45,7 @@ export default function Events({ path, ...props }) {
    camera: props.camera ?? 'all',
    label: props.label ?? 'all',
    zone: props.zone ?? 'all',
+    sub_label: props.sub_label ?? 'all',
  });
  const [state, setState] = useState({
    showDownloadMenu: false,
@@ -53,12 +55,17 @@ export default function Events({ path, ...props }) {
  });
  const [uploading, setUploading] = useState([]);
  const [viewEvent, setViewEvent] = useState();
+  const [eventDetailType, setEventDetailType] = useState('clip');
  const [downloadEvent, setDownloadEvent] = useState({
    id: null,
    has_clip: false,
    has_snapshot: false,
    plus_id: undefined,
  });
+  const [deleteFavoriteState, setDeleteFavoriteState] = useState({
+    deletingFavoriteEventId: null,
+    showDeleteFavorite: false,
+  });

  const eventsFetcher = useCallback((path, params) => {
    params = { ...params, include_thumbnails: 0, limit: API_LIMIT };
@@ -82,6 +89,8 @@ export default function Events({ path, ...props }) {

  const { data: config } = useSWR('config');

+  const { data: allSubLabels } = useSWR('sub_labels')
+
  const filterValues = useMemo(
    () => ({
      cameras: Object.keys(config?.cameras || {}),
@@ -97,8 +106,9 @@ export default function Events({ path, ...props }) {
          return memo;
        }, config?.objects?.track || [])
        .filter((value, i, self) => self.indexOf(value) === i),
+      sub_labels: Object.values(allSubLabels || []),
    }),
-    [config]
+    [config, allSubLabels]
  );

  const onSave = async (e, eventId, save) => {
@@ -114,11 +124,16 @@ export default function Events({ path, ...props }) {
    }
  };

-  const onDelete = async (e, eventId) => {
+  const onDelete = async (e, eventId, saved) => {
    e.stopPropagation();
-    const response = await axios.delete(`events/${eventId}`);
-    if (response.status === 200) {
-      mutate();
+
+    if (saved) {
+      setDeleteFavoriteState({ deletingFavoriteEventId: eventId, showDeleteFavorite: true });
+    } else {
+      const response = await axios.delete(`events/${eventId}`);
+      if (response.status === 200) {
+        mutate();
+      }
    }
  };

@@ -222,6 +237,10 @@ export default function Events({ path, ...props }) {
    }
  };

+  const handleEventDetailTabChange = (index) => {
+    setEventDetailType(index == 0 ? 'clip' : 'image');
+  };
+
  if (!config) {
    return <ActivityIndicator />;
  }
@@ -231,41 +250,56 @@ export default function Events({ path, ...props }) {
      <Heading>Events</Heading>
      <div className="flex flex-wrap gap-2 items-center">
        <select
-          className="basis-1/4 cursor-pointer rounded dark:bg-slate-800"
+          className="basis-1/5 cursor-pointer rounded dark:bg-slate-800"
          value={searchParams.camera}
          onChange={(e) => onFilter('camera', e.target.value)}
        >
-          <option value="all">all</option>
+          <option value="all">all cameras</option>
          {filterValues.cameras.map((item) => (
            <option key={item} value={item}>
-              {item}
+              {item.replaceAll('_', ' ')}
            </option>
          ))}
        </select>
        <select
-          className="basis-1/4 cursor-pointer rounded dark:bg-slate-800"
+          className="basis-1/5 cursor-pointer rounded dark:bg-slate-800"
          value={searchParams.label}
          onChange={(e) => onFilter('label', e.target.value)}
        >
-          <option value="all">all</option>
+          <option value="all">all labels</option>
          {filterValues.labels.map((item) => (
-            <option key={item} value={item}>
+            <option key={item.replaceAll('_', ' ')} value={item}>
              {item}
            </option>
          ))}
        </select>
        <select
-          className="basis-1/4 cursor-pointer rounded dark:bg-slate-800"
+          className="basis-1/5 cursor-pointer rounded dark:bg-slate-800"
          value={searchParams.zone}
          onChange={(e) => onFilter('zone', e.target.value)}
        >
-          <option value="all">all</option>
+          <option value="all">all zones</option>
          {filterValues.zones.map((item) => (
            <option key={item} value={item}>
-              {item}
+              {item.replaceAll('_', ' ')}
            </option>
          ))}
        </select>
+        {
+          filterValues.sub_labels.length > 0 && (
+            <select
+              className="basis-1/5 cursor-pointer rounded dark:bg-slate-800"
+              value={searchParams.sub_label}
+              onChange={(e) => onFilter('sub_label', e.target.value)}
+            >
+              <option value="all">all sub labels</option>
+              {filterValues.sub_labels.map((item) => (
+                <option key={item} value={item}>
+                  {item}
+                </option>
+              ))}
+            </select>
+          )}
        <div ref={datePicker} className="ml-auto">
          <CalendarIcon
            className="h-8 w-8 cursor-pointer"
@@ -374,6 +408,19 @@ export default function Events({ path, ...props }) {
          </div>
        </Dialog>
      )}
+      {deleteFavoriteState.showDeleteFavorite && (
+        <Dialog>
+          <div className="p-4">
+            <Heading size="lg">Delete Saved Event?</Heading>
+            <p className="mb-2">Confirm deletion of saved event.</p>
+          </div>
+          <div className="p-2 flex justify-start flex-row-reverse space-x-2">
+            <Button className="ml-2" color="red" onClick={(e) => { setDeleteFavoriteState({ ...state, showDeleteFavorite: false }); onDelete(e, deleteFavoriteState.deletingFavoriteEventId, false) }} type="text">
+              Delete
+            </Button>
+          </div>
+        </Dialog>
+      )}
      <div className="space-y-2">
        {eventPages ? (
          eventPages.map((page, i) => {
@@ -416,11 +463,11 @@ export default function Events({ path, ...props }) {
                        </div>
                        <div className="capitalize text-sm flex align-center mt-1">
                          <Camera className="h-5 w-5 mr-2 inline" />
-                          {event.camera}
+                          {event.camera.replaceAll('_', ' ')}
                        </div>
                        <div className="capitalize  text-sm flex align-center">
                          <Zone className="w-5 h-5 mr-2 inline" />
-                          {event.zones.join(',')}
+                          {event.zones.join(', ').replaceAll('_', ' ')}
                        </div>
                      </div>
                      <div class="hidden sm:flex flex-col justify-end mr-2">
@@ -441,7 +488,7 @@ export default function Events({ path, ...props }) {
                        )}
                      </div>
                      <div class="flex flex-col">
-                        <Delete className="cursor-pointer" stroke="#f87171" onClick={(e) => onDelete(e, event.id)} />
+                        <Delete className="h-6 w-6 cursor-pointer" stroke="#f87171" onClick={(e) => onDelete(e, event.id, event.retain_indefinitely)} />

                        <Download
                          className="h-6 w-6 mt-auto"
@@ -453,17 +500,23 @@ export default function Events({ path, ...props }) {
                  </div>
                  {viewEvent !== event.id ? null : (
                    <div className="space-y-4">
-                      <div className="mx-auto">
-                        {event.has_clip ? (
-                          <>
-                            <Heading size="lg">Clip</Heading>
+                      <div className="mx-auto max-w-7xl">
+                        <div className='flex justify-center w-full py-2'>
+                          <Tabs selectedIndex={event.has_clip && eventDetailType == 'clip' ? 0 : 1} onChange={handleEventDetailTabChange} className='justify'>
+                            <TextTab text='Clip' disabled={!event.has_clip} />
+                            <TextTab text={event.has_snapshot ? 'Snapshot' : 'Thumbnail'} />
+                          </Tabs>
+                        </div>
+
+                        <div>
+                          {((eventDetailType == 'clip') && event.has_clip) ? (
                            <VideoPlayer
                              options={{
                                preload: 'auto',
                                autoplay: true,
                                sources: [
                                  {
-                                    src: `${apiHost}/vod/event/${event.id}/index.m3u8`,
+                                    src: `${apiHost}/vod/event/${event.id}/master.m3u8`,
                                    type: 'application/vnd.apple.mpegurl',
                                  },
                                ],
@@ -471,23 +524,22 @@ export default function Events({ path, ...props }) {
                              seekOptions={{ forward: 10, back: 5 }}
                              onReady={() => {}}
                            />
-                          </>
-                        ) : (
-                          <div className="flex justify-center">
-                            <div>
-                              <Heading size="sm">{event.has_snapshot ? 'Best Image' : 'Thumbnail'}</Heading>
+                          ) : null }
+
+                          {((eventDetailType == 'image') || !event.has_clip) ? (
+                            <div className="flex justify-center">
                              <img
                                className="flex-grow-0"
                                src={
                                  event.has_snapshot
                                    ? `${apiHost}/api/events/${event.id}/snapshot.jpg`
-                                    : `data:image/jpeg;base64,${event.thumbnail}`
+                                    : `${apiHost}/api/events/${event.id}/thumbnail.jpg`
                                }
                                alt={`${event.label} at ${(event.top_score * 100).toFixed(0)}% confidence`}
                              />
                            </div>
-                          </div>
-                        )}
+                          ) : null }
+                        </div>
                      </div>
                    </div>
                  )}
--- a/web/src/routes/Recording.jsx
+++ b/web/src/routes/Recording.jsx
@@ -15,13 +15,13 @@ export default function Recording({ camera, date, hour = '00', minute = '00', se
  );

  const apiHost = useApiHost();
-  const { data: recordingsSummary } = useSWR(`${camera}/recordings/summary`);
+  const { data: recordingsSummary } = useSWR(`${camera}/recordings/summary`, { revalidateOnFocus: false });

  const recordingParams = {
    before: getUnixTime(endOfHour(currentDate)),
    after: getUnixTime(startOfHour(currentDate)),
  };
-  const { data: recordings } = useSWR([`${camera}/recordings`, recordingParams]);
+  const { data: recordings } = useSWR([`${camera}/recordings`, recordingParams], { revalidateOnFocus: false });

  // calculates the seek seconds by adding up all the seconds in the segments prior to the playback time
  const seekSeconds = useMemo(() => {
@@ -62,7 +62,7 @@ export default function Recording({ camera, date, hour = '00', minute = '00', se
          description: `${camera} recording @ ${h.hour}:00.`,
          sources: [
            {
-              src: `${apiHost}/vod/${year}-${month}/${day}/${h.hour}/${camera}/index.m3u8`,
+              src: `${apiHost}/vod/${year}-${month}/${day}/${h.hour}/${camera}/master.m3u8`,
              type: 'application/vnd.apple.mpegurl',
            },
          ],
@@ -103,7 +103,7 @@ export default function Recording({ camera, date, hour = '00', minute = '00', se
    }
  }, [seekSeconds, playlistIndex]);

-  if (!recordingsSummary) {
+  if (!recordingsSummary || !recordings) {
    return <ActivityIndicator />;
  }

@@ -121,7 +121,7 @@ export default function Recording({ camera, date, hour = '00', minute = '00', se

  return (
    <div className="space-y-4 p-2 px-4">
-      <Heading>{camera} Recordings</Heading>
+      <Heading>{camera.replaceAll('_', ' ')} Recordings</Heading>

      <VideoPlayer
        onReady={(player) => {
Author	SHA1	Message	Date
Blake Blackshear	7c60753ab0	Merge remote-tracking branch 'origin/master' into release-0.11.0	2022-09-22 18:42:20 -05:00
Nicolas Mowen	df40b96b44	BUG: Fixes and cleanup around region / bounding box calculation (#3879 ) * -1 so ensure indexes are correct * Catch case of zero division * Due to the -1, it may be negative * Ignore source of error The error is occurring due to a detections bounding box starting beyond the frame, this should be immediately ignored * Formatting * Check horizontal placement as well * Remove original frame clamping	2022-09-22 08:07:16 -05:00
Aksel Skauge Mellbye	faf583451f	Recording: Fix z-index issue with recording playlist (#3762 )	2022-09-20 06:05:43 -05:00
Nicolas Mowen	be7b858cbd	Remove `JELLYFIN` from intel driver name hwaccel docs (#3855 )	2022-09-16 10:47:22 -06:00
Aksel Skauge Mellbye	a6a0e4d1de	Bring recording playlist in front of video.js modals Ensure that the playlist doesn't get covered by video.js error messages, preventing interaction.	2022-09-15 06:36:32 -05:00
Aksel	14faf0b2f6	Show snapshots on events page (#3763 ) * Add tabs to show snapshot or thumbnail as part of event details, even if event has a clip available. * Add ability for TextTab to render as disabled.	2022-09-15 06:35:51 -05:00
Nicolas Mowen	bdfe4a961a	Add documentation for custom ffmpeg builds (#3771 ) * Add instructions for custom ffmpeg build * Add note about mapping /bin	2022-09-15 06:34:07 -05:00
Nick Mowen	1bc8d94312	Fix edge of frame after region adjustments	2022-09-15 06:33:32 -05:00
Nick Mowen	7e9f913ff6	Fix edge case where browser sends multiple requests to download file.	2022-09-15 06:32:54 -05:00
Blake Blackshear	0882e4a454	update recommended hardware links	2022-09-06 20:59:23 -05:00
Nicolas Mowen	699bd3748a	Add note about special characters in passwords (#3719 )	2022-09-06 20:51:49 -05:00
Nicolas Mowen	2ca59f0abe	Fix stalebot (#3731 ) * Reconfigure stalebot with new stale action * remove old stalebot configuration	2022-09-06 20:51:29 -05:00
Nicolas Mowen	64b1b8e15c	Add support request template for edgetpu and hwaccel	2022-08-28 16:58:43 -06:00
Nick Mowen	b6f799e641	Add camera specific for unify protect cameras	2022-08-28 11:14:01 -05:00
uvjustin	c461c9e700	Set vod_ignore_edit_list option (#3710 )	2022-08-26 06:33:16 -05:00
uvjustin	9df415b3f2	Fix VOD issues with longer keyframe intervals (#3671 ) * Fix VOD issues with longer keyframe intervals * Move probe function to util Update comment * Use recording duration for keyFrameDurations * Remove unused early return * Avoid clipping first clip	2022-08-26 06:32:34 -05:00
Blake Blackshear	f7c5e02a35	Merge remote-tracking branch 'origin/master' into release-0.11.0	2022-08-25 07:40:26 -05:00
Nicolas Mowen	656e6a2a89	Events setup docs (#3164 ) * Add events setup to guides * Add to sidebar * Fix relative docs references	2022-08-25 07:34:39 -05:00
Jason	afefa3ec02	Update camera_specific.md (#3292 ) Change fflag arg to remove `nobuffer`, which causes stream errors in 0.11-beta2	2022-08-25 07:33:47 -05:00
uvjustin	8c45dab9b8	Handle spaces in labels (#3679 ) * Unquote label in flask routes Encode label in Camera.jsx * Don't use preprocessor * Update nginx location for cacheable images	2022-08-25 07:32:30 -05:00
Nicolas Mowen	0d6dd1ed0f	Cleanup names of cameras, zones, & labels in the UI (#3708 ) * Cleanup names of cameras, zones, & labels in the UI * Fix tests to include camera name	2022-08-25 06:44:34 -05:00
Nicolas Mowen	911d6fdfa7	Ensure bounding box is within camera frame (#3702 ) * Ensure bounding box is within camera frame * Account for 0 index	2022-08-24 07:39:47 -05:00
Blake Blackshear	0cf759acad	Merge remote-tracking branch 'origin' into release-0.11.0	2022-08-24 07:22:57 -05:00
Justin Wong	7c57c8c2da	Use master playlist for videojs	2022-08-24 07:21:39 -05:00
Justin Wong	89c04acdff	Bump videojs to 7.20.2 Bump videojs-seek-buttons to 2.2.1 Bump types/video.js to 7.3.44	2022-08-24 07:21:39 -05:00
Nick Mowen	05d5f13f0e	Remove outdated section on events	2022-08-24 06:52:18 -05:00
Blake Blackshear	4682af81fb	update recommended hardware links	2022-08-24 06:43:42 -05:00
Nick Mowen	e649a1eb98	Use btbn build for ffmpeg since jellyfin has compatibility issues with rtsp-simple-server	2022-08-24 06:43:42 -05:00
Blake Blackshear	01482d791b	Merge remote-tracking branch 'origin/master' into release-0.11.0	2022-08-13 06:50:21 -05:00
Nick Mowen	6e2e297aeb	Add clean copy to configuration docs	2022-08-13 06:47:58 -05:00
Stéphane Graber	5577ef081f	docker: Add VAAPI to arm64 Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>	2022-08-13 06:47:29 -05:00
Nicolas Mowen	2d5d3bdaf4	Wait for recordingSummary and recordings to be valid before playing (#3558 ) * Wait for recordingSummary and recordings to be valid before playing * Wait for recordingSummary and recordings to be valid before playing	2022-08-13 06:46:08 -05:00
Nicolas Mowen	3376e85be6	Update docs to reflect new image multiarch tag (#3570 ) * Update docs to reflect new image multiarch * simplify Co-authored-by: Blake Blackshear <blake@frigate.video>	2022-08-13 06:45:32 -05:00
ZuluWhiskey	7a1215d581	Adding configuration example for retain modes (#3589 ) * Adding configuration example for retain modes Reading the documentation on its own didn't help me but when I found https://github.com/blakeblackshear/frigate/discussions/2447 I was able to understand how to add this to my configuration. I've added the example given in that discussion to help future readers of the page. * Update record.md Added suggested changes and have also added wording beneath the example mentioning the configuration can be added on a per camera basis. Have also built on the example to add object specific retentions timings - Not sure if it would be preferred to have it all within one example to not complicate things? Let me know your thoughts * Update record.md Created Object Specific Retention header * Typo Co-authored-by: Blake Blackshear <blake@frigate.video>	2022-08-13 06:42:25 -05:00
Nick Mowen	a94297ac93	Add link to supported encoding for each GPU	2022-08-13 06:32:24 -05:00
Blake Blackshear	37325c70ba	fix plus enabled for addons	2022-07-22 08:12:58 -05:00
Blake Blackshear	3c46a33992	revert false warning messages	2022-07-20 06:55:06 -05:00
deviant77	ed1897db71	Add log message when discarding recording segments in cache (#3439 ) * Add log message when discarding recording segments in cache Currently Frigate silently discards recording segments in cache if there's more than "keep_count" for a camera, which can happen on high load/busy/slow systems. This results in recording segments being lost with no apparent cause in the logs (even when set to debug). This PR adds a warning log entry when discarding segments, in the same way as discarding corrupted segments * Add explanatory warning and properly format cache_path warning * lint fixes Co-authored-by: Blake Blackshear <blakeb@blakeshome.com>	2022-07-19 07:24:44 -05:00
Caros2017	dfbebb63ff	Update hardware_acceleration.md Added the solution for the problem in https://github.com/blakeblackshear/frigate/issues/3227	2022-07-19 07:06:40 -05:00
Matthew Parlane	e68f80b44a	Use relative path without .. for rtmp documentation to fix #3481 ../faq was used in rtmp.md which leads to the wrong URL when the current URL ends in a slash due to 301 redirect of netlify	2022-07-19 07:06:27 -05:00
JohnMark Sill	a67a768e89	improvement: better play/pause	2022-07-19 07:04:33 -05:00
JohnMark Sill	43f05c18d6	chore: remove unused import	2022-07-19 07:04:33 -05:00
JohnMark Sill	3b076c28c2	chore: removed unused properties interface	2022-07-19 07:04:33 -05:00
JohnMark Sill	cbf12e3f90	fix: removed unused state	2022-07-19 07:04:33 -05:00
JohnMark Sill	17b745434c	improvement: migrated to videojs	2022-07-19 07:04:33 -05:00
JohnMark Sill	37011c2fda	improvement: use useCallback instead of setting ref auto-magically	2022-07-19 07:04:33 -05:00
JohnMark Sill	fa95a041dd	fix: height of video is now constant in history viewer	2022-07-19 07:04:33 -05:00
JohnMark Sill	0879d7a2d1	fix: marker time image	2022-07-19 07:04:33 -05:00
Nick Mowen	653c2274e1	Add FAQ about database locked error	2022-07-19 06:59:50 -05:00
Nick Mowen	061fb15a80	Reset motion to false on startup	2022-07-19 06:59:20 -05:00
Blake Blackshear	3246fcce22	document buildx setup	2022-07-19 06:56:23 -05:00
Blake Blackshear	f2a3797b46	add additional render group	2022-07-19 06:44:11 -05:00
Blake Blackshear	b80080ac52	don't refetch data on refocus	2022-07-07 07:05:05 -05:00
Blake Blackshear	b36b63599b	update stimeout to timeout	2022-07-05 11:55:55 -05:00
Blake Blackshear	5d8c0e43c2	try ffmpeg5 again	2022-07-05 11:54:21 -05:00
Josh Hawkins	7845995dfd	Adjust threshold and contour_area with mqtt	2022-07-05 08:46:10 -05:00
Blake Blackshear	afe88d6e3a	switch back to upgraded numpy	2022-07-04 16:51:48 -05:00
Blake Blackshear	560ee0104d	arm32 compat	2022-07-04 09:06:26 -05:00
Blake Blackshear	dc8b625d55	sync numpy version	2022-07-03 10:12:14 -05:00
Blake Blackshear	162c0147d2	use jellyfin for all arch	2022-07-03 10:12:00 -05:00
Blake Blackshear	ef54cd6fb3	add plus endpoint to docs	2022-07-01 06:57:03 -05:00
Nicolas Mowen	c2465a46a8	Http tests (#3350 ) * Set up for http tests * Setup basics for testing and first test * Add testing consts * Cleanup db creation * Add one more check to test * Get event that does not exist * Get events working with cleaner db * Test retain / un-retain * Test setting and deleting sub label * Test getting list of sub labels * Fix bug caught in tests * Test deleting event * Test geting list of events * Expand test * Test more event filters * Write version module so tests don't fail on version import * Test config * Test recordings endpoint * Formatting * Remove unused imports * Test stats * Add cleanup files in const * Add name to match other checks	2022-06-30 07:53:46 -05:00
Blake Blackshear	24d3a9cdd5	read plus api key from addon options	2022-06-30 07:19:40 -05:00
Blake Blackshear	5e82eaed88	switch back to ffmpeg 4.4.1	2022-06-28 06:50:19 -05:00
Blake Blackshear	1d45b0b351	update hwaccel docs	2022-06-11 06:42:09 -05:00
Blake Blackshear	ba119e4f96	revert back to ffmpeg 4.3.2	2022-06-10 07:38:26 -05:00
Blake Blackshear	75c2feb387	ffmpeg5 and intel va driver	2022-06-09 07:16:21 -05:00
Nicolas Mowen	da637d3c8f	Limit size of player in events view (#3288 ) * Set max width * Set data-options so videojs accepts size changing * Add comment to explain exmpty data-setup value * Clarify comment	2022-06-02 07:06:39 -05:00
Blake Blackshear	bc078fcc88	remove deprecated max_seconds config option	2022-06-01 06:50:09 -05:00
Nicolas Mowen	93cd973e59	Update index.md (#3267 )	2022-05-29 09:48:55 -05:00
Nicolas Mowen	5f9d477863	Update event filters naming and add sub label filter (#3194 ) * Use default names so filters are more clear * Add endpoint to get list of sub labels inside DB * Fix crash on no internet * Cleanups for sub_label http * Add sub label selector to events UI * Add event filtering for sub label * Formatting files * Reduce size of filters to fit on one line * Add handler for tests * Remove unused imports * Only show the sub labels filter when there are sub labels in the DB * Fix tests * Use distinct instead of group_by * Formatting * Cleanup event logic	2022-05-29 09:47:43 -05:00
Nicolas Mowen	ca693240b1	Favorite events delete button warning (#3225 ) * Add dialog to shield deletion of favorite event * Use state to keep track of event id * Adjust named * Set color of button	2022-05-26 10:06:02 -05:00
Nicolas Mowen	468febc434	Catch crash on no internet (#3246 )	2022-05-26 10:04:33 -05:00
Blake Blackshear	4b81c88794	use specific jellyfin-ffmpeg build	2022-05-26 10:02:43 -05:00
Blake Blackshear	2ac28b93f3	fix development port	2022-05-20 09:28:26 -05:00
Blake Blackshear	3e7ed982d4	fix tests	2022-05-20 09:28:26 -05:00
Nicolas Mowen	d8d410802f	Set height and width of delete icon for firefox (#3226 )	2022-05-19 07:41:31 -05:00
Blake Blackshear	ca7bad8909	get ingress to play nice with vite	2022-05-19 07:31:51 -05:00
Patrick Fruh	7b2b5bfa71	update hwaccel docs for nvidia docker-compose	2022-05-18 17:19:37 -05:00
Nick Mowen	53bf3cd2e6	Use tip for casting notes and specific note for no audio cameras	2022-05-14 07:32:31 -05:00
Nick Mowen	f59871a189	Fix bolding	2022-05-14 07:32:31 -05:00
Nick Mowen	2dda7608bb	Clarify camera streaming	2022-05-14 07:32:31 -05:00
Nick Mowen	10db9faff9	Add docs about casting	2022-05-14 07:32:31 -05:00