administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-12-06 13:34:13 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add GenAI info to detail stream (#20527)
Some checks are pending
CI / ARM Extra Build (push) Blocked by required conditions
Details
CI / Synaptics Build (push) Blocked by required conditions
Details
CI / AMD64 Build (push) Waiting to run
Details
CI / ARM Build (push) Waiting to run
Details
CI / Jetson Jetpack 6 (push) Waiting to run
Details
CI / AMD64 Extra Build (push) Blocked by required conditions
Details
CI / Assemble and push default build (push) Blocked by required conditions
Details

Browse Source 
* Add camera previews back

* Add genai info
This commit is contained in:
Nicolas Mowen 2025-10-16 07:55:10 -06:00 committed by GitHub
parent b52044aecc
commit 9599450cff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/src/components/timeline/DetailStream.tsx
View File

@ -1,4 +1,4 @@
import { useEffect, useRef, useState } from "react"; import { useEffect, useMemo, useRef, useState } from "react";
import { ObjectLifecycleSequence } from "@/types/timeline"; import { ObjectLifecycleSequence } from "@/types/timeline";
import { LifecycleIcon } from "@/components/overlay/detail/ObjectLifecycle"; import { LifecycleIcon } from "@/components/overlay/detail/ObjectLifecycle";
import { getLifecycleItemDescription } from "@/utils/lifecycleUtil"; import { getLifecycleItemDescription } from "@/utils/lifecycleUtil";
@ -256,9 +256,18 @@ function ReviewGroup({
} }
} }
const objectCount = fetchedEvents const reviewInfo = useMemo(() => {
? fetchedEvents.length if (review.data.metadata?.title) {
: (review.data.objects ?? []).length; return review.data.metadata.title;
} else {
const objectCount = fetchedEvents
? fetchedEvents.length
: (review.data.objects ?? []).length;
return `${objectCount} ${t("detail.trackedObject", { count: objectCount })}`;
}
}, [review, t, fetchedEvents]);
return ( return (
<div <div
data-review-id={id} data-review-id={id}
@ -278,9 +287,7 @@ function ReviewGroup({
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<div className="flex flex-col"> <div className="flex flex-col">
<div className="text-sm font-medium">{displayTime}</div> <div className="text-sm font-medium">{displayTime}</div>
<div className="text-xs text-muted-foreground"> <div className="text-xs text-muted-foreground">{reviewInfo}</div>
{objectCount} {t("detail.trackedObject", { count: objectCount })}
</div>
</div> </div>
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">

107
web/src/views/recording/RecordingView.tsx
View File

@ -774,62 +774,61 @@ export function RecordingView({
containerRef={mainLayoutRef} containerRef={mainLayoutRef}
/> />
</div> </div>
{isDesktop && {isDesktop && effectiveCameras.length > 1 && (
effectiveCameras.length > 1 && <div
timelineType !== "detail" && ( ref={previewRowRef}
<div className={cn(
ref={previewRowRef} "scrollbar-container flex gap-2 overflow-auto",
className={cn( mainCameraAspect == "tall"
"scrollbar-container flex gap-2 overflow-auto", ? "h-full w-72 flex-col"
mainCameraAspect == "tall" : `h-28 w-full`,
? "h-full w-72 flex-col" previewRowOverflows ? "" : "items-center justify-center",
: `h-28 w-full`, timelineType == "detail" && "mt-4",
previewRowOverflows ? "" : "items-center justify-center", )}
)} >
> <div className="w-2" />
<div className="w-2" /> {effectiveCameras.map((cam) => {
{effectiveCameras.map((cam) => { if (cam == mainCamera || cam == "birdseye") {
if (cam == mainCamera || cam == "birdseye") { return;
return; }
}
return ( return (
<Tooltip key={cam}> <Tooltip key={cam}>
<TooltipTrigger asChild> <TooltipTrigger asChild>
<div <div
className={ className={
mainCameraAspect == "tall" ? "w-full" : "h-full" mainCameraAspect == "tall" ? "w-full" : "h-full"
} }
style={{ style={{
aspectRatio: getCameraAspect(cam), aspectRatio: getCameraAspect(cam),
}}
>
<PreviewPlayer
previewRef={previewRef}
className="size-full"
camera={cam}
timeRange={currentTimeRange}
cameraPreviews={allPreviews ?? []}
startTime={startTime}
isScrubbing={scrubbing}
isVisible={visiblePreviews.includes(cam)}
onControllerReady={(controller) => {
previewRefs.current[cam] = controller;
controller.scrubToTimestamp(startTime);
}} }}
> onClick={() => onSelectCamera(cam)}
<PreviewPlayer />
previewRef={previewRef} </div>
className="size-full" </TooltipTrigger>
camera={cam} <TooltipContent className="smart-capitalize">
timeRange={currentTimeRange} <CameraNameLabel camera={cam} />
cameraPreviews={allPreviews ?? []} </TooltipContent>
startTime={startTime} </Tooltip>
isScrubbing={scrubbing} );
isVisible={visiblePreviews.includes(cam)} })}
onControllerReady={(controller) => { <div className="w-2" />
previewRefs.current[cam] = controller; </div>
controller.scrubToTimestamp(startTime); )}
}}
onClick={() => onSelectCamera(cam)}
/>
</div>
</TooltipTrigger>
<TooltipContent className="smart-capitalize">
<CameraNameLabel camera={cam} />
</TooltipContent>
</Tooltip>
);
})}
<div className="w-2" />
</div>
)}
</div> </div>
</div> </div>
<Timeline <Timeline