mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Fix safari preview speed and other cleanup (#9976)
* Cleanups and fix safari preview speed on iOS * Clarifying comment * Update paging when loading page with no items * Use chip for detections and show all the time * make time ago dense * Be smarter about paging empty * Fix elevation
This commit is contained in:
parent
6626b8d758
commit
746939ed4f
@ -65,7 +65,7 @@ export default function Statusbar({}) {
|
|||||||
const gpu = parseInt(stats.gpu);
|
const gpu = parseInt(stats.gpu);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center text-sm">
|
<div key={gpuTitle} className="flex items-center text-sm">
|
||||||
<MdCircle
|
<MdCircle
|
||||||
className={`w-2 h-2 mr-2 ${
|
className={`w-2 h-2 mr-2 ${
|
||||||
gpu < 50
|
gpu < 50
|
||||||
|
@ -16,6 +16,7 @@ import TimeAgo from "../dynamic/TimeAgo";
|
|||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import { FrigateConfig } from "@/types/frigateConfig";
|
import { FrigateConfig } from "@/types/frigateConfig";
|
||||||
import { isMobile, isSafari } from "react-device-detect";
|
import { isMobile, isSafari } from "react-device-detect";
|
||||||
|
import Chip from "../Chip";
|
||||||
|
|
||||||
type PreviewPlayerProps = {
|
type PreviewPlayerProps = {
|
||||||
review: ReviewSegment;
|
review: ReviewSegment;
|
||||||
@ -121,26 +122,26 @@ export default function PreviewThumbnailPlayer({
|
|||||||
) : (
|
) : (
|
||||||
<img
|
<img
|
||||||
className="h-full w-full"
|
className="h-full w-full"
|
||||||
|
loading="lazy"
|
||||||
src={`${apiHost}${review.thumb_path.replace("/media/frigate/", "")}`}
|
src={`${apiHost}${review.thumb_path.replace("/media/frigate/", "")}`}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{!playingBack &&
|
{(review.severity == "alert" || review.severity == "detection") && (
|
||||||
(review.severity == "alert" || review.severity == "detection") && (
|
<Chip className="absolute top-2 left-2 flex gap-1 bg-gradient-to-br from-gray-400 to-gray-500 bg-gray-500 z-0">
|
||||||
<div className="absolute top-1 left-[6px] flex gap-1">
|
{review.data.objects.map((object) => {
|
||||||
{review.data.objects.map((object) => {
|
return getIconForLabel(object, "w-3 h-3 text-white");
|
||||||
return getIconForLabel(object, "w-3 h-3 text-white");
|
})}
|
||||||
})}
|
{review.data.audio.map((audio) => {
|
||||||
{review.data.audio.map((audio) => {
|
return getIconForLabel(audio, "w-3 h-3 text-white");
|
||||||
return getIconForLabel(audio, "w-3 h-3 text-white");
|
})}
|
||||||
})}
|
{review.data.sub_labels?.map((sub) => {
|
||||||
{review.data.sub_labels?.map((sub) => {
|
return getIconForSubLabel(sub, "w-3 h-3 text-white");
|
||||||
return getIconForSubLabel(sub, "w-3 h-3 text-white");
|
})}
|
||||||
})}
|
</Chip>
|
||||||
</div>
|
)}
|
||||||
)}
|
|
||||||
{!playingBack && (
|
{!playingBack && (
|
||||||
<div className="absolute left-[6px] right-[6px] bottom-1 flex justify-between text-white">
|
<div className="absolute left-[6px] right-[6px] bottom-1 flex justify-between text-white">
|
||||||
<TimeAgo time={review.start_time * 1000} />
|
<TimeAgo time={review.start_time * 1000} dense />
|
||||||
{config &&
|
{config &&
|
||||||
formatUnixTimestampToDateTime(review.start_time, {
|
formatUnixTimestampToDateTime(review.start_time, {
|
||||||
strftime_fmt:
|
strftime_fmt:
|
||||||
@ -184,6 +185,26 @@ function PreviewContent({
|
|||||||
setProgress,
|
setProgress,
|
||||||
setReviewed,
|
setReviewed,
|
||||||
}: PreviewContentProps) {
|
}: PreviewContentProps) {
|
||||||
|
// manual playback
|
||||||
|
// safari is incapable of playing at a speed > 2x
|
||||||
|
// so manual seeking is required on iOS
|
||||||
|
|
||||||
|
const [manualPlayback, setManualPlayback] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!manualPlayback || !playerRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const intervalId: NodeJS.Timeout = setInterval(() => {
|
||||||
|
if (playerRef.current) {
|
||||||
|
playerRef.current.currentTime(playerRef.current.currentTime()!! + 1);
|
||||||
|
}
|
||||||
|
}, 125);
|
||||||
|
return () => clearInterval(intervalId);
|
||||||
|
}, [manualPlayback, playerRef]);
|
||||||
|
|
||||||
|
// preview
|
||||||
|
|
||||||
if (relevantPreview && playback) {
|
if (relevantPreview && playback) {
|
||||||
return (
|
return (
|
||||||
<VideoPlayer
|
<VideoPlayer
|
||||||
@ -218,10 +239,16 @@ function PreviewContent({
|
|||||||
review.start_time - relevantPreview.start - 8
|
review.start_time - relevantPreview.start - 8
|
||||||
);
|
);
|
||||||
|
|
||||||
player.playbackRate(isSafari ? 2 : 8);
|
if (isSafari) {
|
||||||
|
player.pause();
|
||||||
|
setManualPlayback(true);
|
||||||
|
} else {
|
||||||
|
player.playbackRate(8);
|
||||||
|
}
|
||||||
|
|
||||||
player.currentTime(playerStartTime);
|
player.currentTime(playerStartTime);
|
||||||
player.on("timeupdate", () => {
|
player.on("timeupdate", () => {
|
||||||
if (!setProgress || playerRef.current?.paused()) {
|
if (!setProgress) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -242,6 +269,7 @@ function PreviewContent({
|
|||||||
|
|
||||||
if (playerPercent > 100) {
|
if (playerPercent > 100) {
|
||||||
playerRef.current?.pause();
|
playerRef.current?.pause();
|
||||||
|
setManualPlayback(false);
|
||||||
setProgress(100.0);
|
setProgress(100.0);
|
||||||
} else {
|
} else {
|
||||||
setProgress(playerPercent);
|
setProgress(playerPercent);
|
||||||
|
@ -116,6 +116,16 @@ export default function DesktopEventView() {
|
|||||||
[reviewPages]
|
[reviewPages]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const currentItems = useMemo(() => {
|
||||||
|
const current = reviewItems[severity];
|
||||||
|
|
||||||
|
if (!current || current.length == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return current;
|
||||||
|
}, [reviewItems, severity]);
|
||||||
|
|
||||||
// review interaction
|
// review interaction
|
||||||
|
|
||||||
const pagingObserver = useRef<IntersectionObserver | null>();
|
const pagingObserver = useRef<IntersectionObserver | null>();
|
||||||
@ -244,8 +254,6 @@ export default function DesktopEventView() {
|
|||||||
return <ActivityIndicator />;
|
return <ActivityIndicator />;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("end of the timeline is " + after + " vs " + (Math.floor(Date.now() / 1000) + 2 * 60 * 60))
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="relative w-full h-full">
|
<div className="relative w-full h-full">
|
||||||
<div className="absolute flex justify-between left-0 top-0 right-0">
|
<div className="absolute flex justify-between left-0 top-0 right-0">
|
||||||
@ -303,68 +311,57 @@ export default function DesktopEventView() {
|
|||||||
ref={contentRef}
|
ref={contentRef}
|
||||||
className="absolute left-0 top-12 bottom-0 right-28 flex flex-wrap content-start gap-2 overflow-y-auto no-scrollbar"
|
className="absolute left-0 top-12 bottom-0 right-28 flex flex-wrap content-start gap-2 overflow-y-auto no-scrollbar"
|
||||||
>
|
>
|
||||||
{reviewItems[severity]?.map((value, segIdx) => {
|
{currentItems ? (
|
||||||
const lastRow = segIdx == reviewItems[severity].length - 1;
|
currentItems.map((value, segIdx) => {
|
||||||
const relevantPreview = Object.values(allPreviews || []).find(
|
const lastRow = segIdx == reviewItems[severity].length - 1;
|
||||||
(preview) =>
|
const relevantPreview = Object.values(allPreviews || []).find(
|
||||||
preview.camera == value.camera &&
|
(preview) =>
|
||||||
preview.start < value.start_time &&
|
preview.camera == value.camera &&
|
||||||
preview.end > value.end_time
|
preview.start < value.start_time &&
|
||||||
);
|
preview.end > value.end_time
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={value.id}
|
key={value.id}
|
||||||
ref={lastRow ? lastReviewRef : minimapRef}
|
ref={lastRow ? lastReviewRef : minimapRef}
|
||||||
data-start={value.start_time}
|
data-start={value.start_time}
|
||||||
>
|
>
|
||||||
<div className="h-[234px] aspect-video rounded-lg overflow-hidden">
|
<div className="h-[234px] aspect-video rounded-lg overflow-hidden">
|
||||||
<PreviewThumbnailPlayer
|
<PreviewThumbnailPlayer
|
||||||
review={value}
|
review={value}
|
||||||
relevantPreview={relevantPreview}
|
relevantPreview={relevantPreview}
|
||||||
setReviewed={() => setReviewed(value.id)}
|
setReviewed={() => setReviewed(value.id)}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
{lastRow && !isDone && <ActivityIndicator />}
|
||||||
</div>
|
</div>
|
||||||
{lastRow && !isDone && <ActivityIndicator />}
|
);
|
||||||
</div>
|
})
|
||||||
);
|
) : (
|
||||||
})}
|
<div ref={lastReviewRef} />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="absolute top-12 right-0 bottom-0">
|
<div className="absolute top-12 right-0 bottom-0">
|
||||||
{after != 0 && (<EventReviewTimeline
|
{after != 0 && (
|
||||||
segmentDuration={60}
|
<EventReviewTimeline
|
||||||
timestampSpread={15}
|
segmentDuration={60}
|
||||||
timelineStart={Math.floor(Date.now() / 1000)} // start of the timeline - all times are numeric, not Date objects
|
timestampSpread={15}
|
||||||
timelineEnd={after} // end of timeline - timestamp
|
timelineStart={Math.floor(Date.now() / 1000)}
|
||||||
showMinimap
|
timelineEnd={after}
|
||||||
minimapStartTime={minimapBounds.start}
|
showMinimap
|
||||||
minimapEndTime={minimapBounds.end}
|
minimapStartTime={minimapBounds.start}
|
||||||
events={reviewItems.all}
|
minimapEndTime={minimapBounds.end}
|
||||||
severityType={severity}
|
events={reviewItems.all}
|
||||||
contentRef={contentRef}
|
severityType={severity}
|
||||||
/>)}
|
contentRef={contentRef}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <EventReviewTimeline
|
|
||||||
segmentDuration={60} // seconds per segment
|
|
||||||
timestampSpread={15} // minutes between each major timestamp
|
|
||||||
timelineStart={Math.floor(Date.now() / 1000)} // start of the timeline - all times are numeric, not Date objects
|
|
||||||
timelineEnd={Math.floor(Date.now() / 1000) + 2 * 60 * 60} // end of timeline - timestamp
|
|
||||||
showHandlebar // show / hide the handlebar
|
|
||||||
handlebarTime={Math.floor(Date.now() / 1000) - 27 * 60} // set the time of the handlebar
|
|
||||||
showMinimap // show / hide the minimap
|
|
||||||
minimapStartTime={Math.floor(Date.now() / 1000) - 35 * 60} // start time of the minimap - the earlier time (eg 1:00pm)
|
|
||||||
minimapEndTime={Math.floor(Date.now() / 1000) - 21 * 60} // end of the minimap - the later time (eg 3:00pm)
|
|
||||||
events={mockEvents} // events, including new has_been_reviewed and severity properties
|
|
||||||
severityType={"alert"} // choose the severity type for the middle line - all other severity types are to the right
|
|
||||||
contentRef={contentRef} // optional content ref where previews are, can be used for observing/scrolling later
|
|
||||||
/>
|
|
||||||
*/
|
|
||||||
|
|
||||||
function ReviewCalendarButton() {
|
function ReviewCalendarButton() {
|
||||||
const disabledDates = useMemo(() => {
|
const disabledDates = useMemo(() => {
|
||||||
const tomorrow = new Date();
|
const tomorrow = new Date();
|
||||||
|
@ -106,6 +106,16 @@ export default function MobileEventView() {
|
|||||||
[reviewPages]
|
[reviewPages]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const currentItems = useMemo(() => {
|
||||||
|
const current = reviewItems[severity];
|
||||||
|
|
||||||
|
if (!current || current.length == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return current;
|
||||||
|
}, [reviewItems, severity]);
|
||||||
|
|
||||||
// review interaction
|
// review interaction
|
||||||
|
|
||||||
const pagingObserver = useRef<IntersectionObserver | null>();
|
const pagingObserver = useRef<IntersectionObserver | null>();
|
||||||
@ -278,33 +288,37 @@ export default function MobileEventView() {
|
|||||||
ref={contentRef}
|
ref={contentRef}
|
||||||
className="w-full h-full grid grid-cols-1 sm:grid-cols-2 mt-2 gap-2 overflow-y-auto"
|
className="w-full h-full grid grid-cols-1 sm:grid-cols-2 mt-2 gap-2 overflow-y-auto"
|
||||||
>
|
>
|
||||||
{reviewItems[severity]?.map((value, segIdx) => {
|
{currentItems ? (
|
||||||
const lastRow = segIdx == reviewItems[severity].length - 1;
|
currentItems.map((value, segIdx) => {
|
||||||
const relevantPreview = Object.values(allPreviews || []).find(
|
const lastRow = segIdx == reviewItems[severity].length - 1;
|
||||||
(preview) =>
|
const relevantPreview = Object.values(allPreviews || []).find(
|
||||||
preview.camera == value.camera &&
|
(preview) =>
|
||||||
preview.start < value.start_time &&
|
preview.camera == value.camera &&
|
||||||
preview.end > value.end_time
|
preview.start < value.start_time &&
|
||||||
);
|
preview.end > value.end_time
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={value.id}
|
key={value.id}
|
||||||
ref={lastRow ? lastReviewRef : minimapRef}
|
ref={lastRow ? lastReviewRef : minimapRef}
|
||||||
data-start={value.start_time}
|
data-start={value.start_time}
|
||||||
>
|
>
|
||||||
<div className="w-full aspect-video rounded-lg overflow-hidden">
|
<div className="w-full aspect-video rounded-lg overflow-hidden">
|
||||||
<PreviewThumbnailPlayer
|
<PreviewThumbnailPlayer
|
||||||
review={value}
|
review={value}
|
||||||
relevantPreview={relevantPreview}
|
relevantPreview={relevantPreview}
|
||||||
autoPlayback={minimapBounds.end == value.start_time}
|
autoPlayback={minimapBounds.end == value.start_time}
|
||||||
setReviewed={() => setReviewed(value.id)}
|
setReviewed={() => setReviewed(value.id)}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
{lastRow && !isDone && <ActivityIndicator />}
|
||||||
</div>
|
</div>
|
||||||
{lastRow && !isDone && <ActivityIndicator />}
|
);
|
||||||
</div>
|
})
|
||||||
);
|
) : (
|
||||||
})}
|
<div ref={lastReviewRef} />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user