From ba49054cd74c9b4ed9f79a1ffdf935ef350530a4 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Fri, 13 Sep 2024 06:57:30 -0500
Subject: [PATCH 01/11] Change camera offline error display and message
 (#13712)

* Don't display offline message in live player if camera is restreamed

* Update error message

* simplify message
---
 web/src/components/player/LivePlayer.tsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/src/components/player/LivePlayer.tsx b/web/src/components/player/LivePlayer.tsx
index ec24d255f..0d7b67fa8 100644
--- a/web/src/components/player/LivePlayer.tsx
+++ b/web/src/components/player/LivePlayer.tsx
@@ -59,6 +59,7 @@ export default function LivePlayer({
   onResetLiveMode,
 }: LivePlayerProps) {
   const internalContainerRef = useRef<HTMLDivElement | null>(null);
+
   // camera activity
 
   const { activeMotion, activeTracking, objects, offline } =
@@ -299,12 +300,16 @@ export default function LivePlayer({
       </div>
 
       {offline && !showStillWithoutActivity && (
-        <div className="flex size-full flex-col items-center">
-          <p className="mb-5">
-            {capitalizeFirstLetter(cameraConfig.name)} is offline
-          </p>
-          <TbExclamationCircle className="mb-3 size-10" />
-          <p>No frames have been received, check error logs</p>
+        <div className="absolute inset-0 left-1/2 top-1/2 flex h-96 w-96 -translate-x-1/2 -translate-y-1/2">
+          <div className="flex flex-col items-center justify-center rounded-lg bg-background/50 p-5">
+            <p className="my-5 text-lg">Stream offline</p>
+            <TbExclamationCircle className="mb-3 size-10" />
+            <p className="max-w-96 text-center">
+              No frames have been received on the{" "}
+              {capitalizeFirstLetter(cameraConfig.name)} <code>detect</code>{" "}
+              stream, check error logs
+            </p>
+          </div>
         </div>
       )}
 

From 90c1cc3e3b4f731293105fad9c7eaca236ea133f Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Fri, 13 Sep 2024 07:07:11 -0500
Subject: [PATCH 02/11] Ensure all cameras switch enables/disables each
 individual switch (#13716)

---
 .../components/filter/CamerasFilterButton.tsx | 53 +++++++++++++------
 .../overlay/detail/SearchDetailDialog.tsx     |  2 +-
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/web/src/components/filter/CamerasFilterButton.tsx b/web/src/components/filter/CamerasFilterButton.tsx
index dfe3fdaa1..1b36102b8 100644
--- a/web/src/components/filter/CamerasFilterButton.tsx
+++ b/web/src/components/filter/CamerasFilterButton.tsx
@@ -29,7 +29,10 @@ export function CamerasFilterButton({
 }: CameraFilterButtonProps) {
   const [open, setOpen] = useState(false);
   const [currentCameras, setCurrentCameras] = useState<string[] | undefined>(
-    selectedCameras,
+    selectedCameras === undefined ? [...allCameras] : selectedCameras,
+  );
+  const [allCamerasSelected, setAllCamerasSelected] = useState(
+    selectedCameras === undefined,
   );
 
   const buttonText = useMemo(() => {
@@ -37,12 +40,18 @@ export function CamerasFilterButton({
       return "Cameras";
     }
 
-    if (!selectedCameras || selectedCameras.length == 0) {
+    if (allCamerasSelected) {
       return "All Cameras";
     }
 
-    return `${selectedCameras.includes("birdseye") ? selectedCameras.length - 1 : selectedCameras.length} Camera${selectedCameras.length !== 1 ? "s" : ""}`;
-  }, [selectedCameras]);
+    if (!currentCameras || currentCameras.length === 0) {
+      return "No cameras";
+    }
+
+    return `${currentCameras.includes("birdseye") ? currentCameras.length - 1 : currentCameras.length} Camera${
+      currentCameras.length !== 1 ? "s" : ""
+    }`;
+  }, [allCamerasSelected, currentCameras]);
 
   const trigger = (
     <Button
@@ -72,11 +81,15 @@ export function CamerasFilterButton({
       )}
       <div className="scrollbar-container h-auto max-h-[80dvh] overflow-y-auto overflow-x-hidden p-4">
         <FilterSwitch
-          isChecked={currentCameras == undefined}
+          isChecked={allCamerasSelected}
           label="All Cameras"
           onCheckedChange={(isChecked) => {
+            setAllCamerasSelected(isChecked);
+
             if (isChecked) {
-              setCurrentCameras(undefined);
+              setCurrentCameras([...allCameras]);
+            } else {
+              setCurrentCameras([]);
             }
           }}
         />
@@ -108,19 +121,26 @@ export function CamerasFilterButton({
                   const updatedCameras = currentCameras
                     ? [...currentCameras]
                     : [];
-
                   updatedCameras.push(item);
                   setCurrentCameras(updatedCameras);
+
+                  // Check if all cameras are now selected
+                  setAllCamerasSelected(
+                    updatedCameras.length === allCameras.length,
+                  );
                 } else {
                   const updatedCameras = currentCameras
                     ? [...currentCameras]
                     : [];
+                  const index = updatedCameras.indexOf(item);
 
-                  // can not deselect the last item
-                  if (updatedCameras.length > 1) {
-                    updatedCameras.splice(updatedCameras.indexOf(item), 1);
+                  if (index > -1) {
+                    updatedCameras.splice(index, 1);
                     setCurrentCameras(updatedCameras);
                   }
+
+                  // Deselecting one camera should disable the "All Cameras" switch
+                  setAllCamerasSelected(false);
                 }
               }}
             />
@@ -131,8 +151,9 @@ export function CamerasFilterButton({
       <div className="flex items-center justify-evenly p-2">
         <Button
           variant="select"
+          disabled={currentCameras?.length === 0}
           onClick={() => {
-            updateCameraFilter(currentCameras);
+            updateCameraFilter(allCamerasSelected ? undefined : currentCameras);
             setOpen(false);
           }}
         >
@@ -140,7 +161,8 @@ export function CamerasFilterButton({
         </Button>
         <Button
           onClick={() => {
-            setCurrentCameras(undefined);
+            setCurrentCameras([...allCameras]);
+            setAllCamerasSelected(true);
             updateCameraFilter(undefined);
           }}
         >
@@ -156,7 +178,8 @@ export function CamerasFilterButton({
         open={open}
         onOpenChange={(open) => {
           if (!open) {
-            setCurrentCameras(selectedCameras);
+            setCurrentCameras(selectedCameras ?? allCameras);
+            setAllCamerasSelected(selectedCameras === undefined);
           }
 
           setOpen(open);
@@ -176,9 +199,9 @@ export function CamerasFilterButton({
       open={open}
       onOpenChange={(open) => {
         if (!open) {
-          setCurrentCameras(selectedCameras);
+          setCurrentCameras(selectedCameras ?? allCameras);
+          setAllCamerasSelected(selectedCameras === undefined);
         }
-
         setOpen(open);
       }}
     >
diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index f1692ccf4..7417cb3c4 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -199,7 +199,7 @@ export default function SearchDetailDialog({
         {page == "video" && <VideoTab search={search} config={config} />}
         {page == "object lifecycle" && (
           <ObjectLifecycle
-            className="w-full"
+            className="w-full overflow-x-hidden"
             event={search as unknown as Event}
             fullscreen={true}
             setPane={() => {}}

From a1fd29b34b2588fd13e34adcdbcc2b15f94731ff Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Fri, 13 Sep 2024 07:25:29 -0600
Subject: [PATCH 03/11] Fix filter args (#13718)

* Fix filter args in events

* Fix export arg

* Don'
t fail

* Fix filter buttons

* Fix right click

* Formatting
---
 web/src/components/card/AnimatedEventCard.tsx | 12 ++++----
 web/src/components/card/ExportCard.tsx        |  2 +-
 .../components/filter/CamerasFilterButton.tsx | 13 ++++++++-
 .../components/filter/ReviewFilterGroup.tsx   | 11 +++++++-
 .../components/filter/SearchFilterGroup.tsx   | 18 +++++++++++-
 web/src/components/player/LivePlayer.tsx      |  8 ++++--
 .../player/PreviewThumbnailPlayer.tsx         |  8 ++++--
 web/src/hooks/use-api-filter.ts               |  6 +++-
 web/src/pages/Events.tsx                      | 28 +++++++++++++++++--
 9 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/web/src/components/card/AnimatedEventCard.tsx b/web/src/components/card/AnimatedEventCard.tsx
index 8ee4acdcf..fd8096ebc 100644
--- a/web/src/components/card/AnimatedEventCard.tsx
+++ b/web/src/components/card/AnimatedEventCard.tsx
@@ -135,11 +135,13 @@ export function AnimatedEventCard({
             <div
               className="size-full cursor-pointer overflow-hidden rounded md:rounded-lg"
               onClick={onOpenReview}
-              onAuxClick={() =>
-                window
-                  .open(`${baseUrl}review?id=${event.id}`, "_blank")
-                  ?.focus()
-              }
+              onAuxClick={(e) => {
+                if (e.button === 1) {
+                  window
+                    .open(`${baseUrl}review?id=${event.id}`, "_blank")
+                    ?.focus();
+                }
+              }}
             >
               {!alertVideos ? (
                 <img
diff --git a/web/src/components/card/ExportCard.tsx b/web/src/components/card/ExportCard.tsx
index efbc61de2..9799b5d1b 100644
--- a/web/src/components/card/ExportCard.tsx
+++ b/web/src/components/card/ExportCard.tsx
@@ -159,7 +159,7 @@ export default function ExportCard({
                   className="cursor-pointer rounded-md bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500"
                   onClick={() =>
                     shareOrCopy(
-                      `${baseUrl}exports?id=${exportedRecording.id}`,
+                      `${baseUrl}export?id=${exportedRecording.id}`,
                       exportedRecording.name.replaceAll("_", " "),
                     )
                   }
diff --git a/web/src/components/filter/CamerasFilterButton.tsx b/web/src/components/filter/CamerasFilterButton.tsx
index 1b36102b8..da188b5d7 100644
--- a/web/src/components/filter/CamerasFilterButton.tsx
+++ b/web/src/components/filter/CamerasFilterButton.tsx
@@ -1,6 +1,6 @@
 import { Button } from "../ui/button";
 import { CameraGroupConfig } from "@/types/frigateConfig";
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -53,6 +53,17 @@ export function CamerasFilterButton({
     }`;
   }, [allCamerasSelected, currentCameras]);
 
+  // ui
+
+  useEffect(() => {
+    setCurrentCameras(
+      selectedCameras === undefined ? [...allCameras] : selectedCameras,
+    );
+    setAllCamerasSelected(selectedCameras === undefined);
+    // only refresh when state changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedCameras]);
+
   const trigger = (
     <Button
       className="flex items-center gap-2 capitalize"
diff --git a/web/src/components/filter/ReviewFilterGroup.tsx b/web/src/components/filter/ReviewFilterGroup.tsx
index 30c2212c7..95790b171 100644
--- a/web/src/components/filter/ReviewFilterGroup.tsx
+++ b/web/src/components/filter/ReviewFilterGroup.tsx
@@ -2,7 +2,7 @@ import { Button } from "../ui/button";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
 import useSWR from "swr";
 import { FrigateConfig } from "@/types/frigateConfig";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { DropdownMenuSeparator } from "../ui/dropdown-menu";
 import { ReviewFilter, ReviewSeverity, ReviewSummary } from "@/types/review";
 import { getEndOfDayTimestamp } from "@/utils/dateUtil";
@@ -321,6 +321,15 @@ function GeneralFilterButton({
     selectedZones,
   );
 
+  // ui
+
+  useEffect(() => {
+    setCurrentLabels(selectedLabels);
+    setCurrentZones(selectedZones);
+    // only refresh when state changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedLabels, selectedZones]);
+
   const trigger = (
     <Button
       size="sm"
diff --git a/web/src/components/filter/SearchFilterGroup.tsx b/web/src/components/filter/SearchFilterGroup.tsx
index 958149923..ceed1028c 100644
--- a/web/src/components/filter/SearchFilterGroup.tsx
+++ b/web/src/components/filter/SearchFilterGroup.tsx
@@ -2,7 +2,7 @@ import { Button } from "../ui/button";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
 import useSWR from "swr";
 import { FrigateConfig } from "@/types/frigateConfig";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { DropdownMenuSeparator } from "../ui/dropdown-menu";
 import { getEndOfDayTimestamp } from "@/utils/dateUtil";
 import { isMobile } from "react-device-detect";
@@ -261,6 +261,14 @@ function GeneralFilterButton({
     return `${selectedLabels.length} Labels`;
   }, [selectedLabels]);
 
+  // ui
+
+  useEffect(() => {
+    setCurrentLabels(selectedLabels);
+    // only refresh when state changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedLabels]);
+
   const trigger = (
     <Button
       size="sm"
@@ -447,6 +455,14 @@ function ZoneFilterButton({
     return `${selectedZones.length} Zones`;
   }, [selectedZones]);
 
+  // ui
+
+  useEffect(() => {
+    setCurrentZones(selectedZones);
+    // only refresh when state changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedZones]);
+
   const trigger = (
     <Button
       size="sm"
diff --git a/web/src/components/player/LivePlayer.tsx b/web/src/components/player/LivePlayer.tsx
index 0d7b67fa8..8038812db 100644
--- a/web/src/components/player/LivePlayer.tsx
+++ b/web/src/components/player/LivePlayer.tsx
@@ -226,9 +226,11 @@ export default function LivePlayer({
         className,
       )}
       onClick={onClick}
-      onAuxClick={() =>
-        window.open(`${baseUrl}#${cameraConfig.name}`, "_blank")?.focus()
-      }
+      onAuxClick={(e) => {
+        if (e.button === 1) {
+          window.open(`${baseUrl}#${cameraConfig.name}`, "_blank")?.focus();
+        }
+      }}
     >
       {((showStillWithoutActivity && !liveReady) || liveReady) && (
         <>
diff --git a/web/src/components/player/PreviewThumbnailPlayer.tsx b/web/src/components/player/PreviewThumbnailPlayer.tsx
index 69a6ac6df..5c9ccb0a2 100644
--- a/web/src/components/player/PreviewThumbnailPlayer.tsx
+++ b/web/src/components/player/PreviewThumbnailPlayer.tsx
@@ -177,9 +177,11 @@ export default function PreviewThumbnailPlayer({
       onMouseOver={isMobile ? undefined : () => setIsHovered(true)}
       onMouseLeave={isMobile ? undefined : () => setIsHovered(false)}
       onClick={handleOnClick}
-      onAuxClick={() =>
-        window.open(`${baseUrl}review?id=${review.id}`, "_blank")?.focus()
-      }
+      onAuxClick={(e) => {
+        if (e.button === 1) {
+          window.open(`${baseUrl}review?id=${review.id}`, "_blank")?.focus();
+        }
+      }}
       {...swipeHandlers}
     >
       {playingBack && (
diff --git a/web/src/hooks/use-api-filter.ts b/web/src/hooks/use-api-filter.ts
index 185d0df9a..1048c87e7 100644
--- a/web/src/hooks/use-api-filter.ts
+++ b/web/src/hooks/use-api-filter.ts
@@ -69,7 +69,11 @@ export function useApiFilterArgs<
         filter[key] = value.includes(",") ? value.split(",") : [value];
       } else {
         if (value != undefined) {
-          filter[key] = JSON.parse(value);
+          try {
+            filter[key] = JSON.parse(value);
+          } catch {
+            filter[key] = `${value}`;
+          }
         }
       }
     });
diff --git a/web/src/pages/Events.tsx b/web/src/pages/Events.tsx
index cbdd246f3..bf9105131 100644
--- a/web/src/pages/Events.tsx
+++ b/web/src/pages/Events.tsx
@@ -1,5 +1,5 @@
 import ActivityIndicator from "@/components/indicators/activity-indicator";
-import { useApiFilterArgs } from "@/hooks/use-api-filter";
+import useApiFilter from "@/hooks/use-api-filter";
 import { useCameraPreviews } from "@/hooks/use-camera-previews";
 import { useTimezone } from "@/hooks/use-date-utils";
 import { useOverlayState, useSearchEffect } from "@/hooks/use-overlay-state";
@@ -71,7 +71,31 @@ export default function Events() {
   // review filter
 
   const [reviewFilter, setReviewFilter, reviewSearchParams] =
-    useApiFilterArgs<ReviewFilter>();
+    useApiFilter<ReviewFilter>();
+
+  useSearchEffect("cameras", (cameras: string) => {
+    setReviewFilter({
+      ...reviewFilter,
+      cameras: cameras.includes(",") ? cameras.split(",") : [cameras],
+    });
+    return true;
+  });
+
+  useSearchEffect("labels", (labels: string) => {
+    setReviewFilter({
+      ...reviewFilter,
+      labels: labels.includes(",") ? labels.split(",") : [labels],
+    });
+    return true;
+  });
+
+  useSearchEffect("zones", (zones: string) => {
+    setReviewFilter({
+      ...reviewFilter,
+      zones: zones.includes(",") ? zones.split(",") : [zones],
+    });
+    return true;
+  });
 
   useSearchEffect("group", (reviewGroup) => {
     if (config && reviewGroup && reviewGroup != "default") {

From 641f1244dd1482313a1f3710d3355dffc001e743 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Fri, 13 Sep 2024 08:55:42 -0600
Subject: [PATCH 04/11] Update ffmpeg (#13720)

---
 docker/main/install_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index 5c6ae619d..95689b411 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -40,7 +40,7 @@ apt-get -qq install --no-install-recommends --no-install-suggests -y \
 # btbn-ffmpeg -> amd64
 if [[ "${TARGETARCH}" == "amd64" ]]; then
     mkdir -p /usr/lib/btbn-ffmpeg
-    wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-04-18-56/ffmpeg-n7.0.2-15-g0458a86656-linux64-gpl-7.0.tar.xz"
+    wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-13-12-57/ffmpeg-n7.0.2-17-gf705bc5b73-linux64-gpl-7.0.tar.xz"
     tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1
     rm -rf btbn-ffmpeg.tar.xz /usr/lib/btbn-ffmpeg/doc /usr/lib/btbn-ffmpeg/bin/ffplay
 fi
@@ -48,7 +48,7 @@ fi
 # ffmpeg -> arm64
 if [[ "${TARGETARCH}" == "arm64" ]]; then
     mkdir -p /usr/lib/btbn-ffmpeg
-    wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-04-18-56/ffmpeg-n7.0.2-15-g0458a86656-linuxarm64-gpl-7.0.tar.xz"
+    wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-13-12-57/ffmpeg-n7.0.2-17-gf705bc5b73-linuxarm64-gpl-7.0.tar.xz"
     tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1
     rm -rf btbn-ffmpeg.tar.xz /usr/lib/btbn-ffmpeg/doc /usr/lib/btbn-ffmpeg/bin/ffplay
 fi

From 5ff476c6f913a0e92ad044442a39a25f38993123 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Fri, 13 Sep 2024 14:14:51 -0600
Subject: [PATCH 05/11] Configurable ffmpeg (#13722)

* Install multiple ffmpeg versions and add config to make it configurable

* Update docs

* Run ffprobe too

* Cleanup

* Apply config to go2rtc as well

* Fix ffmpeg bin

* Docs

* Restore path

* Cleanup env var

* Fix ffmpeg path for encoding

* Fix export

* Formatting
---
 .devcontainer/post_create.sh                  |  2 +-
 docker/main/Dockerfile                        |  3 +-
 docker/main/install_deps.sh                   | 20 +++++--
 .../rootfs/etc/s6-overlay/s6-rc.d/frigate/run |  2 -
 .../rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run  |  2 -
 .../rootfs/usr/local/go2rtc/create_config.py  | 32 +++++++---
 docker/rpi/Dockerfile                         |  2 +
 docs/docs/configuration/advanced.md           |  6 +-
 docs/docs/configuration/reference.md          |  4 ++
 frigate/api/app.py                            |  2 +-
 frigate/api/media.py                          | 25 +++++---
 frigate/app.py                                |  2 +-
 frigate/config.py                             | 35 ++++++++++-
 frigate/events/audio.py                       |  2 +-
 frigate/ffmpeg_presets.py                     | 59 ++++++++++---------
 frigate/output/birdseye.py                    | 12 ++--
 frigate/output/camera.py                      |  6 +-
 frigate/output/preview.py                     |  1 +
 frigate/record/export.py                      | 11 ++--
 frigate/record/maintainer.py                  |  6 +-
 frigate/util/config.py                        |  4 +-
 frigate/util/image.py                         |  8 ++-
 frigate/util/services.py                      | 10 ++--
 23 files changed, 172 insertions(+), 84 deletions(-)

diff --git a/.devcontainer/post_create.sh b/.devcontainer/post_create.sh
index 1a1832f3b..ee0888016 100755
--- a/.devcontainer/post_create.sh
+++ b/.devcontainer/post_create.sh
@@ -17,7 +17,7 @@ sudo chown -R "$(id -u):$(id -g)" /media/frigate
 # When started as a service, LIBAVFORMAT_VERSION_MAJOR is defined in the
 # s6 service file. For dev, where frigate is started from an interactive
 # shell, we define it in .bashrc instead.
-echo 'export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po "libavformat\W+\K\d+")' >> $HOME/.bashrc
+echo 'export LIBAVFORMAT_VERSION_MAJOR=$(/usr/lib/ffmpeg/7.0/bin/ffmpeg -version | grep -Po "libavformat\W+\K\d+")' >> $HOME/.bashrc
 
 make version
 
diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 5ae041845..92e28a381 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -201,7 +201,8 @@ ENV ALLOW_RESET=True
 # Disable tokenizer parallelism warning
 ENV TOKENIZERS_PARALLELISM=true
 
-ENV PATH="/usr/lib/btbn-ffmpeg/bin:/usr/local/go2rtc/bin:/usr/local/tempio/bin:/usr/local/nginx/sbin:${PATH}"
+ENV PATH="/usr/local/go2rtc/bin:/usr/local/tempio/bin:/usr/local/nginx/sbin:${PATH}"
+ENV LIBAVFORMAT_VERSION_MAJOR=60
 
 # Install dependencies
 RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index 95689b411..eb7aeb1b5 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -39,18 +39,26 @@ apt-get -qq install --no-install-recommends --no-install-suggests -y \
 
 # btbn-ffmpeg -> amd64
 if [[ "${TARGETARCH}" == "amd64" ]]; then
-    mkdir -p /usr/lib/btbn-ffmpeg
+    mkdir -p /usr/lib/ffmpeg/5.0
+    mkdir -p /usr/lib/ffmpeg/7.0
+    wget -qO btbn-ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linux64-gpl-5.1.tar.xz"
+    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1
+    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/5.0/doc /usr/lib/ffmpeg/5.0/bin/ffplay
     wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-13-12-57/ffmpeg-n7.0.2-17-gf705bc5b73-linux64-gpl-7.0.tar.xz"
-    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1
-    rm -rf btbn-ffmpeg.tar.xz /usr/lib/btbn-ffmpeg/doc /usr/lib/btbn-ffmpeg/bin/ffplay
+    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1
+    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/7.0/doc /usr/lib/ffmpeg/7.0/bin/ffplay
 fi
 
 # ffmpeg -> arm64
 if [[ "${TARGETARCH}" == "arm64" ]]; then
-    mkdir -p /usr/lib/btbn-ffmpeg
+    mkdir -p /usr/lib/ffmpeg/5.0
+    mkdir -p /usr/lib/ffmpeg/7.0
+    wget -qO btbn-ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linuxarm64-gpl-5.1.tar.xz"
+    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1
+    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/5.0/doc /usr/lib/ffmpeg/5.0/bin/ffplay
     wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-13-12-57/ffmpeg-n7.0.2-17-gf705bc5b73-linuxarm64-gpl-7.0.tar.xz"
-    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1
-    rm -rf btbn-ffmpeg.tar.xz /usr/lib/btbn-ffmpeg/doc /usr/lib/btbn-ffmpeg/bin/ffplay
+    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1
+    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/7.0/doc /usr/lib/ffmpeg/7.0/bin/ffplay
 fi
 
 # arch specific packages
diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run
index 50da2aef9..eacce294f 100755
--- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run
+++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run
@@ -44,8 +44,6 @@ function migrate_db_path() {
 
 echo "[INFO] Preparing Frigate..."
 migrate_db_path
-export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po 'libavformat\W+\K\d+')
-
 echo "[INFO] Starting Frigate..."
 
 cd /opt/frigate || echo "[ERROR] Failed to change working directory to /opt/frigate"
diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run
index 851d78799..9c4922d81 100755
--- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run
+++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run
@@ -43,8 +43,6 @@ function get_ip_and_port_from_supervisor() {
     export FRIGATE_GO2RTC_WEBRTC_CANDIDATE_INTERNAL="${ip_address}:${webrtc_port}"
 }
 
-export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po 'libavformat\W+\K\d+')
-
 if [[ -f "/dev/shm/go2rtc.yaml" ]]; then
     echo "[INFO] Removing stale config from last run..."
     rm /dev/shm/go2rtc.yaml
diff --git a/docker/main/rootfs/usr/local/go2rtc/create_config.py b/docker/main/rootfs/usr/local/go2rtc/create_config.py
index 6855b3b89..6229586e5 100644
--- a/docker/main/rootfs/usr/local/go2rtc/create_config.py
+++ b/docker/main/rootfs/usr/local/go2rtc/create_config.py
@@ -105,16 +105,34 @@ else:
             **FRIGATE_ENV_VARS
         )
 
+# ensure ffmpeg path is set correctly
+path = config.get("ffmpeg", {}).get("path", "default")
+if path == "default":
+    if int(os.getenv("", "59") or "59") >= 59:
+        ffmpeg_path = "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+    else:
+        ffmpeg_path = "ffmpeg"
+elif path == "7.0":
+    ffmpeg_path = "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+elif path == "5.0":
+    ffmpeg_path = "/usr/lib/ffmpeg/5.0/bin/ffmpeg"
+else:
+    ffmpeg_path = f"{path}/bin/ffmpeg"
+
+if go2rtc_config.get("ffmpeg") is None:
+    go2rtc_config["ffmpeg"] = {"bin": ffmpeg_path}
+elif go2rtc_config["ffmpeg"].get("bin") is None:
+    go2rtc_config["ffmpeg"]["bin"] = ffmpeg_path
+
 # need to replace ffmpeg command when using ffmpeg4
-if int(os.environ["LIBAVFORMAT_VERSION_MAJOR"]) < 59:
-    if go2rtc_config.get("ffmpeg") is None:
-        go2rtc_config["ffmpeg"] = {
-            "rtsp": "-fflags nobuffer -flags low_delay -stimeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_transport tcp -i {input}"
-        }
-    elif go2rtc_config["ffmpeg"].get("rtsp") is None:
+if int(os.environ.get("LIBAVFORMAT_VERSION_MAJOR", "59") or "59") < 59:
+    if go2rtc_config["ffmpeg"].get("rtsp") is None:
         go2rtc_config["ffmpeg"]["rtsp"] = (
             "-fflags nobuffer -flags low_delay -stimeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_transport tcp -i {input}"
         )
+else:
+    if go2rtc_config.get("ffmpeg") is None:
+        go2rtc_config["ffmpeg"] = {"path": ""}
 
 for name in go2rtc_config.get("streams", {}):
     stream = go2rtc_config["streams"][name]
@@ -145,7 +163,7 @@ if config.get("birdseye", {}).get("restream", False):
     birdseye: dict[str, any] = config.get("birdseye")
 
     input = f"-f rawvideo -pix_fmt yuv420p -video_size {birdseye.get('width', 1280)}x{birdseye.get('height', 720)} -r 10 -i {BIRDSEYE_PIPE}"
-    ffmpeg_cmd = f"exec:{parse_preset_hardware_acceleration_encode(config.get('ffmpeg', {}).get('hwaccel_args'), input, '-rtsp_transport tcp -f rtsp {output}')}"
+    ffmpeg_cmd = f"exec:{parse_preset_hardware_acceleration_encode(ffmpeg_path, config.get('ffmpeg', {}).get('hwaccel_args'), input, '-rtsp_transport tcp -f rtsp {output}')}"
 
     if go2rtc_config.get("streams"):
         go2rtc_config["streams"]["birdseye"] = ffmpeg_cmd
diff --git a/docker/rpi/Dockerfile b/docker/rpi/Dockerfile
index 581ca7ff8..9860e65ec 100644
--- a/docker/rpi/Dockerfile
+++ b/docker/rpi/Dockerfile
@@ -12,5 +12,7 @@ RUN rm -rf /usr/lib/btbn-ffmpeg/
 RUN --mount=type=bind,source=docker/rpi/install_deps.sh,target=/deps/install_deps.sh \
     /deps/install_deps.sh
 
+ENV LIBAVFORMAT_VERSION_MAJOR=58
+
 WORKDIR /opt/frigate/
 COPY --from=rootfs / /
diff --git a/docs/docs/configuration/advanced.md b/docs/docs/configuration/advanced.md
index 730b0f6b4..1c99ec1c5 100644
--- a/docs/docs/configuration/advanced.md
+++ b/docs/docs/configuration/advanced.md
@@ -162,15 +162,15 @@ listen [::]:5000 ipv6only=off;
 
 ### 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.
+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, statically built ffmpeg binary can be downloaded to /config and used.
 
 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).
+1. Download your ffmpeg build and uncompress to the Frigate config folder.
 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`.
+NOTE: The folder that is set for the config needs to be the folder that contains `/bin`. So if the full structure is `/home/appdata/frigate/custom-ffmpeg/bin/ffmpeg` then the `ffmpeg -> path` field should be `/config/custom-ffmpeg/bin`.
 
 ### Custom go2rtc version
 
diff --git a/docs/docs/configuration/reference.md b/docs/docs/configuration/reference.md
index 2eae6ef90..1ae0739e7 100644
--- a/docs/docs/configuration/reference.md
+++ b/docs/docs/configuration/reference.md
@@ -210,6 +210,10 @@ birdseye:
 # Optional: ffmpeg configuration
 # More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets
 ffmpeg:
+  # Optional: ffmpeg binry path (default: shown below)
+  # can also be set to `7.0` or `5.0` to specify one of the included versions
+  # or can be set to any path that holds `bin/ffmpeg` & `bin/ffprobe`
+  path: "default"
   # Optional: global ffmpeg args (default: shown below)
   global_args: -hide_banner -loglevel warning -threads 2
   # Optional: global hwaccel args (default: auto detect)
diff --git a/frigate/api/app.py b/frigate/api/app.py
index 46a2b9c13..b1b3b8449 100644
--- a/frigate/api/app.py
+++ b/frigate/api/app.py
@@ -414,7 +414,7 @@ def ffprobe():
     output = []
 
     for path in paths:
-        ffprobe = ffprobe_stream(path.strip())
+        ffprobe = ffprobe_stream(current_app.frigate_config.ffmpeg, path.strip())
         output.append(
             {
                 "return_code": ffprobe.returncode,
diff --git a/frigate/api/media.py b/frigate/api/media.py
index 8604b557b..e146fa195 100644
--- a/frigate/api/media.py
+++ b/frigate/api/media.py
@@ -17,6 +17,7 @@ from peewee import DoesNotExist, fn
 from tzlocal import get_localzone_name
 from werkzeug.utils import secure_filename
 
+from frigate.config import FrigateConfig
 from frigate.const import (
     CACHE_DIR,
     CLIPS_DIR,
@@ -216,9 +217,10 @@ def get_snapshot_from_recording(camera_name: str, frame_time: str, format: str):
 
         height = request.args.get("height", type=int)
         codec = "png" if format == "png" else "mjpeg"
+        config: FrigateConfig = current_app.frigate_config
 
         image_data = get_image_from_recording(
-            recording.path, time_in_segment, codec, height
+            config.ffmpeg, recording.path, time_in_segment, codec, height
         )
 
         if not image_data:
@@ -273,9 +275,12 @@ def submit_recording_snapshot_to_plus(camera_name: str, frame_time: str):
     )
 
     try:
+        config: FrigateConfig = current_app.frigate_config
         recording: Recordings = recording_query.get()
         time_in_segment = frame_time - recording.start_time
-        image_data = get_image_from_recording(recording.path, time_in_segment, "png")
+        image_data = get_image_from_recording(
+            config.ffmpeg, recording.path, time_in_segment, "png"
+        )
 
         if not image_data:
             return make_response(
@@ -474,9 +479,11 @@ def recording_clip(camera_name, start_ts, end_ts):
     file_name = secure_filename(file_name)
     path = os.path.join(CLIPS_DIR, f"cache/{file_name}")
 
+    config: FrigateConfig = current_app.frigate_config
+
     if not os.path.exists(path):
         ffmpeg_cmd = [
-            "ffmpeg",
+            config.ffmpeg.ffmpeg_path,
             "-hide_banner",
             "-y",
             "-protocol_whitelist",
@@ -1141,8 +1148,9 @@ def preview_gif(camera_name: str, start_ts, end_ts, max_cache_age=2592000):
         diff = start_ts - preview.start_time
         minutes = int(diff / 60)
         seconds = int(diff % 60)
+        config: FrigateConfig = current_app.frigate_config
         ffmpeg_cmd = [
-            "ffmpeg",
+            config.ffmpeg.ffmpeg_path,
             "-hide_banner",
             "-loglevel",
             "warning",
@@ -1206,9 +1214,10 @@ def preview_gif(camera_name: str, start_ts, end_ts, max_cache_age=2592000):
 
         last_file = selected_previews[-2]
         selected_previews.append(last_file)
+        config: FrigateConfig = current_app.frigate_config
 
         ffmpeg_cmd = [
-            "ffmpeg",
+            config.ffmpeg.ffmpeg_path,
             "-hide_banner",
             "-loglevel",
             "warning",
@@ -1301,8 +1310,9 @@ def preview_mp4(camera_name: str, start_ts, end_ts, max_cache_age=604800):
         diff = start_ts - preview.start_time
         minutes = int(diff / 60)
         seconds = int(diff % 60)
+        config: FrigateConfig = current_app.frigate_config
         ffmpeg_cmd = [
-            "ffmpeg",
+            config.ffmpeg.ffmpeg_path,
             "-hide_banner",
             "-loglevel",
             "warning",
@@ -1364,9 +1374,10 @@ def preview_mp4(camera_name: str, start_ts, end_ts, max_cache_age=604800):
 
         last_file = selected_previews[-2]
         selected_previews.append(last_file)
+        config: FrigateConfig = current_app.frigate_config
 
         ffmpeg_cmd = [
-            "ffmpeg",
+            config.ffmpeg.ffmpeg_path,
             "-hide_banner",
             "-loglevel",
             "warning",
diff --git a/frigate/app.py b/frigate/app.py
index bad2d9281..3401ff6dc 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -374,7 +374,7 @@ class FrigateApp:
             except PermissionError:
                 logger.error("Unable to write to /config to save export state")
 
-            migrate_exports(self.config.cameras.keys())
+            migrate_exports(self.config.ffmpeg, self.config.cameras.keys())
 
     def init_external_event_processor(self) -> None:
         self.external_event_processor = ExternalEventProcessor(self.config)
diff --git a/frigate/config.py b/frigate/config.py
index 972562328..5794debff 100644
--- a/frigate/config.py
+++ b/frigate/config.py
@@ -866,6 +866,7 @@ class FfmpegOutputArgsConfig(FrigateBaseModel):
 
 
 class FfmpegConfig(FrigateBaseModel):
+    path: str = Field(default="default", title="FFmpeg path")
     global_args: Union[str, List[str]] = Field(
         default=FFMPEG_GLOBAL_ARGS_DEFAULT, title="Global FFmpeg arguments."
     )
@@ -884,6 +885,34 @@ class FfmpegConfig(FrigateBaseModel):
         title="Time in seconds to wait before FFmpeg retries connecting to the camera.",
     )
 
+    @property
+    def ffmpeg_path(self) -> str:
+        if self.path == "default":
+            if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59:
+                return "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+            else:
+                return "ffmpeg"
+        elif self.path == "7.0":
+            return "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+        elif self.path == "5.0":
+            return "/usr/lib/ffmpeg/5.0/bin/ffmpeg"
+        else:
+            return f"{self.path}/bin/ffmpeg"
+
+    @property
+    def ffprobe_path(self) -> str:
+        if self.path == "default":
+            if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59:
+                return "/usr/lib/ffmpeg/7.0/bin/ffprobe"
+            else:
+                return "ffprobe"
+        elif self.path == "7.0":
+            return "/usr/lib/ffmpeg/7.0/bin/ffprobe"
+        elif self.path == "5.0":
+            return "/usr/lib/ffmpeg/5.0/bin/ffprobe"
+        else:
+            return f"{self.path}/bin/ffprobe"
+
 
 class CameraRoleEnum(str, Enum):
     audio = "audio"
@@ -1194,7 +1223,7 @@ class CameraConfig(FrigateBaseModel):
         )
 
         cmd = (
-            ["ffmpeg"]
+            [self.ffmpeg.ffmpeg_path]
             + global_args
             + hwaccel_args
             + input_args
@@ -1520,7 +1549,9 @@ class FrigateConfig(FrigateBaseModel):
                 if need_detect_dimensions or need_record_fourcc:
                     stream_info = {"width": 0, "height": 0, "fourcc": None}
                     try:
-                        stream_info = stream_info_retriever.get_stream_info(input.path)
+                        stream_info = stream_info_retriever.get_stream_info(
+                            config.ffmpeg, input.path
+                        )
                     except Exception:
                         logger.warn(
                             f"Error detecting stream parameters automatically for {input.path} Applying default values."
diff --git a/frigate/events/audio.py b/frigate/events/audio.py
index 4302abb68..662eb5189 100644
--- a/frigate/events/audio.py
+++ b/frigate/events/audio.py
@@ -50,7 +50,7 @@ def get_ffmpeg_command(ffmpeg: FfmpegConfig) -> list[str]:
         or get_ffmpeg_arg_list(ffmpeg.input_args)
     )
     return (
-        ["ffmpeg", "-vn", "-threads", "1"]
+        [ffmpeg.ffmpeg_path, "-vn", "-threads", "1"]
         + input_args
         + ["-i"]
         + [ffmpeg_input.path]
diff --git a/frigate/ffmpeg_presets.py b/frigate/ffmpeg_presets.py
index 1cf9bef43..19103cdf8 100644
--- a/frigate/ffmpeg_presets.py
+++ b/frigate/ffmpeg_presets.py
@@ -49,12 +49,12 @@ class LibvaGpuSelector:
 
 FPS_VFR_PARAM = (
     "-fps_mode vfr"
-    if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59
+    if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59") or "59") >= 59
     else "-vsync 2"
 )
 TIMEOUT_PARAM = (
     "-timeout"
-    if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59
+    if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59") or "59") >= 59
     else "-stimeout"
 )
 
@@ -111,17 +111,17 @@ PRESETS_HW_ACCEL_SCALE["preset-nvidia-h265"] = PRESETS_HW_ACCEL_SCALE[
 ]
 
 PRESETS_HW_ACCEL_ENCODE_BIRDSEYE = {
-    "preset-rpi-64-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m {1}",
-    "preset-rpi-64-h265": "ffmpeg -hide_banner {0} -c:v hevc_v4l2m2m {1}",
-    FFMPEG_HWACCEL_VAAPI: "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device {2} {0} -c:v h264_vaapi -g 50 -bf 0 -profile:v high -level:v 4.1 -sei:v 0 -an -vf format=vaapi|nv12,hwupload {1}",
-    "preset-intel-qsv-h264": "ffmpeg -hide_banner {0} -c:v h264_qsv -g 50 -bf 0 -profile:v high -level:v 4.1 -async_depth:v 1 {1}",
-    "preset-intel-qsv-h265": "ffmpeg -hide_banner {0} -c:v h264_qsv -g 50 -bf 0 -profile:v high -level:v 4.1 -async_depth:v 1 {1}",
-    FFMPEG_HWACCEL_NVIDIA: "ffmpeg -hide_banner {0} -c:v h264_nvenc -g 50 -profile:v high -level:v auto -preset:v p2 -tune:v ll {1}",
-    "preset-jetson-h264": "ffmpeg -hide_banner {0} -c:v h264_nvmpi -profile high {1}",
-    "preset-jetson-h265": "ffmpeg -hide_banner {0} -c:v h264_nvmpi -profile high {1}",
-    "preset-rk-h264": "ffmpeg -hide_banner {0} -c:v h264_rkmpp -profile:v high {1}",
-    "preset-rk-h265": "ffmpeg -hide_banner {0} -c:v hevc_rkmpp -profile:v high {1}",
-    "default": "ffmpeg -hide_banner {0} -c:v libx264 -g 50 -profile:v high -level:v 4.1 -preset:v superfast -tune:v zerolatency {1}",
+    "preset-rpi-64-h264": "{0} -hide_banner {1} -c:v h264_v4l2m2m {2}",
+    "preset-rpi-64-h265": "{0} -hide_banner {1} -c:v hevc_v4l2m2m {2}",
+    FFMPEG_HWACCEL_VAAPI: "{0} -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device {3} {1} -c:v h264_vaapi -g 50 -bf 0 -profile:v high -level:v 4.1 -sei:v 0 -an -vf format=vaapi|nv12,hwupload {2}",
+    "preset-intel-qsv-h264": "{0} -hide_banner {1} -c:v h264_qsv -g 50 -bf 0 -profile:v high -level:v 4.1 -async_depth:v 1 {2}",
+    "preset-intel-qsv-h265": "{0} -hide_banner {1} -c:v h264_qsv -g 50 -bf 0 -profile:v high -level:v 4.1 -async_depth:v 1 {2}",
+    FFMPEG_HWACCEL_NVIDIA: "{0} -hide_banner {1} -c:v h264_nvenc -g 50 -profile:v high -level:v auto -preset:v p2 -tune:v ll {2}",
+    "preset-jetson-h264": "{0} -hide_banner {1} -c:v h264_nvmpi -profile high {2}",
+    "preset-jetson-h265": "{0} -hide_banner {1} -c:v h264_nvmpi -profile high {2}",
+    "preset-rk-h264": "{0} -hide_banner {1} -c:v h264_rkmpp -profile:v high {2}",
+    "preset-rk-h265": "{0} -hide_banner {1} -c:v hevc_rkmpp -profile:v high {2}",
+    "default": "{0} -hide_banner {1} -c:v libx264 -g 50 -profile:v high -level:v 4.1 -preset:v superfast -tune:v zerolatency {2}",
 }
 PRESETS_HW_ACCEL_ENCODE_BIRDSEYE["preset-nvidia-h264"] = (
     PRESETS_HW_ACCEL_ENCODE_BIRDSEYE[FFMPEG_HWACCEL_NVIDIA]
@@ -131,18 +131,18 @@ PRESETS_HW_ACCEL_ENCODE_BIRDSEYE["preset-nvidia-h265"] = (
 )
 
 PRESETS_HW_ACCEL_ENCODE_TIMELAPSE = {
-    "preset-rpi-64-h264": "ffmpeg -hide_banner {0} -c:v h264_v4l2m2m -pix_fmt yuv420p {1}",
-    "preset-rpi-64-h265": "ffmpeg -hide_banner {0} -c:v hevc_v4l2m2m -pix_fmt yuv420p {1}",
-    FFMPEG_HWACCEL_VAAPI: "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device {2} {0} -c:v h264_vaapi {1}",
-    "preset-intel-qsv-h264": "ffmpeg -hide_banner {0} -c:v h264_qsv -profile:v high -level:v 4.1 -async_depth:v 1 {1}",
-    "preset-intel-qsv-h265": "ffmpeg -hide_banner {0} -c:v hevc_qsv -profile:v high -level:v 4.1 -async_depth:v 1 {1}",
-    FFMPEG_HWACCEL_NVIDIA: "ffmpeg -hide_banner -hwaccel cuda -hwaccel_output_format cuda -extra_hw_frames 8 {0} -c:v h264_nvenc {1}",
-    "preset-nvidia-h265": "ffmpeg -hide_banner -hwaccel cuda -hwaccel_output_format cuda -extra_hw_frames 8 {0} -c:v hevc_nvenc {1}",
-    "preset-jetson-h264": "ffmpeg -hide_banner {0} -c:v h264_nvmpi -profile high {1}",
-    "preset-jetson-h265": "ffmpeg -hide_banner {0} -c:v hevc_nvmpi -profile high {1}",
-    "preset-rk-h264": "ffmpeg -hide_banner {0} -c:v h264_rkmpp -profile:v high {1}",
-    "preset-rk-h265": "ffmpeg -hide_banner {0} -c:v hevc_rkmpp -profile:v high {1}",
-    "default": "ffmpeg -hide_banner {0} -c:v libx264 -preset:v ultrafast -tune:v zerolatency {1}",
+    "preset-rpi-64-h264": "{0} -hide_banner {1} -c:v h264_v4l2m2m -pix_fmt yuv420p {2}",
+    "preset-rpi-64-h265": "{0} -hide_banner {1} -c:v hevc_v4l2m2m -pix_fmt yuv420p {2}",
+    FFMPEG_HWACCEL_VAAPI: "{0} -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device {3} {1} -c:v h264_vaapi {2}",
+    "preset-intel-qsv-h264": "{0} -hide_banner {1} -c:v h264_qsv -profile:v high -level:v 4.1 -async_depth:v 1 {2}",
+    "preset-intel-qsv-h265": "{0} -hide_banner {1} -c:v hevc_qsv -profile:v high -level:v 4.1 -async_depth:v 1 {2}",
+    FFMPEG_HWACCEL_NVIDIA: "{0} -hide_banner -hwaccel cuda -hwaccel_output_format cuda -extra_hw_frames 8 {1} -c:v h264_nvenc {2}",
+    "preset-nvidia-h265": "{0} -hide_banner -hwaccel cuda -hwaccel_output_format cuda -extra_hw_frames 8 {1} -c:v hevc_nvenc {2}",
+    "preset-jetson-h264": "{0} -hide_banner {1} -c:v h264_nvmpi -profile high {2}",
+    "preset-jetson-h265": "{0} -hide_banner {1} -c:v hevc_nvmpi -profile high {2}",
+    "preset-rk-h264": "{0} -hide_banner {1} -c:v h264_rkmpp -profile:v high {2}",
+    "preset-rk-h265": "{0} -hide_banner {1} -c:v hevc_rkmpp -profile:v high {2}",
+    "default": "{0} -hide_banner {1} -c:v libx264 -preset:v ultrafast -tune:v zerolatency {2}",
 }
 PRESETS_HW_ACCEL_ENCODE_TIMELAPSE["preset-nvidia-h264"] = (
     PRESETS_HW_ACCEL_ENCODE_TIMELAPSE[FFMPEG_HWACCEL_NVIDIA]
@@ -150,7 +150,7 @@ PRESETS_HW_ACCEL_ENCODE_TIMELAPSE["preset-nvidia-h264"] = (
 
 # encoding of previews is only done on CPU due to comparable encode times and better quality from libx264
 PRESETS_HW_ACCEL_ENCODE_PREVIEW = {
-    "default": "ffmpeg -hide_banner {0} -c:v libx264 -profile:v baseline -preset:v ultrafast {1}",
+    "default": "{0} -hide_banner {1} -c:v libx264 -profile:v baseline -preset:v ultrafast {2}",
 }
 
 
@@ -197,7 +197,11 @@ class EncodeTypeEnum(str, Enum):
 
 
 def parse_preset_hardware_acceleration_encode(
-    arg: Any, input: str, output: str, type: EncodeTypeEnum = EncodeTypeEnum.birdseye
+    ffmpeg_path: str,
+    arg: Any,
+    input: str,
+    output: str,
+    type: EncodeTypeEnum = EncodeTypeEnum.birdseye,
 ) -> str:
     """Return the correct scaling preset or default preset if none is set."""
     if type == EncodeTypeEnum.birdseye:
@@ -215,6 +219,7 @@ def parse_preset_hardware_acceleration_encode(
         arg = "default"
 
     return arg_map.get(arg, arg_map["default"]).format(
+        ffmpeg_path,
         input,
         output,
         _gpu_selector.get_selected_gpu(),
diff --git a/frigate/output/birdseye.py b/frigate/output/birdseye.py
index 6c42f450b..00e7c7ad1 100644
--- a/frigate/output/birdseye.py
+++ b/frigate/output/birdseye.py
@@ -15,7 +15,7 @@ import cv2
 import numpy as np
 
 from frigate.comms.config_updater import ConfigSubscriber
-from frigate.config import BirdseyeModeEnum, FrigateConfig
+from frigate.config import BirdseyeModeEnum, FfmpegConfig, FrigateConfig
 from frigate.const import BASE_DIR, BIRDSEYE_PIPE
 from frigate.util.image import (
     SharedMemoryFrameManager,
@@ -112,7 +112,7 @@ class Canvas:
 class FFMpegConverter(threading.Thread):
     def __init__(
         self,
-        camera: str,
+        ffmpeg: FfmpegConfig,
         input_queue: queue.Queue,
         stop_event: mp.Event,
         in_width: int,
@@ -123,8 +123,8 @@ class FFMpegConverter(threading.Thread):
         birdseye_rtsp: bool = False,
     ):
         threading.Thread.__init__(self)
-        self.name = f"{camera}_output_converter"
-        self.camera = camera
+        self.name = "birdseye_output_converter"
+        self.camera = "birdseye"
         self.input_queue = input_queue
         self.stop_event = stop_event
         self.bd_pipe = None
@@ -133,7 +133,7 @@ class FFMpegConverter(threading.Thread):
             self.recreate_birdseye_pipe()
 
         ffmpeg_cmd = [
-            "ffmpeg",
+            ffmpeg.ffmpeg_path,
             "-threads",
             "1",
             "-f",
@@ -725,7 +725,7 @@ class Birdseye:
         self.config = config
         self.input = queue.Queue(maxsize=10)
         self.converter = FFMpegConverter(
-            "birdseye",
+            config.ffmpeg,
             self.input,
             stop_event,
             config.birdseye.width,
diff --git a/frigate/output/camera.py b/frigate/output/camera.py
index b9c607375..317d7902e 100644
--- a/frigate/output/camera.py
+++ b/frigate/output/camera.py
@@ -6,7 +6,7 @@ import queue
 import subprocess as sp
 import threading
 
-from frigate.config import CameraConfig
+from frigate.config import CameraConfig, FfmpegConfig
 
 logger = logging.getLogger(__name__)
 
@@ -15,6 +15,7 @@ class FFMpegConverter(threading.Thread):
     def __init__(
         self,
         camera: str,
+        ffmpeg: FfmpegConfig,
         input_queue: queue.Queue,
         stop_event: mp.Event,
         in_width: int,
@@ -30,7 +31,7 @@ class FFMpegConverter(threading.Thread):
         self.stop_event = stop_event
 
         ffmpeg_cmd = [
-            "ffmpeg",
+            ffmpeg.ffmpeg_path,
             "-threads",
             "1",
             "-f",
@@ -142,6 +143,7 @@ class JsmpegCamera:
         )
         self.converter = FFMpegConverter(
             config.name,
+            config.ffmpeg,
             self.input,
             stop_event,
             config.frame_shape[1],
diff --git a/frigate/output/preview.py b/frigate/output/preview.py
index f5a0f2e71..5b5dd4afa 100644
--- a/frigate/output/preview.py
+++ b/frigate/output/preview.py
@@ -78,6 +78,7 @@ class FFMpegConverter(threading.Thread):
 
         # write a PREVIEW at fps and 1 key frame per clip
         self.ffmpeg_cmd = parse_preset_hardware_acceleration_encode(
+            config.ffmpeg.ffmpeg_path,
             config.ffmpeg.hwaccel_args,
             input="-f concat -y -protocol_whitelist pipe,file -safe 0 -threads 1 -i /dev/stdin",
             output=f"-threads 1 -g {PREVIEW_KEYFRAME_INTERVAL} -bf 0 -b:v {PREVIEW_QUALITY_BIT_RATES[self.config.record.preview.quality]} {FPS_VFR_PARAM} -movflags +faststart -pix_fmt yuv420p {self.path}",
diff --git a/frigate/record/export.py b/frigate/record/export.py
index feb96f01f..7d38e60f1 100644
--- a/frigate/record/export.py
+++ b/frigate/record/export.py
@@ -14,7 +14,7 @@ from typing import Optional
 
 from peewee import DoesNotExist
 
-from frigate.config import FrigateConfig
+from frigate.config import FfmpegConfig, FrigateConfig
 from frigate.const import (
     CACHE_DIR,
     CLIPS_DIR,
@@ -116,7 +116,7 @@ class RecordingExporter(threading.Thread):
             minutes = int(diff / 60)
             seconds = int(diff % 60)
             ffmpeg_cmd = [
-                "ffmpeg",
+                self.config.ffmpeg.ffmpeg_path,
                 "-hide_banner",
                 "-loglevel",
                 "warning",
@@ -230,11 +230,12 @@ class RecordingExporter(threading.Thread):
 
         if self.playback_factor == PlaybackFactorEnum.realtime:
             ffmpeg_cmd = (
-                f"ffmpeg -hide_banner {ffmpeg_input} -c copy -movflags +faststart {video_path}"
+                f"{self.config.ffmpeg.ffmpeg_path} -hide_banner {ffmpeg_input} -c copy -movflags +faststart {video_path}"
             ).split(" ")
         elif self.playback_factor == PlaybackFactorEnum.timelapse_25x:
             ffmpeg_cmd = (
                 parse_preset_hardware_acceleration_encode(
+                    self.config.ffmpeg.ffmpeg_path,
                     self.config.ffmpeg.hwaccel_args,
                     f"{TIMELAPSE_DATA_INPUT_ARGS} {ffmpeg_input}",
                     f"{self.config.cameras[self.camera].record.export.timelapse_args} -movflags +faststart {video_path}",
@@ -267,7 +268,7 @@ class RecordingExporter(threading.Thread):
         logger.debug(f"Finished exporting {video_path}")
 
 
-def migrate_exports(camera_names: list[str]):
+def migrate_exports(ffmpeg: FfmpegConfig, camera_names: list[str]):
     Path(os.path.join(CLIPS_DIR, "export")).mkdir(exist_ok=True)
 
     exports = []
@@ -286,7 +287,7 @@ def migrate_exports(camera_names: list[str]):
         )  # use jpg because webp encoder can't get quality low enough
 
         ffmpeg_cmd = [
-            "ffmpeg",
+            ffmpeg.ffmpeg_path,
             "-hide_banner",
             "-loglevel",
             "warning",
diff --git a/frigate/record/maintainer.py b/frigate/record/maintainer.py
index e06660223..5bcec62e6 100644
--- a/frigate/record/maintainer.py
+++ b/frigate/record/maintainer.py
@@ -209,7 +209,9 @@ class RecordingMaintainer(threading.Thread):
         if cache_path in self.end_time_cache:
             end_time, duration = self.end_time_cache[cache_path]
         else:
-            segment_info = await get_video_properties(cache_path, get_duration=True)
+            segment_info = await get_video_properties(
+                self.config.ffmpeg, cache_path, get_duration=True
+            )
 
             if segment_info["duration"]:
                 duration = float(segment_info["duration"])
@@ -387,7 +389,7 @@ class RecordingMaintainer(threading.Thread):
 
                 # add faststart to kept segments to improve metadata reading
                 p = await asyncio.create_subprocess_exec(
-                    "ffmpeg",
+                    self.config.ffmpeg.ffmpeg_path,
                     "-hide_banner",
                     "-y",
                     "-i",
diff --git a/frigate/util/config.py b/frigate/util/config.py
index a40efeafd..729215e9e 100644
--- a/frigate/util/config.py
+++ b/frigate/util/config.py
@@ -314,10 +314,10 @@ class StreamInfoRetriever:
     def __init__(self) -> None:
         self.stream_cache: dict[str, tuple[int, int]] = {}
 
-    def get_stream_info(self, path: str) -> str:
+    def get_stream_info(self, ffmpeg, path: str) -> str:
         if path in self.stream_cache:
             return self.stream_cache[path]
 
-        info = asyncio.run(get_video_properties(path))
+        info = asyncio.run(get_video_properties(ffmpeg, path))
         self.stream_cache[path] = info
         return info
diff --git a/frigate/util/image.py b/frigate/util/image.py
index f3186fe6a..dfd3a3061 100644
--- a/frigate/util/image.py
+++ b/frigate/util/image.py
@@ -765,12 +765,16 @@ def add_mask(mask: str, mask_img: np.ndarray):
 
 
 def get_image_from_recording(
-    file_path: str, relative_frame_time: float, codec: str, height: Optional[int] = None
+    ffmpeg,  # Ffmpeg Config
+    file_path: str,
+    relative_frame_time: float,
+    codec: str,
+    height: Optional[int] = None,
 ) -> Optional[any]:
     """retrieve a frame from given time in recording file."""
 
     ffmpeg_cmd = [
-        "ffmpeg",
+        ffmpeg.executable_path,
         "-hide_banner",
         "-loglevel",
         "warning",
diff --git a/frigate/util/services.py b/frigate/util/services.py
index 16f46e114..03787d248 100644
--- a/frigate/util/services.py
+++ b/frigate/util/services.py
@@ -378,11 +378,11 @@ def get_jetson_stats() -> dict[int, dict]:
     return results
 
 
-def ffprobe_stream(path: str) -> sp.CompletedProcess:
+def ffprobe_stream(ffmpeg, path: str) -> sp.CompletedProcess:
     """Run ffprobe on stream."""
     clean_path = escape_special_characters(path)
     ffprobe_cmd = [
-        "ffprobe",
+        ffmpeg.ffprobe_path,
         "-timeout",
         "1000000",
         "-print_format",
@@ -438,7 +438,9 @@ def auto_detect_hwaccel() -> str:
     return ""
 
 
-async def get_video_properties(url, get_duration=False) -> dict[str, any]:
+async def get_video_properties(
+    ffmpeg, url: str, get_duration: bool = False
+) -> dict[str, any]:
     async def calculate_duration(video: Optional[any]) -> float:
         duration = None
 
@@ -453,7 +455,7 @@ async def get_video_properties(url, get_duration=False) -> dict[str, any]:
         # if cv2 failed need to use ffprobe
         if duration is None:
             p = await asyncio.create_subprocess_exec(
-                "ffprobe",
+                ffmpeg.ffprobe_path,
                 "-v",
                 "error",
                 "-show_entries",

From 5aee70ac7a24e9d29d9cf8bb8a3971c184917314 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Fri, 13 Sep 2024 15:44:31 -0500
Subject: [PATCH 06/11] Explore view fixes (#13726)

* return description consistently under data object

* description type

* navigate to history view from explore video tab
---
 frigate/api/event.py                          | 25 +++++--
 frigate/api/review.py                         | 12 +++
 .../overlay/detail/SearchDetailDialog.tsx     | 75 ++++++++++++++-----
 web/src/types/search.ts                       |  2 +-
 4 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/frigate/api/event.py b/frigate/api/event.py
index 6e75602e9..fd3c4ad0b 100644
--- a/frigate/api/event.py
+++ b/frigate/api/event.py
@@ -302,8 +302,21 @@ def events_explore():
         .dicts()
     )
 
-    events = query.iterator()
-    return jsonify(list(events))
+    events = list(query.iterator())
+
+    processed_events = [
+        {k: v for k, v in event.items() if k != "data"}
+        | {
+            "data": {
+                k: v
+                for k, v in event["data"].items()
+                if k in ["type", "score", "top_score", "description"]
+            }
+        }
+        for event in events
+    ]
+
+    return jsonify(processed_events)
 
 
 @EventBp.route("/event_ids")
@@ -507,9 +520,11 @@ def events_search():
     events = [
         {k: v for k, v in event.items() if k != "data"}
         | {
-            k: v
-            for k, v in event["data"].items()
-            if k in ["type", "score", "top_score", "description"]
+            "data": {
+                k: v
+                for k, v in event["data"].items()
+                if k in ["type", "score", "top_score", "description"]
+            }
         }
         | {
             "search_distance": results[event["id"]]["distance"],
diff --git a/frigate/api/review.py b/frigate/api/review.py
index 6bb2a4800..d391828d5 100644
--- a/frigate/api/review.py
+++ b/frigate/api/review.py
@@ -94,6 +94,18 @@ def review():
     return jsonify([r for r in review])
 
 
+@ReviewBp.route("/review/event/<id>")
+def get_review_from_event(id: str):
+    try:
+        return model_to_dict(
+            ReviewSegment.get(
+                ReviewSegment.data["detections"].cast("text") % f'*"{id}"*'
+            )
+        )
+    except DoesNotExist:
+        return "Review item not found", 404
+
+
 @ReviewBp.route("/review/<id>")
 def get_review(id: str):
     try:
diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index 7417cb3c4..e4651d6dd 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -27,7 +27,7 @@ import { baseUrl } from "@/api/baseUrl";
 import { cn } from "@/lib/utils";
 import ActivityIndicator from "@/components/indicators/activity-indicator";
 import { ASPECT_VERTICAL_LAYOUT, ASPECT_WIDE_LAYOUT } from "@/types/record";
-import { FaImage, FaRegListAlt, FaVideo } from "react-icons/fa";
+import { FaHistory, FaImage, FaRegListAlt, FaVideo } from "react-icons/fa";
 import { FaRotate } from "react-icons/fa6";
 import ObjectLifecycle from "./ObjectLifecycle";
 import {
@@ -37,6 +37,14 @@ import {
   MobilePageHeader,
   MobilePageTitle,
 } from "@/components/mobile/MobilePage";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { ReviewSegment } from "@/types/review";
+import { useNavigate } from "react-router-dom";
+import Chip from "@/components/indicators/Chip";
 
 const SEARCH_TABS = [
   "details",
@@ -226,10 +234,10 @@ function ObjectDetailsTab({
 
   // data
 
-  const [desc, setDesc] = useState(search?.description);
+  const [desc, setDesc] = useState(search?.data.description);
 
   // we have to make sure the current selected search item stays in sync
-  useEffect(() => setDesc(search?.description), [search]);
+  useEffect(() => setDesc(search?.data.description), [search]);
 
   const formattedDate = useFormattedTimestamp(
     search?.start_time ?? 0,
@@ -279,7 +287,7 @@ function ObjectDetailsTab({
         toast.error("Failed to update the description", {
           position: "top-center",
         });
-        setDesc(search.description);
+        setDesc(search.data.description);
       });
   }, [desc, search]);
 
@@ -367,6 +375,11 @@ function VideoTab({ search, config }: VideoTabProps) {
 
   const endTime = useMemo(() => search.end_time ?? Date.now() / 1000, [search]);
 
+  const navigate = useNavigate();
+  const { data: reviewItem } = useSWR<ReviewSegment>([
+    `review/event/${search.id}`,
+  ]);
+
   const mainCameraAspect = useMemo(() => {
     const camera = config?.cameras?.[search.camera];
 
@@ -416,22 +429,46 @@ function VideoTab({ search, config }: VideoTabProps) {
   }, [mainCameraAspect]);
 
   return (
-    <div className={`aspect-video ${containerClassName}`}>
-      {isLoading && (
-        <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
-      )}
-      <div className={videoClassName}>
-        <HlsVideoPlayer
-          videoRef={videoRef}
-          currentSource={`${baseUrl}vod/${search.camera}/start/${search.start_time}/end/${endTime}/index.m3u8`}
-          hotKeys
-          visible
-          frigateControls={false}
-          fullscreen={false}
-          supportsFullscreen={false}
-          onPlaying={() => setIsLoading(false)}
-        />
+    <div className="relative flex flex-col">
+      <div className={`aspect-video ${containerClassName}`}>
+        {(isLoading || !reviewItem) && (
+          <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
+        )}
+        <div className={videoClassName}>
+          <HlsVideoPlayer
+            videoRef={videoRef}
+            currentSource={`${baseUrl}vod/${search.camera}/start/${search.start_time}/end/${endTime}/index.m3u8`}
+            hotKeys
+            visible
+            frigateControls={false}
+            fullscreen={false}
+            supportsFullscreen={false}
+            onPlaying={() => setIsLoading(false)}
+          />
+        </div>
       </div>
+      {!isLoading && (
+        <div className="absolute right-2 top-2 flex items-center">
+          <Tooltip>
+            <TooltipTrigger>
+              <Chip
+                className="cursor-pointer rounded-md bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500"
+                onClick={() => {
+                  if (reviewItem?.id) {
+                    const params = new URLSearchParams({
+                      id: reviewItem.id,
+                    }).toString();
+                    navigate(`/review?${params}`);
+                  }
+                }}
+              >
+                <FaHistory className="size-4 text-white" />
+              </Chip>
+            </TooltipTrigger>
+            <TooltipContent side="left">View in History</TooltipContent>
+          </Tooltip>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/web/src/types/search.ts b/web/src/types/search.ts
index 63b86229d..7cc7e3e91 100644
--- a/web/src/types/search.ts
+++ b/web/src/types/search.ts
@@ -3,7 +3,6 @@ export type SearchSource = "similarity" | "thumbnail" | "description";
 export type SearchResult = {
   id: string;
   camera: string;
-  description?: string;
   start_time: number;
   end_time?: number;
   score: number;
@@ -25,6 +24,7 @@ export type SearchResult = {
     area: number;
     ratio: number;
     type: "object" | "audio" | "manual";
+    description?: string;
   };
 };
 

From 4f10f825809122db32c8fecce63b060840446e3d Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Fri, 13 Sep 2024 20:18:56 -0600
Subject: [PATCH 07/11] Install onevpl tools for intel (#13730)

* Install onevpl tools for intel

* Use updated intel lib
---
 docker/main/install_deps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index eb7aeb1b5..8ce033e0c 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -67,8 +67,9 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
     echo 'deb https://deb.debian.org/debian bookworm main contrib non-free' >/etc/apt/sources.list.d/debian-bookworm.list
     apt-get -qq update
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
-        intel-opencl-icd \
-        mesa-va-drivers radeontop libva-drm2 intel-media-va-driver-non-free i965-va-driver libmfx1 intel-gpu-tools
+        intel-opencl-icd onevpl-tools intel-media-va-driver-non-free i965-va-driver libmfx-gen1.2 intel-gpu-tools \
+        libva-drm2 \
+        mesa-va-drivers radeontop
     # something about this dependency requires it to be installed in a separate call rather than in the line above
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
         i965-va-driver-shaders

From 088a0fb4a53f87505885246a2586217295fa825f Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Sat, 14 Sep 2024 07:03:39 -0600
Subject: [PATCH 08/11] Ffmpeg cleanup (#13737)

---
 docker/main/install_deps.sh | 5 ++++-
 frigate/util/image.py       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index 8ce033e0c..fbfcd8689 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -67,12 +67,15 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
     echo 'deb https://deb.debian.org/debian bookworm main contrib non-free' >/etc/apt/sources.list.d/debian-bookworm.list
     apt-get -qq update
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
-        intel-opencl-icd onevpl-tools intel-media-va-driver-non-free i965-va-driver libmfx-gen1.2 intel-gpu-tools \
+        intel-opencl-icd intel-media-va-driver-non-free i965-va-driver \
+        libmfx-gen1.2 onevpl-tools intel-gpu-tools \
         libva-drm2 \
         mesa-va-drivers radeontop
+
     # something about this dependency requires it to be installed in a separate call rather than in the line above
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
         i965-va-driver-shaders
+
     rm -f /etc/apt/sources.list.d/debian-bookworm.list
 fi
 
diff --git a/frigate/util/image.py b/frigate/util/image.py
index dfd3a3061..41024a599 100644
--- a/frigate/util/image.py
+++ b/frigate/util/image.py
@@ -774,7 +774,7 @@ def get_image_from_recording(
     """retrieve a frame from given time in recording file."""
 
     ffmpeg_cmd = [
-        ffmpeg.executable_path,
+        ffmpeg.ffmpeg_path,
         "-hide_banner",
         "-loglevel",
         "warning",

From 2a66923524952e63d3fdc2c037599c96cf434db0 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sat, 14 Sep 2024 08:42:56 -0500
Subject: [PATCH 09/11] Explore pane infinite loading (#13738)

* swr for infinite loading

* search detail language change

* drawer padding

* spacing

* center calendar

* padding

* catch error

* use limit const
---
 .../components/filter/CamerasFilterButton.tsx | 10 +--
 .../components/filter/SearchFilterGroup.tsx   | 18 ++---
 .../overlay/detail/ObjectLifecycle.tsx        |  2 +-
 .../overlay/detail/SearchDetailDialog.tsx     |  4 +-
 web/src/components/ui/calendar-range.tsx      |  2 +-
 web/src/pages/Explore.tsx                     | 76 +++++++++++++++++--
 web/src/types/search.ts                       | 17 +++++
 web/src/views/explore/ExploreView.tsx         |  2 +-
 web/src/views/search/SearchView.tsx           | 67 +++++++++++++---
 9 files changed, 162 insertions(+), 36 deletions(-)

diff --git a/web/src/components/filter/CamerasFilterButton.tsx b/web/src/components/filter/CamerasFilterButton.tsx
index da188b5d7..12c5431bf 100644
--- a/web/src/components/filter/CamerasFilterButton.tsx
+++ b/web/src/components/filter/CamerasFilterButton.tsx
@@ -90,7 +90,7 @@ export function CamerasFilterButton({
           <DropdownMenuSeparator />
         </>
       )}
-      <div className="scrollbar-container h-auto max-h-[80dvh] overflow-y-auto overflow-x-hidden p-4">
+      <div className="scrollbar-container flex h-auto max-h-[80dvh] flex-col gap-2 overflow-y-auto overflow-x-hidden p-4">
         <FilterSwitch
           isChecked={allCamerasSelected}
           label="All Cameras"
@@ -106,12 +106,12 @@ export function CamerasFilterButton({
         />
         {groups.length > 0 && (
           <>
-            <DropdownMenuSeparator className="mt-2" />
+            <DropdownMenuSeparator />
             {groups.map(([name, conf]) => {
               return (
                 <div
                   key={name}
-                  className="w-full cursor-pointer rounded-lg px-2 py-1.5 text-sm capitalize text-primary hover:bg-muted"
+                  className="w-full cursor-pointer rounded-lg px-2 py-0.5 text-sm capitalize text-primary hover:bg-muted"
                   onClick={() => setCurrentCameras([...conf.cameras])}
                 >
                   {name}
@@ -120,7 +120,7 @@ export function CamerasFilterButton({
             })}
           </>
         )}
-        <DropdownMenuSeparator className="my-2" />
+        <DropdownMenuSeparator />
         <div className="flex flex-col gap-2.5">
           {allCameras.map((item) => (
             <FilterSwitch
@@ -158,7 +158,7 @@ export function CamerasFilterButton({
           ))}
         </div>
       </div>
-      <DropdownMenuSeparator className="my-2" />
+      <DropdownMenuSeparator />
       <div className="flex items-center justify-evenly p-2">
         <Button
           variant="select"
diff --git a/web/src/components/filter/SearchFilterGroup.tsx b/web/src/components/filter/SearchFilterGroup.tsx
index ceed1028c..0b0b3278e 100644
--- a/web/src/components/filter/SearchFilterGroup.tsx
+++ b/web/src/components/filter/SearchFilterGroup.tsx
@@ -5,7 +5,7 @@ import { FrigateConfig } from "@/types/frigateConfig";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { DropdownMenuSeparator } from "../ui/dropdown-menu";
 import { getEndOfDayTimestamp } from "@/utils/dateUtil";
-import { isMobile } from "react-device-detect";
+import { isDesktop, isMobile } from "react-device-detect";
 import { Drawer, DrawerContent, DrawerTrigger } from "../ui/drawer";
 import { Switch } from "../ui/switch";
 import { Label } from "../ui/label";
@@ -309,7 +309,7 @@ function GeneralFilterButton({
         }}
       >
         <DrawerTrigger asChild>{trigger}</DrawerTrigger>
-        <DrawerContent className="max-h-[75dvh] overflow-hidden">
+        <DrawerContent className="max-h-[75dvh] overflow-hidden p-4">
           {content}
         </DrawerContent>
       </Drawer>
@@ -503,7 +503,7 @@ function ZoneFilterButton({
         }}
       >
         <DrawerTrigger asChild>{trigger}</DrawerTrigger>
-        <DrawerContent className="max-h-[75dvh] overflow-hidden">
+        <DrawerContent className="max-h-[75dvh] overflow-hidden p-4">
           {content}
         </DrawerContent>
       </Drawer>
@@ -548,7 +548,7 @@ export function ZoneFilterContent({
       <div className="scrollbar-container h-auto max-h-[80dvh] overflow-y-auto overflow-x-hidden">
         {allZones && setCurrentZones && (
           <>
-            <DropdownMenuSeparator />
+            {isDesktop && <DropdownMenuSeparator />}
             <div className="mb-5 mt-2.5 flex items-center justify-between">
               <Label
                 className="mx-2 cursor-pointer text-primary"
@@ -599,7 +599,7 @@ export function ZoneFilterContent({
           </>
         )}
       </div>
-      <DropdownMenuSeparator />
+      {isDesktop && <DropdownMenuSeparator />}
       <div className="flex items-center justify-evenly p-2">
         <Button
           variant="select"
@@ -697,7 +697,7 @@ function SubFilterButton({
         }}
       >
         <DrawerTrigger asChild>{trigger}</DrawerTrigger>
-        <DrawerContent className="max-h-[75dvh] overflow-hidden">
+        <DrawerContent className="max-h-[75dvh] overflow-hidden p-4">
           {content}
         </DrawerContent>
       </Drawer>
@@ -788,7 +788,7 @@ export function SubFilterContent({
           ))}
         </div>
       </div>
-      <DropdownMenuSeparator />
+      {isDesktop && <DropdownMenuSeparator />}
       <div className="flex items-center justify-evenly p-2">
         <Button
           variant="select"
@@ -877,7 +877,7 @@ function SearchTypeButton({
         }}
       >
         <DrawerTrigger asChild>{trigger}</DrawerTrigger>
-        <DrawerContent className="max-h-[75dvh] overflow-hidden">
+        <DrawerContent className="max-h-[75dvh] overflow-hidden p-4">
           {content}
         </DrawerContent>
       </Drawer>
@@ -956,7 +956,7 @@ export function SearchTypeContent({
             }}
           />
         </div>
-        <DropdownMenuSeparator />
+        {isDesktop && <DropdownMenuSeparator />}
         <div className="flex items-center justify-evenly p-2">
           <Button
             variant="select"
diff --git a/web/src/components/overlay/detail/ObjectLifecycle.tsx b/web/src/components/overlay/detail/ObjectLifecycle.tsx
index 377710b09..5dca6be79 100644
--- a/web/src/components/overlay/detail/ObjectLifecycle.tsx
+++ b/web/src/components/overlay/detail/ObjectLifecycle.tsx
@@ -193,7 +193,7 @@ export default function ObjectLifecycle({
   };
 
   useEffect(() => {
-    if (eventSequence) {
+    if (eventSequence && eventSequence.length > 0) {
       setTimeIndex(eventSequence?.[current].timestamp);
       handleSetBox(eventSequence?.[current].data.box ?? []);
       setLifecycleZones(eventSequence?.[current].data.zones);
diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index e4651d6dd..441e48df6 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -237,7 +237,7 @@ function ObjectDetailsTab({
   const [desc, setDesc] = useState(search?.data.description);
 
   // we have to make sure the current selected search item stays in sync
-  useEffect(() => setDesc(search?.data.description), [search]);
+  useEffect(() => setDesc(search?.data.description ?? ""), [search]);
 
   const formattedDate = useFormattedTimestamp(
     search?.start_time ?? 0,
@@ -351,7 +351,7 @@ function ObjectDetailsTab({
         <div className="text-sm text-primary/40">Description</div>
         <Textarea
           className="md:h-64"
-          placeholder="Description of the event"
+          placeholder="Description of the tracked object"
           value={desc}
           onChange={(e) => setDesc(e.target.value)}
         />
diff --git a/web/src/components/ui/calendar-range.tsx b/web/src/components/ui/calendar-range.tsx
index 5629c5ce9..395cfb779 100644
--- a/web/src/components/ui/calendar-range.tsx
+++ b/web/src/components/ui/calendar-range.tsx
@@ -315,7 +315,7 @@ export function DateRangePicker({
 
   return (
     <div className="w-full">
-      <div className="flex py-2">
+      <div className="flex flex-row items-start justify-center py-2">
         <div className="flex">
           <div className="flex flex-col">
             <div className="flex flex-col items-center justify-end gap-2 px-3 pb-4 lg:flex-row lg:items-start lg:pb-0">
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index f68bb5068..21ab01f71 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -3,12 +3,15 @@ import { useCameraPreviews } from "@/hooks/use-camera-previews";
 import { useOverlayState, useSearchEffect } from "@/hooks/use-overlay-state";
 import { FrigateConfig } from "@/types/frigateConfig";
 import { RecordingStartingPoint } from "@/types/record";
-import { SearchFilter, SearchResult } from "@/types/search";
+import { SearchFilter, SearchQuery, SearchResult } from "@/types/search";
 import { TimeRange } from "@/types/timeline";
 import { RecordingView } from "@/views/recording/RecordingView";
 import SearchView from "@/views/search/SearchView";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import useSWR from "swr";
+import useSWRInfinite from "swr/infinite";
+
+const API_LIMIT = 25;
 
 export default function Explore() {
   const { data: config } = useSWR<FrigateConfig>("config", {
@@ -61,7 +64,7 @@ export default function Explore() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [search]);
 
-  const searchQuery = useMemo(() => {
+  const searchQuery: SearchQuery = useMemo(() => {
     if (similaritySearch) {
       return [
         "events/search",
@@ -107,7 +110,8 @@ export default function Explore() {
           before: searchSearchParams["before"],
           after: searchSearchParams["after"],
           search_type: searchSearchParams["search_type"],
-          limit: Object.keys(searchSearchParams).length == 0 ? 20 : null,
+          limit:
+            Object.keys(searchSearchParams).length == 0 ? API_LIMIT : undefined,
           in_progress: 0,
           include_thumbnails: 0,
         },
@@ -117,8 +121,66 @@ export default function Explore() {
     return null;
   }, [searchTerm, searchSearchParams, similaritySearch]);
 
-  const { data: searchResults, isLoading } =
-    useSWR<SearchResult[]>(searchQuery);
+  // paging
+
+  const getKey = (
+    pageIndex: number,
+    previousPageData: SearchResult[] | null,
+  ): SearchQuery => {
+    if (previousPageData && !previousPageData.length) return null; // reached the end
+    if (!searchQuery) return null;
+
+    const [url, params] = searchQuery;
+
+    // If it's not the first page, use the last item's start_time as the 'before' parameter
+    if (pageIndex > 0 && previousPageData) {
+      const lastDate = previousPageData[previousPageData.length - 1].start_time;
+      return [
+        url,
+        { ...params, before: lastDate.toString(), limit: API_LIMIT },
+      ];
+    }
+
+    // For the first page, use the original params
+    return [url, { ...params, limit: API_LIMIT }];
+  };
+
+  const { data, size, setSize, isValidating } = useSWRInfinite<SearchResult[]>(
+    getKey,
+    {
+      revalidateFirstPage: false,
+      revalidateAll: false,
+    },
+  );
+
+  const searchResults = useMemo(
+    () => (data ? ([] as SearchResult[]).concat(...data) : []),
+    [data],
+  );
+  const isLoadingInitialData = !data && !isValidating;
+  const isLoadingMore =
+    isLoadingInitialData ||
+    (size > 0 && data && typeof data[size - 1] === "undefined");
+  const isEmpty = data?.[0]?.length === 0;
+  const isReachingEnd =
+    isEmpty || (data && data[data.length - 1]?.length < API_LIMIT);
+
+  const loadMore = useCallback(() => {
+    if (!isReachingEnd && !isLoadingMore) {
+      if (searchQuery) {
+        const [url] = searchQuery;
+
+        // for chroma, only load 100 results for description and similarity
+        if (url === "events/search" && searchResults.length >= 100) {
+          return;
+        }
+      }
+
+      setSize(size + 1);
+    }
+  }, [isReachingEnd, isLoadingMore, setSize, size, searchResults, searchQuery]);
+
+  // previews
 
   const previewTimeRange = useMemo<TimeRange>(() => {
     if (!searchResults) {
@@ -212,11 +274,13 @@ export default function Explore() {
         searchTerm={searchTerm}
         searchFilter={searchFilter}
         searchResults={searchResults}
-        isLoading={isLoading}
+        isLoading={(isLoadingInitialData || isLoadingMore) ?? true}
         setSearch={setSearch}
         setSimilaritySearch={(search) => setSearch(`similarity:${search.id}`)}
         onUpdateFilter={setSearchFilter}
         onOpenSearch={onOpenSearch}
+        loadMore={loadMore}
+        hasMore={!isReachingEnd}
       />
     );
   }
diff --git a/web/src/types/search.ts b/web/src/types/search.ts
index 7cc7e3e91..762da2c82 100644
--- a/web/src/types/search.ts
+++ b/web/src/types/search.ts
@@ -38,3 +38,20 @@ export type SearchFilter = {
   search_type?: SearchSource[];
   event_id?: string;
 };
+
+export type SearchQueryParams = {
+  cameras?: string[];
+  labels?: string[];
+  sub_labels?: string[];
+  zones?: string[];
+  before?: string;
+  after?: string;
+  search_type?: string;
+  limit?: number;
+  in_progress?: number;
+  include_thumbnails?: number;
+  query?: string;
+  page?: number;
+};
+
+export type SearchQuery = [string, SearchQueryParams] | null;
\ No newline at end of file
diff --git a/web/src/views/explore/ExploreView.tsx b/web/src/views/explore/ExploreView.tsx
index 48fee439c..1a6c33142 100644
--- a/web/src/views/explore/ExploreView.tsx
+++ b/web/src/views/explore/ExploreView.tsx
@@ -94,7 +94,7 @@ function ThumbnailRow({
   };
 
   return (
-    <div className="rounded-lg bg-background_alt p-2 md:p-4">
+    <div className="rounded-lg bg-background_alt p-2 md:px-4">
       <div className="text-lg capitalize">
         {objectType.replaceAll("_", " ")}
         {searchResults && (
diff --git a/web/src/views/search/SearchView.tsx b/web/src/views/search/SearchView.tsx
index 3b6fb49e3..42c8c0833 100644
--- a/web/src/views/search/SearchView.tsx
+++ b/web/src/views/search/SearchView.tsx
@@ -33,6 +33,8 @@ type SearchViewProps = {
   setSimilaritySearch: (search: SearchResult) => void;
   onUpdateFilter: (filter: SearchFilter) => void;
   onOpenSearch: (item: SearchResult) => void;
+  loadMore: () => void;
+  hasMore: boolean;
 };
 export default function SearchView({
   search,
@@ -43,6 +45,8 @@ export default function SearchView({
   setSearch,
   setSimilaritySearch,
   onUpdateFilter,
+  loadMore,
+  hasMore,
 }: SearchViewProps) {
   const { data: config } = useSWR<FrigateConfig>("config", {
     revalidateOnFocus: false,
@@ -143,7 +147,37 @@ export default function SearchView({
         scrollMode: "if-needed",
       });
     }
-  }, [selectedIndex, uniqueResults]);
+    // we only want to scroll when the index changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedIndex]);
+
+  // observer for loading more
+
+  const observerTarget = useRef<HTMLDivElement>(null);
+  const observerRef = useRef<IntersectionObserver | null>(null);
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0].isIntersecting && hasMore && !isLoading) {
+          loadMore();
+        }
+      },
+      { threshold: 1.0 },
+    );
+
+    if (observerTarget.current) {
+      observer.observe(observerTarget.current);
+    }
+
+    observerRef.current = observer;
+
+    return () => {
+      if (observerRef.current) {
+        observerRef.current.disconnect();
+      }
+    };
+  }, [hasMore, isLoading, loadMore]);
 
   return (
     <div className="flex size-full flex-col pt-2 md:py-2">
@@ -199,20 +233,23 @@ export default function SearchView({
         )}
       </div>
 
-      <div className="no-scrollbar flex flex-1 flex-wrap content-start gap-2 overflow-y-auto md:gap-4">
-        {searchTerm.length > 0 && searchResults?.length == 0 && (
+      <div className="no-scrollbar flex flex-1 flex-wrap content-start gap-2 overflow-y-auto">
+        {uniqueResults?.length == 0 && !isLoading && (
           <div className="absolute left-1/2 top-1/2 flex -translate-x-1/2 -translate-y-1/2 flex-col items-center justify-center text-center">
             <LuSearchX className="size-16" />
             No Tracked Objects Found
           </div>
         )}
 
-        {isLoading && (
-          <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
-        )}
+        {uniqueResults?.length == 0 &&
+          isLoading &&
+          searchFilter &&
+          Object.keys(searchFilter).length !== 0 && (
+            <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
+          )}
 
         {uniqueResults && (
-          <div className="mt-2 grid w-full gap-2 px-1 sm:grid-cols-2 md:mx-2 md:grid-cols-4 md:gap-4 3xl:grid-cols-6">
+          <div className="grid w-full gap-2 px-1 sm:grid-cols-2 md:mx-2 md:grid-cols-4 md:gap-4 3xl:grid-cols-6">
             {uniqueResults &&
               uniqueResults.map((value, index) => {
                 const selected = selectedIndex === index;
@@ -273,12 +310,20 @@ export default function SearchView({
               })}
           </div>
         )}
-        {!uniqueResults && !isLoading && (
-          <div className="scrollbar-container flex size-full flex-col overflow-y-auto">
-            <ExploreView onSelectSearch={onSelectSearch} />
-          </div>
+        {uniqueResults && uniqueResults.length > 0 && (
+          <>
+            <div ref={observerTarget} className="h-10 w-full" />
+            <div className="flex h-12 w-full justify-center">
+              {hasMore && isLoading && <ActivityIndicator />}
+            </div>
+          </>
         )}
       </div>
+      {searchFilter && Object.keys(searchFilter).length === 0 && (
+        <div className="scrollbar-container flex size-full flex-col overflow-y-auto">
+          <ExploreView onSelectSearch={onSelectSearch} />
+        </div>
+      )}
     </div>
   );
 }

From d5acd11164e29ea98d66ca97446aad4d96ed70b4 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Sat, 14 Sep 2024 12:22:03 -0600
Subject: [PATCH 10/11] Ffmpeg fixes (#13739)

* Only include hwaccel args if detect is being used

* Include both libmfx libraries
---
 docker/main/install_deps.sh | 2 +-
 frigate/config.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index fbfcd8689..34f2e093e 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -68,7 +68,7 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
     apt-get -qq update
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
         intel-opencl-icd intel-media-va-driver-non-free i965-va-driver \
-        libmfx-gen1.2 onevpl-tools intel-gpu-tools \
+        libmfx-gen1.2 libmfx1 onevpl-tools intel-gpu-tools \
         libva-drm2 \
         mesa-va-drivers radeontop
 
diff --git a/frigate/config.py b/frigate/config.py
index 5794debff..7e557f0a3 100644
--- a/frigate/config.py
+++ b/frigate/config.py
@@ -1225,7 +1225,7 @@ class CameraConfig(FrigateBaseModel):
         cmd = (
             [self.ffmpeg.ffmpeg_path]
             + global_args
-            + hwaccel_args
+            + (hwaccel_args if "detect" in ffmpeg_input.roles else [])
             + input_args
             + ["-i", escape_special_characters(ffmpeg_input.path)]
             + ffmpeg_output_args

From c17524bc3cbfbccf84654491e6463927c9dd2b6c Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sat, 14 Sep 2024 15:08:46 -0500
Subject: [PATCH 11/11] Explore tweaks (#13744)

* Fix loading indicator and explore view when entering a search term

* don't hide iOS video mute button

* use searchTerm instead of search for trigger
---
 .../overlay/detail/SearchDetailDialog.tsx        | 11 ++++++++---
 web/src/views/search/SearchView.tsx              | 16 +++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index 441e48df6..d0504fb76 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -350,7 +350,7 @@ function ObjectDetailsTab({
       <div className="flex flex-col gap-1.5">
         <div className="text-sm text-primary/40">Description</div>
         <Textarea
-          className="md:h-64"
+          className="h-64"
           placeholder="Description of the tracked object"
           value={desc}
           onChange={(e) => setDesc(e.target.value)}
@@ -447,8 +447,13 @@ function VideoTab({ search, config }: VideoTabProps) {
           />
         </div>
       </div>
-      {!isLoading && (
-        <div className="absolute right-2 top-2 flex items-center">
+      {!isLoading && reviewItem && (
+        <div
+          className={cn(
+            "absolute top-2 flex items-center",
+            isIOS ? "right-8" : "right-2",
+          )}
+        >
           <Tooltip>
             <TooltipTrigger>
               <Chip
diff --git a/web/src/views/search/SearchView.tsx b/web/src/views/search/SearchView.tsx
index 42c8c0833..e031d211c 100644
--- a/web/src/views/search/SearchView.tsx
+++ b/web/src/views/search/SearchView.tsx
@@ -243,8 +243,8 @@ export default function SearchView({
 
         {uniqueResults?.length == 0 &&
           isLoading &&
-          searchFilter &&
-          Object.keys(searchFilter).length !== 0 && (
+          (searchTerm ||
+            (searchFilter && Object.keys(searchFilter).length !== 0)) && (
             <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
           )}
 
@@ -319,11 +319,13 @@ export default function SearchView({
           </>
         )}
       </div>
-      {searchFilter && Object.keys(searchFilter).length === 0 && (
-        <div className="scrollbar-container flex size-full flex-col overflow-y-auto">
-          <ExploreView onSelectSearch={onSelectSearch} />
-        </div>
-      )}
+      {searchFilter &&
+        Object.keys(searchFilter).length === 0 &&
+        !searchTerm && (
+          <div className="scrollbar-container flex size-full flex-col overflow-y-auto">
+            <ExploreView onSelectSearch={onSelectSearch} />
+          </div>
+        )}
     </div>
   );
 }