administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-05-01 19:17:41 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Nicolas Mowen 2025-05-19 08:08:13 -06:00
parent 9bcfb5a852
commit 842cba4245
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/player/dynamic/DynamicVideoPlayer.tsx
View File

@ -198,25 +198,10 @@ export default function DynamicVideoPlayer({
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [controller, recordings]); }, [controller, recordings]);
<<<<<<< Updated upstream
/** the HLS endpoint returns the vod segments with the first
* segment of the hour trimmed, meaning it will start at
* the beginning of the hour, cutting off any difference
* that the segment has.
*/
const inpointOffset = useMemo(() => {
if (!recordingParams || !recordings || recordings?.length === 0) {
return 0;
}
return recordingParams.after - recordings[0].start_time;
}, [recordingParams, recordings]);
=======
const inpointOffset = useMemo( const inpointOffset = useMemo(
() => calculateInpointOffset(recordingParams.after, (recordings || [])[0]), () => calculateInpointOffset(recordingParams.after, (recordings || [])[0]),
[recordingParams, recordings], [recordingParams, recordings],
); );
>>>>>>> Stashed changes
return ( return (
<> <>