fix: Improves video player reliability and performance

Prevents crashes by adding safeguards that check if video is loaded before calling player methods Removes performance monitoring hook that was causing unnecessary overhead during playback Reorganizes code structure by removing excessive comment sections and consolidating related functionality for better maintainability Updates Biome linter to latest version for improved code formatting and analysis
refactor: Refactors video player with state consolidation and performance optimizations
2025-08-20 18:37:18 +02:00 · 2025-08-11 01:03:06 +02:00 · 2025-08-10 23:48:32 +02:00
17 changed files with 967 additions and 409 deletions
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-native/no-inline-styles */
 import {
  type BaseItemDto,
  type MediaSourceInfo,
@@ -13,7 +14,14 @@ import {
 import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake";
 import { router, useGlobalSearchParams, useNavigation } from "expo-router";
 import { useAtomValue } from "jotai";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+} from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Platform, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
@@ -47,49 +55,74 @@ const downloadProvider = !Platform.isTV

 const IGNORE_SAFE_AREAS_KEY = "video_player_ignore_safe_areas";

-export default function page() {
+/* Playback state reducer to consolidate related state */
+interface VideoState {
+  isPlaying: boolean;
+  isMuted: boolean;
+  isBuffering: boolean;
+  isVideoLoaded: boolean;
+  isPipStarted: boolean;
+}
+type VideoAction =
+  | { type: "PLAYING_CHANGED"; value: boolean }
+  | { type: "BUFFERING_CHANGED"; value: boolean }
+  | { type: "VIDEO_LOADED" }
+  | { type: "MUTED_CHANGED"; value: boolean }
+  | { type: "PIP_CHANGED"; value: boolean };
+
+const videoReducer = (state: VideoState, action: VideoAction): VideoState => {
+  switch (action.type) {
+    case "PLAYING_CHANGED":
+      return { ...state, isPlaying: action.value };
+    case "BUFFERING_CHANGED":
+      return { ...state, isBuffering: action.value };
+    case "VIDEO_LOADED":
+      // Mark video as loaded and buffering false here
+      return { ...state, isVideoLoaded: true, isBuffering: false };
+    case "MUTED_CHANGED":
+      return { ...state, isMuted: action.value };
+    case "PIP_CHANGED":
+      return { ...state, isPipStarted: action.value };
+    default:
+      return state;
+  }
+};
+
+const initialVideoState: VideoState = {
+  isPlaying: false,
+  isMuted: false,
+  isBuffering: true,
+  isVideoLoaded: false,
+  isPipStarted: false,
+};
+
+export default function DirectPlayerPage() {
  const videoRef = useRef<VlcPlayerViewRef>(null);
  const user = useAtomValue(userAtom);
  const api = useAtomValue(apiAtom);
-  const { t } = useTranslation();
  const navigation = useNavigation();
+  const { t } = useTranslation();
+
+  /* Consolidated video playback state */
+  const [videoState, dispatch] = useReducer(videoReducer, initialVideoState);

-  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
  const [showControls, _setShowControls] = useState(true);
  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(() => {
-    // Load persisted state from storage
-    const saved = storage.getBoolean(IGNORE_SAFE_AREAS_KEY);
-    return saved ?? false;
+    return storage.getBoolean(IGNORE_SAFE_AREAS_KEY) ?? false;
  });
-  const [isPlaying, setIsPlaying] = useState(false);
-  const [isMuted, setIsMuted] = useState(false);
-  const [isBuffering, setIsBuffering] = useState(true);
-  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
-  const [isPipStarted, setIsPipStarted] = useState(false);
+  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
+
+  const insets = useSafeAreaInsets();
+  const [settings] = useSettings();

  const progress = useSharedValue(0);
  const isSeeking = useSharedValue(false);
  const cacheProgress = useSharedValue(0);
+  const lightHapticFeedback = useHaptic("light");
  const VolumeManager = Platform.isTV
    ? null
    : require("react-native-volume-manager");

-  const getDownloadedItem = downloadProvider.useDownload();
-
-  const revalidateProgressCache = useInvalidatePlaybackProgressCache();
-
-  const lightHapticFeedback = useHaptic("light");
-
-  const setShowControls = useCallback((show: boolean) => {
-    _setShowControls(show);
-    lightHapticFeedback();
-  }, []);
-
-  // Persist ignoreSafeAreas state whenever it changes
-  useEffect(() => {
-    storage.set(IGNORE_SAFE_AREAS_KEY, ignoreSafeAreas);
-  }, [ignoreSafeAreas]);
-
  const {
    itemId,
    audioIndex: audioIndexStr,
@@ -105,71 +138,82 @@ export default function page() {
    mediaSourceId: string;
    bitrateValue: string;
    offline: string;
-    /** Playback position in ticks. */
    playbackPosition?: string;
  }>();
-  const [settings] = useSettings();
-  const insets = useSafeAreaInsets();
-  const offline = offlineStr === "true";

-  const audioIndex = audioIndexStr
-    ? Number.parseInt(audioIndexStr, 10)
-    : undefined;
-  const subtitleIndex = subtitleIndexStr
-    ? Number.parseInt(subtitleIndexStr, 10)
-    : -1;
+  const offline = offlineStr === "true";
+  const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
+  const subtitleIndex = subtitleIndexStr ? parseInt(subtitleIndexStr, 10) : -1;
  const bitrateValue = bitrateValueStr
-    ? Number.parseInt(bitrateValueStr, 10)
+    ? parseInt(bitrateValueStr, 10)
    : BITRATES[0].value;

+  const setShowControls = useCallback(
+    (show: boolean) => {
+      _setShowControls(show);
+      lightHapticFeedback();
+    },
+    [lightHapticFeedback],
+  );
+
+  useEffect(() => {
+    storage.set(IGNORE_SAFE_AREAS_KEY, ignoreSafeAreas);
+  }, [ignoreSafeAreas]);
+
+  /* Fetch the item info */
  const [item, setItem] = useState<BaseItemDto | null>(null);
  const [itemStatus, setItemStatus] = useState({
    isLoading: true,
    isError: false,
  });
+  const getDownloadedItem = downloadProvider.useDownload();

-  /** Gets the initial playback position from the URL or the item's user data. */
  const getInitialPlaybackTicks = useCallback((): number => {
    if (playbackPositionFromUrl) {
-      return Number.parseInt(playbackPositionFromUrl, 10);
+      return parseInt(playbackPositionFromUrl, 10);
    }
    return item?.UserData?.PlaybackPositionTicks ?? 0;
  }, [playbackPositionFromUrl, item]);

  useEffect(() => {
-    const fetchItemData = async () => {
+    if (!itemId) return;
+
+    const controller = new AbortController();
+    (async () => {
      setItemStatus({ isLoading: true, isError: false });
      try {
        let fetchedItem: BaseItemDto | null = null;
        if (offline && !Platform.isTV) {
          const data = await getDownloadedItem.getDownloadedItem(itemId);
-          if (data) fetchedItem = data.item as BaseItemDto;
+          fetchedItem = data?.item as BaseItemDto | null;
        } else {
-          const res = await getUserLibraryApi(api!).getItem({
-            itemId,
-            userId: user?.Id,
-          });
+          const res = await getUserLibraryApi(api!).getItem(
+            { itemId, userId: user?.Id },
+            { signal: controller.signal },
+          );
          fetchedItem = res.data;
        }
-        setItem(fetchedItem);
-        setItemStatus({ isLoading: false, isError: false });
+        if (!controller.signal.aborted) {
+          setItem(fetchedItem);
+          setItemStatus({ isLoading: false, isError: false });
+        }
      } catch (error) {
-        console.error("Failed to fetch item:", error);
-        setItemStatus({ isLoading: false, isError: true });
+        if (!controller.signal.aborted) {
+          console.error("Failed to fetch item:", error);
+          setItemStatus({ isLoading: false, isError: true });
+        }
      }
-    };
+    })();

-    if (itemId) {
-      fetchItemData();
-    }
-  }, [itemId, offline, api, user?.Id]);
+    return () => controller.abort();
+  }, [itemId, offline, api, user?.Id, getDownloadedItem]);

+  /* Fetch stream info */
  interface Stream {
    mediaSource: MediaSourceInfo;
    sessionId: string;
    url: string;
  }
-
  const [stream, setStream] = useState<Stream | null>(null);
  const [streamStatus, setStreamStatus] = useState({
    isLoading: true,
@@ -179,18 +223,16 @@ export default function page() {
  useEffect(() => {
    const fetchStreamData = async () => {
      setStreamStatus({ isLoading: true, isError: false });
-      const native = await generateDeviceProfile();
      try {
+        const native = await generateDeviceProfile();
        let result: Stream | null = null;
+
        if (offline && !Platform.isTV) {
          const data = await getDownloadedItem.getDownloadedItem(itemId);
          if (!data?.mediaSource) return;
          const url = await getDownloadedFileUrl(data.item.Id!);
-          if (item) {
-            result = { mediaSource: data.mediaSource, sessionId: "", url };
-          }
-        } else {
-          if (!item) return;
+          result = { mediaSource: data.mediaSource, sessionId: "", url };
+        } else if (item) {
          const res = await getStreamUrl({
            api,
            item,
@@ -198,7 +240,7 @@ export default function page() {
            userId: user?.Id,
            audioStreamIndex: audioIndex,
            maxStreamingBitrate: bitrateValue,
-            mediaSourceId: mediaSourceId,
+            mediaSourceId,
            subtitleStreamIndex: subtitleIndex,
            deviceProfile: native,
          });
@@ -213,6 +255,7 @@ export default function page() {
          }
          result = { mediaSource, sessionId, url };
        }
+
        setStream(result);
        setStreamStatus({ isLoading: false, isError: false });
      } catch (error) {
@@ -220,219 +263,310 @@ export default function page() {
        setStreamStatus({ isLoading: false, isError: true });
      }
    };
+
    fetchStreamData();
-  }, [itemId, mediaSourceId, bitrateValue, api, item, user?.Id]);
-
-  useEffect(() => {
-    if (!stream) return;
-
-    const reportPlaybackStart = async () => {
-      await getPlaystateApi(api!).reportPlaybackStart({
-        playbackStartInfo: currentPlayStateInfo() as PlaybackStartInfo,
-      });
-    };
-
-    reportPlaybackStart();
-  }, [stream]);
-
-  const togglePlay = async () => {
-    lightHapticFeedback();
-    setIsPlaying(!isPlaying);
-    if (isPlaying) {
-      await videoRef.current?.pause();
-      reportPlaybackProgress();
-    } else {
-      videoRef.current?.play();
-      await getPlaystateApi(api!).reportPlaybackStart({
-        playbackStartInfo: currentPlayStateInfo() as PlaybackStartInfo,
-      });
-    }
-  };
-
-  const reportPlaybackStopped = useCallback(async () => {
-    if (offline) return;
-    const currentTimeInTicks = msToTicks(progress.get());
-    await getPlaystateApi(api!).onPlaybackStopped({
-      itemId: item?.Id!,
-      mediaSourceId: mediaSourceId,
-      positionTicks: currentTimeInTicks,
-      playSessionId: stream?.sessionId!,
-    });
-
-    revalidateProgressCache();
  }, [
+    itemId,
+    mediaSourceId,
+    bitrateValue,
    api,
    item,
-    mediaSourceId,
-    stream,
-    progress,
+    user?.Id,
    offline,
-    revalidateProgressCache,
+    getInitialPlaybackTicks,
+    audioIndex,
+    subtitleIndex,
  ]);

-  const stop = useCallback(() => {
-    reportPlaybackStopped();
-    setIsPlaybackStopped(true);
-    videoRef.current?.stop();
-  }, [videoRef, reportPlaybackStopped]);
+  const revalidateProgressCache = useInvalidatePlaybackProgressCache();

-  useEffect(() => {
-    const beforeRemoveListener = navigation.addListener("beforeRemove", stop);
-    return () => {
-      beforeRemoveListener();
-    };
-  }, [navigation, stop]);
-
-  const currentPlayStateInfo = () => {
-    if (!stream) return;
+  /* Memoized playback state info for reporting */
+  const currentPlayStateInfo = useMemo(() => {
+    if (!stream) return null;
    return {
      itemId: item?.Id!,
-      audioStreamIndex: audioIndex ? audioIndex : undefined,
-      subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-      mediaSourceId: mediaSourceId,
+      audioStreamIndex: audioIndex,
+      subtitleStreamIndex: subtitleIndex,
+      mediaSourceId,
      positionTicks: msToTicks(progress.get()),
-      isPaused: !isPlaying,
-      playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
+      isPaused: !videoState.isPlaying,
+      playMethod: stream.url.includes("m3u8") ? "Transcode" : "DirectStream",
      playSessionId: stream.sessionId,
-      isMuted: isMuted,
+      isMuted: videoState.isMuted,
      canSeek: true,
      repeatMode: RepeatMode.RepeatNone,
      playbackOrder: PlaybackOrder.Default,
    };
-  };
-
-  const onProgress = useCallback(
-    async (data: ProgressUpdatePayload) => {
-      if (isSeeking.get() || isPlaybackStopped) return;
-
-      const { currentTime } = data.nativeEvent;
-      if (isBuffering) {
-        setIsBuffering(false);
-      }
-
-      progress.set(currentTime);
-
-      // Update the playback position in the URL.
-      router.setParams({
-        playbackPosition: msToTicks(currentTime).toString(),
-      });
-
-      if (offline) return;
-      if (!item?.Id || !stream) return;
-
-      reportPlaybackProgress();
-    },
-    [
-      item?.Id,
-      audioIndex,
-      subtitleIndex,
-      mediaSourceId,
-      isPlaying,
-      stream,
-      isSeeking,
-      isPlaybackStopped,
-      isBuffering,
-    ],
-  );
-
-  const onPipStarted = useCallback((e: PipStartedPayload) => {
-    const { pipStarted } = e.nativeEvent;
-    setIsPipStarted(pipStarted);
-  }, []);
-
-  const reportPlaybackProgress = useCallback(async () => {
-    if (!api || offline || !stream) return;
-    await getPlaystateApi(api).reportPlaybackProgress({
-      playbackProgressInfo: currentPlayStateInfo() as PlaybackProgressInfo,
-    });
  }, [
-    api,
-    isPlaying,
-    offline,
-    stream,
    item?.Id,
    audioIndex,
    subtitleIndex,
    mediaSourceId,
    progress,
+    videoState.isPlaying,
+    videoState.isMuted,
+    stream,
  ]);

-  /** Gets the initial playback position in seconds. */
-  const startPosition = useMemo(() => {
-    if (offline) return 0;
-    return ticksToSeconds(getInitialPlaybackTicks());
-  }, [offline, getInitialPlaybackTicks]);
+  /* Playback progress reporting */
+  const reportPlaybackProgress = useCallback(async () => {
+    if (!api || offline || !stream || !currentPlayStateInfo) return;
+    await getPlaystateApi(api).reportPlaybackProgress({
+      playbackProgressInfo: currentPlayStateInfo as PlaybackProgressInfo,
+    });
+  }, [api, offline, stream, currentPlayStateInfo]);

+  /* Report playback stopped */
+  const reportPlaybackStopped = useCallback(async () => {
+    if (offline || !stream) return;
+    await getPlaystateApi(api!).onPlaybackStopped({
+      itemId: item?.Id!,
+      mediaSourceId,
+      positionTicks: msToTicks(progress.get()),
+      playSessionId: stream.sessionId,
+    });
+    revalidateProgressCache();
+  }, [
+    api,
+    item?.Id,
+    mediaSourceId,
+    progress,
+    stream,
+    offline,
+    revalidateProgressCache,
+  ]);
+
+  /* Toggle play/pause */
+  const togglePlay = useCallback(async () => {
+    lightHapticFeedback();
+    const playing = videoState.isPlaying;
+    dispatch({ type: "PLAYING_CHANGED", value: !playing });
+
+    if (playing) {
+      await videoRef.current?.pause();
+      reportPlaybackProgress();
+    } else {
+      await videoRef.current?.play();
+      if (currentPlayStateInfo) {
+        await getPlaystateApi(api!).reportPlaybackStart({
+          playbackStartInfo: currentPlayStateInfo as PlaybackStartInfo,
+        });
+      }
+    }
+  }, [
+    videoState.isPlaying,
+    lightHapticFeedback,
+    reportPlaybackProgress,
+    api,
+    currentPlayStateInfo,
+  ]);
+
+  /* Stop playback and clean up */
+  const stop = useCallback(() => {
+    reportPlaybackStopped();
+    setIsPlaybackStopped(true);
+    videoRef.current?.stop();
+  }, [reportPlaybackStopped]);
+
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("beforeRemove", stop);
+    return unsubscribe;
+  }, [navigation, stop]);
+
+  /* VLC init options optimized for performance */
+  const optimizedInitOptions = useMemo(() => {
+    const opts = [`--sub-text-scale=${settings.subtitleSize}`];
+    // Reduce buffering memory usage
+    opts.push("--network-caching=300", "--file-caching=300");
+    if (Platform.OS === "android") opts.push("--aout=opensles");
+    if (Platform.OS === "ios") opts.push("--ios-hw-decoding");
+
+    // Pre-selection of audio & subtitle tracks handled here
+    const notTranscoding = !stream?.mediaSource.TranscodingUrl;
+    const allAudio =
+      stream?.mediaSource.MediaStreams?.filter((s) => s.Type === "Audio") ?? [];
+    const allSubs =
+      stream?.mediaSource.MediaStreams?.filter(
+        (s) => s.Type === "Subtitle",
+      )?.sort((a, b) => Number(a.IsExternal) - Number(b.IsExternal)) ?? [];
+
+    if (subtitleIndex >= 0) {
+      const chosenSubtitleTrack = allSubs.find(
+        (s) => s.Index === subtitleIndex,
+      );
+      const textSubs = allSubs.filter((s) => s.IsTextSubtitleStream);
+      if (
+        chosenSubtitleTrack &&
+        (notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
+      ) {
+        const finalIdx = notTranscoding
+          ? allSubs.indexOf(chosenSubtitleTrack)
+          : textSubs.indexOf(chosenSubtitleTrack);
+        opts.push(`--sub-track=${finalIdx}`);
+      }
+    }
+    if (notTranscoding && audioIndex !== undefined) {
+      const chosenAudioTrack = allAudio.find((a) => a.Index === audioIndex);
+      if (chosenAudioTrack)
+        opts.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
+    }
+
+    return opts;
+  }, [settings.subtitleSize, stream?.mediaSource, subtitleIndex, audioIndex]);
+
+  /* On Picture-In-Picture started or stopped */
+  const onPipStarted = useCallback((e: PipStartedPayload) => {
+    dispatch({ type: "PIP_CHANGED", value: e.nativeEvent.pipStarted });
+  }, []);
+
+  /* Progress event handler */
+  const onProgress = useCallback(
+    (data: ProgressUpdatePayload) => {
+      if (isSeeking.get() || isPlaybackStopped) return;
+      if (videoState.isBuffering)
+        dispatch({ type: "BUFFERING_CHANGED", value: false });
+      const { currentTime } = data.nativeEvent;
+      progress.set(currentTime);
+      router.setParams({ playbackPosition: msToTicks(currentTime).toString() });
+      if (!offline) reportPlaybackProgress();
+    },
+    [
+      isSeeking,
+      isPlaybackStopped,
+      progress,
+      offline,
+      reportPlaybackProgress,
+      videoState.isBuffering,
+    ],
+  );
+
+  /* Playback state changes */
+  const onPlaybackStateChanged = useCallback(
+    async (e: PlaybackStatePayload) => {
+      const { state, isBuffering, isPlaying } = e.nativeEvent;
+      switch (state) {
+        case "Playing":
+          dispatch({ type: "PLAYING_CHANGED", value: true });
+          await activateKeepAwakeAsync();
+          reportPlaybackProgress();
+          break;
+        case "Paused":
+          dispatch({ type: "PLAYING_CHANGED", value: false });
+          await deactivateKeepAwake();
+          reportPlaybackProgress();
+          break;
+        default:
+          dispatch({ type: "BUFFERING_CHANGED", value: !!isBuffering });
+          dispatch({ type: "PLAYING_CHANGED", value: !!isPlaying });
+      }
+    },
+    [reportPlaybackProgress],
+  );
+
+  /* Safe wrapper for player methods that skips calls if video not loaded */
+  const safeMethod =
+    <T extends unknown[]>(
+      fn: ((...args: T) => any) | undefined,
+      name: string,
+    ) =>
+    async (...args: T) => {
+      // New safeguard: skip calling if video not loaded yet
+      if (!videoState.isVideoLoaded) {
+        writeToLog("WARN", `${name} skipped - video not loaded yet`);
+        return;
+      }
+      if (!fn) {
+        writeToLog("ERROR", `${name} fn missing`, {
+          isVideoLoaded: videoState.isVideoLoaded,
+        });
+        return;
+      }
+      try {
+        return await fn(...args);
+      } catch (error) {
+        writeToLog("ERROR", `Error in ${name}`, {
+          error,
+          isVideoLoaded: videoState.isVideoLoaded,
+        });
+      }
+    };
+
+  const play = useCallback(
+    () => safeMethod(videoRef.current?.play, "play")(),
+    [videoRef],
+  );
+  const pause = useCallback(
+    () => safeMethod(videoRef.current?.pause, "pause")(),
+    [videoRef],
+  );
+  const startPictureInPicture = useCallback(
+    () => safeMethod(videoRef.current?.startPictureInPicture, "PiP")(),
+    [videoRef],
+  );
+  const seek = useCallback(
+    (t: number) => safeMethod(videoRef.current?.seekTo, "seek")(t),
+    [videoRef],
+  );
+  const getAudioTracks = useCallback(
+    () => safeMethod(videoRef.current?.getAudioTracks, "getAudioTracks")(),
+    [videoRef],
+  );
+  const getSubtitleTracks = useCallback(
+    () =>
+      safeMethod(videoRef.current?.getSubtitleTracks, "getSubtitleTracks")(),
+    [videoRef],
+  );
+  const setAudioTrack = useCallback(
+    (i: number) =>
+      safeMethod(videoRef.current?.setAudioTrack, "setAudioTrack")(i),
+    [videoRef],
+  );
+  const setSubtitleTrack = useCallback(
+    (i: number) =>
+      safeMethod(videoRef.current?.setSubtitleTrack, "setSubtitleTrack")(i),
+    [videoRef],
+  );
+  const setSubtitleURL = useCallback(
+    (url: string, n: string) =>
+      safeMethod(videoRef.current?.setSubtitleURL, "setSubtitleURL")(url, n),
+    [videoRef],
+  );
+
+  /* Volume handlers */
+  const [previousVolume, setPreviousVolume] = useState<number | null>(null);
  const volumeUpCb = useCallback(async () => {
    if (Platform.isTV) return;
-
-    try {
-      const { volume: currentVolume } = await VolumeManager.getVolume();
-      const newVolume = Math.min(currentVolume + 0.1, 1.0);
-
-      await VolumeManager.setVolume(newVolume);
-    } catch (error) {
-      console.error("Error adjusting volume:", error);
-    }
+    const { volume } = await VolumeManager.getVolume();
+    await VolumeManager.setVolume(Math.min(volume + 0.1, 1));
  }, []);
-  const [previousVolume, setPreviousVolume] = useState<number | null>(null);
-
-  const toggleMuteCb = useCallback(async () => {
-    if (Platform.isTV) return;
-
-    try {
-      const { volume: currentVolume } = await VolumeManager.getVolume();
-      const currentVolumePercent = currentVolume * 100;
-
-      if (currentVolumePercent > 0) {
-        // Currently not muted, so mute
-        setPreviousVolume(currentVolumePercent);
-        await VolumeManager.setVolume(0);
-        setIsMuted(true);
-      } else {
-        // Currently muted, so restore previous volume
-        const volumeToRestore = previousVolume || 50; // Default to 50% if no previous volume
-        await VolumeManager.setVolume(volumeToRestore / 100);
-        setPreviousVolume(null);
-        setIsMuted(false);
-      }
-    } catch (error) {
-      console.error("Error toggling mute:", error);
-    }
-  }, [previousVolume]);
  const volumeDownCb = useCallback(async () => {
    if (Platform.isTV) return;
-
-    try {
-      const { volume: currentVolume } = await VolumeManager.getVolume();
-      const newVolume = Math.max(currentVolume - 0.1, 0); // Decrease by 10%
-      console.log(
-        "Volume Down",
-        Math.round(currentVolume * 100),
-        "→",
-        Math.round(newVolume * 100),
-      );
-      await VolumeManager.setVolume(newVolume);
-    } catch (error) {
-      console.error("Error adjusting volume:", error);
-    }
+    const { volume } = await VolumeManager.getVolume();
+    await VolumeManager.setVolume(Math.max(volume - 0.1, 0));
  }, []);
-
-  const setVolumeCb = useCallback(async (newVolume: number) => {
+  const setVolumeCb = useCallback(async (v: number) => {
    if (Platform.isTV) return;
-
-    try {
-      const clampedVolume = Math.max(0, Math.min(newVolume, 100));
-      console.log("Setting volume to", clampedVolume);
-      await VolumeManager.setVolume(clampedVolume / 100);
-    } catch (error) {
-      console.error("Error setting volume:", error);
-    }
+    await VolumeManager.setVolume(Math.max(0, Math.min(v, 100)) / 100);
  }, []);
+  const toggleMuteCb = useCallback(async () => {
+    if (Platform.isTV) return;
+    const { volume } = await VolumeManager.getVolume();
+    const percent = volume * 100;
+    if (percent > 0) {
+      setPreviousVolume(percent);
+      await VolumeManager.setVolume(0);
+      dispatch({ type: "MUTED_CHANGED", value: true });
+    } else {
+      const restore = previousVolume || 50;
+      await VolumeManager.setVolume(restore / 100);
+      setPreviousVolume(null);
+      dispatch({ type: "MUTED_CHANGED", value: false });
+    }
+  }, [previousVolume]);

  useWebSocket({
-    isPlaying: isPlaying,
-    togglePlay: togglePlay,
+    isPlaying: videoState.isPlaying,
+    togglePlay,
    stopPlayback: stop,
    offline,
    toggleMute: toggleMuteCb,
@@ -441,118 +575,44 @@ export default function page() {
    setVolume: setVolumeCb,
  });

-  const onPlaybackStateChanged = useCallback(
-    async (e: PlaybackStatePayload) => {
-      const { state, isBuffering, isPlaying } = e.nativeEvent;
-      if (state === "Playing") {
-        setIsPlaying(true);
-        reportPlaybackProgress();
-        if (!Platform.isTV) await activateKeepAwakeAsync();
-        return;
-      }
-
-      if (state === "Paused") {
-        setIsPlaying(false);
-        reportPlaybackProgress();
-        if (!Platform.isTV) await deactivateKeepAwake();
-        return;
-      }
-
-      if (isPlaying) {
-        setIsPlaying(true);
-        setIsBuffering(false);
-      } else if (isBuffering) {
-        setIsBuffering(true);
-      }
-    },
-    [reportPlaybackProgress],
+  /* Calculate start position in seconds */
+  const startPosition = useMemo(
+    () => (offline ? 0 : ticksToSeconds(getInitialPlaybackTicks())),
+    [offline, getInitialPlaybackTicks],
  );

-  const allAudio =
-    stream?.mediaSource.MediaStreams?.filter(
-      (audio) => audio.Type === "Audio",
-    ) || [];
-
-  // Move all the external subtitles last, because vlc places them last.
-  const allSubs =
-    stream?.mediaSource.MediaStreams?.filter(
-      (sub) => sub.Type === "Subtitle",
-    ).sort((a, b) => Number(a.IsExternal) - Number(b.IsExternal)) || [];
-
-  const externalSubtitles = allSubs
-    .filter((sub: any) => sub.DeliveryMethod === "External")
-    .map((sub: any) => ({
-      name: sub.DisplayTitle,
-      DeliveryUrl: api?.basePath + sub.DeliveryUrl,
-    }));
-
-  const textSubs = allSubs.filter((sub) => sub.IsTextSubtitleStream);
-
-  const chosenSubtitleTrack = allSubs.find(
-    (sub) => sub.Index === subtitleIndex,
-  );
-  const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
-
-  const notTranscoding = !stream?.mediaSource.TranscodingUrl;
-  const initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
-  if (
-    chosenSubtitleTrack &&
-    (notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
-  ) {
-    const finalIndex = notTranscoding
-      ? allSubs.indexOf(chosenSubtitleTrack)
-      : textSubs.indexOf(chosenSubtitleTrack);
-    initOptions.push(`--sub-track=${finalIndex}`);
-  }
-
-  if (notTranscoding && chosenAudioTrack) {
-    initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
-  }
-
-  const [isMounted, setIsMounted] = useState(false);
-
-  // Add useEffect to handle mounting
-  useEffect(() => {
-    setIsMounted(true);
-    return () => setIsMounted(false);
-  }, []);
-
-  // Show error UI first, before checking loading/missing‐data
+  /* Conditionally render based on loading and error state */
  if (itemStatus.isError || streamStatus.isError) {
    return (
-      <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
+      <View className='w-screen h-screen items-center justify-center bg-black'>
        <Text className='text-white'>{t("player.error")}</Text>
      </View>
    );
  }
-
-  // Then show loader while either side is still fetching or data isn’t present
  if (itemStatus.isLoading || streamStatus.isLoading || !item || !stream) {
-    // …loader UI…
    return (
-      <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
+      <View className='w-screen h-screen items-center justify-center bg-black'>
        <Loader />
      </View>
    );
  }

-  if (itemStatus.isError || streamStatus.isError)
-    return (
-      <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
-        <Text className='text-white'>{t("player.error")}</Text>
-      </View>
-    );
+  const allSubs =
+    stream?.mediaSource.MediaStreams?.filter((s) => s.Type === "Subtitle") ||
+    [];
+  const externalSubtitles = allSubs
+    .filter((s) => s.DeliveryMethod === "External")
+    .map((s) => ({
+      name: s.DisplayTitle,
+      DeliveryUrl: api?.basePath + s.DeliveryUrl,
+    }));

  return (
    <View style={{ flex: 1, backgroundColor: "black" }}>
      <View
        style={{
-          display: "flex",
          width: "100%",
          height: "100%",
-          position: "relative",
-          flexDirection: "column",
-          justifyContent: "center",
          paddingLeft: ignoreSafeAreas ? 0 : insets.left,
          paddingRight: ignoreSafeAreas ? 0 : insets.right,
        }}
@@ -560,21 +620,20 @@ export default function page() {
        <VlcPlayerView
          ref={videoRef}
          source={{
-            uri: stream?.url || "",
+            uri: stream.url,
            autoplay: true,
-            isNetwork: !offline,
+            isNetwork: true,
            startPosition,
            externalSubtitles,
-            initOptions,
+            initOptions: optimizedInitOptions,
          }}
          style={{ width: "100%", height: "100%" }}
          onVideoProgress={onProgress}
          progressUpdateInterval={1000}
          onVideoStateChange={onPlaybackStateChanged}
          onPipStarted={onPipStarted}
-          onVideoLoadEnd={() => {
-            setIsVideoLoaded(true);
-          }}
+          // Mark video as loaded on load end to enable player method calls safely
+          onVideoLoadEnd={() => dispatch({ type: "VIDEO_LOADED" })}
          onVideoError={(e) => {
            console.error("Video Error:", e.nativeEvent);
            Alert.alert(
@@ -585,33 +644,39 @@ export default function page() {
          }}
        />
      </View>
-      {!isPipStarted && isMounted === true && item && (
+
+      {!videoState.isPipStarted && (
        <Controls
-          mediaSource={stream?.mediaSource}
+          mediaSource={stream.mediaSource}
          item={item}
          videoRef={videoRef}
          togglePlay={togglePlay}
-          isPlaying={isPlaying}
+          isPlaying={videoState.isPlaying}
          isSeeking={isSeeking}
          progress={progress}
          cacheProgress={cacheProgress}
-          isBuffering={isBuffering}
+          isBuffering={videoState.isBuffering}
          showControls={showControls}
          setShowControls={setShowControls}
          setIgnoreSafeAreas={setIgnoreSafeAreas}
          ignoreSafeAreas={ignoreSafeAreas}
-          isVideoLoaded={isVideoLoaded}
-          startPictureInPicture={videoRef.current?.startPictureInPicture}
-          play={videoRef.current?.play}
-          pause={videoRef.current?.pause}
-          seek={videoRef.current?.seekTo}
-          enableTrickplay={true}
-          getAudioTracks={videoRef.current?.getAudioTracks}
-          getSubtitleTracks={videoRef.current?.getSubtitleTracks}
+          isVideoLoaded={videoState.isVideoLoaded}
+          startPictureInPicture={startPictureInPicture}
+          play={play}
+          pause={pause}
+          seek={seek}
+          enableTrickplay
+          // Pass undefined for player methods until the video is loaded to avoid crashes
+          getAudioTracks={videoState.isVideoLoaded ? getAudioTracks : undefined}
+          getSubtitleTracks={
+            videoState.isVideoLoaded ? getSubtitleTracks : undefined
+          }
          offline={offline}
-          setSubtitleTrack={videoRef.current?.setSubtitleTrack}
-          setSubtitleURL={videoRef.current?.setSubtitleURL}
-          setAudioTrack={videoRef.current?.setAudioTrack}
+          setSubtitleTrack={
+            videoState.isVideoLoaded ? setSubtitleTrack : undefined
+          }
+          setSubtitleURL={videoState.isVideoLoaded ? setSubtitleURL : undefined}
+          setAudioTrack={videoState.isVideoLoaded ? setAudioTrack : undefined}
          isVlc
        />
      )}
--- a/biome.json
+++ b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
  "files": {
    "includes": [
      "**/*",
--- a/bun.lock
+++ b/bun.lock
@@ -85,7 +85,7 @@
      },
      "devDependencies": {
        "@babel/core": "^7.20.0",
-        "@biomejs/biome": "^2.1.3",
+        "@biomejs/biome": "^2.1.4",
        "@react-native-community/cli": "^19",
        "@react-native-tvos/config-tv": "^0.1.1",
        "@types/jest": "^29.5.12",
@@ -94,7 +94,7 @@
        "@types/react-test-renderer": "^19.0.0",
        "cross-env": "^10.0.0",
        "husky": "^9.1.7",
-        "lint-staged": "^16.1.2",
+        "lint-staged": "^16.1.5",
        "postinstall-postinstall": "^2.1.0",
        "react-test-renderer": "19.1.1",
        "typescript": "~5.8.3",
@@ -297,23 +297,23 @@

    "@babel/types": ["@babel/types@7.28.2", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ=="],

-    "@biomejs/biome": ["@biomejs/biome@2.1.3", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.1.3", "@biomejs/cli-darwin-x64": "2.1.3", "@biomejs/cli-linux-arm64": "2.1.3", "@biomejs/cli-linux-arm64-musl": "2.1.3", "@biomejs/cli-linux-x64": "2.1.3", "@biomejs/cli-linux-x64-musl": "2.1.3", "@biomejs/cli-win32-arm64": "2.1.3", "@biomejs/cli-win32-x64": "2.1.3" }, "bin": { "biome": "bin/biome" } }, "sha512-KE/tegvJIxTkl7gJbGWSgun7G6X/n2M6C35COT6ctYrAy7SiPyNvi6JtoQERVK/VRbttZfgGq96j2bFmhmnH4w=="],
+    "@biomejs/biome": ["@biomejs/biome@2.1.4", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.1.4", "@biomejs/cli-darwin-x64": "2.1.4", "@biomejs/cli-linux-arm64": "2.1.4", "@biomejs/cli-linux-arm64-musl": "2.1.4", "@biomejs/cli-linux-x64": "2.1.4", "@biomejs/cli-linux-x64-musl": "2.1.4", "@biomejs/cli-win32-arm64": "2.1.4", "@biomejs/cli-win32-x64": "2.1.4" }, "bin": { "biome": "bin/biome" } }, "sha512-QWlrqyxsU0FCebuMnkvBIkxvPqH89afiJzjMl+z67ybutse590jgeaFdDurE9XYtzpjRGTI1tlUZPGWmbKsElA=="],

-    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.1.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LFLkSWRoSGS1wVUD/BE6Nlt2dSn0ulH3XImzg2O/36BoToJHKXjSxzPEMAqT9QvwVtk7/9AQhZpTneERU9qaXA=="],
+    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.1.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-sCrNENE74I9MV090Wq/9Dg7EhPudx3+5OiSoQOkIe3DLPzFARuL1dOwCWhKCpA3I5RHmbrsbNSRfZwCabwd8Qg=="],

-    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.1.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-Q/4OTw8P9No9QeowyxswcWdm0n2MsdCwWcc5NcKQQvzwPjwuPdf8dpPPf4r+x0RWKBtl1FLiAUtJvBlri6DnYw=="],
+    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.1.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-gOEICJbTCy6iruBywBDcG4X5rHMbqCPs3clh3UQ+hRKlgvJTk4NHWQAyHOXvaLe+AxD1/TNX1jbZeffBJzcrOw=="],

-    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.1.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-2hS6LgylRqMFmAZCOFwYrf77QMdUwJp49oe8PX/O8+P2yKZMSpyQTf3Eo5ewnsMFUEmYbPOskafdV1ds1MZMJA=="],
+    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.1.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-juhEkdkKR4nbUi5k/KRp1ocGPNWLgFRD4NrHZSveYrD6i98pyvuzmS9yFYgOZa5JhaVqo0HPnci0+YuzSwT2fw=="],

-    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.1.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-KXouFSBnoxAWZYDQrnNRzZBbt5s9UJkIm40hdvSL9mBxSSoxRFQJbtg1hP3aa8A2SnXyQHxQfpiVeJlczZt76w=="],
+    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.1.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-nYr7H0CyAJPaLupFE2cH16KZmRC5Z9PEftiA2vWxk+CsFkPZQ6dBRdcC6RuS+zJlPc/JOd8xw3uCCt9Pv41WvQ=="],

-    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.1.3", "", { "os": "linux", "cpu": "x64" }, "sha512-NxlSCBhLvQtWGagEztfAZ4WcE1AkMTntZV65ZvR+J9jp06+EtOYEBPQndA70ZGhHbEDG57bR6uNvqkd1WrEYVA=="],
+    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.1.4", "", { "os": "linux", "cpu": "x64" }, "sha512-Eoy9ycbhpJVYuR+LskV9s3uyaIkp89+qqgqhGQsWnp/I02Uqg2fXFblHJOpGZR8AxdB9ADy87oFVxn9MpFKUrw=="],

-    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.1.3", "", { "os": "linux", "cpu": "x64" }, "sha512-KaLAxnROouzIWtl6a0Y88r/4hW5oDUJTIqQorOTVQITaKQsKjZX4XCUmHIhdEk8zMnaiLZzRTAwk1yIAl+mIew=="],
+    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.1.4", "", { "os": "linux", "cpu": "x64" }, "sha512-lvwvb2SQQHctHUKvBKptR6PLFCM7JfRjpCCrDaTmvB7EeZ5/dQJPhTYBf36BE/B4CRWR2ZiBLRYhK7hhXBCZAg=="],

-    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.1.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-V9CUZCtWH4u0YwyCYbQ3W5F4ZGPWp2C2TYcsiWFNNyRfmOW1j/TY/jAurl33SaRjgZPO5UUhGyr9m6BN9t84NQ=="],
+    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.1.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-3WRYte7orvyi6TRfIZkDN9Jzoogbv+gSvR+b9VOXUg1We1XrjBg6WljADeVEaKTvOcpVdH0a90TwyOQ6ue4fGw=="],

-    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.1.3", "", { "os": "win32", "cpu": "x64" }, "sha512-dxy599q6lgp8ANPpR8sDMscwdp9oOumEsVXuVCVT9N2vAho8uYXlCz53JhxX6LtJOXaE73qzgkGQ7QqvFlMC0g=="],
+    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.1.4", "", { "os": "win32", "cpu": "x64" }, "sha512-tBc+W7anBPSFXGAoQW+f/+svkpt8/uXfRwDzN1DvnatkRMt16KIYpEi/iw8u9GahJlFv98kgHcIrSsZHZTR0sw=="],

    "@bottom-tabs/react-navigation": ["@bottom-tabs/react-navigation@0.9.2", "", { "dependencies": { "color": "^4.2.3" }, "peerDependencies": { "@react-navigation/native": ">=7", "react": "*", "react-native": "*", "react-native-bottom-tabs": "*" } }, "sha512-IZZKllcaqCGsKIgeXmYFGU95IXxbBpXtwKws4Lg2GJw/qqAYYsPFEl0JBvnymSD7G1zkHYEilg5UHuTd0NmX7A=="],

@@ -1335,9 +1335,9 @@

    "lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="],

-    "lint-staged": ["lint-staged@16.1.2", "", { "dependencies": { "chalk": "^5.4.1", "commander": "^14.0.0", "debug": "^4.4.1", "lilconfig": "^3.1.3", "listr2": "^8.3.3", "micromatch": "^4.0.8", "nano-spawn": "^1.0.2", "pidtree": "^0.6.0", "string-argv": "^0.3.2", "yaml": "^2.8.0" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-sQKw2Si2g9KUZNY3XNvRuDq4UJqpHwF0/FQzZR2M7I5MvtpWvibikCjUVJzZdGE0ByurEl3KQNvsGetd1ty1/Q=="],
+    "lint-staged": ["lint-staged@16.1.5", "", { "dependencies": { "chalk": "^5.5.0", "commander": "^14.0.0", "debug": "^4.4.1", "lilconfig": "^3.1.3", "listr2": "^9.0.1", "micromatch": "^4.0.8", "nano-spawn": "^1.0.2", "pidtree": "^0.6.0", "string-argv": "^0.3.2", "yaml": "^2.8.1" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-uAeQQwByI6dfV7wpt/gVqg+jAPaSp8WwOA8kKC/dv1qw14oGpnpAisY65ibGHUGDUv0rYaZ8CAJZ/1U8hUvC2A=="],

-    "listr2": ["listr2@8.3.3", "", { "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", "log-update": "^6.1.0", "rfdc": "^1.4.1", "wrap-ansi": "^9.0.0" } }, "sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ=="],
+    "listr2": ["listr2@9.0.1", "", { "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", "log-update": "^6.1.0", "rfdc": "^1.4.1", "wrap-ansi": "^9.0.0" } }, "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g=="],

    "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],

@@ -1987,7 +1987,7 @@

    "yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],

-    "yaml": ["yaml@2.8.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ=="],
+    "yaml": ["yaml@2.8.1", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw=="],

    "yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],

@@ -2081,6 +2081,8 @@

    "@react-native-community/cli-doctor/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

+    "@react-native-community/cli-doctor/yaml": ["yaml@2.8.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ=="],
+
    "@react-native-community/cli-server-api/pretty-format": ["pretty-format@26.6.2", "", { "dependencies": { "@jest/types": "^26.6.2", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^17.0.1" } }, "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="],

    "@react-native-community/cli-tools/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],
@@ -2167,7 +2169,7 @@

    "lighthouse-logger/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],

-    "lint-staged/chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="],
+    "lint-staged/chalk": ["chalk@5.5.0", "", {}, "sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg=="],

    "lint-staged/commander": ["commander@14.0.0", "", {}, "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA=="],

@@ -2201,6 +2203,8 @@

    "postcss-css-variables/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="],

+    "postcss-load-config/yaml": ["yaml@2.8.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ=="],
+
    "pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],

    "pretty-format/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
--- a/components/video-player/controls/contexts/VideoContext.tsx
+++ b/components/video-player/controls/contexts/VideoContext.tsx
@@ -9,7 +9,7 @@ import {
  useState,
 } from "react";
 import type { TrackInfo } from "@/modules/VlcPlayer.types";
-import { useSettings } from "@/utils/atoms/settings";
+import { useSettings, VideoPlayer } from "@/utils/atoms/settings";
 import type { Track } from "../types";
 import { useControlContext } from "./ControlContext";

@@ -48,7 +48,7 @@ export const VideoProvider: React.FC<VideoProviderProps> = ({
 }) => {
  const [audioTracks, setAudioTracks] = useState<Track[] | null>(null);
  const [subtitleTracks, setSubtitleTracks] = useState<Track[] | null>(null);
-  const [_settings] = useSettings();
+  const [settings] = useSettings();

  const ControlContext = useControlContext();
  const isVideoLoaded = ControlContext?.isVideoLoaded;
@@ -136,7 +136,7 @@ export const VideoProvider: React.FC<VideoProviderProps> = ({
        );

        // Step 2: Apply VLC indexing logic
-        let textSubIndex = 0;
+        let textSubIndex = settings.defaultPlayer === VideoPlayer.VLC_4 ? 0 : 1;
        const processedSubs: Track[] = sortedSubs?.map((sub) => {
          // Always increment for non-transcoding subtitles
          // Only increment for text-based subtitles when transcoding
--- a/modules/VlcPlayerView.tsx
+++ b/modules/VlcPlayerView.tsx
@@ -13,10 +13,22 @@ interface NativeViewRef extends VlcPlayerViewRef {
 }

 const VLCViewManager = requireNativeViewManager("VlcPlayer");
+const VLC3ViewManager = requireNativeViewManager("VlcPlayer3");

 // Create a forwarded ref version of the native view
 const NativeView = React.forwardRef<NativeViewRef, VlcPlayerViewProps>(
-  (props, ref) => <VLCViewManager {...props} ref={ref} />,
+  (props, ref) => {
+    const [settings] = useSettings();
+
+    if (Platform.OS === "ios" || Platform.isTVOS) {
+      if (settings.defaultPlayer === VideoPlayer.VLC_3) {
+        console.log("[Apple] Using Vlc Player 3");
+        return <VLC3ViewManager {...props} ref={ref} />;
+      }
+    }
+    console.log("Using default Vlc Player");
+    return <VLCViewManager {...props} ref={ref} />;
+  },
 );

 const VlcPlayerView = React.forwardRef<VlcPlayerViewRef, VlcPlayerViewProps>(
--- a/modules/vlc-player-3/expo-module.config.json
+++ b/modules/vlc-player-3/expo-module.config.json
@@ -0,0 +1,6 @@
+{
+  "platforms": ["ios", "tvos"],
+  "ios": {
+    "modules": ["VlcPlayer3Module"]
+  }
+}
--- a/modules/vlc-player-3/ios/VlcPlayer3.podspec
+++ b/modules/vlc-player-3/ios/VlcPlayer3.podspec
@@ -0,0 +1,23 @@
+Pod::Spec.new do |s|
+  s.name           = 'VlcPlayer3'
+  s.version        = '3.6.1b1'
+  s.summary        = 'A sample project summary'
+  s.description    = 'A sample project description'
+  s.author         = ''
+  s.homepage       = 'https://docs.expo.dev/modules/'
+  s.platforms      = { :ios => '13.4', :tvos => '13.4' }
+  s.source         = { git: '' }
+  s.static_framework = true
+
+  s.dependency 'ExpoModulesCore'
+  s.ios.dependency 'MobileVLCKit', s.version
+  s.tvos.dependency 'TVVLCKit', s.version
+
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
+  s.source_files = "*.{h,m,mm,swift,hpp,cpp}"
+end
--- a/modules/vlc-player-3/ios/VlcPlayer3Module.swift
+++ b/modules/vlc-player-3/ios/VlcPlayer3Module.swift
@@ -0,0 +1,71 @@
+import ExpoModulesCore
+
+public class VlcPlayer3Module: Module {
+    public func definition() -> ModuleDefinition {
+        Name("VlcPlayer3")
+        View(VlcPlayer3View.self) {
+            Prop("source") { (view: VlcPlayer3View, source: [String: Any]) in
+                view.setSource(source)
+            }
+
+            Prop("paused") { (view: VlcPlayer3View, paused: Bool) in
+                if paused {
+                    view.pause()
+                } else {
+                    view.play()
+                }
+            }
+
+            Events(
+                "onPlaybackStateChanged",
+                "onVideoStateChange",
+                "onVideoLoadStart",
+                "onVideoLoadEnd",
+                "onVideoProgress",
+                "onVideoError",
+                "onPipStarted"
+            )
+
+            AsyncFunction("startPictureInPicture") { (view: VlcPlayer3View) in
+                view.startPictureInPicture()
+            }
+
+            AsyncFunction("play") { (view: VlcPlayer3View) in
+                view.play()
+            }
+
+            AsyncFunction("pause") { (view: VlcPlayer3View) in
+                view.pause()
+            }
+
+            AsyncFunction("stop") { (view: VlcPlayer3View) in
+                view.stop()
+            }
+
+            AsyncFunction("seekTo") { (view: VlcPlayer3View, time: Int32) in
+                view.seekTo(time)
+            }
+
+            AsyncFunction("setAudioTrack") { (view: VlcPlayer3View, trackIndex: Int) in
+                view.setAudioTrack(trackIndex)
+            }
+
+            AsyncFunction("getAudioTracks") { (view: VlcPlayer3View) -> [[String: Any]]? in
+                return view.getAudioTracks()
+            }
+
+            AsyncFunction("setSubtitleTrack") { (view: VlcPlayer3View, trackIndex: Int) in
+                view.setSubtitleTrack(trackIndex)
+            }
+
+            AsyncFunction("getSubtitleTracks") { (view: VlcPlayer3View) -> [[String: Any]]? in
+                return view.getSubtitleTracks()
+            }
+
+            AsyncFunction("setSubtitleURL") {
+                (view: VlcPlayer3View, url: String, name: String) in
+                view.setSubtitleURL(url, name: name)
+            }
+        }
+    }
+}
--- a/modules/vlc-player-3/ios/VlcPlayer3View.swift
+++ b/modules/vlc-player-3/ios/VlcPlayer3View.swift
@@ -0,0 +1,392 @@
+import ExpoModulesCore
+
+#if os(tvOS)
+    import TVVLCKit
+#else
+    import MobileVLCKit
+#endif
+
+class VlcPlayer3View: ExpoView {
+    private var mediaPlayer: VLCMediaPlayer?
+    private var videoView: UIView?
+    private var progressUpdateInterval: TimeInterval = 1.0  // Update interval set to 1 second
+    private var isPaused: Bool = false
+    private var currentGeometryCString: [CChar]?
+    private var lastReportedState: VLCMediaPlayerState?
+    private var lastReportedIsPlaying: Bool?
+    private var customSubtitles: [(internalName: String, originalName: String)] = []
+    private var startPosition: Int32 = 0
+    private var externalSubtitles: [[String: String]]?
+    private var externalTrack: [String: String]?
+    private var progressTimer: DispatchSourceTimer?
+    private var isStopping: Bool = false  // Define isStopping here
+    private var lastProgressCall = Date().timeIntervalSince1970
+    var hasSource = false
+
+    // MARK: - Initialization
+
+    required init(appContext: AppContext? = nil) {
+        super.init(appContext: appContext)
+        setupView()
+        setupNotifications()
+    }
+
+    // MARK: - Setup
+
+    private func setupView() {
+        DispatchQueue.main.async {
+            self.backgroundColor = .black
+            self.videoView = UIView()
+            self.videoView?.translatesAutoresizingMaskIntoConstraints = false
+
+            if let videoView = self.videoView {
+                self.addSubview(videoView)
+                NSLayoutConstraint.activate([
+                    videoView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
+                    videoView.trailingAnchor.constraint(equalTo: self.trailingAnchor),
+                    videoView.topAnchor.constraint(equalTo: self.topAnchor),
+                    videoView.bottomAnchor.constraint(equalTo: self.bottomAnchor),
+                ])
+            }
+        }
+    }
+
+    private func setupNotifications() {
+        NotificationCenter.default.addObserver(
+            self, selector: #selector(applicationWillResignActive),
+            name: UIApplication.willResignActiveNotification, object: nil)
+        NotificationCenter.default.addObserver(
+            self, selector: #selector(applicationDidBecomeActive),
+            name: UIApplication.didBecomeActiveNotification, object: nil)
+    }
+
+    // MARK: - Public Methods
+    func startPictureInPicture() {}
+
+    @objc func play() {
+        self.mediaPlayer?.play()
+        self.isPaused = false
+        print("Play")
+    }
+
+    @objc func pause() {
+        self.mediaPlayer?.pause()
+        self.isPaused = true
+    }
+
+    @objc func seekTo(_ time: Int32) {
+        guard let player = self.mediaPlayer else { return }
+
+        let wasPlaying = player.isPlaying
+        if wasPlaying {
+            self.pause()
+        }
+
+        if let duration = player.media?.length.intValue {
+            print("Seeking to time: \(time) Video Duration \(duration)")
+
+            // If the specified time is greater than the duration, seek to the end
+            let seekTime = time > duration ? duration - 1000 : time
+            player.time = VLCTime(int: seekTime)
+
+            if wasPlaying {
+                self.play()
+            }
+            self.updatePlayerState()
+        } else {
+            print("Error: Unable to retrieve video duration")
+        }
+    }
+
+    @objc func setSource(_ source: [String: Any]) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            if self.hasSource {
+                return
+            }
+
+            let mediaOptions = source["mediaOptions"] as? [String: Any] ?? [:]
+            self.externalTrack = source["externalTrack"] as? [String: String]
+            var initOptions = source["initOptions"] as? [Any] ?? []
+            self.startPosition = source["startPosition"] as? Int32 ?? 0
+            self.externalSubtitles = source["externalSubtitles"] as? [[String: String]]
+            initOptions.append("--start-time=\(self.startPosition)")
+
+            guard let uri = source["uri"] as? String, !uri.isEmpty else {
+                print("Error: Invalid or empty URI")
+                self.onVideoError?(["error": "Invalid or empty URI"])
+                return
+            }
+
+            let autoplay = source["autoplay"] as? Bool ?? false
+            let isNetwork = source["isNetwork"] as? Bool ?? false
+
+            self.onVideoLoadStart?(["target": self.reactTag ?? NSNull()])
+            self.mediaPlayer = VLCMediaPlayer(options: initOptions)
+            self.mediaPlayer?.delegate = self
+            self.mediaPlayer?.drawable = self.videoView
+            self.mediaPlayer?.scaleFactor = 0
+
+            let media: VLCMedia
+            if isNetwork {
+                print("Loading network file: \(uri)")
+                media = VLCMedia(url: URL(string: uri)!)
+            } else {
+                print("Loading local file: \(uri)")
+                if uri.starts(with: "file://"), let url = URL(string: uri) {
+                    media = VLCMedia(url: url)
+                } else {
+                    media = VLCMedia(path: uri)
+                }
+            }
+
+            print("Debug: Media options: \(mediaOptions)")
+            media.addOptions(mediaOptions)
+
+            self.mediaPlayer?.media = media
+            self.setInitialExternalSubtitles()
+            self.hasSource = true
+            if autoplay {
+                print("Playing...")
+                self.play()
+            }
+        }
+    }
+
+    @objc func setAudioTrack(_ trackIndex: Int) {
+        self.mediaPlayer?.currentAudioTrackIndex = Int32(trackIndex)
+    }
+
+    @objc func getAudioTracks() -> [[String: Any]]? {
+        guard let trackNames = mediaPlayer?.audioTrackNames,
+            let trackIndexes = mediaPlayer?.audioTrackIndexes
+        else {
+            return nil
+        }
+
+        return zip(trackNames, trackIndexes).map { name, index in
+            return ["name": name, "index": index]
+        }
+    }
+
+    @objc func setSubtitleTrack(_ trackIndex: Int) {
+        print("Debug: Attempting to set subtitle track to index: \(trackIndex)")
+        self.mediaPlayer?.currentVideoSubTitleIndex = Int32(trackIndex)
+        print(
+            "Debug: Current subtitle track index after setting: \(self.mediaPlayer?.currentVideoSubTitleIndex ?? -1)"
+        )
+    }
+
+    @objc func setSubtitleURL(_ subtitleURL: String, name: String) {
+        guard let url = URL(string: subtitleURL) else {
+            print("Error: Invalid subtitle URL")
+            return
+        }
+
+        let result = self.mediaPlayer?.addPlaybackSlave(url, type: .subtitle, enforce: false)
+        if let result = result {
+            let internalName = "Track \(self.customSubtitles.count)"
+            print("Subtitle added with result: \(result) \(internalName)")
+            self.customSubtitles.append((internalName: internalName, originalName: name))
+        } else {
+            print("Failed to add subtitle")
+        }
+    }
+
+    private func setInitialExternalSubtitles() {
+        if let externalSubtitles = self.externalSubtitles {
+            for subtitle in externalSubtitles {
+                if let subtitleName = subtitle["name"],
+                    let subtitleURL = subtitle["DeliveryUrl"]
+                {
+                    print("Setting external subtitle: \(subtitleName) \(subtitleURL)")
+                    self.setSubtitleURL(subtitleURL, name: subtitleName)
+                }
+            }
+        }
+    }
+
+    @objc func getSubtitleTracks() -> [[String: Any]]? {
+        guard let mediaPlayer = self.mediaPlayer else {
+            return nil
+        }
+
+        let count = mediaPlayer.numberOfSubtitlesTracks
+        print("Debug: Number of subtitle tracks: \(count)")
+
+        guard count > 0 else {
+            return nil
+        }
+
+        var tracks: [[String: Any]] = []
+
+        if let names = mediaPlayer.videoSubTitlesNames as? [String],
+            let indexes = mediaPlayer.videoSubTitlesIndexes as? [NSNumber]
+        {
+            for (index, name) in zip(indexes, names) {
+                if let customSubtitle = customSubtitles.first(where: { $0.internalName == name }) {
+                    tracks.append(["name": customSubtitle.originalName, "index": index.intValue])
+                } else {
+                    tracks.append(["name": name, "index": index.intValue])
+                }
+            }
+        }
+
+        print("Debug: Subtitle tracks: \(tracks)")
+        return tracks
+    }
+
+    @objc func stop(completion: (() -> Void)? = nil) {
+        guard !isStopping else {
+            completion?()
+            return
+        }
+        isStopping = true
+
+        // If we're not on the main thread, dispatch to main thread
+        if !Thread.isMainThread {
+            DispatchQueue.main.async { [weak self] in
+                self?.performStop(completion: completion)
+            }
+        } else {
+            performStop(completion: completion)
+        }
+    }
+
+    // MARK: - Private Methods
+
+    @objc private func applicationWillResignActive() {
+
+    }
+
+    @objc private func applicationDidBecomeActive() {
+
+    }
+
+    private func performStop(completion: (() -> Void)? = nil) {
+        // Stop the media player
+        mediaPlayer?.stop()
+
+        // Remove observer
+        NotificationCenter.default.removeObserver(self)
+
+        // Clear the video view
+        videoView?.removeFromSuperview()
+        videoView = nil
+
+        // Release the media player
+        mediaPlayer?.delegate = nil
+        mediaPlayer = nil
+
+        isStopping = false
+        completion?()
+    }
+
+    private func updateVideoProgress() {
+        guard let player = self.mediaPlayer else { return }
+
+        let currentTimeMs = player.time.intValue
+        let durationMs = player.media?.length.intValue ?? 0
+
+        print("Debug: Current time: \(currentTimeMs)")
+        if currentTimeMs >= 0 && currentTimeMs < durationMs {
+            self.onVideoProgress?([
+                "currentTime": currentTimeMs,
+                "duration": durationMs,
+            ])
+        }
+    }
+
+    // MARK: - Expo Events
+
+    @objc var onPlaybackStateChanged: RCTDirectEventBlock?
+    @objc var onVideoLoadStart: RCTDirectEventBlock?
+    @objc var onVideoStateChange: RCTDirectEventBlock?
+    @objc var onVideoProgress: RCTDirectEventBlock?
+    @objc var onVideoLoadEnd: RCTDirectEventBlock?
+    @objc var onVideoError: RCTDirectEventBlock?
+    @objc var onPipStarted: RCTDirectEventBlock?
+
+    // MARK: - Deinitialization
+
+    deinit {
+        performStop()
+    }
+}
+
+extension VlcPlayer3View: VLCMediaPlayerDelegate {
+    func mediaPlayerTimeChanged(_ aNotification: Notification) {
+        // self?.updateVideoProgress()
+        let timeNow = Date().timeIntervalSince1970
+        if timeNow - lastProgressCall >= 1 {
+            lastProgressCall = timeNow
+            updateVideoProgress()
+        }
+    }
+
+    func mediaPlayerStateChanged(_ aNotification: Notification) {
+        self.updatePlayerState()
+    }
+
+    private func updatePlayerState() {
+        guard let player = self.mediaPlayer else { return }
+        let currentState = player.state
+
+        var stateInfo: [String: Any] = [
+            "target": self.reactTag ?? NSNull(),
+            "currentTime": player.time.intValue,
+            "duration": player.media?.length.intValue ?? 0,
+            "error": false,
+        ]
+
+        if player.isPlaying {
+            stateInfo["isPlaying"] = true
+            stateInfo["isBuffering"] = false
+            stateInfo["state"] = "Playing"
+        } else {
+            stateInfo["isPlaying"] = false
+            stateInfo["state"] = "Paused"
+        }
+
+        if player.state == VLCMediaPlayerState.buffering {
+            stateInfo["isBuffering"] = true
+            stateInfo["state"] = "Buffering"
+        } else if player.state == VLCMediaPlayerState.error {
+            print("player.state ~ error")
+            stateInfo["state"] = "Error"
+            self.onVideoLoadEnd?(stateInfo)
+        } else if player.state == VLCMediaPlayerState.opening {
+            print("player.state ~ opening")
+            stateInfo["state"] = "Opening"
+        }
+
+        if self.lastReportedState != currentState
+            || self.lastReportedIsPlaying != player.isPlaying
+        {
+            self.lastReportedState = currentState
+            self.lastReportedIsPlaying = player.isPlaying
+            self.onVideoStateChange?(stateInfo)
+        }
+
+    }
+}
+
+extension VlcPlayer3View: VLCMediaDelegate {
+    // Implement VLCMediaDelegate methods if needed
+}
+
+extension VLCMediaPlayerState {
+    var description: String {
+        switch self {
+        case .opening: return "Opening"
+        case .buffering: return "Buffering"
+        case .playing: return "Playing"
+        case .paused: return "Paused"
+        case .stopped: return "Stopped"
+        case .ended: return "Ended"
+        case .error: return "Error"
+        case .esAdded: return "ESAdded"
+        @unknown default: return "Unknown"
+        }
+    }
+}
--- a/modules/vlc-player-3/src/VlcPlayer3Module.ts
+++ b/modules/vlc-player-3/src/VlcPlayer3Module.ts
@@ -0,0 +1,5 @@
+import { requireNativeModule } from "expo-modules-core";
+
+// It loads the native module object from the JSI or falls back to
+// the bridge module (from NativeModulesProxy) if the remote debugger is on.
+export default requireNativeModule("VlcPlayer3");
--- a/modules/vlc-player/ios/VlcPlayer.podspec
+++ b/modules/vlc-player/ios/VlcPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name           = 'VlcPlayer'
-  s.version        = '4.0.0a13'
+  s.version        = '4.0.0a10'
  s.summary        = 'A sample project summary'
  s.description    = 'A sample project description'
  s.author         = ''
--- a/modules/vlc-player/ios/VlcPlayerModule.swift
+++ b/modules/vlc-player/ios/VlcPlayerModule.swift
@@ -68,4 +68,4 @@ public class VlcPlayerModule: Module {
            }
        }
    }
-}
+}
--- a/modules/vlc-player/ios/VlcPlayerView.swift
+++ b/modules/vlc-player/ios/VlcPlayerView.swift
@@ -118,7 +118,6 @@ extension VLCPlayerWrapper: VLCMediaPlayerDelegate {
    func mediaPlayerTimeChanged(_ aNotification: Notification) {
        DispatchQueue.main.async { [weak self] in
            guard let self = self else { return }
-            self.performInitialSeek()
            let timeNow = Date().timeIntervalSince1970
            if timeNow - self.lastProgressCall >= 1 {
                self.lastProgressCall = timeNow
@@ -136,22 +135,11 @@ extension VLCPlayerWrapper: VLCMediaPlayerDelegate {
            pipController.invalidatePlaybackState()
        }
    }
+}

-    // Workaround: When playing an HLS video for the first time, seeking to a specific time immediately can cause a crash.
-    // To avoid this, we wait until the video has started playing before performing the initial seek.
-    func performInitialSeek() {
-        guard let vlcPlayerView = self.playerView.superview as? VlcPlayerView,
-              !vlcPlayerView.initialSeekPerformed,
-              vlcPlayerView.startPosition > 0,
-              vlcPlayerView.shouldPerformInitialSeek,
-              player.isSeekable else { return }
-        vlcPlayerView.initialSeekPerformed = true
-        // Use a logger from the VlcPlayerView if available, or create a new one
-        let logger = (vlcPlayerView).logger
-        logger.debug("First time update, performing initial seek to \(vlcPlayerView.startPosition) seconds")
-        player.time = VLCTime(int: vlcPlayerView.startPosition * 1000)
-        self.updateVideoProgress?()
-    }
+// MARK: - VLCMediaDelegate
+extension VLCPlayerWrapper: VLCMediaDelegate {
+    // Implement VLCMediaDelegate methods if needed
 }

 class VlcPlayerView: ExpoView {
@@ -161,15 +149,11 @@ class VlcPlayerView: ExpoView {
    private var progressUpdateInterval: TimeInterval = 1.0  // Update interval set to 1 second
    private var isPaused: Bool = false
    private var customSubtitles: [(internalName: String, originalName: String)] = []
-    var startPosition: Int32 = 0
+    private var startPosition: Int32 = 0
    private var externalTrack: [String: String]?
    private var isStopping: Bool = false  // Define isStopping here
    private var externalSubtitles: [[String: String]]?
    var hasSource = false
-    var initialSeekPerformed = false
-    // A flag variable determinging if we should perform the initial seek. Its either transcoding or offline playback. that makes
-    var shouldPerformInitialSeek: Bool = false
-    

    // MARK: - Initialization
    required init(appContext: AppContext? = nil) {
@@ -270,8 +254,6 @@ class VlcPlayerView: ExpoView {
            let autoplay = source["autoplay"] as? Bool ?? false
            let isNetwork = source["isNetwork"] as? Bool ?? false

-            // Set shouldPeformIntial based on isTranscoding and is not a network stream
-            self.shouldPerformInitialSeek = uri.contains("m3u8") || !isNetwork
            self.onVideoLoadStart?(["target": self.reactTag ?? NSNull()])

            let media: VLCMedia!
@@ -295,11 +277,8 @@ class VlcPlayerView: ExpoView {
            self.hasSource = true
            if autoplay {
                logger.info("Playing...")
-                // The Video is not transcoding so it its safe to seek to the start position.
-                if !self.shouldPerformInitialSeek {
-                    self.vlc.player.time = VLCTime(number: NSNumber(value: self.startPosition * 1000))
-                }
                self.play()
+                self.vlc.player.time = VLCTime(number: NSNumber(value: self.startPosition * 1000))
            }
        }
    }
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
  },
  "devDependencies": {
    "@babel/core": "^7.20.0",
-    "@biomejs/biome": "^2.1.3",
+    "@biomejs/biome": "^2.1.4",
    "@react-native-community/cli": "^19",
    "@react-native-tvos/config-tv": "^0.1.1",
    "@types/jest": "^29.5.12",
@@ -109,7 +109,7 @@
    "@types/react-test-renderer": "^19.0.0",
    "cross-env": "^10.0.0",
    "husky": "^9.1.7",
-    "lint-staged": "^16.1.2",
+    "lint-staged": "^16.1.5",
    "postinstall-postinstall": "^2.1.0",
    "react-test-renderer": "19.1.1",
    "typescript": "~5.8.3"
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -128,6 +128,7 @@ export type HomeSectionLatestResolver = {

 export enum VideoPlayer {
  // NATIVE, //todo: changes will make this a lot more easier to implement if we want. delete if not wanted
+  VLC_3 = 0,
  VLC_4 = 1,
 }

--- a/utils/jellyfin/media/getStreamUrl.ts
+++ b/utils/jellyfin/media/getStreamUrl.ts
@@ -31,7 +31,7 @@ export const getStreamUrl = async ({
  subtitleStreamIndex?: number;
  height?: number;
  mediaSourceId?: string | null;
-  download?: boolean;
+  download?: bool;
  deviceId?: string | null;
 }): Promise<{
  url: string | null;
@@ -71,8 +71,8 @@ export const getStreamUrl = async ({
  }

  sessionId = res.data.PlaySessionId || null;
-  mediaSource = res.data.MediaSources?.[0];
-  let transcodeUrl = mediaSource?.TranscodingUrl;
+  mediaSource = res.data.MediaSources[0];
+  let transcodeUrl = mediaSource.TranscodingUrl;

  if (transcodeUrl) {
    if (download) {
@@ -123,7 +123,7 @@ export const getStreamUrl = async ({

  return {
    url: directPlayUrl,
-    sessionId: sessionId || playSessionId || null,
+    sessionId: sessionId || playSessionId,
    mediaSource,
  };
 };
--- a/utils/profiles/native.js
+++ b/utils/profiles/native.js
@@ -44,7 +44,7 @@ export const generateDeviceProfile = async () => {
    DirectPlayProfiles: [
      {
        Type: MediaTypes.Video,
-        Container: "mkv,avi,mov,flv,ts,m2ts,webm,ogv,3gp,hls",
+        Container: "mp4,mkv,avi,mov,flv,ts,m2ts,webm,ogv,3gp,hls",
        VideoCodec:
          "h264,hevc,mpeg4,divx,xvid,wmv,vc1,vp8,vp9,av1,avi,mpeg,mpeg2video",
        AudioCodec: "aac,ac3,eac3,mp3,flac,alac,opus,vorbis,wma,dts",