Merge 793906bb68 into 213a1fbd00

web/src/components/player/HlsVideoPlayer.tsx

@@ -6,7 +6,7 @@ import {
   useState,
 } from "react";
 import Hls from "hls.js";
-import { isDesktop, isMobile } from "react-device-detect";
+import { isAndroid, isDesktop, isMobile } from "react-device-detect";
 import { TransformComponent, TransformWrapper } from "react-zoom-pan-pinch";
 import VideoControls from "./VideoControls";
 import { VideoResolutionType } from "@/types/live";
@@ -22,7 +22,7 @@ import { useTranslation } from "react-i18next";
 import ObjectTrackOverlay from "@/components/overlay/ObjectTrackOverlay";
 
 // Android native hls does not seek correctly
-const USE_NATIVE_HLS = false;
+const USE_NATIVE_HLS = !isAndroid;
 const HLS_MIME_TYPE = "application/vnd.apple.mpegurl" as const;
 const unsupportedErrorCodes = [
   MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,

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

@@ -111,7 +111,7 @@ export default function DynamicVideoPlayer({
   const [loadingTimeout, setLoadingTimeout] = useState<NodeJS.Timeout>();
   const [source, setSource] = useState<HlsSource>({
     playlist: `${apiHost}vod/${camera}/start/${timeRange.after}/end/${timeRange.before}/master.m3u8`,
-    startPosition: startTimestamp ? startTimestamp - timeRange.after : 0,
+    startPosition: startTimestamp ? timeRange.after - startTimestamp : 0,
   });
 
   // start at correct time