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

use single lookup for motion data (#10778)

Browse Source
This commit is contained in:
Josh Hawkins 2024-04-01 10:57:35 -05:00 committed by GitHub
parent 52f65a4dc4
commit 99878d9eee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/src/components/timeline/MotionReviewTimeline.tsx
View File

@ -90,9 +90,13 @@ export function MotionReviewTimeline({
const motionStart = segmentTime;
const motionEnd = motionStart + segmentDuration;
const firstHalfMotionValue = getMotionSegmentValue(motionStart);
const secondHalfMotionValue = getMotionSegmentValue(
motionStart + segmentDuration / 2,
);
const segmentMotion =
getMotionSegmentValue(motionStart) > 0 ||
getMotionSegmentValue(motionStart + segmentDuration / 2) > 0;
firstHalfMotionValue > 0 || secondHalfMotionValue > 0;
const overlappingReviewItems = events.some(
(item) =>
(item.start_time >= motionStart && item.start_time < motionEnd) ||
@ -110,7 +114,8 @@ export function MotionReviewTimeline({
<MotionSegment
key={segmentTime}
events={events}
motion_events={motion_events}
firstHalfMotionValue={firstHalfMotionValue}
secondHalfMotionValue={secondHalfMotionValue}
segmentDuration={segmentDuration}
segmentTime={segmentTime}
timestampSpread={timestampSpread}

39
web/src/components/timeline/MotionSegment.tsx
View File

@ -1,6 +1,6 @@
import { useTimelineUtils } from "@/hooks/use-timeline-utils";
import { useEventSegmentUtils } from "@/hooks/use-event-segment-utils";
import { MotionData, ReviewSegment } from "@/types/review";
import { ReviewSegment } from "@/types/review";
import React, { useCallback, useEffect, useMemo, useRef } from "react";
import scrollIntoView from "scroll-into-view-if-needed";
import { MinimapBounds, Tick, Timestamp } from "./segment-metadata";
@ -10,10 +10,11 @@ import useTapUtils from "@/hooks/use-tap-utils";
type MotionSegmentProps = {
events: ReviewSegment[];
motion_events: MotionData[];
segmentTime: number;
segmentDuration: number;
timestampSpread: number;
firstHalfMotionValue: number;
secondHalfMotionValue: number;
motionOnly: boolean;
showMinimap: boolean;
minimapStartTime?: number;
@ -24,10 +25,11 @@ type MotionSegmentProps = {
export function MotionSegment({
events,
motion_events,
segmentTime,
segmentDuration,
timestampSpread,
firstHalfMotionValue,
secondHalfMotionValue,
motionOnly,
showMinimap,
minimapStartTime,
@ -43,8 +45,10 @@ export function MotionSegment({
shouldShowRoundedCorners,
} = useEventSegmentUtils(segmentDuration, events, severityType);
const { getMotionSegmentValue, interpolateMotionAudioData } =
useMotionSegmentUtils(segmentDuration, motion_events);
const { interpolateMotionAudioData } = useMotionSegmentUtils(
segmentDuration,
[],
);
const { alignStartDateToTimeline, alignEndDateToTimeline } = useTimelineUtils(
{ segmentDuration },
@ -77,29 +81,12 @@ export function MotionSegment({
}, []);
const firstHalfSegmentWidth = useMemo(() => {
return interpolateMotionAudioData(
getMotionSegmentValue(segmentTime),
maxSegmentWidth,
);
}, [
segmentTime,
maxSegmentWidth,
getMotionSegmentValue,
interpolateMotionAudioData,
]);
return interpolateMotionAudioData(firstHalfMotionValue, maxSegmentWidth);
}, [maxSegmentWidth, firstHalfMotionValue, interpolateMotionAudioData]);
const secondHalfSegmentWidth = useMemo(() => {
return interpolateMotionAudioData(
getMotionSegmentValue(segmentTime + segmentDuration / 2),
maxSegmentWidth,
);
}, [
segmentTime,
segmentDuration,
maxSegmentWidth,
getMotionSegmentValue,
interpolateMotionAudioData,
]);
return interpolateMotionAudioData(secondHalfMotionValue, maxSegmentWidth);
}, [maxSegmentWidth, secondHalfMotionValue, interpolateMotionAudioData]);
const alignedMinimapStartTime = useMemo(
() => alignStartDateToTimeline(minimapStartTime ?? 0),