Skip to content

Commit

Permalink
Preview fixes (#13193)
Browse files Browse the repository at this point in the history
* Handle case where preview was saved late

* fix timing
  • Loading branch information
NickM-27 committed Aug 19, 2024
1 parent 8e31244 commit 38a8d34
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 11 deletions.
15 changes: 6 additions & 9 deletions web/src/components/player/PreviewPlayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { isAndroid, isChrome, isMobile } from "react-device-detect";
import { TimeRange } from "@/types/timeline";
import { Skeleton } from "../ui/skeleton";
import { cn } from "@/lib/utils";
import { usePreviewForTimeRange } from "@/hooks/use-camera-previews";

type PreviewPlayerProps = {
className?: string;
Expand All @@ -39,15 +40,11 @@ export default function PreviewPlayer({
onClick,
}: PreviewPlayerProps) {
const [currentHourFrame, setCurrentHourFrame] = useState<string>();

const currentPreview = useMemo(() => {
return cameraPreviews.find(
(preview) =>
preview.camera == camera &&
Math.round(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before,
);
}, [cameraPreviews, camera, timeRange]);
const currentPreview = usePreviewForTimeRange(
cameraPreviews,
camera,
timeRange,
);

if (currentPreview) {
return (
Expand Down
24 changes: 22 additions & 2 deletions web/src/hooks/use-camera-previews.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { Preview } from "@/types/preview";
import { TimeRange } from "@/types/timeline";
import { useEffect, useState } from "react";
import { useEffect, useMemo, useState } from "react";
import useSWR from "swr";

type OptionalCameraPreviewProps = {
camera?: string;
autoRefresh?: boolean;
fetchPreviews?: boolean;
};

export function useCameraPreviews(
initialTimeRange: TimeRange,
{
Expand All @@ -32,3 +31,24 @@ export function useCameraPreviews(

return allPreviews;
}

// we need to add a buffer of 5 seconds to the end preview times
// this ensures that if preview generation is running slowly
// and the previews are generated 1-5 seconds late
// it is not falsely thrown out.
const PREVIEW_END_BUFFER = 5; // seconds

export function usePreviewForTimeRange(
allPreviews: Preview[],
camera: string,
timeRange: TimeRange,
) {
return useMemo(() => {
return allPreviews.find(
(preview) =>
preview.camera == camera &&
Math.ceil(preview.start) >= timeRange.after &&
Math.floor(preview.end) <= timeRange.before + PREVIEW_END_BUFFER,
);
}, [allPreviews, camera, timeRange]);
}

0 comments on commit 38a8d34

Please sign in to comment.