mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-04-03 22:04:53 +03:00
History: add snapshot support in recording player
This commit is contained in:
parent
80c4ce2b5d
commit
c5e816f8d3
@ -22,6 +22,11 @@ import { ASPECT_VERTICAL_LAYOUT, RecordingPlayerError } from "@/types/record";
|
|||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import ObjectTrackOverlay from "@/components/overlay/ObjectTrackOverlay";
|
import ObjectTrackOverlay from "@/components/overlay/ObjectTrackOverlay";
|
||||||
import { useIsAdmin } from "@/hooks/use-is-admin";
|
import { useIsAdmin } from "@/hooks/use-is-admin";
|
||||||
|
import {
|
||||||
|
downloadSnapshot,
|
||||||
|
generateSnapshotFilename,
|
||||||
|
grabVideoSnapshot,
|
||||||
|
} from "@/utils/snapshotUtil";
|
||||||
|
|
||||||
// Android native hls does not seek correctly
|
// Android native hls does not seek correctly
|
||||||
const USE_NATIVE_HLS = false;
|
const USE_NATIVE_HLS = false;
|
||||||
@ -58,6 +63,7 @@ type HlsVideoPlayerProps = {
|
|||||||
isDetailMode?: boolean;
|
isDetailMode?: boolean;
|
||||||
camera?: string;
|
camera?: string;
|
||||||
currentTimeOverride?: number;
|
currentTimeOverride?: number;
|
||||||
|
supportsSnapshot?: boolean;
|
||||||
transformedOverlay?: ReactNode;
|
transformedOverlay?: ReactNode;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -83,9 +89,10 @@ export default function HlsVideoPlayer({
|
|||||||
isDetailMode = false,
|
isDetailMode = false,
|
||||||
camera,
|
camera,
|
||||||
currentTimeOverride,
|
currentTimeOverride,
|
||||||
|
supportsSnapshot = false,
|
||||||
transformedOverlay,
|
transformedOverlay,
|
||||||
}: HlsVideoPlayerProps) {
|
}: HlsVideoPlayerProps) {
|
||||||
const { t } = useTranslation("components/player");
|
const { t } = useTranslation(["components/player", "views/live"]);
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
const isAdmin = useIsAdmin();
|
const isAdmin = useIsAdmin();
|
||||||
|
|
||||||
@ -264,13 +271,36 @@ export default function HlsVideoPlayer({
|
|||||||
const getVideoTime = useCallback(() => {
|
const getVideoTime = useCallback(() => {
|
||||||
const currentTime = videoRef.current?.currentTime;
|
const currentTime = videoRef.current?.currentTime;
|
||||||
|
|
||||||
if (!currentTime) {
|
if (currentTime == undefined) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
return currentTime + inpointOffset;
|
return currentTime + inpointOffset;
|
||||||
}, [videoRef, inpointOffset]);
|
}, [videoRef, inpointOffset]);
|
||||||
|
|
||||||
|
const handleSnapshot = useCallback(async () => {
|
||||||
|
const frameTime = getVideoTime();
|
||||||
|
const result = await grabVideoSnapshot(videoRef.current);
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
downloadSnapshot(
|
||||||
|
result.data.dataUrl,
|
||||||
|
generateSnapshotFilename(
|
||||||
|
camera ?? "recording",
|
||||||
|
currentTime ?? frameTime,
|
||||||
|
config?.ui?.timezone,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
toast.success(t("snapshot.downloadStarted", { ns: "views/live" }), {
|
||||||
|
position: "top-center",
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toast.error(t("snapshot.captureFailed", { ns: "views/live" }), {
|
||||||
|
position: "top-center",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [camera, config?.ui?.timezone, currentTime, getVideoTime, t, videoRef]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TransformWrapper
|
<TransformWrapper
|
||||||
minScale={1.0}
|
minScale={1.0}
|
||||||
@ -294,6 +324,7 @@ export default function HlsVideoPlayer({
|
|||||||
seek: true,
|
seek: true,
|
||||||
playbackRate: true,
|
playbackRate: true,
|
||||||
plusUpload: isAdmin && config?.plus?.enabled == true,
|
plusUpload: isAdmin && config?.plus?.enabled == true,
|
||||||
|
snapshot: supportsSnapshot,
|
||||||
fullscreen: supportsFullscreen,
|
fullscreen: supportsFullscreen,
|
||||||
}}
|
}}
|
||||||
setControlsOpen={setControlsOpen}
|
setControlsOpen={setControlsOpen}
|
||||||
@ -320,7 +351,7 @@ export default function HlsVideoPlayer({
|
|||||||
onUploadFrame={async () => {
|
onUploadFrame={async () => {
|
||||||
const frameTime = getVideoTime();
|
const frameTime = getVideoTime();
|
||||||
|
|
||||||
if (frameTime && onUploadFrame) {
|
if (frameTime != undefined && onUploadFrame) {
|
||||||
const resp = await onUploadFrame(frameTime);
|
const resp = await onUploadFrame(frameTime);
|
||||||
|
|
||||||
if (resp && resp.status == 200) {
|
if (resp && resp.status == 200) {
|
||||||
@ -334,6 +365,8 @@ export default function HlsVideoPlayer({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
onSnapshot={supportsSnapshot ? handleSnapshot : undefined}
|
||||||
|
snapshotTitle={t("snapshot.takeSnapshot", { ns: "views/live" })}
|
||||||
fullscreen={fullscreen}
|
fullscreen={fullscreen}
|
||||||
toggleFullscreen={toggleFullscreen}
|
toggleFullscreen={toggleFullscreen}
|
||||||
containerRef={containerRef}
|
containerRef={containerRef}
|
||||||
@ -465,7 +498,7 @@ export default function HlsVideoPlayer({
|
|||||||
|
|
||||||
const frameTime = getVideoTime();
|
const frameTime = getVideoTime();
|
||||||
|
|
||||||
if (frameTime) {
|
if (frameTime != undefined) {
|
||||||
onTimeUpdate(frameTime);
|
onTimeUpdate(frameTime);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -34,12 +34,14 @@ import {
|
|||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { FaCompress, FaExpand } from "react-icons/fa";
|
import { FaCompress, FaExpand } from "react-icons/fa";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { TbCameraDown } from "react-icons/tb";
|
||||||
|
|
||||||
type VideoControls = {
|
type VideoControls = {
|
||||||
volume?: boolean;
|
volume?: boolean;
|
||||||
seek?: boolean;
|
seek?: boolean;
|
||||||
playbackRate?: boolean;
|
playbackRate?: boolean;
|
||||||
plusUpload?: boolean;
|
plusUpload?: boolean;
|
||||||
|
snapshot?: boolean;
|
||||||
fullscreen?: boolean;
|
fullscreen?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -48,6 +50,7 @@ const CONTROLS_DEFAULT: VideoControls = {
|
|||||||
seek: true,
|
seek: true,
|
||||||
playbackRate: true,
|
playbackRate: true,
|
||||||
plusUpload: false,
|
plusUpload: false,
|
||||||
|
snapshot: false,
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
};
|
};
|
||||||
const PLAYBACK_RATE_DEFAULT = isSafari ? [0.5, 1, 2] : [0.5, 1, 2, 4, 8, 16];
|
const PLAYBACK_RATE_DEFAULT = isSafari ? [0.5, 1, 2] : [0.5, 1, 2, 4, 8, 16];
|
||||||
@ -71,6 +74,8 @@ type VideoControlsProps = {
|
|||||||
onSeek: (diff: number) => void;
|
onSeek: (diff: number) => void;
|
||||||
onSetPlaybackRate: (rate: number) => void;
|
onSetPlaybackRate: (rate: number) => void;
|
||||||
onUploadFrame?: () => void;
|
onUploadFrame?: () => void;
|
||||||
|
onSnapshot?: () => void;
|
||||||
|
snapshotTitle?: string;
|
||||||
toggleFullscreen?: () => void;
|
toggleFullscreen?: () => void;
|
||||||
containerRef?: React.MutableRefObject<HTMLDivElement | null>;
|
containerRef?: React.MutableRefObject<HTMLDivElement | null>;
|
||||||
};
|
};
|
||||||
@ -92,6 +97,8 @@ export default function VideoControls({
|
|||||||
onSeek,
|
onSeek,
|
||||||
onSetPlaybackRate,
|
onSetPlaybackRate,
|
||||||
onUploadFrame,
|
onUploadFrame,
|
||||||
|
onSnapshot,
|
||||||
|
snapshotTitle,
|
||||||
toggleFullscreen,
|
toggleFullscreen,
|
||||||
containerRef,
|
containerRef,
|
||||||
}: VideoControlsProps) {
|
}: VideoControlsProps) {
|
||||||
@ -292,6 +299,17 @@ export default function VideoControls({
|
|||||||
fullscreen={fullscreen}
|
fullscreen={fullscreen}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{features.snapshot && onSnapshot && (
|
||||||
|
<TbCameraDown
|
||||||
|
aria-label={snapshotTitle}
|
||||||
|
className="size-5 cursor-pointer"
|
||||||
|
title={snapshotTitle}
|
||||||
|
onClick={(e: React.MouseEvent<SVGElement>) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
onSnapshot();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{features.fullscreen && toggleFullscreen && (
|
{features.fullscreen && toggleFullscreen && (
|
||||||
<div className="cursor-pointer" onClick={toggleFullscreen}>
|
<div className="cursor-pointer" onClick={toggleFullscreen}>
|
||||||
{fullscreen ? <FaCompress /> : <FaExpand />}
|
{fullscreen ? <FaCompress /> : <FaExpand />}
|
||||||
|
|||||||
@ -47,6 +47,7 @@ type DynamicVideoPlayerProps = {
|
|||||||
setFullResolution: React.Dispatch<React.SetStateAction<VideoResolutionType>>;
|
setFullResolution: React.Dispatch<React.SetStateAction<VideoResolutionType>>;
|
||||||
toggleFullscreen: () => void;
|
toggleFullscreen: () => void;
|
||||||
containerRef?: React.MutableRefObject<HTMLDivElement | null>;
|
containerRef?: React.MutableRefObject<HTMLDivElement | null>;
|
||||||
|
supportsSnapshot?: boolean;
|
||||||
transformedOverlay?: ReactNode;
|
transformedOverlay?: ReactNode;
|
||||||
};
|
};
|
||||||
export default function DynamicVideoPlayer({
|
export default function DynamicVideoPlayer({
|
||||||
@ -66,6 +67,7 @@ export default function DynamicVideoPlayer({
|
|||||||
setFullResolution,
|
setFullResolution,
|
||||||
toggleFullscreen,
|
toggleFullscreen,
|
||||||
containerRef,
|
containerRef,
|
||||||
|
supportsSnapshot = false,
|
||||||
transformedOverlay,
|
transformedOverlay,
|
||||||
}: DynamicVideoPlayerProps) {
|
}: DynamicVideoPlayerProps) {
|
||||||
const { t } = useTranslation(["components/player"]);
|
const { t } = useTranslation(["components/player"]);
|
||||||
@ -321,6 +323,7 @@ export default function DynamicVideoPlayer({
|
|||||||
isDetailMode={isDetailMode}
|
isDetailMode={isDetailMode}
|
||||||
camera={contextCamera || camera}
|
camera={contextCamera || camera}
|
||||||
currentTimeOverride={currentTime}
|
currentTimeOverride={currentTime}
|
||||||
|
supportsSnapshot={supportsSnapshot}
|
||||||
transformedOverlay={transformedOverlay}
|
transformedOverlay={transformedOverlay}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import { baseUrl } from "@/api/baseUrl";
|
import { baseUrl } from "@/api/baseUrl";
|
||||||
|
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
|
||||||
|
|
||||||
type SnapshotResponse = {
|
type SnapshotResponse = {
|
||||||
dataUrl: string;
|
dataUrl: string;
|
||||||
@ -97,17 +98,34 @@ export function downloadSnapshot(dataUrl: string, filename: string): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function generateSnapshotFilename(cameraName: string): string {
|
export function generateSnapshotFilename(
|
||||||
const timestamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, -5);
|
cameraName: string,
|
||||||
return `${cameraName}_snapshot_${timestamp}.jpg`;
|
timestampSeconds?: number,
|
||||||
|
timezone?: string,
|
||||||
|
): string {
|
||||||
|
const seconds = timestampSeconds ?? Date.now() / 1000;
|
||||||
|
const timestamp = formatUnixTimestampToDateTime(seconds, {
|
||||||
|
timezone,
|
||||||
|
date_format: "yyyy-MM-dd'T'HH-mm-ss",
|
||||||
|
});
|
||||||
|
|
||||||
|
const safeTimestamp =
|
||||||
|
timestamp === "Invalid time"
|
||||||
|
? new Date(seconds * 1000)
|
||||||
|
.toISOString()
|
||||||
|
.replace(/[:.]/g, "-")
|
||||||
|
.slice(0, -5)
|
||||||
|
: timestamp;
|
||||||
|
return `${cameraName}_snapshot_${safeTimestamp}.jpg`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function grabVideoSnapshot(): Promise<SnapshotResult> {
|
export async function grabVideoSnapshot(
|
||||||
|
targetVideo?: HTMLVideoElement | null,
|
||||||
|
): Promise<SnapshotResult> {
|
||||||
try {
|
try {
|
||||||
// Find the video element in the player
|
const videoElement =
|
||||||
const videoElement = document.querySelector(
|
targetVideo ??
|
||||||
"#player-container video",
|
(document.querySelector("#player-container video") as HTMLVideoElement);
|
||||||
) as HTMLVideoElement;
|
|
||||||
|
|
||||||
if (!videoElement) {
|
if (!videoElement) {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@ -839,6 +839,7 @@ export function RecordingView({
|
|||||||
setFullResolution={setFullResolution}
|
setFullResolution={setFullResolution}
|
||||||
toggleFullscreen={toggleFullscreen}
|
toggleFullscreen={toggleFullscreen}
|
||||||
containerRef={mainLayoutRef}
|
containerRef={mainLayoutRef}
|
||||||
|
supportsSnapshot={true}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{isDesktop && effectiveCameras.length > 1 && (
|
{isDesktop && effectiveCameras.length > 1 && (
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user