web/src/components/overlay/detail/TrackingDetails.tsx

@@ -56,7 +56,6 @@ export function TrackingDetails({
   const apiHost = useApiHost();
   const imgRef = useRef<HTMLImageElement | null>(null);
   const [imgLoaded, setImgLoaded] = useState(false);
-  const [isVideoLoading, setIsVideoLoading] = useState(true);
   const [displaySource, _setDisplaySource] = useState<"video" | "image">(
     "video",
   );
@@ -71,10 +70,6 @@ export function TrackingDetails({
     (event.start_time ?? 0) + annotationOffset / 1000 - REVIEW_PADDING,
   );
 
-  useEffect(() => {
-    setIsVideoLoading(true);
-  }, [event.id]);
-
   const { data: eventSequence } = useSWR<TrackingDetailsSequence[]>([
     "timeline",
     {
@@ -532,28 +527,22 @@ export function TrackingDetails({
           )}
         >
           {displaySource == "video" && (
-            <>
-              <HlsVideoPlayer
-                videoRef={videoRef}
-                containerRef={containerRef}
-                visible={true}
-                currentSource={videoSource}
-                hotKeys={false}
-                supportsFullscreen={false}
-                fullscreen={false}
-                frigateControls={true}
-                onTimeUpdate={handleTimeUpdate}
-                onSeekToTime={handleSeekToTime}
-                onUploadFrame={onUploadFrameToPlus}
-                onPlaying={() => setIsVideoLoading(false)}
-                isDetailMode={true}
-                camera={event.camera}
-                currentTimeOverride={currentTime}
-              />
-              {isVideoLoading && (
-                <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />
-              )}
-            </>
+            <HlsVideoPlayer
+              videoRef={videoRef}
+              containerRef={containerRef}
+              visible={true}
+              currentSource={videoSource}
+              hotKeys={false}
+              supportsFullscreen={false}
+              fullscreen={false}
+              frigateControls={true}
+              onTimeUpdate={handleTimeUpdate}
+              onSeekToTime={handleSeekToTime}
+              onUploadFrame={onUploadFrameToPlus}
+              isDetailMode={true}
+              camera={event.camera}
+              currentTimeOverride={currentTime}
+            />
           )}
           {displaySource == "image" && (
             <>

web/src/components/player/HlsVideoPlayer.tsx

@@ -130,8 +130,6 @@ export default function HlsVideoPlayer({
       return;
     }
 
-    setLoadedMetadata(false);
-
     const currentPlaybackRate = videoRef.current.playbackRate;
 
     if (!useHlsCompat) {

web/src/components/player/PreviewPlayer.tsx

@@ -309,7 +309,6 @@ function PreviewVideoPlayer({
           playsInline
           muted
           disableRemotePlayback
-          disablePictureInPicture
           onSeeked={onPreviewSeeked}
           onLoadedData={() => {
             if (firstLoad) {

web/src/components/player/dynamic/DynamicVideoController.ts

@@ -2,10 +2,7 @@ import { Recording } from "@/types/record";
 import { DynamicPlayback } from "@/types/playback";
 import { PreviewController } from "../PreviewPlayer";
 import { TimeRange, TrackingDetailsSequence } from "@/types/timeline";
-import {
-  calculateInpointOffset,
-  calculateSeekPosition,
-} from "@/utils/videoUtil";
+import { calculateInpointOffset } from "@/utils/videoUtil";
 
 type PlayerMode = "playback" | "scrubbing";
 
@@ -75,20 +72,38 @@ export class DynamicVideoController {
       return;
     }
 
+    if (
+      this.recordings.length == 0 ||
+      time < this.recordings[0].start_time ||
+      time > this.recordings[this.recordings.length - 1].end_time
+    ) {
+      this.setNoRecording(true);
+      return;
+    }
+
     if (this.playerMode != "playback") {
       this.playerMode = "playback";
     }
 
-    const seekSeconds = calculateSeekPosition(
-      time,
-      this.recordings,
-      this.inpointOffset,
-    );
+    let seekSeconds = 0;
+    (this.recordings || []).every((segment) => {
+      // if the next segment is past the desired time, stop calculating
+      if (segment.start_time > time) {
+        return false;
+      }
 
-    if (seekSeconds === undefined) {
-      this.setNoRecording(true);
-      return;
-    }
+      if (segment.end_time < time) {
+        seekSeconds += segment.end_time - segment.start_time;
+        return true;
+      }
+
+      seekSeconds +=
+        segment.end_time - segment.start_time - (segment.end_time - time);
+      return true;
+    });
+
+    // adjust for HLS inpoint offset
+    seekSeconds -= this.inpointOffset;
 
     if (seekSeconds != 0) {
       this.playerController.currentTime = seekSeconds;

web/src/components/player/dynamic/DynamicVideoPlayer.tsx

@@ -14,10 +14,7 @@ import { VideoResolutionType } from "@/types/live";
 import axios from "axios";
 import { cn } from "@/lib/utils";
 import { useTranslation } from "react-i18next";
-import {
-  calculateInpointOffset,
-  calculateSeekPosition,
-} from "@/utils/videoUtil";
+import { calculateInpointOffset } from "@/utils/videoUtil";
 import { isFirefox } from "react-device-detect";
 
 /**
@@ -112,10 +109,10 @@ export default function DynamicVideoPlayer({
   const [isLoading, setIsLoading] = useState(false);
   const [isBuffering, setIsBuffering] = useState(false);
   const [loadingTimeout, setLoadingTimeout] = useState<NodeJS.Timeout>();
-
-  // Don't set source until recordings load - we need accurate startPosition
-  // to avoid hls.js clamping to video end when startPosition exceeds duration
-  const [source, setSource] = useState<HlsSource | undefined>(undefined);
+  const [source, setSource] = useState<HlsSource>({
+    playlist: `${apiHost}vod/${camera}/start/${timeRange.after}/end/${timeRange.before}/master.m3u8`,
+    startPosition: startTimestamp ? startTimestamp - timeRange.after : 0,
+  });
 
   // start at correct time
 
@@ -187,7 +184,7 @@ export default function DynamicVideoPlayer({
   );
 
   useEffect(() => {
-    if (!recordings?.length) {
+    if (!controller || !recordings?.length) {
       if (recordings?.length == 0) {
         setNoRecording(true);
       }
@@ -195,6 +192,10 @@ export default function DynamicVideoPlayer({
       return;
     }
 
+    if (playerRef.current) {
+      playerRef.current.autoplay = !isScrubbing;
+    }
+
     let startPosition = undefined;
 
     if (startTimestamp) {
@@ -202,12 +203,14 @@ export default function DynamicVideoPlayer({
         recordingParams.after,
         (recordings || [])[0],
       );
-
-      startPosition = calculateSeekPosition(
-        startTimestamp,
-        recordings,
-        inpointOffset,
+      const idealStartPosition = Math.max(
+        0,
+        startTimestamp - timeRange.after - inpointOffset,
       );
+
+      if (idealStartPosition >= recordings[0].start_time - timeRange.after) {
+        startPosition = idealStartPosition;
+      }
     }
 
     setSource({
@@ -215,18 +218,6 @@ export default function DynamicVideoPlayer({
       startPosition,
     });
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [recordings]);
-
-  useEffect(() => {
-    if (!controller || !recordings?.length) {
-      return;
-    }
-
-    if (playerRef.current) {
-      playerRef.current.autoplay = !isScrubbing;
-    }
-
     setLoadingTimeout(setTimeout(() => setIsLoading(true), 1000));
 
     controller.newPlayback({
@@ -234,7 +225,7 @@ export default function DynamicVideoPlayer({
       timeRange,
     });
 
-    // we only want this to change when controller or recordings update
+    // we only want this to change when recordings update
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [controller, recordings]);
 
@@ -272,48 +263,46 @@ export default function DynamicVideoPlayer({
 
   return (
     <>
-      {source && (
-        <HlsVideoPlayer
-          videoRef={playerRef}
-          containerRef={containerRef}
-          visible={!(isScrubbing || isLoading)}
-          currentSource={source}
-          hotKeys={hotKeys}
-          supportsFullscreen={supportsFullscreen}
-          fullscreen={fullscreen}
-          inpointOffset={inpointOffset}
-          onTimeUpdate={onTimeUpdate}
-          onPlayerLoaded={onPlayerLoaded}
-          onClipEnded={onValidateClipEnd}
-          onSeekToTime={(timestamp, play) => {
-            if (onSeekToTime) {
-              onSeekToTime(timestamp, play);
-            }
-          }}
-          onPlaying={() => {
-            if (isScrubbing) {
-              playerRef.current?.pause();
-            }
+      <HlsVideoPlayer
+        videoRef={playerRef}
+        containerRef={containerRef}
+        visible={!(isScrubbing || isLoading)}
+        currentSource={source}
+        hotKeys={hotKeys}
+        supportsFullscreen={supportsFullscreen}
+        fullscreen={fullscreen}
+        inpointOffset={inpointOffset}
+        onTimeUpdate={onTimeUpdate}
+        onPlayerLoaded={onPlayerLoaded}
+        onClipEnded={onValidateClipEnd}
+        onSeekToTime={(timestamp, play) => {
+          if (onSeekToTime) {
+            onSeekToTime(timestamp, play);
+          }
+        }}
+        onPlaying={() => {
+          if (isScrubbing) {
+            playerRef.current?.pause();
+          }
 
-            if (loadingTimeout) {
-              clearTimeout(loadingTimeout);
-            }
+          if (loadingTimeout) {
+            clearTimeout(loadingTimeout);
+          }
 
-            setNoRecording(false);
-          }}
-          setFullResolution={setFullResolution}
-          onUploadFrame={onUploadFrameToPlus}
-          toggleFullscreen={toggleFullscreen}
-          onError={(error) => {
-            if (error == "stalled" && !isScrubbing) {
-              setIsBuffering(true);
-            }
-          }}
-          isDetailMode={isDetailMode}
-          camera={contextCamera || camera}
-          currentTimeOverride={currentTime}
-        />
-      )}
+          setNoRecording(false);
+        }}
+        setFullResolution={setFullResolution}
+        onUploadFrame={onUploadFrameToPlus}
+        toggleFullscreen={toggleFullscreen}
+        onError={(error) => {
+          if (error == "stalled" && !isScrubbing) {
+            setIsBuffering(true);
+          }
+        }}
+        isDetailMode={isDetailMode}
+        camera={contextCamera || camera}
+        currentTimeOverride={currentTime}
+      />
       <PreviewPlayer
         className={cn(
           className,

web/src/utils/videoUtil.ts

@@ -24,57 +24,3 @@ export function calculateInpointOffset(
 
   return 0;
 }
-
-/**
- * Calculates the video player time (in seconds) for a given timestamp
- * by iterating through recording segments and summing their durations.
- * This accounts for the fact that the video is a concatenation of segments,
- * not a single continuous stream.
- *
- * @param timestamp - The target timestamp to seek to
- * @param recordings - Array of recording segments
- * @param inpointOffset - HLS inpoint offset to subtract from the result
- * @returns The calculated seek position in seconds, or undefined if timestamp is out of range
- */
-export function calculateSeekPosition(
-  timestamp: number,
-  recordings: Recording[],
-  inpointOffset: number = 0,
-): number | undefined {
-  if (!recordings || recordings.length === 0) {
-    return undefined;
-  }
-
-  // Check if timestamp is within the recordings range
-  if (
-    timestamp < recordings[0].start_time ||
-    timestamp > recordings[recordings.length - 1].end_time
-  ) {
-    return undefined;
-  }
-
-  let seekSeconds = 0;
-
-  (recordings || []).every((segment) => {
-    // if the next segment is past the desired time, stop calculating
-    if (segment.start_time > timestamp) {
-      return false;
-    }
-
-    if (segment.end_time < timestamp) {
-      // Add the full duration of this segment
-      seekSeconds += segment.end_time - segment.start_time;
-      return true;
-    }
-
-    // We're in this segment - calculate position within it
-    seekSeconds +=
-      segment.end_time - segment.start_time - (segment.end_time - timestamp);
-    return true;
-  });
-
-  // Adjust for HLS inpoint offset
-  seekSeconds -= inpointOffset;
-
-  return seekSeconds >= 0 ? seekSeconds : undefined;
-}