Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix delayed preview not showing (#13295)

Browse Source
This commit is contained in:
Nicolas Mowen 2024-08-23 08:51:59 -06:00
parent 1529ee59fe
commit f8fd746678
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/components/player/PreviewPlayer.tsx
View File

@ -16,7 +16,10 @@ import { isAndroid, isChrome, isMobile } from "react-device-detect";
import { TimeRange } from "@/types/timeline"; import { TimeRange } from "@/types/timeline";
import { Skeleton } from "../ui/skeleton"; import { Skeleton } from "../ui/skeleton";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { usePreviewForTimeRange } from "@/hooks/use-camera-previews"; import {
getPreviewForTimeRange,
usePreviewForTimeRange,
} from "@/hooks/use-camera-previews";
type PreviewPlayerProps = { type PreviewPlayerProps = {
className?: string; className?: string;
@ -243,12 +246,7 @@ function PreviewVideoPlayer({
return; return;
} }
const preview = cameraPreviews.find( const preview = getPreviewForTimeRange(cameraPreviews, camera, timeRange);
(preview) =>
preview.camera == camera &&
Math.round(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before,
);
if (preview != currentPreview) { if (preview != currentPreview) {
controller.newPreviewLoaded = false; controller.newPreviewLoaded = false;

25
web/src/hooks/use-camera-previews.ts
View File

@ -38,17 +38,26 @@ export function useCameraPreviews(
// it is not falsely thrown out. // it is not falsely thrown out.
const PREVIEW_END_BUFFER = 5; // seconds const PREVIEW_END_BUFFER = 5; // seconds
export function getPreviewForTimeRange(
allPreviews: Preview[],
camera: string,
timeRange: TimeRange,
) {
return allPreviews.find(
(preview) =>
preview.camera == camera &&
Math.ceil(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before + PREVIEW_END_BUFFER,
);
}
export function usePreviewForTimeRange( export function usePreviewForTimeRange(
allPreviews: Preview[], allPreviews: Preview[],
camera: string, camera: string,
timeRange: TimeRange, timeRange: TimeRange,
) { ) {
return useMemo(() => { return useMemo(
return allPreviews.find( () => getPreviewForTimeRange(allPreviews, camera, timeRange),
(preview) => [allPreviews, camera, timeRange],
preview.camera == camera && );
Math.ceil(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before + PREVIEW_END_BUFFER,
);
}, [allPreviews, camera, timeRange]);
} }