mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-07-13 23:41:15 +03:00
Compare commits
2 Commits
3f0ebb3577
...
7e83d5de90
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e83d5de90 | ||
|
|
a08e2d7529 |
@ -265,8 +265,8 @@ ENV PATH="/usr/local/go2rtc/bin:/usr/local/tempio/bin:/usr/local/nginx/sbin:${PA
|
|||||||
RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
|
RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
|
||||||
/deps/install_deps.sh
|
/deps/install_deps.sh
|
||||||
|
|
||||||
ENV DEFAULT_FFMPEG_VERSION="7.0"
|
ENV DEFAULT_FFMPEG_VERSION="8.0"
|
||||||
ENV INCLUDED_FFMPEG_VERSIONS="${DEFAULT_FFMPEG_VERSION}:5.0"
|
ENV INCLUDED_FFMPEG_VERSIONS="${DEFAULT_FFMPEG_VERSION}:7.0:5.0"
|
||||||
|
|
||||||
RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
|
RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
|
||||||
&& sed -i 's/args.append("setuptools")/args.append("setuptools==77.0.3")/' get-pip.py \
|
&& sed -i 's/args.append("setuptools")/args.append("setuptools==77.0.3")/' get-pip.py \
|
||||||
|
|||||||
@ -52,9 +52,13 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
|
|||||||
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1 amd64/bin/ffmpeg amd64/bin/ffprobe
|
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1 amd64/bin/ffmpeg amd64/bin/ffprobe
|
||||||
rm -rf ffmpeg.tar.xz
|
rm -rf ffmpeg.tar.xz
|
||||||
mkdir -p /usr/lib/ffmpeg/7.0
|
mkdir -p /usr/lib/ffmpeg/7.0
|
||||||
wget -qO ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2026-03-19-13-03/ffmpeg-n7.1.3-43-g5a1f107b4c-linux64-gpl-7.1.tar.xz"
|
wget -qO ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2024-09-19-12-51/ffmpeg-n7.0.2-18-g3e6cec1286-linux64-gpl-7.0.tar.xz"
|
||||||
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1 amd64/bin/ffmpeg amd64/bin/ffprobe
|
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1 amd64/bin/ffmpeg amd64/bin/ffprobe
|
||||||
rm -rf ffmpeg.tar.xz
|
rm -rf ffmpeg.tar.xz
|
||||||
|
mkdir -p /usr/lib/ffmpeg/8.0
|
||||||
|
wget -qO ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2026-06-02-14-20/ffmpeg-n8.1.1-9-g58d4114d36-linux64-gpl-8.1.tar.xz"
|
||||||
|
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/8.0 --strip-components 1 amd64/bin/ffmpeg amd64/bin/ffprobe
|
||||||
|
rm -rf ffmpeg.tar.xz
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ffmpeg -> arm64
|
# ffmpeg -> arm64
|
||||||
@ -64,9 +68,13 @@ if [[ "${TARGETARCH}" == "arm64" ]]; then
|
|||||||
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1 arm64/bin/ffmpeg arm64/bin/ffprobe
|
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1 arm64/bin/ffmpeg arm64/bin/ffprobe
|
||||||
rm -f ffmpeg.tar.xz
|
rm -f ffmpeg.tar.xz
|
||||||
mkdir -p /usr/lib/ffmpeg/7.0
|
mkdir -p /usr/lib/ffmpeg/7.0
|
||||||
wget -qO ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2026-03-19-13-03/ffmpeg-n7.1.3-43-g5a1f107b4c-linuxarm64-gpl-7.1.tar.xz"
|
wget -qO ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2024-09-19-12-51/ffmpeg-n7.0.2-18-g3e6cec1286-linuxarm64-gpl-7.0.tar.xz"
|
||||||
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1 arm64/bin/ffmpeg arm64/bin/ffprobe
|
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1 arm64/bin/ffmpeg arm64/bin/ffprobe
|
||||||
rm -f ffmpeg.tar.xz
|
rm -f ffmpeg.tar.xz
|
||||||
|
mkdir -p /usr/lib/ffmpeg/8.0
|
||||||
|
wget -qO ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2026-06-02-14-20/ffmpeg-n8.1.1-9-g58d4114d36-linuxarm64-gpl-8.1.tar.xz"
|
||||||
|
tar -xf ffmpeg.tar.xz -C /usr/lib/ffmpeg/8.0 --strip-components 1 arm64/bin/ffmpeg arm64/bin/ffprobe
|
||||||
|
rm -f ffmpeg.tar.xz
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# arch specific packages
|
# arch specific packages
|
||||||
|
|||||||
@ -5,11 +5,7 @@ from typing import Any
|
|||||||
from ruamel.yaml import YAML
|
from ruamel.yaml import YAML
|
||||||
|
|
||||||
sys.path.insert(0, "/opt/frigate")
|
sys.path.insert(0, "/opt/frigate")
|
||||||
from frigate.const import (
|
from frigate.util.config import find_config_file, resolve_ffmpeg_path
|
||||||
DEFAULT_FFMPEG_VERSION,
|
|
||||||
INCLUDED_FFMPEG_VERSIONS,
|
|
||||||
)
|
|
||||||
from frigate.util.config import find_config_file
|
|
||||||
|
|
||||||
sys.path.remove("/opt/frigate")
|
sys.path.remove("/opt/frigate")
|
||||||
|
|
||||||
@ -29,9 +25,4 @@ except FileNotFoundError:
|
|||||||
config: dict[str, Any] = {}
|
config: dict[str, Any] = {}
|
||||||
|
|
||||||
path = config.get("ffmpeg", {}).get("path", "default")
|
path = config.get("ffmpeg", {}).get("path", "default")
|
||||||
if path == "default":
|
print(resolve_ffmpeg_path(path, "ffmpeg"))
|
||||||
print(f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg")
|
|
||||||
elif path in INCLUDED_FFMPEG_VERSIONS:
|
|
||||||
print(f"/usr/lib/ffmpeg/{path}/bin/ffmpeg")
|
|
||||||
else:
|
|
||||||
print(f"{path}/bin/ffmpeg")
|
|
||||||
|
|||||||
@ -11,12 +11,10 @@ sys.path.insert(0, "/opt/frigate")
|
|||||||
from frigate.config.env import substitute_frigate_vars
|
from frigate.config.env import substitute_frigate_vars
|
||||||
from frigate.const import (
|
from frigate.const import (
|
||||||
BIRDSEYE_PIPE,
|
BIRDSEYE_PIPE,
|
||||||
DEFAULT_FFMPEG_VERSION,
|
|
||||||
INCLUDED_FFMPEG_VERSIONS,
|
|
||||||
LIBAVFORMAT_VERSION_MAJOR,
|
LIBAVFORMAT_VERSION_MAJOR,
|
||||||
)
|
)
|
||||||
from frigate.ffmpeg_presets import parse_preset_hardware_acceleration_encode
|
from frigate.ffmpeg_presets import parse_preset_hardware_acceleration_encode
|
||||||
from frigate.util.config import find_config_file
|
from frigate.util.config import find_config_file, resolve_ffmpeg_path
|
||||||
from frigate.util.services import is_restricted_go2rtc_source
|
from frigate.util.services import is_restricted_go2rtc_source
|
||||||
|
|
||||||
sys.path.remove("/opt/frigate")
|
sys.path.remove("/opt/frigate")
|
||||||
@ -81,12 +79,7 @@ if go2rtc_config.get("rtsp", {}).get("password") is not None:
|
|||||||
|
|
||||||
# ensure ffmpeg path is set correctly
|
# ensure ffmpeg path is set correctly
|
||||||
path = config.get("ffmpeg", {}).get("path", "default")
|
path = config.get("ffmpeg", {}).get("path", "default")
|
||||||
if path == "default":
|
ffmpeg_path = resolve_ffmpeg_path(path, "ffmpeg")
|
||||||
ffmpeg_path = f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
|
|
||||||
elif path in INCLUDED_FFMPEG_VERSIONS:
|
|
||||||
ffmpeg_path = f"/usr/lib/ffmpeg/{path}/bin/ffmpeg"
|
|
||||||
else:
|
|
||||||
ffmpeg_path = f"{path}/bin/ffmpeg"
|
|
||||||
|
|
||||||
if go2rtc_config.get("ffmpeg") is None:
|
if go2rtc_config.get("ffmpeg") is None:
|
||||||
go2rtc_config["ffmpeg"] = {"bin": ffmpeg_path}
|
go2rtc_config["ffmpeg"] = {"bin": ffmpeg_path}
|
||||||
|
|||||||
@ -257,7 +257,7 @@ birdseye:
|
|||||||
# More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets
|
# More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets
|
||||||
ffmpeg:
|
ffmpeg:
|
||||||
# Optional: ffmpeg binary path (default: shown below)
|
# Optional: ffmpeg binary path (default: shown below)
|
||||||
# can also be set to `7.0` or `5.0` to specify one of the included versions
|
# can also be set to `8.0` or `5.0` to specify one of the included versions
|
||||||
# or can be set to any path that holds `bin/ffmpeg` & `bin/ffprobe`
|
# or can be set to any path that holds `bin/ffmpeg` & `bin/ffprobe`
|
||||||
path: "default"
|
path: "default"
|
||||||
# Optional: global ffmpeg args (default: shown below)
|
# Optional: global ffmpeg args (default: shown below)
|
||||||
|
|||||||
@ -3,7 +3,7 @@ from typing import Union
|
|||||||
|
|
||||||
from pydantic import Field, field_validator
|
from pydantic import Field, field_validator
|
||||||
|
|
||||||
from frigate.const import DEFAULT_FFMPEG_VERSION, INCLUDED_FFMPEG_VERSIONS
|
from frigate.util.config import resolve_ffmpeg_path
|
||||||
|
|
||||||
from ..base import FrigateBaseModel
|
from ..base import FrigateBaseModel
|
||||||
from ..env import EnvString
|
from ..env import EnvString
|
||||||
@ -49,7 +49,7 @@ class FfmpegConfig(FrigateBaseModel):
|
|||||||
path: str = Field(
|
path: str = Field(
|
||||||
default="default",
|
default="default",
|
||||||
title="FFmpeg path",
|
title="FFmpeg path",
|
||||||
description='Path to the FFmpeg binary to use or a version alias ("5.0" or "7.0").',
|
description='Path to the FFmpeg binary to use or a version alias ("5.0" or "8.0").',
|
||||||
)
|
)
|
||||||
global_args: Union[str, list[str]] = Field(
|
global_args: Union[str, list[str]] = Field(
|
||||||
default=FFMPEG_GLOBAL_ARGS_DEFAULT,
|
default=FFMPEG_GLOBAL_ARGS_DEFAULT,
|
||||||
@ -90,21 +90,11 @@ class FfmpegConfig(FrigateBaseModel):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def ffmpeg_path(self) -> str:
|
def ffmpeg_path(self) -> str:
|
||||||
if self.path == "default":
|
return resolve_ffmpeg_path(self.path, "ffmpeg")
|
||||||
return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
|
|
||||||
elif self.path in INCLUDED_FFMPEG_VERSIONS:
|
|
||||||
return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"
|
|
||||||
else:
|
|
||||||
return f"{self.path}/bin/ffmpeg"
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def ffprobe_path(self) -> str:
|
def ffprobe_path(self) -> str:
|
||||||
if self.path == "default":
|
return resolve_ffmpeg_path(self.path, "ffprobe")
|
||||||
return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"
|
|
||||||
elif self.path in INCLUDED_FFMPEG_VERSIONS:
|
|
||||||
return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"
|
|
||||||
else:
|
|
||||||
return f"{self.path}/bin/ffprobe"
|
|
||||||
|
|
||||||
|
|
||||||
class CameraRoleEnum(str, Enum):
|
class CameraRoleEnum(str, Enum):
|
||||||
|
|||||||
@ -465,16 +465,6 @@ PRESETS_RECORD_OUTPUT = {
|
|||||||
"-c:a",
|
"-c:a",
|
||||||
"aac",
|
"aac",
|
||||||
],
|
],
|
||||||
# NOTE: This preset originally used "-c:a copy" to pass through audio
|
|
||||||
# without re-encoding. FFmpeg 7.x introduced a threaded pipeline where
|
|
||||||
# demuxing, encoding, and muxing run in parallel via a Scheduler. This
|
|
||||||
# broke audio streamcopy from RTSP sources: packets are demuxed correctly
|
|
||||||
# but silently dropped before reaching the muxer (0 bytes written). The
|
|
||||||
# issue is specific to RTSP + streamcopy; file inputs and transcoding both
|
|
||||||
# work. Transcoding AAC audio is very lightweight (~30KiB per 10s segment)
|
|
||||||
# and adds negligible CPU overhead, so this is an acceptable workaround.
|
|
||||||
# The benefits of FFmpeg 7.x — particularly the removal of gamma correction
|
|
||||||
# hacks required by earlier versions — outweigh this trade-off.
|
|
||||||
"preset-record-generic-audio-copy": [
|
"preset-record-generic-audio-copy": [
|
||||||
"-f",
|
"-f",
|
||||||
"segment",
|
"segment",
|
||||||
@ -486,10 +476,8 @@ PRESETS_RECORD_OUTPUT = {
|
|||||||
"1",
|
"1",
|
||||||
"-strftime",
|
"-strftime",
|
||||||
"1",
|
"1",
|
||||||
"-c:v",
|
"-c",
|
||||||
"copy",
|
"copy",
|
||||||
"-c:a",
|
|
||||||
"aac",
|
|
||||||
],
|
],
|
||||||
"preset-record-mjpeg": [
|
"preset-record-mjpeg": [
|
||||||
"-f",
|
"-f",
|
||||||
|
|||||||
@ -456,7 +456,7 @@ class RecordingExporter(threading.Thread):
|
|||||||
|
|
||||||
diff = max(0.0, float(self.start_time) - float(preview.start_time))
|
diff = max(0.0, float(self.start_time) - float(preview.start_time))
|
||||||
ffmpeg_cmd = [
|
ffmpeg_cmd = [
|
||||||
"/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support
|
"/usr/lib/ffmpeg/8.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support
|
||||||
"-hide_banner",
|
"-hide_banner",
|
||||||
"-loglevel",
|
"-loglevel",
|
||||||
"warning",
|
"warning",
|
||||||
|
|||||||
@ -394,7 +394,7 @@ def collect_state_classification_examples(
|
|||||||
|
|
||||||
# Step 3: Extract keyframes from recordings with crops applied
|
# Step 3: Extract keyframes from recordings with crops applied
|
||||||
keyframes = _extract_keyframes(
|
keyframes = _extract_keyframes(
|
||||||
"/usr/lib/ffmpeg/7.0/bin/ffmpeg", timestamps, temp_dir, cameras
|
"/usr/lib/ffmpeg/8.0/bin/ffmpeg", timestamps, temp_dir, cameras
|
||||||
)
|
)
|
||||||
|
|
||||||
# Step 4: Select 24 most visually distinct images (they're already cropped)
|
# Step 4: Select 24 most visually distinct images (they're already cropped)
|
||||||
@ -566,7 +566,7 @@ def _extract_keyframes(
|
|||||||
relative_time = timestamp - recording.start_time
|
relative_time = timestamp - recording.start_time
|
||||||
|
|
||||||
try:
|
try:
|
||||||
config = FfmpegConfig(path="/usr/lib/ffmpeg/7.0")
|
config = FfmpegConfig(path="/usr/lib/ffmpeg/8.0")
|
||||||
image_data = get_image_from_recording(
|
image_data = get_image_from_recording(
|
||||||
config,
|
config,
|
||||||
recording.path,
|
recording.path,
|
||||||
|
|||||||
@ -8,7 +8,13 @@ from typing import Any, Optional, Union
|
|||||||
|
|
||||||
from ruamel.yaml import YAML
|
from ruamel.yaml import YAML
|
||||||
|
|
||||||
from frigate.const import CONFIG_DIR, EXPORT_DIR, REDACTED_CREDENTIAL_SENTINEL
|
from frigate.const import (
|
||||||
|
CONFIG_DIR,
|
||||||
|
DEFAULT_FFMPEG_VERSION,
|
||||||
|
EXPORT_DIR,
|
||||||
|
INCLUDED_FFMPEG_VERSIONS,
|
||||||
|
REDACTED_CREDENTIAL_SENTINEL,
|
||||||
|
)
|
||||||
from frigate.util.builtin import deep_merge
|
from frigate.util.builtin import deep_merge
|
||||||
from frigate.util.services import get_video_properties
|
from frigate.util.services import get_video_properties
|
||||||
|
|
||||||
@ -18,6 +24,26 @@ CURRENT_CONFIG_VERSION = "0.18-0"
|
|||||||
DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")
|
DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_ffmpeg_path(path: str, binary: str = "ffmpeg") -> str:
|
||||||
|
"""Resolve an ffmpeg version alias or custom path to a binary path.
|
||||||
|
|
||||||
|
A bare version alias that is no longer bundled (for example one that was
|
||||||
|
dropped when the default version changed) falls back to the default
|
||||||
|
bundled version so existing configs keep working across an upgrade or a
|
||||||
|
revert. Custom install paths (anything absolute) are used as-is.
|
||||||
|
"""
|
||||||
|
if path == "default" or (
|
||||||
|
not path.startswith("/") and path not in INCLUDED_FFMPEG_VERSIONS
|
||||||
|
):
|
||||||
|
version = DEFAULT_FFMPEG_VERSION
|
||||||
|
elif path in INCLUDED_FFMPEG_VERSIONS:
|
||||||
|
version = path
|
||||||
|
else:
|
||||||
|
return f"{path}/bin/{binary}"
|
||||||
|
|
||||||
|
return f"/usr/lib/ffmpeg/{version}/bin/{binary}"
|
||||||
|
|
||||||
|
|
||||||
def redact_credential(obj: dict[str, Any], key: str) -> None:
|
def redact_credential(obj: dict[str, Any], key: str) -> None:
|
||||||
"""Replace obj[key] with the redaction sentinel if a value is saved, else drop.
|
"""Replace obj[key] with the redaction sentinel if a value is saved, else drop.
|
||||||
|
|
||||||
|
|||||||
@ -54,6 +54,7 @@ type HlsVideoPlayerProps = {
|
|||||||
setFullResolution?: React.Dispatch<React.SetStateAction<VideoResolutionType>>;
|
setFullResolution?: React.Dispatch<React.SetStateAction<VideoResolutionType>>;
|
||||||
onUploadFrame?: (playTime: number) => Promise<AxiosResponse> | undefined;
|
onUploadFrame?: (playTime: number) => Promise<AxiosResponse> | undefined;
|
||||||
getSnapshotUrl?: (playTime: number) => string | undefined;
|
getSnapshotUrl?: (playTime: number) => string | undefined;
|
||||||
|
onSnapshot?: (playTime: number) => Promise<void> | void;
|
||||||
toggleFullscreen?: () => void;
|
toggleFullscreen?: () => void;
|
||||||
onError?: (error: RecordingPlayerError) => void;
|
onError?: (error: RecordingPlayerError) => void;
|
||||||
isDetailMode?: boolean;
|
isDetailMode?: boolean;
|
||||||
@ -80,6 +81,7 @@ export default function HlsVideoPlayer({
|
|||||||
setFullResolution,
|
setFullResolution,
|
||||||
onUploadFrame,
|
onUploadFrame,
|
||||||
getSnapshotUrl,
|
getSnapshotUrl,
|
||||||
|
onSnapshot,
|
||||||
toggleFullscreen,
|
toggleFullscreen,
|
||||||
onError,
|
onError,
|
||||||
isDetailMode = false,
|
isDetailMode = false,
|
||||||
@ -232,6 +234,7 @@ export default function HlsVideoPlayer({
|
|||||||
const [mobileCtrlTimeout, setMobileCtrlTimeout] = useState<NodeJS.Timeout>();
|
const [mobileCtrlTimeout, setMobileCtrlTimeout] = useState<NodeJS.Timeout>();
|
||||||
const [controls, setControls] = useState(isMobile);
|
const [controls, setControls] = useState(isMobile);
|
||||||
const [controlsOpen, setControlsOpen] = useState(false);
|
const [controlsOpen, setControlsOpen] = useState(false);
|
||||||
|
const [isSnapshotLoading, setIsSnapshotLoading] = useState(false);
|
||||||
const [zoomScale, setZoomScale] = useState(1.0);
|
const [zoomScale, setZoomScale] = useState(1.0);
|
||||||
const [videoDimensions, setVideoDimensions] = useState<{
|
const [videoDimensions, setVideoDimensions] = useState<{
|
||||||
width: number;
|
width: number;
|
||||||
@ -287,6 +290,21 @@ export default function HlsVideoPlayer({
|
|||||||
return currentTime + inpointOffset;
|
return currentTime + inpointOffset;
|
||||||
}, [videoRef, inpointOffset]);
|
}, [videoRef, inpointOffset]);
|
||||||
|
|
||||||
|
const handleSnapshot = useCallback(async () => {
|
||||||
|
const frameTime = getVideoTime();
|
||||||
|
|
||||||
|
if (!frameTime || !onSnapshot) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsSnapshotLoading(true);
|
||||||
|
try {
|
||||||
|
await onSnapshot(frameTime);
|
||||||
|
} finally {
|
||||||
|
setIsSnapshotLoading(false);
|
||||||
|
}
|
||||||
|
}, [getVideoTime, onSnapshot]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TransformWrapper
|
<TransformWrapper
|
||||||
minScale={1.0}
|
minScale={1.0}
|
||||||
@ -310,6 +328,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: !!onSnapshot,
|
||||||
fullscreen: supportsFullscreen,
|
fullscreen: supportsFullscreen,
|
||||||
}}
|
}}
|
||||||
setControlsOpen={setControlsOpen}
|
setControlsOpen={setControlsOpen}
|
||||||
@ -357,6 +376,8 @@ export default function HlsVideoPlayer({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
onSnapshot={onSnapshot ? handleSnapshot : undefined}
|
||||||
|
snapshotLoading={isSnapshotLoading}
|
||||||
fullscreen={fullscreen}
|
fullscreen={fullscreen}
|
||||||
toggleFullscreen={toggleFullscreen}
|
toggleFullscreen={toggleFullscreen}
|
||||||
containerRef={containerRef}
|
containerRef={containerRef}
|
||||||
|
|||||||
@ -34,6 +34,7 @@ import {
|
|||||||
} from "../ui/alert-dialog";
|
} from "../ui/alert-dialog";
|
||||||
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 { TbCameraDown } from "react-icons/tb";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
type VideoControls = {
|
type VideoControls = {
|
||||||
@ -41,6 +42,7 @@ type VideoControls = {
|
|||||||
seek?: boolean;
|
seek?: boolean;
|
||||||
playbackRate?: boolean;
|
playbackRate?: boolean;
|
||||||
plusUpload?: boolean;
|
plusUpload?: boolean;
|
||||||
|
snapshot?: boolean;
|
||||||
fullscreen?: boolean;
|
fullscreen?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -49,6 +51,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];
|
||||||
@ -73,6 +76,8 @@ type VideoControlsProps = {
|
|||||||
onSetPlaybackRate: (rate: number) => void;
|
onSetPlaybackRate: (rate: number) => void;
|
||||||
onUploadFrame?: () => void;
|
onUploadFrame?: () => void;
|
||||||
getSnapshotUrl?: () => string | undefined;
|
getSnapshotUrl?: () => string | undefined;
|
||||||
|
onSnapshot?: () => void;
|
||||||
|
snapshotLoading?: boolean;
|
||||||
toggleFullscreen?: () => void;
|
toggleFullscreen?: () => void;
|
||||||
containerRef?: React.MutableRefObject<HTMLDivElement | null>;
|
containerRef?: React.MutableRefObject<HTMLDivElement | null>;
|
||||||
};
|
};
|
||||||
@ -95,6 +100,8 @@ export default function VideoControls({
|
|||||||
onSetPlaybackRate,
|
onSetPlaybackRate,
|
||||||
onUploadFrame,
|
onUploadFrame,
|
||||||
getSnapshotUrl,
|
getSnapshotUrl,
|
||||||
|
onSnapshot,
|
||||||
|
snapshotLoading = false,
|
||||||
toggleFullscreen,
|
toggleFullscreen,
|
||||||
containerRef,
|
containerRef,
|
||||||
}: VideoControlsProps) {
|
}: VideoControlsProps) {
|
||||||
@ -295,6 +302,25 @@ export default function VideoControls({
|
|||||||
fullscreen={fullscreen}
|
fullscreen={fullscreen}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{features.snapshot && onSnapshot && (
|
||||||
|
<TbCameraDown
|
||||||
|
className={cn(
|
||||||
|
"size-5",
|
||||||
|
snapshotLoading
|
||||||
|
? "cursor-not-allowed opacity-50"
|
||||||
|
: "cursor-pointer",
|
||||||
|
)}
|
||||||
|
onClick={(e: React.MouseEvent<SVGElement>) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
|
||||||
|
if (snapshotLoading) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 />}
|
||||||
|
|||||||
@ -19,12 +19,18 @@ import { TimeRange } from "@/types/timeline";
|
|||||||
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
||||||
import { VideoResolutionType } from "@/types/live";
|
import { VideoResolutionType } from "@/types/live";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
|
import { toast } from "sonner";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import {
|
import {
|
||||||
calculateInpointOffset,
|
calculateInpointOffset,
|
||||||
calculateSeekPosition,
|
calculateSeekPosition,
|
||||||
} from "@/utils/videoUtil";
|
} from "@/utils/videoUtil";
|
||||||
|
import {
|
||||||
|
downloadSnapshot,
|
||||||
|
generateSnapshotFilename,
|
||||||
|
grabVideoSnapshot,
|
||||||
|
} from "@/utils/snapshotUtil";
|
||||||
import { isFirefox } from "react-device-detect";
|
import { isFirefox } from "react-device-detect";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -68,7 +74,7 @@ export default function DynamicVideoPlayer({
|
|||||||
containerRef,
|
containerRef,
|
||||||
transformedOverlay,
|
transformedOverlay,
|
||||||
}: DynamicVideoPlayerProps) {
|
}: DynamicVideoPlayerProps) {
|
||||||
const { t } = useTranslation(["components/player"]);
|
const { t } = useTranslation(["components/player", "views/live"]);
|
||||||
const apiHost = useApiHost();
|
const apiHost = useApiHost();
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
|
|
||||||
@ -196,6 +202,34 @@ export default function DynamicVideoPlayer({
|
|||||||
[apiHost, camera, controller],
|
[apiHost, camera, controller],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const onDownloadSnapshot = useCallback(
|
||||||
|
async (playTime: number) => {
|
||||||
|
if (!controller || !playerRef.current) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// map the player time back to the timeline timestamp so the filename
|
||||||
|
// reflects the moment being viewed rather than the current time
|
||||||
|
const frameTime = controller.getProgress(playTime);
|
||||||
|
const result = await grabVideoSnapshot(playerRef.current);
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
downloadSnapshot(
|
||||||
|
result.data.dataUrl,
|
||||||
|
generateSnapshotFilename(camera, frameTime),
|
||||||
|
);
|
||||||
|
toast.success(t("snapshot.downloadStarted", { ns: "views/live" }), {
|
||||||
|
position: "top-center",
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
toast.error(t("snapshot.captureFailed", { ns: "views/live" }), {
|
||||||
|
position: "top-center",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[camera, controller, t],
|
||||||
|
);
|
||||||
|
|
||||||
// state of playback player
|
// state of playback player
|
||||||
|
|
||||||
const recordingParams = useMemo(
|
const recordingParams = useMemo(
|
||||||
@ -328,6 +362,7 @@ export default function DynamicVideoPlayer({
|
|||||||
setFullResolution={setFullResolution}
|
setFullResolution={setFullResolution}
|
||||||
onUploadFrame={onUploadFrameToPlus}
|
onUploadFrame={onUploadFrameToPlus}
|
||||||
getSnapshotUrl={getSnapshotUrlForPlus}
|
getSnapshotUrl={getSnapshotUrlForPlus}
|
||||||
|
onSnapshot={onDownloadSnapshot}
|
||||||
toggleFullscreen={toggleFullscreen}
|
toggleFullscreen={toggleFullscreen}
|
||||||
onError={(error) => {
|
onError={(error) => {
|
||||||
if (error == "stalled" && !isScrubbing) {
|
if (error == "stalled" && !isScrubbing) {
|
||||||
|
|||||||
@ -97,17 +97,27 @@ 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,
|
||||||
|
timestampSeconds?: number,
|
||||||
|
): string {
|
||||||
|
// Live snapshots use the current time, while History snapshots pass the
|
||||||
|
// playback timestamp so the filename matches the moment being viewed.
|
||||||
|
const date =
|
||||||
|
typeof timestampSeconds === "number" && Number.isFinite(timestampSeconds)
|
||||||
|
? new Date(timestampSeconds * 1000)
|
||||||
|
: new Date();
|
||||||
|
const timestamp = date.toISOString().replace(/[:.]/g, "-").slice(0, -5);
|
||||||
return `${cameraName}_snapshot_${timestamp}.jpg`;
|
return `${cameraName}_snapshot_${timestamp}.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 {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user