mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-07 11:45:24 +03:00
Remove seekbar and use timeline as seekbar
This commit is contained in:
parent
903424c334
commit
4884a75c6f
@ -20,7 +20,7 @@ export default function TimelineItemCard({
|
|||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="relative m-2 flex h-32 cursor-pointer" onClick={onSelect}>
|
<Card className="relative m-2 flex w-full h-32 cursor-pointer" onClick={onSelect}>
|
||||||
<div className="w-1/2 p-2">
|
<div className="w-1/2 p-2">
|
||||||
{relevantPreview && (
|
{relevantPreview && (
|
||||||
<VideoPlayer
|
<VideoPlayer
|
||||||
|
|||||||
@ -186,8 +186,8 @@ function PreviewContent({
|
|||||||
|
|
||||||
const touchEnd = new Date().getTime();
|
const touchEnd = new Date().getTime();
|
||||||
|
|
||||||
// consider tap less than 500 ms
|
// consider tap less than 300 ms
|
||||||
if (touchEnd - touchStart < 500) {
|
if (touchEnd - touchStart < 300) {
|
||||||
onClick();
|
onClick();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -94,7 +94,7 @@ function ActivityScrubber({
|
|||||||
timeline: null,
|
timeline: null,
|
||||||
});
|
});
|
||||||
const [currentTime, setCurrentTime] = useState(Date.now());
|
const [currentTime, setCurrentTime] = useState(Date.now());
|
||||||
const [customTimes, setCustomTimes] = useState<
|
const [_, setCustomTimes] = useState<
|
||||||
{ id: IdType; time: DateType }[]
|
{ id: IdType; time: DateType }[]
|
||||||
>([]);
|
>([]);
|
||||||
|
|
||||||
|
|||||||
@ -118,6 +118,24 @@ export default function DesktopTimelineView({
|
|||||||
[annotationOffset, recordings, playerRef]
|
[annotationOffset, recordings, playerRef]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const onPlayerProgressUpdate = useCallback(() => {
|
||||||
|
if (!playerRef.current?.currentTime) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const playerTime = playerRef.current.currentTime();
|
||||||
|
|
||||||
|
if (!playerTime) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const time = timelineTime - selectedPlayback.range.start;
|
||||||
|
|
||||||
|
if (Math.round(playerTime) - time >= 5) {
|
||||||
|
setTimelineTime(selectedPlayback.range.start + playerTime);
|
||||||
|
}
|
||||||
|
}, [selectedPlayback, timelineTime]);
|
||||||
|
|
||||||
// handle seeking to next frame when seek is finished
|
// handle seeking to next frame when seek is finished
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (seeking) {
|
if (seeking) {
|
||||||
@ -130,7 +148,7 @@ export default function DesktopTimelineView({
|
|||||||
}
|
}
|
||||||
}, [timeToSeek, seeking]);
|
}, [timeToSeek, seeking]);
|
||||||
|
|
||||||
// handle loading main playback when selected hour changes
|
// handle loading main / preview playback when selected hour changes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!playerRef.current || !previewRef.current) {
|
if (!playerRef.current || !previewRef.current) {
|
||||||
return;
|
return;
|
||||||
@ -147,12 +165,10 @@ export default function DesktopTimelineView({
|
|||||||
type: "application/vnd.apple.mpegurl",
|
type: "application/vnd.apple.mpegurl",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
playerRef.current.off("timeupdate", onPlayerProgressUpdate);
|
||||||
|
playerRef.current.on("timeupdate", onPlayerProgressUpdate);
|
||||||
|
|
||||||
if (selectedPlayback.relevantPreview) {
|
if (selectedPlayback.relevantPreview) {
|
||||||
console.log(
|
|
||||||
`found relevant preview with start ${new Date(
|
|
||||||
selectedPlayback.relevantPreview.start * 1000
|
|
||||||
)} for ${new Date(selectedPlayback.range.start * 1000)}`
|
|
||||||
);
|
|
||||||
previewRef.current.src({
|
previewRef.current.src({
|
||||||
src: selectedPlayback.relevantPreview.src,
|
src: selectedPlayback.relevantPreview.src,
|
||||||
type: selectedPlayback.relevantPreview.type,
|
type: selectedPlayback.relevantPreview.type,
|
||||||
@ -197,6 +213,12 @@ export default function DesktopTimelineView({
|
|||||||
type: "application/vnd.apple.mpegurl",
|
type: "application/vnd.apple.mpegurl",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
controlBar: {
|
||||||
|
remainingTimeDisplay: false,
|
||||||
|
progressControl: {
|
||||||
|
seekBar: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
seekOptions={{ forward: 10, backward: 5 }}
|
seekOptions={{ forward: 10, backward: 5 }}
|
||||||
onReady={(player) => {
|
onReady={(player) => {
|
||||||
@ -210,9 +232,8 @@ export default function DesktopTimelineView({
|
|||||||
} else {
|
} else {
|
||||||
player.currentTime(0);
|
player.currentTime(0);
|
||||||
}
|
}
|
||||||
player.on("playing", () => {
|
player.on("playing", () => onSelectItem(undefined));
|
||||||
onSelectItem(undefined);
|
player.on("timeupdate", onPlayerProgressUpdate);
|
||||||
});
|
|
||||||
}}
|
}}
|
||||||
onDispose={() => {
|
onDispose={() => {
|
||||||
playerRef.current = undefined;
|
playerRef.current = undefined;
|
||||||
|
|||||||
@ -51,13 +51,11 @@ export default function MobileTimelineView({
|
|||||||
);
|
);
|
||||||
}, [config]);
|
}, [config]);
|
||||||
|
|
||||||
const timelineTime = useMemo(() => {
|
const [timelineTime, setTimelineTime] = useState(
|
||||||
if (!playback || playback.timelineItems.length == 0) {
|
playback.timelineItems.length > 0
|
||||||
return 0;
|
? playback.timelineItems[0].timestamp
|
||||||
}
|
: playback.range.start
|
||||||
|
);
|
||||||
return playback.timelineItems.at(0)!!.timestamp;
|
|
||||||
}, [playback]);
|
|
||||||
|
|
||||||
const recordingParams = useMemo(() => {
|
const recordingParams = useMemo(() => {
|
||||||
return {
|
return {
|
||||||
@ -129,14 +127,7 @@ export default function MobileTimelineView({
|
|||||||
|
|
||||||
const seekTimestamp = data.time.getTime() / 1000;
|
const seekTimestamp = data.time.getTime() / 1000;
|
||||||
const seekTime = seekTimestamp - playback.relevantPreview.start;
|
const seekTime = seekTimestamp - playback.relevantPreview.start;
|
||||||
console.log(
|
setTimelineTime(seekTimestamp);
|
||||||
"seeking to " +
|
|
||||||
seekTime +
|
|
||||||
" comparing " +
|
|
||||||
new Date(seekTimestamp * 1000) +
|
|
||||||
" - " +
|
|
||||||
new Date(playback.relevantPreview.start * 1000)
|
|
||||||
);
|
|
||||||
setTimeToSeek(Math.round(seekTime));
|
setTimeToSeek(Math.round(seekTime));
|
||||||
},
|
},
|
||||||
[scrubbing, playerRef, playback]
|
[scrubbing, playerRef, playback]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user