Merge a0e0f61c59 into c244e6582a

docs/docs/integrations/third_party_extensions.md

@@ -39,10 +39,6 @@ This is a fork (with fixed errors and new features) of [original Double Take](ht
 
 [Frigate telegram](https://github.com/OldTyT/frigate-telegram) makes it possible to send events from Frigate to Telegram. Events are sent as a message with a text description, video, and thumbnail.
 
-## [kiosk-monitor](https://github.com/extremeshok/kiosk-monitor)
-
-[kiosk-monitor](https://github.com/extremeshok/kiosk-monitor) is a Raspberry Pi watchdog that runs Chromium fullscreen on a Frigate dashboard (optionally with VLC on a second monitor for an RTSP camera stream), auto-restarts on frozen screens or unreachable URLs, and ships a Birdseye-aware Chromium helper that auto-sizes the grid to the display.
-
 ## [Periscope](https://github.com/maksz42/periscope)
 
 [Periscope](https://github.com/maksz42/periscope) is a lightweight Android app that turns old devices into live viewers for Frigate. It works on Android 2.2 and above, including Android TV. It supports authentication and HTTPS.

frigate/util/services.py

@@ -711,31 +711,23 @@ def ffprobe_stream(ffmpeg, path: str, detailed: bool = False) -> sp.CompletedPro
     else:
         format_entries = None
 
-    def run(rtsp_transport: Optional[str] = None) -> sp.CompletedProcess:
-        cmd = [ffmpeg.ffprobe_path]
-        if rtsp_transport:
-            cmd += ["-rtsp_transport", rtsp_transport]
-        cmd += [
-            "-timeout",
-            "1000000",
-            "-print_format",
-            "json",
-            "-show_entries",
-            f"stream={stream_entries}",
-        ]
-        if detailed and format_entries:
-            cmd.extend(["-show_entries", f"format={format_entries}"])
-        cmd.extend(["-loglevel", "error", clean_path])
-        return sp.run(cmd, capture_output=True)
+    ffprobe_cmd = [
+        ffmpeg.ffprobe_path,
+        "-timeout",
+        "1000000",
+        "-print_format",
+        "json",
+        "-show_entries",
+        f"stream={stream_entries}",
+    ]
 
-    result = run()
+    # Add format entries for detailed mode
+    if detailed and format_entries:
+        ffprobe_cmd.extend(["-show_entries", f"format={format_entries}"])
 
-    # For RTSP: retry with explicit TCP transport if the first attempt failed
-    # (default UDP may be blocked)
-    if result.returncode != 0 and clean_path.startswith("rtsp://"):
-        result = run(rtsp_transport="tcp")
+    ffprobe_cmd.extend(["-loglevel", "error", clean_path])
 
-    return result
+    return sp.run(ffprobe_cmd, capture_output=True)
 
 
 def vainfo_hwaccel(device_name: Optional[str] = None) -> sp.CompletedProcess:

web/package-lock.json

@@ -9642,9 +9642,9 @@
       "license": "MIT"
     },
     "node_modules/lodash-es": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
-      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "license": "MIT"
     },
     "node_modules/lodash.merge": {

web/public/locales/en/views/settings.json

@@ -415,7 +415,7 @@
         "audioCodecGood": "Audio codec is {{codec}}.",
         "resolutionHigh": "A resolution of {{resolution}} may cause increased resource usage.",
         "resolutionLow": "A resolution of {{resolution}} may be too low for reliable detection of small objects.",
-        "resolutionUnknown": "The resolution of this stream could not be probed. You should manually set the detect resolution in Settings or your config.",
+        "resolutionUnknown": "The resolution of this stream could not be probed. This will cause issues on startup. You should manually set the detect resolution in Settings or your config.",
         "noAudioWarning": "No audio detected for this stream, recordings will not have audio.",
         "audioCodecRecordError": "The AAC audio codec is required to support audio in recordings.",
         "audioCodecRequired": "An audio stream is required to support audio detection.",

web/src/components/card/AnimatedEventCard.tsx

@@ -17,9 +17,6 @@ import { useUserPersistence } from "@/hooks/use-user-persistence";
 import { Skeleton } from "../ui/skeleton";
 import { Button } from "../ui/button";
 import { FaCircleCheck } from "react-icons/fa6";
-import { FaExclamationTriangle } from "react-icons/fa";
-import { MdOutlinePersonSearch } from "react-icons/md";
-import { ThreatLevel } from "@/types/review";
 import { cn } from "@/lib/utils";
 import { useTranslation } from "react-i18next";
 import { getTranslatedLabel } from "@/utils/i18n";
@@ -130,11 +127,6 @@ export function AnimatedEventCard({
     true,
   );
 
-  const threatLevel = useMemo<ThreatLevel>(
-    () => (event.data.metadata?.potential_threat_level ?? 0) as ThreatLevel,
-    [event],
-  );
-
   const aspectRatio = useMemo(() => {
     if (
       !config ||
@@ -160,15 +152,7 @@ export function AnimatedEventCard({
           <Tooltip>
             <TooltipTrigger asChild>
               <Button
-                className={cn(
-                  "absolute left-2 top-1 z-40 transition-opacity",
-                  threatLevel === ThreatLevel.SECURITY_CONCERN &&
-                    "pointer-events-auto bg-severity_alert opacity-100 hover:bg-severity_alert",
-                  threatLevel === ThreatLevel.NEEDS_REVIEW &&
-                    "pointer-events-auto bg-severity_detection opacity-100 hover:bg-severity_detection",
-                  threatLevel === ThreatLevel.NORMAL &&
-                    "pointer-events-none bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 opacity-0 group-hover:pointer-events-auto group-hover:opacity-100",
-                )}
+                className="pointer-events-none absolute left-2 top-1 z-40 bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100"
                 size="xs"
                 aria-label={t("markAsReviewed")}
                 onClick={async () => {
@@ -176,13 +160,7 @@ export function AnimatedEventCard({
                   updateEvents();
                 }}
               >
-                {threatLevel === ThreatLevel.SECURITY_CONCERN ? (
-                  <FaExclamationTriangle className="size-3 text-white" />
-                ) : threatLevel === ThreatLevel.NEEDS_REVIEW ? (
-                  <MdOutlinePersonSearch className="size-3 text-white" />
-                ) : (
-                  <FaCircleCheck className="size-3 text-white" />
-                )}
+                <FaCircleCheck className="size-3 text-white" />
               </Button>
             </TooltipTrigger>
             <TooltipContent>{t("markAsReviewed")}</TooltipContent>

web/src/views/live/LiveCameraView.tsx

@@ -389,7 +389,7 @@ export default function LiveCameraView({
     return "mse";
   }, [lowBandwidth, mic, webRTC, isRestreamed]);
 
-  useKeyboardListener(["m", "Escape"], (key, modifiers) => {
+  useKeyboardListener(["m"], (key, modifiers) => {
     if (!modifiers.down) {
       return true;
     }
@@ -407,12 +407,6 @@ export default function LiveCameraView({
           return true;
         }
         break;
-      case "Escape":
-        if (!fullscreen) {
-          navigate(-1);
-          return true;
-        }
-        break;
     }
 
     return false;