mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-09 04:35:25 +03:00
Chunk recording times and run playback
This commit is contained in:
parent
341922aaf4
commit
d8b08ff5d5
@ -6,13 +6,14 @@ import MobileEventView from "@/views/events/MobileEventView";
|
|||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||||
import { isMobile } from "react-device-detect";
|
import { isMobile } from "react-device-detect";
|
||||||
|
import useSWR from "swr";
|
||||||
import useSWRInfinite from "swr/infinite";
|
import useSWRInfinite from "swr/infinite";
|
||||||
|
|
||||||
const API_LIMIT = 250;
|
const API_LIMIT = 250;
|
||||||
|
|
||||||
export default function Events() {
|
export default function Events() {
|
||||||
// recordings viewer
|
// recordings viewer
|
||||||
const [selectedReview, setSelectedReview] = useOverlayState("review");
|
const [selectedReviewId, setSelectedReviewId] = useOverlayState("review");
|
||||||
|
|
||||||
// review paging
|
// review paging
|
||||||
|
|
||||||
@ -66,6 +67,34 @@ export default function Events() {
|
|||||||
[reviewPages]
|
[reviewPages]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// preview videos
|
||||||
|
|
||||||
|
const previewTimes = useMemo(() => {
|
||||||
|
if (
|
||||||
|
!reviewPages ||
|
||||||
|
reviewPages.length == 0 ||
|
||||||
|
reviewPages.at(-1)!!.length == 0
|
||||||
|
) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const startDate = new Date();
|
||||||
|
startDate.setMinutes(0, 0, 0);
|
||||||
|
|
||||||
|
const endDate = new Date(reviewPages.at(-1)!!.at(-1)!!.end_time);
|
||||||
|
endDate.setHours(0, 0, 0, 0);
|
||||||
|
return {
|
||||||
|
start: startDate.getTime() / 1000,
|
||||||
|
end: endDate.getTime() / 1000,
|
||||||
|
};
|
||||||
|
}, [reviewPages]);
|
||||||
|
const { data: allPreviews } = useSWR<Preview[]>(
|
||||||
|
previewTimes
|
||||||
|
? `preview/all/start/${previewTimes.start}/end/${previewTimes.end}`
|
||||||
|
: null,
|
||||||
|
{ revalidateOnFocus: false }
|
||||||
|
);
|
||||||
|
|
||||||
// review status
|
// review status
|
||||||
|
|
||||||
const markItemAsReviewed = useCallback(
|
const markItemAsReviewed = useCallback(
|
||||||
@ -104,8 +133,42 @@ export default function Events() {
|
|||||||
[updateSegments]
|
[updateSegments]
|
||||||
);
|
);
|
||||||
|
|
||||||
if (selectedReview) {
|
// selected items
|
||||||
return <DesktopRecordingView />;
|
|
||||||
|
const selectedReviews = useMemo(() => {
|
||||||
|
if (!selectedReviewId) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!reviewPages) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const allReviews = reviewPages.flat();
|
||||||
|
const selectedReview = allReviews.find(
|
||||||
|
(item) => item.id == selectedReviewId
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!selectedReview) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
selected: selectedReview,
|
||||||
|
cameraReviews: allReviews.filter(
|
||||||
|
(seg) => seg.camera == selectedReview?.camera
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}, [selectedReviewId, reviewPages]);
|
||||||
|
|
||||||
|
if (selectedReviews) {
|
||||||
|
return (
|
||||||
|
<DesktopRecordingView
|
||||||
|
reviewItems={selectedReviews.cameraReviews}
|
||||||
|
selectedReview={selectedReviews.selected}
|
||||||
|
relevantPreviews={allPreviews}
|
||||||
|
/>
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
if (isMobile) {
|
if (isMobile) {
|
||||||
return (
|
return (
|
||||||
@ -122,12 +185,13 @@ export default function Events() {
|
|||||||
return (
|
return (
|
||||||
<DesktopEventView
|
<DesktopEventView
|
||||||
reviewPages={reviewPages}
|
reviewPages={reviewPages}
|
||||||
|
relevantPreviews={allPreviews}
|
||||||
timeRange={[Date.now() / 1000, after]}
|
timeRange={[Date.now() / 1000, after]}
|
||||||
reachedEnd={isDone}
|
reachedEnd={isDone}
|
||||||
isValidating={isValidating}
|
isValidating={isValidating}
|
||||||
loadNextPage={() => setSize(size + 1)}
|
loadNextPage={() => setSize(size + 1)}
|
||||||
markItemAsReviewed={markItemAsReviewed}
|
markItemAsReviewed={markItemAsReviewed}
|
||||||
onSelectReview={setSelectedReview}
|
onSelectReview={setSelectedReviewId}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,6 +20,7 @@ import {
|
|||||||
MdOutlinePictureInPictureAlt,
|
MdOutlinePictureInPictureAlt,
|
||||||
} from "react-icons/md";
|
} from "react-icons/md";
|
||||||
import { FaBicycle } from "react-icons/fa";
|
import { FaBicycle } from "react-icons/fa";
|
||||||
|
import { endOfHourOrCurrentTime } from "./dateUtil";
|
||||||
|
|
||||||
export function getTimelineIcon(timelineItem: Timeline) {
|
export function getTimelineIcon(timelineItem: Timeline) {
|
||||||
switch (timelineItem.class_type) {
|
switch (timelineItem.class_type) {
|
||||||
@ -118,3 +119,31 @@ export function getTimelineItemDescription(timelineItem: Timeline) {
|
|||||||
return `${label} detected`;
|
return `${label} detected`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getChunkedTimeRange(timestamp: number) {
|
||||||
|
const endOfThisHour = new Date();
|
||||||
|
endOfThisHour.setHours(endOfThisHour.getHours() + 1, 0, 0, 0);
|
||||||
|
const data: { start: number; end: number }[] = [];
|
||||||
|
const startDay = new Date(timestamp * 1000);
|
||||||
|
startDay.setHours(0, 0, 0, 0);
|
||||||
|
const startTimestamp = startDay.getTime() / 1000;
|
||||||
|
let start = startDay.getTime() / 1000;
|
||||||
|
let end = 0;
|
||||||
|
|
||||||
|
for (let i = 0; i < 24; i++) {
|
||||||
|
startDay.setHours(startDay.getHours() + 1);
|
||||||
|
|
||||||
|
if (startDay > endOfThisHour) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
end = endOfHourOrCurrentTime(startDay.getTime() / 1000);
|
||||||
|
data.push({
|
||||||
|
start,
|
||||||
|
end,
|
||||||
|
});
|
||||||
|
start = startDay.getTime() / 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { start: startTimestamp, end, ranges: data };
|
||||||
|
}
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import useSWR from "swr";
|
|||||||
|
|
||||||
type DesktopEventViewProps = {
|
type DesktopEventViewProps = {
|
||||||
reviewPages?: ReviewSegment[][];
|
reviewPages?: ReviewSegment[][];
|
||||||
|
relevantPreviews?: Preview[];
|
||||||
timeRange: [number, number];
|
timeRange: [number, number];
|
||||||
reachedEnd: boolean;
|
reachedEnd: boolean;
|
||||||
isValidating: boolean;
|
isValidating: boolean;
|
||||||
@ -28,6 +29,7 @@ type DesktopEventViewProps = {
|
|||||||
};
|
};
|
||||||
export default function DesktopEventView({
|
export default function DesktopEventView({
|
||||||
reviewPages,
|
reviewPages,
|
||||||
|
relevantPreviews,
|
||||||
timeRange,
|
timeRange,
|
||||||
reachedEnd,
|
reachedEnd,
|
||||||
isValidating,
|
isValidating,
|
||||||
@ -166,34 +168,6 @@ export default function DesktopEventView({
|
|||||||
return data;
|
return data;
|
||||||
}, [minimap]);
|
}, [minimap]);
|
||||||
|
|
||||||
// preview videos
|
|
||||||
|
|
||||||
const previewTimes = useMemo(() => {
|
|
||||||
if (
|
|
||||||
!reviewPages ||
|
|
||||||
reviewPages.length == 0 ||
|
|
||||||
reviewPages.at(-1)!!.length == 0
|
|
||||||
) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
const startDate = new Date();
|
|
||||||
startDate.setMinutes(0, 0, 0);
|
|
||||||
|
|
||||||
const endDate = new Date(reviewPages.at(-1)!!.at(-1)!!.end_time);
|
|
||||||
endDate.setHours(0, 0, 0, 0);
|
|
||||||
return {
|
|
||||||
start: startDate.getTime() / 1000,
|
|
||||||
end: endDate.getTime() / 1000,
|
|
||||||
};
|
|
||||||
}, [reviewPages]);
|
|
||||||
const { data: allPreviews } = useSWR<Preview[]>(
|
|
||||||
previewTimes
|
|
||||||
? `preview/all/start/${previewTimes.start}/end/${previewTimes.end}`
|
|
||||||
: null,
|
|
||||||
{ revalidateOnFocus: false }
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!config) {
|
if (!config) {
|
||||||
return <ActivityIndicator />;
|
return <ActivityIndicator />;
|
||||||
}
|
}
|
||||||
@ -258,7 +232,7 @@ export default function DesktopEventView({
|
|||||||
{currentItems ? (
|
{currentItems ? (
|
||||||
currentItems.map((value, segIdx) => {
|
currentItems.map((value, segIdx) => {
|
||||||
const lastRow = segIdx == reviewItems[severity].length - 1;
|
const lastRow = segIdx == reviewItems[severity].length - 1;
|
||||||
const relevantPreview = Object.values(allPreviews || []).find(
|
const relevantPreview = Object.values(relevantPreviews || []).find(
|
||||||
(preview) =>
|
(preview) =>
|
||||||
preview.camera == value.camera &&
|
preview.camera == value.camera &&
|
||||||
preview.start < value.start_time &&
|
preview.start < value.start_time &&
|
||||||
|
|||||||
@ -1,7 +1,89 @@
|
|||||||
|
import DynamicVideoPlayer, {
|
||||||
|
DynamicVideoController,
|
||||||
|
} from "@/components/player/DynamicVideoPlayer";
|
||||||
|
import EventReviewTimeline from "@/components/timeline/EventReviewTimeline";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { ReviewSegment } from "@/types/review";
|
||||||
|
import { getChunkedTimeRange } from "@/utils/timelineUtil";
|
||||||
|
import { useMemo, useRef, useState } from "react";
|
||||||
|
import { IoMdArrowRoundBack } from "react-icons/io";
|
||||||
|
import { useNavigate } from "react-router-dom";
|
||||||
|
|
||||||
|
type DesktopRecordingViewProps = {
|
||||||
|
selectedReview: ReviewSegment;
|
||||||
|
reviewItems: ReviewSegment[];
|
||||||
|
relevantPreviews?: Preview[];
|
||||||
|
};
|
||||||
|
export default function DesktopRecordingView({
|
||||||
|
selectedReview,
|
||||||
|
reviewItems,
|
||||||
|
relevantPreviews,
|
||||||
|
}: DesktopRecordingViewProps) {
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const controllerRef = useRef<DynamicVideoController | undefined>(undefined);
|
||||||
|
const contentRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
|
||||||
export default function DesktopRecordingView ({ }) {
|
// timeline time
|
||||||
|
const timeRange = useMemo(
|
||||||
|
() => getChunkedTimeRange(selectedReview.start_time),
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
const [selectedRangeIdx, setSelectedRangeIdx] = useState(
|
||||||
|
timeRange.ranges.findIndex((chunk) => {
|
||||||
return (
|
return (
|
||||||
<div>Hey this is pretty cool</div>
|
chunk.start <= selectedReview.start_time &&
|
||||||
)
|
chunk.end >= selectedReview.start_time
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const [currentTime, setCurrentTime] = useState<number>(
|
||||||
|
selectedReview?.start_time || Date.now() / 1000
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div ref={contentRef} className="relative w-full h-full">
|
||||||
|
<Button
|
||||||
|
className="absolute left-0 top-0 rounded-lg"
|
||||||
|
onClick={() => navigate(-1)}
|
||||||
|
>
|
||||||
|
<IoMdArrowRoundBack className="w-5 h-5 mr-[10px]" />
|
||||||
|
Back
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div className="absolute left-[20%] top-8 right-[20%]">
|
||||||
|
<DynamicVideoPlayer
|
||||||
|
camera={selectedReview.camera}
|
||||||
|
timeRange={timeRange.ranges[selectedRangeIdx]}
|
||||||
|
cameraPreviews={relevantPreviews || []}
|
||||||
|
onControllerReady={(controller) => {
|
||||||
|
controllerRef.current = controller;
|
||||||
|
controllerRef.current.onPlayerTimeUpdate((timestamp: number) => {
|
||||||
|
setCurrentTime(timestamp);
|
||||||
|
});
|
||||||
|
|
||||||
|
controllerRef.current?.seekToTimestamp(
|
||||||
|
selectedReview.start_time,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="absolute top-0 right-0 bottom-0">
|
||||||
|
<EventReviewTimeline
|
||||||
|
segmentDuration={60}
|
||||||
|
timestampSpread={15}
|
||||||
|
timelineStart={timeRange.end}
|
||||||
|
timelineEnd={timeRange.start}
|
||||||
|
showHandlebar
|
||||||
|
handlebarTime={currentTime}
|
||||||
|
setHandlebarTime={setCurrentTime}
|
||||||
|
events={reviewItems}
|
||||||
|
severityType={selectedReview.severity}
|
||||||
|
contentRef={contentRef}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user