mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-10 13:15:25 +03:00
Split recording view for mobile and desktop and get desktop working
This commit is contained in:
parent
b4b2162ada
commit
68c0d06860
@ -406,7 +406,7 @@ export class DynamicVideoController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onPlayerTimeUpdate(listener: (timestamp: number) => void) {
|
onPlayerTimeUpdate(listener: ((timestamp: number) => void) | undefined) {
|
||||||
this.onPlaybackTimestamp = listener;
|
this.onPlaybackTimestamp = listener;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,9 +6,13 @@ import { FrigateConfig } from "@/types/frigateConfig";
|
|||||||
import { Preview } from "@/types/preview";
|
import { Preview } from "@/types/preview";
|
||||||
import { ReviewFilter, ReviewSegment, ReviewSeverity } from "@/types/review";
|
import { ReviewFilter, ReviewSegment, ReviewSeverity } from "@/types/review";
|
||||||
import EventView from "@/views/events/EventView";
|
import EventView from "@/views/events/EventView";
|
||||||
import RecordingView from "@/views/events/RecordingView";
|
import {
|
||||||
|
DesktopRecordingView,
|
||||||
|
MobileRecordingView,
|
||||||
|
} from "@/views/events/RecordingView";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { useCallback, useMemo, useState } from "react";
|
import { useCallback, useMemo, useState } from "react";
|
||||||
|
import { isMobile } from "react-device-detect";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import useSWRInfinite from "swr/infinite";
|
import useSWRInfinite from "swr/infinite";
|
||||||
|
|
||||||
@ -183,6 +187,10 @@ export default function Events() {
|
|||||||
// selected items
|
// selected items
|
||||||
|
|
||||||
const selectedData = useMemo(() => {
|
const selectedData = useMemo(() => {
|
||||||
|
if (!config) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
if (!selectedReviewId) {
|
if (!selectedReviewId) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
@ -191,6 +199,8 @@ export default function Events() {
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const allCameras = reviewFilter?.cameras ?? Object.keys(config.cameras);
|
||||||
|
|
||||||
const allReviews = reviewPages.flat();
|
const allReviews = reviewPages.flat();
|
||||||
const selectedReview = allReviews.find(
|
const selectedReview = allReviews.find(
|
||||||
(item) => item.id == selectedReviewId,
|
(item) => item.id == selectedReviewId,
|
||||||
@ -202,11 +212,9 @@ export default function Events() {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
selected: selectedReview,
|
selected: selectedReview,
|
||||||
cameraSegments: allReviews.filter(
|
allCameras: allCameras,
|
||||||
(seg) => seg.camera == selectedReview.camera,
|
cameraSegments: allReviews.filter((seg) =>
|
||||||
),
|
allCameras.includes(seg.camera),
|
||||||
cameraPreviews: allPreviews?.filter(
|
|
||||||
(seg) => seg.camera == selectedReview.camera,
|
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -219,11 +227,24 @@ export default function Events() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (selectedData) {
|
if (selectedData) {
|
||||||
|
if (isMobile) {
|
||||||
return (
|
return (
|
||||||
<RecordingView
|
<MobileRecordingView
|
||||||
reviewItems={selectedData.cameraSegments}
|
reviewItems={selectedData.cameraSegments}
|
||||||
selectedReview={selectedData.selected}
|
selectedReview={selectedData.selected}
|
||||||
relevantPreviews={selectedData.cameraPreviews}
|
relevantPreviews={allPreviews}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<DesktopRecordingView
|
||||||
|
startCamera={selectedData.selected.camera}
|
||||||
|
startTime={selectedData.selected.start_time}
|
||||||
|
allCameras={selectedData.allCameras}
|
||||||
|
severity={selectedData.selected.severity}
|
||||||
|
reviewItems={selectedData.cameraSegments}
|
||||||
|
allPreviews={allPreviews}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -4,22 +4,193 @@ import DynamicVideoPlayer, {
|
|||||||
import EventReviewTimeline from "@/components/timeline/EventReviewTimeline";
|
import EventReviewTimeline from "@/components/timeline/EventReviewTimeline";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Preview } from "@/types/preview";
|
import { Preview } from "@/types/preview";
|
||||||
import { ReviewSegment } from "@/types/review";
|
import { ReviewSegment, ReviewSeverity } from "@/types/review";
|
||||||
import { getChunkedTimeDay } from "@/utils/timelineUtil";
|
import { getChunkedTimeDay } from "@/utils/timelineUtil";
|
||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||||
import { IoMdArrowRoundBack } from "react-icons/io";
|
import { IoMdArrowRoundBack } from "react-icons/io";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
|
|
||||||
type RecordingViewProps = {
|
type DesktopRecordingViewProps = {
|
||||||
|
startCamera: string;
|
||||||
|
startTime: number;
|
||||||
|
severity: ReviewSeverity;
|
||||||
|
reviewItems: ReviewSegment[];
|
||||||
|
allCameras: string[];
|
||||||
|
allPreviews?: Preview[];
|
||||||
|
};
|
||||||
|
export function DesktopRecordingView({
|
||||||
|
startCamera,
|
||||||
|
startTime,
|
||||||
|
severity,
|
||||||
|
reviewItems,
|
||||||
|
allCameras,
|
||||||
|
allPreviews,
|
||||||
|
}: DesktopRecordingViewProps) {
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const contentRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
|
||||||
|
// controller state
|
||||||
|
|
||||||
|
const [playerReady, setPlayerReady] = useState(false);
|
||||||
|
const [mainCamera, setMainCamera] = useState(startCamera);
|
||||||
|
const videoPlayersRef = useRef<{ [camera: string]: DynamicVideoController }>(
|
||||||
|
{},
|
||||||
|
);
|
||||||
|
|
||||||
|
// timeline time
|
||||||
|
|
||||||
|
const timeRange = useMemo(() => getChunkedTimeDay(startTime), [startTime]);
|
||||||
|
const [selectedRangeIdx, setSelectedRangeIdx] = useState(
|
||||||
|
timeRange.ranges.findIndex((chunk) => {
|
||||||
|
return chunk.start <= startTime && chunk.end >= startTime;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
// move to next clip
|
||||||
|
useEffect(() => {
|
||||||
|
if (
|
||||||
|
!videoPlayersRef.current &&
|
||||||
|
Object.values(videoPlayersRef.current).length > 0
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const firstController = Object.values(videoPlayersRef.current)[0];
|
||||||
|
|
||||||
|
if (firstController) {
|
||||||
|
firstController.onClipChangedEvent((dir) => {
|
||||||
|
if (
|
||||||
|
dir == "forward" &&
|
||||||
|
selectedRangeIdx < timeRange.ranges.length - 1
|
||||||
|
) {
|
||||||
|
setSelectedRangeIdx(selectedRangeIdx + 1);
|
||||||
|
} else if (selectedRangeIdx > 0) {
|
||||||
|
setSelectedRangeIdx(selectedRangeIdx - 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [selectedRangeIdx, timeRange, videoPlayersRef, playerReady]);
|
||||||
|
|
||||||
|
// scrubbing and timeline state
|
||||||
|
|
||||||
|
const [scrubbing, setScrubbing] = useState(false);
|
||||||
|
const [currentTime, setCurrentTime] = useState<number>(startTime);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (scrubbing) {
|
||||||
|
Object.values(videoPlayersRef.current).forEach((controller) => {
|
||||||
|
controller.scrubToTimestamp(currentTime);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [currentTime, scrubbing]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!scrubbing) {
|
||||||
|
videoPlayersRef.current[mainCamera]?.seekToTimestamp(currentTime, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// we only want to seek when user stops scrubbing
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [scrubbing]);
|
||||||
|
|
||||||
|
const onSelectCamera = useCallback(
|
||||||
|
(newCam: string) => {
|
||||||
|
videoPlayersRef.current[mainCamera].onPlayerTimeUpdate(undefined);
|
||||||
|
videoPlayersRef.current[mainCamera].scrubToTimestamp(currentTime);
|
||||||
|
videoPlayersRef.current[newCam].seekToTimestamp(currentTime, true);
|
||||||
|
setMainCamera(newCam);
|
||||||
|
},
|
||||||
|
[currentTime, mainCamera],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div ref={contentRef} className="relative size-full">
|
||||||
|
<Button
|
||||||
|
className="absolute top-0 left-0 rounded-lg"
|
||||||
|
onClick={() => navigate(-1)}
|
||||||
|
>
|
||||||
|
<IoMdArrowRoundBack className="size-5 mr-[10px]" />
|
||||||
|
Back
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div className="absolute h-32 left-2 right-28 bottom-4 flex justify-center gap-1">
|
||||||
|
{allCameras.map((cam) => {
|
||||||
|
if (cam == mainCamera) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={cam}
|
||||||
|
className="fixed left-96 right-96 top-[40%] -translate-y-[50%]"
|
||||||
|
>
|
||||||
|
<DynamicVideoPlayer
|
||||||
|
camera={cam}
|
||||||
|
timeRange={timeRange.ranges[selectedRangeIdx]}
|
||||||
|
cameraPreviews={allPreviews ?? []}
|
||||||
|
onControllerReady={(controller) => {
|
||||||
|
videoPlayersRef.current[cam] = controller;
|
||||||
|
setPlayerReady(true);
|
||||||
|
controller.onPlayerTimeUpdate((timestamp: number) => {
|
||||||
|
setCurrentTime(timestamp);
|
||||||
|
});
|
||||||
|
|
||||||
|
controller.seekToTimestamp(startTime, true);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={cam}
|
||||||
|
className="aspect-video flex items-center"
|
||||||
|
onClick={() => onSelectCamera(cam)}
|
||||||
|
>
|
||||||
|
<DynamicVideoPlayer
|
||||||
|
className="size-full"
|
||||||
|
camera={cam}
|
||||||
|
timeRange={timeRange.ranges[selectedRangeIdx]}
|
||||||
|
cameraPreviews={allPreviews ?? []}
|
||||||
|
previewOnly
|
||||||
|
onControllerReady={(controller) => {
|
||||||
|
videoPlayersRef.current[cam] = controller;
|
||||||
|
setPlayerReady(true);
|
||||||
|
controller.scrubToTimestamp(startTime);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="absolute overflow-hidden w-56 inset-y-0 right-0">
|
||||||
|
<EventReviewTimeline
|
||||||
|
segmentDuration={30}
|
||||||
|
timestampSpread={15}
|
||||||
|
timelineStart={timeRange.end}
|
||||||
|
timelineEnd={timeRange.start}
|
||||||
|
showHandlebar
|
||||||
|
handlebarTime={currentTime}
|
||||||
|
setHandlebarTime={setCurrentTime}
|
||||||
|
events={reviewItems}
|
||||||
|
severityType={severity}
|
||||||
|
contentRef={contentRef}
|
||||||
|
onHandlebarDraggingChange={(scrubbing) => setScrubbing(scrubbing)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
type MobileRecordingViewProps = {
|
||||||
selectedReview: ReviewSegment;
|
selectedReview: ReviewSegment;
|
||||||
reviewItems: ReviewSegment[];
|
reviewItems: ReviewSegment[];
|
||||||
relevantPreviews?: Preview[];
|
relevantPreviews?: Preview[];
|
||||||
};
|
};
|
||||||
export default function RecordingView({
|
export function MobileRecordingView({
|
||||||
selectedReview,
|
selectedReview,
|
||||||
reviewItems,
|
reviewItems,
|
||||||
relevantPreviews,
|
relevantPreviews,
|
||||||
}: RecordingViewProps) {
|
}: MobileRecordingViewProps) {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const contentRef = useRef<HTMLDivElement | null>(null);
|
const contentRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
|
||||||
@ -82,15 +253,12 @@ export default function RecordingView({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div ref={contentRef} className="flex flex-col relative w-full h-full">
|
<div ref={contentRef} className="flex flex-col relative w-full h-full">
|
||||||
<Button
|
<Button className="rounded-lg" onClick={() => navigate(-1)}>
|
||||||
className="md:absolute md:top-0 md:left-0 rounded-lg"
|
|
||||||
onClick={() => navigate(-1)}
|
|
||||||
>
|
|
||||||
<IoMdArrowRoundBack className="size-5 mr-[10px]" />
|
<IoMdArrowRoundBack className="size-5 mr-[10px]" />
|
||||||
Back
|
Back
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<div className="md:absolute md:top-8 md:inset-x-[20%]">
|
<div>
|
||||||
<DynamicVideoPlayer
|
<DynamicVideoPlayer
|
||||||
camera={selectedReview.camera}
|
camera={selectedReview.camera}
|
||||||
timeRange={timeRange.ranges[selectedRangeIdx]}
|
timeRange={timeRange.ranges[selectedRangeIdx]}
|
||||||
@ -110,7 +278,7 @@ export default function RecordingView({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex-grow overflow-hidden md:absolute md:w-[100px] md:inset-y-0 md:right-0">
|
<div className="flex-grow overflow-hidden">
|
||||||
<EventReviewTimeline
|
<EventReviewTimeline
|
||||||
segmentDuration={30}
|
segmentDuration={30}
|
||||||
timestampSpread={15}
|
timestampSpread={15}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user