mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-09 23:15:28 +03:00
Compare commits
6 Commits
dc0f36e8f9
...
d02115290f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d02115290f | ||
|
|
4a1b7a1629 | ||
|
|
8eace9c3e7 | ||
|
|
8fc1e97df5 | ||
|
|
0a332cada9 | ||
|
|
ba499201e6 |
@ -39,6 +39,10 @@ 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.
|
[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)
|
||||||
|
|
||||||
[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.
|
[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.
|
||||||
|
|||||||
@ -711,23 +711,44 @@ def ffprobe_stream(ffmpeg, path: str, detailed: bool = False) -> sp.CompletedPro
|
|||||||
else:
|
else:
|
||||||
format_entries = None
|
format_entries = None
|
||||||
|
|
||||||
ffprobe_cmd = [
|
def run(rtsp_transport: Optional[str] = None) -> sp.CompletedProcess:
|
||||||
ffmpeg.ffprobe_path,
|
cmd = [ffmpeg.ffprobe_path]
|
||||||
"-timeout",
|
if rtsp_transport:
|
||||||
"1000000",
|
cmd += ["-rtsp_transport", rtsp_transport]
|
||||||
"-print_format",
|
cmd += [
|
||||||
"json",
|
"-timeout",
|
||||||
"-show_entries",
|
"1000000",
|
||||||
f"stream={stream_entries}",
|
"-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])
|
||||||
|
try:
|
||||||
|
return sp.run(cmd, capture_output=True, timeout=6)
|
||||||
|
except sp.TimeoutExpired as e:
|
||||||
|
logger.info(
|
||||||
|
"ffprobe timed out while probing %s (transport=%s)",
|
||||||
|
clean_camera_user_pass(path),
|
||||||
|
rtsp_transport or "default",
|
||||||
|
)
|
||||||
|
return sp.CompletedProcess(
|
||||||
|
args=cmd,
|
||||||
|
returncode=1,
|
||||||
|
stdout=e.stdout or b"",
|
||||||
|
stderr=(e.stderr or b"") + b"\nffprobe timed out",
|
||||||
|
)
|
||||||
|
|
||||||
# Add format entries for detailed mode
|
result = run()
|
||||||
if detailed and format_entries:
|
|
||||||
ffprobe_cmd.extend(["-show_entries", f"format={format_entries}"])
|
|
||||||
|
|
||||||
ffprobe_cmd.extend(["-loglevel", "error", clean_path])
|
# 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")
|
||||||
|
|
||||||
return sp.run(ffprobe_cmd, capture_output=True)
|
return result
|
||||||
|
|
||||||
|
|
||||||
def vainfo_hwaccel(device_name: Optional[str] = None) -> sp.CompletedProcess:
|
def vainfo_hwaccel(device_name: Optional[str] = None) -> sp.CompletedProcess:
|
||||||
@ -824,11 +845,23 @@ async def get_video_properties(
|
|||||||
"-show_streams",
|
"-show_streams",
|
||||||
url,
|
url,
|
||||||
]
|
]
|
||||||
|
proc = None
|
||||||
try:
|
try:
|
||||||
proc = await asyncio.create_subprocess_exec(
|
proc = await asyncio.create_subprocess_exec(
|
||||||
*cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
|
*cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
|
||||||
)
|
)
|
||||||
stdout, _ = await proc.communicate()
|
try:
|
||||||
|
stdout, _ = await asyncio.wait_for(proc.communicate(), timeout=6)
|
||||||
|
except asyncio.TimeoutError:
|
||||||
|
logger.info(
|
||||||
|
"ffprobe timed out while probing %s (transport=%s)",
|
||||||
|
clean_camera_user_pass(url),
|
||||||
|
rtsp_transport or "default",
|
||||||
|
)
|
||||||
|
proc.kill()
|
||||||
|
await proc.wait()
|
||||||
|
return False, 0, 0, None, -1
|
||||||
|
|
||||||
if proc.returncode != 0:
|
if proc.returncode != 0:
|
||||||
return False, 0, 0, None, -1
|
return False, 0, 0, None, -1
|
||||||
|
|
||||||
|
|||||||
6
web/package-lock.json
generated
6
web/package-lock.json
generated
@ -9642,9 +9642,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/lodash-es": {
|
"node_modules/lodash-es": {
|
||||||
"version": "4.17.23",
|
"version": "4.18.1",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
|
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
|
||||||
"integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
|
"integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/lodash.merge": {
|
"node_modules/lodash.merge": {
|
||||||
|
|||||||
@ -415,7 +415,7 @@
|
|||||||
"audioCodecGood": "Audio codec is {{codec}}.",
|
"audioCodecGood": "Audio codec is {{codec}}.",
|
||||||
"resolutionHigh": "A resolution of {{resolution}} may cause increased resource usage.",
|
"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.",
|
"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. This will cause issues on startup. You should manually set the detect resolution in Settings or your config.",
|
"resolutionUnknown": "The resolution of this stream could not be probed. You should manually set the detect resolution in Settings or your config.",
|
||||||
"noAudioWarning": "No audio detected for this stream, recordings will not have audio.",
|
"noAudioWarning": "No audio detected for this stream, recordings will not have audio.",
|
||||||
"audioCodecRecordError": "The AAC audio codec is required to support audio in recordings.",
|
"audioCodecRecordError": "The AAC audio codec is required to support audio in recordings.",
|
||||||
"audioCodecRequired": "An audio stream is required to support audio detection.",
|
"audioCodecRequired": "An audio stream is required to support audio detection.",
|
||||||
|
|||||||
@ -17,6 +17,9 @@ import { useUserPersistence } from "@/hooks/use-user-persistence";
|
|||||||
import { Skeleton } from "../ui/skeleton";
|
import { Skeleton } from "../ui/skeleton";
|
||||||
import { Button } from "../ui/button";
|
import { Button } from "../ui/button";
|
||||||
import { FaCircleCheck } from "react-icons/fa6";
|
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 { cn } from "@/lib/utils";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { getTranslatedLabel } from "@/utils/i18n";
|
import { getTranslatedLabel } from "@/utils/i18n";
|
||||||
@ -127,6 +130,11 @@ export function AnimatedEventCard({
|
|||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const threatLevel = useMemo<ThreatLevel>(
|
||||||
|
() => (event.data.metadata?.potential_threat_level ?? 0) as ThreatLevel,
|
||||||
|
[event],
|
||||||
|
);
|
||||||
|
|
||||||
const aspectRatio = useMemo(() => {
|
const aspectRatio = useMemo(() => {
|
||||||
if (
|
if (
|
||||||
!config ||
|
!config ||
|
||||||
@ -152,7 +160,15 @@ export function AnimatedEventCard({
|
|||||||
<Tooltip>
|
<Tooltip>
|
||||||
<TooltipTrigger asChild>
|
<TooltipTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
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"
|
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",
|
||||||
|
)}
|
||||||
size="xs"
|
size="xs"
|
||||||
aria-label={t("markAsReviewed")}
|
aria-label={t("markAsReviewed")}
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
@ -160,7 +176,13 @@ export function AnimatedEventCard({
|
|||||||
updateEvents();
|
updateEvents();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<FaCircleCheck className="size-3 text-white" />
|
{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" />
|
||||||
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>{t("markAsReviewed")}</TooltipContent>
|
<TooltipContent>{t("markAsReviewed")}</TooltipContent>
|
||||||
|
|||||||
@ -389,7 +389,7 @@ export default function LiveCameraView({
|
|||||||
return "mse";
|
return "mse";
|
||||||
}, [lowBandwidth, mic, webRTC, isRestreamed]);
|
}, [lowBandwidth, mic, webRTC, isRestreamed]);
|
||||||
|
|
||||||
useKeyboardListener(["m"], (key, modifiers) => {
|
useKeyboardListener(["m", "Escape"], (key, modifiers) => {
|
||||||
if (!modifiers.down) {
|
if (!modifiers.down) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -407,6 +407,12 @@ export default function LiveCameraView({
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "Escape":
|
||||||
|
if (!fullscreen) {
|
||||||
|
navigate(-1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user