chore(deps): Update dependency react-native-reanimated to v4.5.0

.github/copilot-instructions.md

@@ -42,7 +42,7 @@ and provides seamless media streaming with offline capabilities and Chromecast s
 
 ## Coding Standards
 
-- Use TypeScript for ALL files (no .js files). Tooling-required exceptions: `babel.config.js`, `metro.config.js`, `react-native.config.js`, `tailwind.config.js` (their loaders cannot parse TypeScript)
+- Use TypeScript for ALL files (no .js files)
 - Use descriptive English names for variables, functions, and components
 - Prefer functional React components with hooks
 - Use Jotai atoms for global state management

.github/workflows/build-apps.yml

@@ -11,7 +11,7 @@ on:
   push:
     branches: [develop, master]
 
-# Exposed to `expo prebuild` (app.config.ts → extra.build) so Settings can show the
+# Exposed to `expo prebuild` (app.config.js → extra.build) so Settings can show the
 # branch + commit + Actions run a CI build was made from. EAS cloud builds use
 # EAS_BUILD_* instead. The run number maps a sideloaded build back to its Actions
 # run (artifacts + logs) without needing Expo access.

.github/workflows/detect-duplicate.yml

@@ -30,7 +30,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 🔍 Detect duplicate issues
-        run: bun scripts/detect-duplicate-issue.ts
+        run: bun scripts/detect-duplicate-issue.mjs
         env:
           GH_TOKEN: ${{ github.token }}
           GITHUB_REPOSITORY: ${{ github.repository }}

.gitignore

@@ -12,6 +12,10 @@ web-build/
 # Platform-specific Build Directories
 /ios
 /android
+/iostv
+/iosmobile
+/androidmobile
+/androidtv
 
 # Gradle caches (top-level + per-module native projects)
 **/.gradle/

CLAUDE.md

@@ -152,7 +152,7 @@ import { apiAtom } from "@/providers/JellyfinProvider";
 
 ## Coding Standards
 
-- Use TypeScript for all files (no .js). Tooling-required exceptions: `babel.config.js`, `metro.config.js`, `react-native.config.js`, `tailwind.config.js` (their loaders cannot parse TypeScript)
+- Use TypeScript for all files (no .js)
 - Use functional React components with hooks
 - Use Jotai atoms for global state, React Query for server state
 - Follow BiomeJS formatting rules (2-space indent, semicolons, LF line endings)

app.config.js

@@ -1,13 +1,9 @@
-// Registers the tsx require hook so the TypeScript config plugins referenced
-// from app.json ("./plugins/*.ts") can be loaded by Node during config evaluation.
-import "tsx/cjs";
-import { execFileSync } from "node:child_process";
-import type { ConfigContext, ExpoConfig } from "expo/config";
+const { execFileSync } = require("node:child_process");
 
 // Build metadata, injected into `extra.build` and read at runtime via
 // expo-constants (see utils/version.ts). Sources in priority order:
 // EAS cloud build → GitHub Actions → explicit EXPO_PUBLIC_* → local git → null.
-const git = (args: string[]): string | null => {
+const git = (args) => {
   try {
     return execFileSync("git", args, { stdio: ["ignore", "pipe", "ignore"] })
       .toString()
@@ -46,16 +42,16 @@ const buildMeta = {
   builtAt: new Date().toISOString(),
 };
 
-export default ({ config }: ConfigContext): ExpoConfig => {
+module.exports = ({ config }) => {
   if (process.env.EXPO_TV !== "1") {
-    config.plugins?.push("expo-background-task");
+    config.plugins.push("expo-background-task");
 
-    config.plugins?.push([
+    config.plugins.push([
       "react-native-google-cast",
       { useDefaultExpandedMediaControls: true },
     ]);
 
-    config.plugins?.push([
+    config.plugins.push([
       "expo-camera",
       {
         cameraPermission:
@@ -65,7 +61,7 @@ export default ({ config }: ConfigContext): ExpoConfig => {
   }
 
   // Only override googleServicesFile if env var is set
-  const androidConfig: { googleServicesFile?: string } = {};
+  const androidConfig = {};
   if (process.env.GOOGLE_SERVICES_JSON) {
     androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
   }
@@ -75,5 +71,5 @@ export default ({ config }: ConfigContext): ExpoConfig => {
   return {
     ...(Object.keys(androidConfig).length > 0 && { android: androidConfig }),
     ...config,
-  } as ExpoConfig;
+  };
 };

app.json

@@ -71,8 +71,8 @@
       ],
       "expo-router",
       "expo-font",
-      "./plugins/withExcludeMedia3Dash.ts",
-      "./plugins/withTVUserManagement.ts",
+      "./plugins/withExcludeMedia3Dash.js",
+      "./plugins/withTVUserManagement.js",
       [
         "expo-build-properties",
         {
@@ -134,17 +134,17 @@
         }
       ],
       "expo-web-browser",
-      ["./plugins/with-runtime-framework-headers.ts"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.ts"],
-      ["./plugins/withAndroidAlertColors.ts"],
-      ["./plugins/withAndroidManifest.ts"],
-      ["./plugins/withTrustLocalCerts.ts"],
-      ["./plugins/withGradleProperties.ts"],
-      ["./plugins/withTVOSAppIcon.ts"],
-      ["./plugins/withTVOSTopShelf.ts"],
-      ["./plugins/withTVXcodeEnv.ts"],
+      ["./plugins/with-runtime-framework-headers.js"],
+      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
+      ["./plugins/withAndroidAlertColors.js"],
+      ["./plugins/withAndroidManifest.js"],
+      ["./plugins/withTrustLocalCerts.js"],
+      ["./plugins/withGradleProperties.js"],
+      ["./plugins/withTVOSAppIcon.js"],
+      ["./plugins/withTVOSTopShelf.js"],
+      ["./plugins/withTVXcodeEnv.js"],
       [
-        "./plugins/withGitPod.ts",
+        "./plugins/withGitPod.js",
         {
           "podName": "MPVKit",
           "podspecUrl": "https://raw.githubusercontent.com/mpv-ios/MPVKit/0.41.0-av/MPVKit.podspec"

app/(auth)/(tabs)/(home)/settings.tv.tsx

@@ -5,7 +5,7 @@ import { Image } from "expo-image";
 import { useAtom } from "jotai";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Alert, Platform, ScrollView, View } from "react-native";
+import { Alert, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { TVPasswordEntryModal } from "@/components/login/TVPasswordEntryModal";
@@ -33,16 +33,13 @@ import {
 } from "@/providers/JellyfinProvider";
 import {
   AudioTranscodeMode,
-  getActiveVideoPlayer,
   InactivityTimeout,
   type MpvCacheMode,
   type MpvVoDriver,
   TVTypographyScale,
   useSettings,
-  VideoPlayer,
 } from "@/utils/atoms/settings";
 import { storage } from "@/utils/mmkv";
-import { scaleSize } from "@/utils/scaleSize";
 import {
   getPreviousServers,
   type SavedServer,
@@ -265,25 +262,6 @@ export default function SettingsTV() {
   const currentVoDriver = settings.mpvVoDriver ?? "gpu-next";
   const currentLanguage = settings.preferedLanguage;
 
-  // Video player selection. MPV is the default; ExoPlayer is only offered
-  // as an opt-in alternative on Android TV. The selector is hidden on
-  // other platforms.
-  const isAndroidTv = Platform.OS === "android" && Platform.isTV;
-  const currentVideoPlayer = getActiveVideoPlayer(settings);
-  const isMpv = currentVideoPlayer !== VideoPlayer.ExoPlayer;
-
-  // Shared style for the ExoPlayer / MPV limitation notes shown under the
-  // selector when the respective player is active. All pixel values scaled
-  // so the layout holds on 4K TVs (see utils/scaleSize.ts).
-  const playerNoteStyle = {
-    color: "#9CA3AF",
-    fontSize: typography.callout - 2,
-    marginTop: scaleSize(4),
-    marginBottom: scaleSize(12),
-    marginLeft: scaleSize(8),
-    marginRight: scaleSize(8),
-  } as const;
-
   // Audio transcoding options
   const audioTranscodeModeOptions: TVOptionItem<AudioTranscodeMode>[] = useMemo(
     () => [
@@ -413,23 +391,6 @@ export default function SettingsTV() {
     [t, currentVoDriver],
   );
 
-  // Video player backend options (Android TV only)
-  const videoPlayerOptions: TVOptionItem<VideoPlayer>[] = useMemo(
-    () => [
-      {
-        label: t("home.settings.video_player.exoplayer"),
-        value: VideoPlayer.ExoPlayer,
-        selected: currentVideoPlayer === VideoPlayer.ExoPlayer,
-      },
-      {
-        label: t("home.settings.video_player.mpv"),
-        value: VideoPlayer.MPV,
-        selected: currentVideoPlayer === VideoPlayer.MPV,
-      },
-    ],
-    [t, currentVideoPlayer],
-  );
-
   // Typography scale options
   const typographyScaleOptions: TVOptionItem<TVTypographyScale>[] = useMemo(
     () => [
@@ -561,11 +522,6 @@ export default function SettingsTV() {
     return option?.label || t("home.settings.vo_driver.gpu_next");
   }, [voDriverOptions, t]);
 
-  const videoPlayerLabel = useMemo(() => {
-    const option = videoPlayerOptions.find((o) => o.selected);
-    return option?.label || "MPV";
-  }, [videoPlayerOptions]);
-
   const languageLabel = useMemo(() => {
     if (!currentLanguage) return t("home.settings.languages.system");
     const option = APP_LANGUAGES.find((l) => l.value === currentLanguage);
@@ -630,34 +586,6 @@ export default function SettingsTV() {
 
           {/* Audio Section */}
           <TVSectionHeader title={t("home.settings.audio.audio_title")} />
-
-          {/* Video Player selector — Android TV only */}
-          {isAndroidTv && (
-            <>
-              <TVSettingsOptionButton
-                label={t("home.settings.video_player.title")}
-                value={videoPlayerLabel}
-                onPress={() =>
-                  showOptions({
-                    title: t("home.settings.video_player.title"),
-                    options: videoPlayerOptions,
-                    onSelect: (value) => updateSettings({ videoPlayer: value }),
-                  })
-                }
-              />
-              {!isMpv && (
-                <Text style={playerNoteStyle}>
-                  {t("home.settings.video_player.exoplayer_note")}
-                </Text>
-              )}
-              {isMpv && (
-                <Text style={playerNoteStyle}>
-                  {t("home.settings.video_player.mpv_note")}
-                </Text>
-              )}
-            </>
-          )}
-
           <TVSettingsOptionButton
             label={t("home.settings.audio.transcode_mode.title")}
             value={audioTranscodeLabel}
@@ -734,23 +662,20 @@ export default function SettingsTV() {
               updateSettings({ mpvSubtitleMarginY: newValue });
             }}
           />
-          {isMpv && (
-            <TVSettingsOptionButton
-              label='Horizontal Alignment'
-              value={alignXLabel}
-              // ExoPlayer follows authored cue alignment; hide on ExoPlayer.
-              onPress={() =>
-                showOptions({
-                  title: "Horizontal Alignment",
-                  options: alignXOptions,
-                  onSelect: (value) =>
-                    updateSettings({
-                      mpvSubtitleAlignX: value as "left" | "center" | "right",
-                    }),
-                })
-              }
-            />
-          )}
+          <TVSettingsOptionButton
+            label='Horizontal Alignment'
+            value={alignXLabel}
+            onPress={() =>
+              showOptions({
+                title: "Horizontal Alignment",
+                options: alignXOptions,
+                onSelect: (value) =>
+                  updateSettings({
+                    mpvSubtitleAlignX: value as "left" | "center" | "right",
+                  }),
+              })
+            }
+          />
           <TVSettingsOptionButton
             label='Vertical Alignment'
             value={alignYLabel}
@@ -823,24 +748,19 @@ export default function SettingsTV() {
             }
           />
 
-          {/* Video Output Section — MPV only (gpu-next/gpu is a libmpv concept) */}
-          {isMpv && (
-            <>
-              <TVSectionHeader title={t("home.settings.vo_driver.title")} />
-              <TVSettingsOptionButton
-                label={t("home.settings.vo_driver.vo_mode")}
-                value={voDriverLabel}
-                onPress={() =>
-                  showOptions({
-                    title: t("home.settings.vo_driver.vo_mode"),
-                    options: voDriverOptions,
-                    onSelect: (value) => updateSettings({ mpvVoDriver: value }),
-                  })
-                }
-              />
-            </>
-          )}
-
+          {/* Video Output Section */}
+          <TVSectionHeader title={t("home.settings.vo_driver.title")} />
+          <TVSettingsOptionButton
+            label={t("home.settings.vo_driver.vo_mode")}
+            value={voDriverLabel}
+            onPress={() =>
+              showOptions({
+                title: t("home.settings.vo_driver.vo_mode"),
+                options: voDriverOptions,
+                onSelect: (value) => updateSettings({ mpvVoDriver: value }),
+              })
+            }
+          />
           <TVSettingsStepper
             label={t("home.settings.buffer.buffer_duration")}
             value={settings.mpvCacheSeconds ?? 10}

app/(auth)/(tabs)/(libraries)/[libraryId].tsx

@@ -12,16 +12,11 @@ import {
 import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
-import {
-  useFocusEffect,
-  useLocalSearchParams,
-  useNavigation,
-} from "expo-router";
+import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import {
-  BackHandler,
   FlatList,
   Platform,
   ScrollView,
@@ -85,9 +80,8 @@ const Page = () => {
     sortBy?: string;
     sortOrder?: string;
     filterBy?: string;
-    fromSeeAll?: string;
   };
-  const { libraryId, fromSeeAll } = searchParams;
+  const { libraryId } = searchParams;
 
   const typography = useScaledTVTypography();
   const posterSizes = useScaledTVPosterSizes();
@@ -118,22 +112,6 @@ const Page = () => {
   const { t } = useTranslation();
   const router = useRouter();
   const { showOptions } = useTVOptionModal();
-
-  // When this library detail was opened from the home "See All" button, its
-  // libraries stack is just [detail], so the default TV Back would exit to home.
-  // Intercept Back (scoped to while this screen is focused via useFocusEffect) and
-  // route to the library list instead, so the user can switch libraries. Normal
-  // entries from the list keep their native pop-to-list behavior.
-  useFocusEffect(
-    useCallback(() => {
-      if (!Platform.isTV || fromSeeAll !== "true") return;
-      const sub = BackHandler.addEventListener("hardwareBackPress", () => {
-        router.replace("/(auth)/(tabs)/(libraries)");
-        return true;
-      });
-      return () => sub.remove();
-    }, [fromSeeAll, router]),
-  );
   const { showItemActions } = useTVItemActionModal();
 
   // TV Filter queries
@@ -291,23 +269,6 @@ const Page = () => {
     });
   }, [library]);
 
-  // If this See-All detail was deep-linked on top of the libraries index, collapse
-  // the libraries stack to just this screen. Otherwise the stack is [index, detail],
-  // which the native bottom tab reliably auto-pops back to the index (the detail
-  // "bounces" to the library list ~0.5s after opening). With [detail] alone it stays
-  // put, and Back is handled explicitly by the fromSeeAll interceptor above.
-  const didCollapseRef = useRef(false);
-  useEffect(() => {
-    if (!Platform.isTV || fromSeeAll !== "true" || didCollapseRef.current)
-      return;
-    const state = navigation.getState();
-    if (state?.routes && state.routes.length > 1) {
-      didCollapseRef.current = true;
-      const top = state.routes[state.routes.length - 1];
-      navigation.reset({ index: 0, routes: [top] } as any);
-    }
-  }, [navigation, fromSeeAll]);
-
   const fetchItems = useCallback(
     async ({
       pageParam,

app/(auth)/player/direct-player.tsx

@@ -29,7 +29,6 @@ import {
   PlaybackSpeedScope,
   updatePlaybackSpeedSettings,
 } from "@/components/video-player/controls/utils/playback-speed-settings";
-import { VideoPlayerView } from "@/components/video-player/VideoPlayerView";
 import useRouter from "@/hooks/useAppRouter";
 import { useHaptic } from "@/hooks/useHaptic";
 import { useOrientation } from "@/hooks/useOrientation";
@@ -41,6 +40,7 @@ import {
   type MpvOnErrorEventPayload,
   type MpvOnPlaybackStateChangePayload,
   type MpvOnProgressEventPayload,
+  MpvPlayerView,
   type MpvPlayerViewRef,
   type MpvVideoSource,
 } from "@/modules";
@@ -51,7 +51,7 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";
 
 import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
-import { getActivePlayerType, useSettings } from "@/utils/atoms/settings";
+import { useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
@@ -364,13 +364,7 @@ export default function DirectPlayerPage() {
             maxStreamingBitrate: bitrateValue,
             mediaSourceId: mediaSourceId,
             subtitleStreamIndex: subtitleIndex,
-            // Match the device profile to the player that will render the
-            // stream so the server picks a codec/container the player can
-            // actually decode.
-            deviceProfile: generateDeviceProfile({
-              player: getActivePlayerType(settings),
-              audioMode: settings.audioTranscodeMode,
-            }),
+            deviceProfile: generateDeviceProfile(),
           });
           if (!res) return null;
           const { mediaSource, sessionId, url, requiredHttpHeaders } = res;
@@ -462,23 +456,10 @@ export default function DirectPlayerPage() {
     });
     reportPlaybackStopped();
     setIsPlaybackStopped(true);
-    // Synchronously destroy the mpv instance + decoder + surface buffers
-    // BEFORE the screen unmounts. Otherwise the next screen (or the next
-    // episode's player) mounts while the old 4K decoder is still alive,
-    // causing OOM on low-RAM devices. Native stop() is idempotent so the
-    // later React unmount cleanup is still safe.
-    videoRef.current?.destroy().catch(() => {});
-    // Pre-libmpv-1.0 used `stop()`:
-    // videoRef.current?.stop();
+    videoRef.current?.pause();
     revalidateProgressCache();
     // Resume inactivity timer when leaving player (TV only)
     resumeInactivityTimer();
-    // Release the keep-awake wakelock acquired during playback so it
-    // doesn't follow us back to the home screen and block the TV
-    // screensaver. activateKeepAwakeAsync() is tag-scoped to this module
-    // and only released on the "paused" event; without this, navigating
-    // away mid-play leaves FLAG_KEEP_SCREEN_ON set on the window.
-    deactivateKeepAwake();
   }, [videoRef, reportPlaybackStopped, progress, resumeInactivityTimer]);
 
   useEffect(() => {
@@ -1124,15 +1105,6 @@ export default function DirectPlayerPage() {
         nextItem.UserData?.PlaybackPositionTicks?.toString() ?? "",
     }).toString();
 
-    // Destroy the current mpv instance BEFORE navigating so the old 4K
-    // decoder + surface buffers are freed before the new player screen
-    // mounts. Without this, Expo Router briefly holds two simultaneous
-    // mpv instances during the transition (~768 MB of surface buffers
-    // for two 4K HDR10+ decoders) and OOM-kills the app on low-RAM
-    // devices. Native stop() is idempotent so the subsequent React
-    // unmount cleanup is still safe.
-    videoRef.current?.destroy().catch(() => {});
-
     router.replace(`player/direct-player?${queryParams}` as any);
   }, [
     nextItem,
@@ -1143,7 +1115,6 @@ export default function DirectPlayerPage() {
     bitrateValue,
     router,
     isPlaybackStopped,
-    videoRef,
   ]);
 
   // Apply subtitle settings when video loads
@@ -1283,7 +1254,7 @@ export default function DirectPlayerPage() {
                 justifyContent: "center",
               }}
             >
-              <VideoPlayerView
+              <MpvPlayerView
                 ref={videoRef}
                 source={videoSource}
                 style={{ width: "100%", height: "100%" }}

app/_layout.tsx

@@ -7,7 +7,6 @@ import { onlineManager, QueryClient } from "@tanstack/react-query";
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import * as BackgroundTask from "expo-background-task";
 import * as Device from "expo-device";
-import { Image } from "expo-image";
 import { DarkTheme, ThemeProvider } from "expo-router/react-navigation";
 import { Platform } from "react-native";
 import { GlobalModal } from "@/components/GlobalModal";
@@ -101,22 +100,6 @@ SplashScreen.setOptions({
   fade: true,
 });
 
-// Cap expo-image's in-memory cache. Default is unbounded (maxMemoryCost=0),
-// which on a 2GB Android TV box leads to ~200MB of decoded backdrops/posters
-// pinned in RAM after browsing. Caps are intentionally tighter on TV (which
-// has less RAM and runs alongside libmpv/MediaCodec) than on mobile.
-// Cost is measured in bytes of decoded bitmap (ARGB8888 = 4 bytes/pixel).
-try {
-  Image.configureCache({
-    maxMemoryCost: Platform.isTV
-      ? 8 * 1024 * 1024 // ~8 MB on TV
-      : 128 * 1024 * 1024, // ~128 MB on mobile
-    maxDiskSize: 200 * 1024 * 1024, // 200 MB disk cache on all platforms
-  });
-} catch {
-  // configureCache is a no-op on some platforms/versions; safe to ignore.
-}
-
 function useNotificationObserver() {
   const router = useRouter();
 

bun.lock

@@ -79,7 +79,7 @@
         "react-native-nitro-modules": "0.33.1",
         "react-native-pager-view": "8.0.1",
         "react-native-qrcode-svg": "^6.3.21",
-        "react-native-reanimated": "4.3.1",
+        "react-native-reanimated": "4.5.0",
         "react-native-reanimated-carousel": "4.0.3",
         "react-native-safe-area-context": "~5.7.0",
         "react-native-screens": "4.25.2",
@@ -113,7 +113,6 @@
         "husky": "9.1.7",
         "lint-staged": "17.0.8",
         "react-test-renderer": "19.2.3",
-        "tsx": "^4.22.4",
         "typescript": "6.0.3",
       },
     },
@@ -295,58 +294,6 @@
 
     "@epic-web/invariant": ["@epic-web/invariant@1.0.0", "", {}, "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA=="],
 
-    "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.28.1", "", { "os": "aix", "cpu": "ppc64" }, "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ=="],
-
-    "@esbuild/android-arm": ["@esbuild/android-arm@0.28.1", "", { "os": "android", "cpu": "arm" }, "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ=="],
-
-    "@esbuild/android-arm64": ["@esbuild/android-arm64@0.28.1", "", { "os": "android", "cpu": "arm64" }, "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg=="],
-
-    "@esbuild/android-x64": ["@esbuild/android-x64@0.28.1", "", { "os": "android", "cpu": "x64" }, "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng=="],
-
-    "@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.28.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q=="],
-
-    "@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.28.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ=="],
-
-    "@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.28.1", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw=="],
-
-    "@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.28.1", "", { "os": "freebsd", "cpu": "x64" }, "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ=="],
-
-    "@esbuild/linux-arm": ["@esbuild/linux-arm@0.28.1", "", { "os": "linux", "cpu": "arm" }, "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ=="],
-
-    "@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.28.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g=="],
-
-    "@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.28.1", "", { "os": "linux", "cpu": "ia32" }, "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w=="],
-
-    "@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.28.1", "", { "os": "linux", "cpu": "none" }, "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg=="],
-
-    "@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.28.1", "", { "os": "linux", "cpu": "none" }, "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ=="],
-
-    "@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.28.1", "", { "os": "linux", "cpu": "ppc64" }, "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ=="],
-
-    "@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.28.1", "", { "os": "linux", "cpu": "none" }, "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ=="],
-
-    "@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.28.1", "", { "os": "linux", "cpu": "s390x" }, "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag=="],
-
-    "@esbuild/linux-x64": ["@esbuild/linux-x64@0.28.1", "", { "os": "linux", "cpu": "x64" }, "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA=="],
-
-    "@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.28.1", "", { "os": "none", "cpu": "arm64" }, "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw=="],
-
-    "@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.28.1", "", { "os": "none", "cpu": "x64" }, "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg=="],
-
-    "@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.28.1", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q=="],
-
-    "@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.28.1", "", { "os": "openbsd", "cpu": "x64" }, "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw=="],
-
-    "@esbuild/openharmony-arm64": ["@esbuild/openharmony-arm64@0.28.1", "", { "os": "none", "cpu": "arm64" }, "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg=="],
-
-    "@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.28.1", "", { "os": "sunos", "cpu": "x64" }, "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ=="],
-
-    "@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.28.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA=="],
-
-    "@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.28.1", "", { "os": "win32", "cpu": "ia32" }, "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg=="],
-
-    "@esbuild/win32-x64": ["@esbuild/win32-x64@0.28.1", "", { "os": "win32", "cpu": "x64" }, "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A=="],
-
     "@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.38", "", {}, "sha512-IJkBtN1o8u9BW5fvSii1MyHPQ7Q0HxbWcVBvOrOzgMLpVtZw7R2w94wBTVR7kZwv3w1JNTESMmLA5Sqn1+Z36A=="],
 
     "@expo/cli": ["@expo/cli@56.1.16", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/config": "~56.0.9", "@expo/config-plugins": "~56.0.9", "@expo/devcert": "^1.2.1", "@expo/env": "~2.3.0", "@expo/image-utils": "^0.10.1", "@expo/inline-modules": "^0.0.12", "@expo/json-file": "^10.2.0", "@expo/log-box": "^56.0.13", "@expo/metro": "~56.0.0", "@expo/metro-config": "~56.0.14", "@expo/metro-file-map": "^56.0.3", "@expo/osascript": "^2.6.0", "@expo/package-manager": "^1.12.1", "@expo/plist": "^0.7.0", "@expo/prebuild-config": "^56.0.16", "@expo/require-utils": "^56.1.3", "@expo/router-server": "^56.0.14", "@expo/schema-utils": "^56.0.0", "@expo/spawn-async": "^1.8.0", "@expo/ws-tunnel": "^2.0.0", "@expo/xcpretty": "^4.4.4", "@react-native/dev-middleware": "0.85.3", "accepts": "^1.3.8", "arg": "^5.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "dnssd-advertise": "^1.1.4", "expo-server": "^56.0.5", "fetch-nodeshim": "^0.4.10", "getenv": "^2.0.0", "glob": "^13.0.0", "lan-network": "^0.2.1", "multitars": "^1.0.0", "node-forge": "^1.3.3", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^4.0.4", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "resolve-from": "^5.0.0", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "terminal-link": "^2.1.1", "toqr": "^0.1.1", "wrap-ansi": "^7.0.0", "ws": "^8.12.1", "zod": "^3.25.76" }, "peerDependencies": { "expo": "*", "expo-router": "*", "react-native": "*" }, "optionalPeers": ["expo-router", "react-native"], "bin": { "expo-internal": "main.js" } }, "sha512-VBQn0mqAwc67b9Cn0RVXyeodghomAx5xGRhA/bXaQzuxDjMQk0zIOb6pXMZX7yiIwJW66UZt/zQiJNSv6aWJYw=="],
@@ -961,8 +908,6 @@
 
     "es-set-tostringtag": ["es-set-tostringtag@2.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA=="],
 
-    "esbuild": ["esbuild@0.28.1", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.28.1", "@esbuild/android-arm": "0.28.1", "@esbuild/android-arm64": "0.28.1", "@esbuild/android-x64": "0.28.1", "@esbuild/darwin-arm64": "0.28.1", "@esbuild/darwin-x64": "0.28.1", "@esbuild/freebsd-arm64": "0.28.1", "@esbuild/freebsd-x64": "0.28.1", "@esbuild/linux-arm": "0.28.1", "@esbuild/linux-arm64": "0.28.1", "@esbuild/linux-ia32": "0.28.1", "@esbuild/linux-loong64": "0.28.1", "@esbuild/linux-mips64el": "0.28.1", "@esbuild/linux-ppc64": "0.28.1", "@esbuild/linux-riscv64": "0.28.1", "@esbuild/linux-s390x": "0.28.1", "@esbuild/linux-x64": "0.28.1", "@esbuild/netbsd-arm64": "0.28.1", "@esbuild/netbsd-x64": "0.28.1", "@esbuild/openbsd-arm64": "0.28.1", "@esbuild/openbsd-x64": "0.28.1", "@esbuild/openharmony-arm64": "0.28.1", "@esbuild/sunos-x64": "0.28.1", "@esbuild/win32-arm64": "0.28.1", "@esbuild/win32-ia32": "0.28.1", "@esbuild/win32-x64": "0.28.1" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw=="],
-
     "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],
 
     "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="],
@@ -1627,7 +1572,7 @@
 
     "react-native-qrcode-svg": ["react-native-qrcode-svg@6.3.21", "", { "dependencies": { "prop-types": "^15.8.0", "qrcode": "^1.5.4", "text-encoding": "^0.7.0" }, "peerDependencies": { "react": "*", "react-native": ">=0.63.4", "react-native-svg": ">=14.0.0" } }, "sha512-6vcj4rcdpWedvphDR+NSJcudJykNuLgNGFwm2p4xYjR8RdyTzlrELKI5LkO4ANS9cQUbqsfkpippPv64Q2tUtA=="],
 
-    "react-native-reanimated": ["react-native-reanimated@4.3.1", "", { "dependencies": { "react-native-is-edge-to-edge": "^1.3.1", "semver": "^7.7.3" }, "peerDependencies": { "react": "*", "react-native": "0.81 - 0.85", "react-native-worklets": "0.8.x" } }, "sha512-KhGsS0YkCA+gusgyzlf9hnqzVPIR398KTpqXyqq/+yYJJPAvyEEPKcxlB0xtOOXSMrR2A9uRKVARVQhZwrOh+Q=="],
+    "react-native-reanimated": ["react-native-reanimated@4.5.0", "", { "dependencies": { "react-native-is-edge-to-edge": "^1.3.1", "semver": "^7.7.3" }, "peerDependencies": { "react": "*", "react-native": "0.83 - 0.86", "react-native-worklets": "0.10.x" } }, "sha512-+iPfvK34PKKYP/p/4TaBliFkbfvjGDIvXuiiaxvISP5ip7sWegvlacwU/uAV6zNDSSmX0tDyER7PurPMKGDipA=="],
 
     "react-native-reanimated-carousel": ["react-native-reanimated-carousel@4.0.3", "", { "peerDependencies": { "react": ">=18.0.0", "react-native": ">=0.70.3", "react-native-gesture-handler": ">=2.9.0", "react-native-reanimated": ">=3.0.0" } }, "sha512-YZXlvZNghR5shFcI9hTA7h7bEhh97pfUSLZvLBAshpbkuYwJDKmQXejO/199T6hqGq0wCRwR0CWf2P4Vs6A4Fw=="],
 
@@ -1863,8 +1808,6 @@
 
     "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "tsx": ["tsx@4.22.4", "", { "dependencies": { "esbuild": "~0.28.0" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg=="],
-
     "type-fest": ["type-fest@0.7.1", "", {}, "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="],
 
     "type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="],

components/home/Home.tv.tsx

@@ -140,11 +140,9 @@ export const Home = () => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Prefetch to disk only - the full-size 1920x1080 backdrop (~8MB
-      // decoded ARGB) is too large to pin in the memory cache on every
-      // focus change. Disk cache is fast enough for a 500ms crossfade.
+      // Prefetch the image before starting the crossfade
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/home/InfiniteScrollingCollectionList.tv.tsx

@@ -201,18 +201,12 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
 
   const handleSeeAllPress = useCallback(() => {
     if (!parentId) return;
-    // Navigate into the library detail (lives in the libraries tab) sorted by most
-    // recently added. The `fromSeeAll` flag tells the detail page to (a) collapse
-    // the libraries stack so the native tab can't auto-pop it back to the list, and
-    // (b) intercept Back to route to the library list so the user can switch
-    // libraries. See app/(auth)/(tabs)/(libraries)/[libraryId].tsx.
     router.push({
-      pathname: "/[libraryId]",
+      pathname: "/(auth)/(tabs)/(libraries)/[libraryId]",
       params: {
         libraryId: parentId,
         sortBy: SortByOption.DateCreated,
         sortOrder: SortOrderOption.Descending,
-        fromSeeAll: "true",
       },
     } as any);
   }, [router, parentId]);
@@ -332,9 +326,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
           showsHorizontalScrollIndicator={false}
           onEndReached={handleEndReached}
           onEndReachedThreshold={0.5}
-          initialNumToRender={4}
-          maxToRenderPerBatch={2}
-          windowSize={3}
+          initialNumToRender={5}
+          maxToRenderPerBatch={3}
+          windowSize={5}
           removeClippedSubviews={false}
           maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
           style={{ overflow: "visible" }}
@@ -354,14 +348,11 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
           // contentOffset={{ x: -sizes.padding.horizontal, y: 0 }}
           // contentContainerStyle={{ paddingVertical: SCALE_PADDING }}
           ListFooterComponent={
-            // No fixed width: the footer must size to the "See All" card so the
-            // FlatList's scrollable content extends to fully reveal it. A fixed
-            // (narrow) width clipped the card at the right edge. Trailing space is
-            // provided by contentContainerStyle.paddingRight.
             <View
               style={{
                 flexDirection: "row",
                 alignItems: "center",
+                width: sizes.padding.horizontal,
               }}
             >
               {isFetchingNextPage && (

components/home/TVHeroCarousel.tsx

@@ -256,11 +256,8 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Disk-only prefetch: backdrops are ~8MB decoded ARGB; keeping them
-      // out of the memory cache avoids bloat when the user cycles through
-      // hero items quickly.
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/persons/TVActorPage.tsx

@@ -156,9 +156,9 @@ export const TVActorPage: React.FC<TVActorPageProps> = ({ personId }) => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Disk-only prefetch to avoid pinning large backdrops in memory cache.
+      // Prefetch the image before starting the crossfade
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/tv/TVNextEpisodeCountdown.tsx

@@ -44,10 +44,8 @@ export interface TVNextEpisodeCountdownProps {
   playButtonRef?: RNView | null;
 }
 
-// Position constants — kept in sync with TVSkipSegmentCard (the two are
-// mutually exclusive). See TVSkipSegmentCard for the BOTTOM_WITH_CONTROLS
-// rationale (220 sits just above the controls bar; 300 floated too high).
-const BOTTOM_WITH_CONTROLS = scaleSize(220);
+// Position constants
+const BOTTOM_WITH_CONTROLS = scaleSize(300);
 const BOTTOM_WITHOUT_CONTROLS = scaleSize(120);
 
 export const TVNextEpisodeCountdown: FC<TVNextEpisodeCountdownProps> = ({

components/tv/TVPosterCard.tsx

@@ -448,8 +448,8 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
         <Image
           placeholder={{ blurhash }}
           key={item.Id}
+          id={item.Id}
           source={{ uri: imageUrl }}
-          recyclingKey={item.Id}
           cachePolicy='memory-disk'
           contentFit='cover'
           style={{

components/tv/TVSkipSegmentCard.tsx

@@ -33,15 +33,9 @@ export interface TVSkipSegmentCardProps {
   playButtonRef?: View | null;
 }
 
-// Position constants — kept in sync with TVNextEpisodeCountdown (the two
-// are mutually exclusive). Scaled to the screen so 4K TVs don't get a
-// card that floats far above the controls.
-//
-// BOTTOM_WITH_CONTROLS is tuned to sit just above the bottom controls bar
-// (metadata + seekbar + buttons ≈ 200px on 1080p). Previously 300, which
-// left the card hovering ~100px above the controls.
-const BOTTOM_WITH_CONTROLS = scaleSize(220);
-const BOTTOM_WITHOUT_CONTROLS = scaleSize(120);
+// Position constants - same as TVNextEpisodeCountdown (they're mutually exclusive)
+const BOTTOM_WITH_CONTROLS = 300;
+const BOTTOM_WITHOUT_CONTROLS = 120;
 
 export const TVSkipSegmentCard: FC<TVSkipSegmentCardProps> = ({
   show,

components/video-player/VideoPlayerView.tsx

@@ -1,35 +0,0 @@
-import * as React from "react";
-import { Platform } from "react-native";
-import type { MpvPlayerViewProps, MpvPlayerViewRef } from "@/modules";
-import { MpvPlayerView } from "@/modules";
-import { ExoPlayerView } from "@/modules/exoplayer-player";
-import {
-  getActiveVideoPlayer,
-  useSettings,
-  VideoPlayer,
-} from "@/utils/atoms/settings";
-
-/**
- * Unified video player view. MPV is the default on every platform; users
- * can opt into ExoPlayer on Android TV via settings.videoPlayer. Both
- * children conform to the same `MpvPlayerViewRef` interface, so the ref
- * is forwarded transparently regardless of which player is rendered.
- */
-export const VideoPlayerView = React.forwardRef<
-  MpvPlayerViewRef,
-  MpvPlayerViewProps
->(function VideoPlayerView(props, ref) {
-  const { settings } = useSettings();
-
-  // ExoPlayer's native module only ships for Android TV. Even if a user
-  // somehow ends up with `videoPlayer: ExoPlayer` set on another platform
-  // (shouldn't happen — the selector is hidden outside Android TV — but
-  // MMKV-persisted settings can roam), fall back to MPV rather than
-  // crash on requireNativeView().
-  const isExoSupported = Platform.OS === "android" && Platform.isTV;
-  const useExo =
-    isExoSupported && getActiveVideoPlayer(settings) === VideoPlayer.ExoPlayer;
-
-  const Player = useExo ? ExoPlayerView : MpvPlayerView;
-  return <Player ref={ref} {...props} />;
-});

components/video-player/controls/Controls.tv.tsx

@@ -1129,16 +1129,7 @@ export const Controls: FC<Props> = ({
       {/* Skip intro card */}
       <TVSkipSegmentCard
         show={showSkipButton && !isCountdownActive}
-        onPress={() => {
-          // After the seek lands, showSkipButton flips false and this card
-          // unmounts. With controls visible the focus-stealing overlay is
-          // disabled, so without an explicit handoff the focus engine is
-          // stranded. Prime the play button to receive focus on the next
-          // render — when controls are hidden the focus overlay takes over
-          // naturally and this is a harmless no-op.
-          if (showControls) setFocusPlayButton(true);
-          skipIntro();
-        }}
+        onPress={skipIntro}
         type='intro'
         controlsVisible={showControls}
         refSetter={setSkipSegmentRef}
@@ -1153,11 +1144,7 @@ export const Controls: FC<Props> = ({
           (hasContentAfterCredits || !nextItem) &&
           !isCountdownActive
         }
-        onPress={() => {
-          // See the intro card above for the focus-handoff rationale.
-          if (showControls) setFocusPlayButton(true);
-          skipCredit();
-        }}
+        onPress={skipCredit}
         type='credits'
         controlsVisible={showControls}
         refSetter={setSkipSegmentRef}

components/video-player/controls/TechnicalInfoOverlay.tsx

@@ -213,10 +213,13 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
       );
 
       return {
+        container: mediaSource.Container,
         videoRange: videoStream?.VideoRangeType,
         bitDepth: videoStream?.BitDepth,
         audioChannels: audioStream?.Channels,
+        audioCodecFromSource: audioStream?.Codec,
         subtitleCodec: subtitleStream?.Codec,
+        subtitleTitle: subtitleStream?.DisplayTitle,
       };
     }, [mediaSource, currentAudioIndex, currentSubtitleIndex]);
 
@@ -302,13 +305,9 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
             <Text style={textStyle}>
               {info.videoWidth}x{info.videoHeight}
               {streamInfo?.bitDepth ? ` ${streamInfo.bitDepth}bit` : ""}
-              {/* Prefer the player-reported HDR format (authoritative —
-                  what's actually being decoded) over Jellyfin metadata. */}
-              {info?.hdrFormat
-                ? ` ${info.hdrFormat}`
-                : formatVideoRange(streamInfo?.videoRange)
-                  ? ` ${formatVideoRange(streamInfo?.videoRange)}`
-                  : ""}
+              {formatVideoRange(streamInfo?.videoRange)
+                ? ` ${formatVideoRange(streamInfo?.videoRange)}`
+                : ""}
             </Text>
           )}
           {info?.videoCodec && (
@@ -320,15 +319,8 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
           {info?.audioCodec && (
             <Text style={textStyle}>
               Audio: {formatCodec(info.audioCodec)}
-              {/* Prefer player-reported channel count; fall back to
-                  Jellyfin metadata for MPV which doesn't populate it. */}
-              {(info.audioChannels ?? streamInfo?.audioChannels)
-                ? ` ${formatAudioChannels(
-                    info.audioChannels ?? streamInfo!.audioChannels!,
-                  )}`
-                : ""}
-              {info.audioSampleRate
-                ? ` @ ${(info.audioSampleRate / 1000).toFixed(1)}kHz`
+              {streamInfo?.audioChannels
+                ? ` ${formatAudioChannels(streamInfo.audioChannels)}`
                 : ""}
             </Text>
           )}
@@ -347,26 +339,9 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
                   : "N/A"}
             </Text>
           )}
-          {(info?.colorSpace || info?.colorRange || info?.colorTransfer) && (
-            <Text style={textStyle}>
-              Color:
-              {[info.colorSpace, info.colorRange, info.colorTransfer]
-                .filter(Boolean)
-                .join(" / ")}
-            </Text>
-          )}
-          {info?.videoCodecs && (
-            <Text style={textStyle}>Codec tag: {info.videoCodecs}</Text>
-          )}
           {info?.cacheSeconds !== undefined && (
             <Text style={textStyle}>
               Buffer: {info.cacheSeconds.toFixed(1)}s
-              {info?.demuxerMaxBytes !== undefined
-                ? ` (cap ${info.demuxerMaxBytes}MB` +
-                  `${info.demuxerMaxBackBytes !== undefined ? ` / ${info.demuxerMaxBackBytes}MB back` : ""}` +
-                  `${info?.cacheSecsLimit !== undefined && info.cacheSecsLimit < 3600 ? ` · ${info.cacheSecsLimit.toFixed(0)}s` : ""}` +
-                  ")"
-                : ""}
             </Text>
           )}
           {info?.voDriver && (
@@ -375,18 +350,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
               {info.hwdec ? ` / ${info.hwdec}` : ""}
             </Text>
           )}
-          {info?.decoderName && (
-            <Text style={textStyle}>
-              Decoder: {info.decoderName}
-              {info.decoderType ? ` (${info.decoderType})` : ""}
-            </Text>
-          )}
-          {info?.estimatedVfFps !== undefined && (
-            <Text style={textStyle}>
-              Output FPS: {info.estimatedVfFps.toFixed(2)}
-              {info?.fps ? ` (container ${formatFps(info.fps)})` : ""}
-            </Text>
-          )}
           {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
             <Text style={[textStyle, styles.warningText]}>
               Dropped: {info.droppedFrames} frames

constants/MediaTypes.js

@@ -3,13 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-const MediaTypes = {
+export default {
   Audio: "Audio",
   Video: "Video",
   Photo: "Photo",
   Book: "Book",
-} as const;
-
-export type MediaType = (typeof MediaTypes)[keyof typeof MediaTypes];
-
-export default MediaTypes;
+};

docs/tv-discovery.md

@@ -28,7 +28,7 @@ Apple TV uses a Top Shelf extension target, not the main app process.
 
 Relevant files:
 
-- [plugins/withTVOSTopShelf.ts](../plugins/withTVOSTopShelf.ts)
+- [plugins/withTVOSTopShelf.js](../plugins/withTVOSTopShelf.js)
 - [targets/StreamyfinTopShelf/TopShelfProvider.swift](../targets/StreamyfinTopShelf/TopShelfProvider.swift)
 - [modules/top-shelf-cache/ios/TopShelfCacheModule.swift](../modules/top-shelf-cache/ios/TopShelfCacheModule.swift)
 - [utils/topshelf/cache.ts](../utils/topshelf/cache.ts)

modules/exoplayer-player/android/build.gradle

@@ -1,68 +0,0 @@
-apply plugin: 'com.android.library'
-
-group = 'expo.modules.exoplayerplayer'
-version = '0.1.0'
-
-def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-apply from: expoModulesCorePlugin
-applyKotlinExpoModulesCorePlugin()
-useCoreDependencies()
-useExpoPublishing()
-
-def useManagedAndroidSdkVersions = false
-if (useManagedAndroidSdkVersions) {
-  useDefaultAndroidSdkVersions()
-} else {
-  buildscript {
-    ext.safeExtGet = { prop, fallback ->
-      rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-    }
-  }
-  project.android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 36)
-    defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 26)
-      targetSdkVersion safeExtGet("targetSdkVersion", 36)
-    }
-  }
-}
-
-android {
-  namespace "expo.modules.exoplayerplayer"
-  defaultConfig {
-    versionCode 1
-    versionName "0.1.0"
-  }
-  lintOptions {
-    abortOnError false
-  }
-}
-
-dependencies {
-  // Media3 (ExoPlayer). The default tracks react-native-track-player's
-  // pinned version (currently 1.10.1) so we don't end up with two media3
-  // versions on the classpath and duplicate-class errors. The
-  // DASH/SmoothStreaming/RTSP artifacts that RNTP pulls in are excluded
-  // globally via plugins/withExcludeMedia3Dash.js.
-  def media3Version = safeExtGet('media3Version', '1.10.1')
-  implementation "androidx.media3:media3-exoplayer:${media3Version}"
-  implementation "androidx.media3:media3-exoplayer-hls:${media3Version}"
-  implementation "androidx.media3:media3-ui:${media3Version}"
-  implementation "androidx.media3:media3-common:${media3Version}"
-
-  // FFmpeg software decoders — DTS / TrueHD / AC-4 / WMA / older video
-  // codecs that MediaCodec doesn't ship with on most Android TVs.
-  //
-  // This is the Jellyfin-published distribution of media3-decoder-ffmpeg
-  // with prebuilt native libraries (the upstream androidx artifact is a
-  // stub that requires building FFmpeg yourself). RNTP already pulls
-  // 1.9.0+1 in transitively, so declaring it here is mostly defensive —
-  // it guarantees we still get it if RNTP ever drops the dep.
-  //
-  // Version skew: this is built against media3 1.9.0 but RNTP (and we)
-  // resolve media3 core to 1.10.1. RNTP ships the same combination in
-  // production, and Media3 maintains binary compat for Renderer /
-  // RenderersFactory APIs across minor versions, so this works in
-  // practice. Re-evaluate when Jellyfin publishes a 1.10.x build.
-  implementation "org.jellyfin.media3:media3-ffmpeg-decoder:1.9.0+1"
-}

modules/exoplayer-player/android/src/main/java/expo/modules/exoplayerplayer/ExoPlayerModule.kt

@@ -1,193 +0,0 @@
-package expo.modules.exoplayerplayer
-
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-
-class ExoPlayerModule : Module() {
-    override fun definition() = ModuleDefinition {
-        Name("ExoPlayer")
-
-        // Enables the module to be used as a native view.
-        View(ExoPlayerView::class) {
-            // All video load options are passed via a single "source" prop,
-            // mirroring MpvPlayerView. MPV-only fields (voDriver, extra
-            // cacheConfig fields) are silently ignored.
-            Prop("source") { view: ExoPlayerView, source: Map<String, Any?>? ->
-                if (source == null) return@Prop
-
-                val urlString = source["url"] as? String ?: return@Prop
-
-                @Suppress("UNCHECKED_CAST")
-                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
-
-                val config = VideoLoadConfig(
-                    url = urlString,
-                    headers = source["headers"] as? Map<String, String>,
-                    externalSubtitles = source["externalSubtitles"] as? List<String>,
-                    startPosition = (source["startPosition"] as? Number)?.toDouble(),
-                    autoplay = (source["autoplay"] as? Boolean) ?: true,
-                    initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
-                    initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
-                    cacheEnabled = cacheConfig?.get("enabled") as? String,
-                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
-                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
-                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
-                )
-
-                view.loadVideo(config)
-            }
-
-            // Now Playing metadata is iOS-only on MPV; no-op here (TV has
-            // no Control Center equivalent — Android handles media sessions
-            // via MediaSessionCompat which we don't wire up for TV).
-            Prop("nowPlayingMetadata") { _: ExoPlayerView, _: Map<String, String>? ->
-                // No-op
-            }
-
-            AsyncFunction("play") { view: ExoPlayerView ->
-                view.play()
-            }
-
-            AsyncFunction("pause") { view: ExoPlayerView ->
-                view.pause()
-            }
-
-            AsyncFunction("destroy") { view: ExoPlayerView ->
-                view.destroy()
-            }
-
-            AsyncFunction("seekTo") { view: ExoPlayerView, position: Double ->
-                view.seekTo(position)
-            }
-
-            AsyncFunction("seekBy") { view: ExoPlayerView, offset: Double ->
-                view.seekBy(offset)
-            }
-
-            AsyncFunction("setSpeed") { view: ExoPlayerView, speed: Double ->
-                view.setSpeed(speed)
-            }
-
-            AsyncFunction("getSpeed") { view: ExoPlayerView ->
-                view.getSpeed()
-            }
-
-            AsyncFunction("isPaused") { view: ExoPlayerView ->
-                view.isPaused()
-            }
-
-            AsyncFunction("getCurrentPosition") { view: ExoPlayerView ->
-                view.getCurrentPosition()
-            }
-
-            AsyncFunction("getDuration") { view: ExoPlayerView ->
-                view.getDuration()
-            }
-
-            // Picture in Picture — TV does not use PiP; safe no-ops.
-            AsyncFunction("startPictureInPicture") { _: ExoPlayerView ->
-                // No-op
-            }
-
-            AsyncFunction("stopPictureInPicture") { _: ExoPlayerView ->
-                // No-op
-            }
-
-            AsyncFunction("isPictureInPictureSupported") { _: ExoPlayerView ->
-                false
-            }
-
-            AsyncFunction("isPictureInPictureActive") { _: ExoPlayerView ->
-                false
-            }
-
-            // Subtitle functions
-            AsyncFunction("getSubtitleTracks") { view: ExoPlayerView ->
-                view.getSubtitleTracks()
-            }
-
-            AsyncFunction("setSubtitleTrack") { view: ExoPlayerView, trackId: Int ->
-                view.setSubtitleTrack(trackId)
-            }
-
-            AsyncFunction("disableSubtitles") { view: ExoPlayerView ->
-                view.disableSubtitles()
-            }
-
-            AsyncFunction("getCurrentSubtitleTrack") { view: ExoPlayerView ->
-                view.getCurrentSubtitleTrack()
-            }
-
-            AsyncFunction("addSubtitleFile") { view: ExoPlayerView, url: String, select: Boolean ->
-                view.addSubtitleFile(url, select)
-            }
-
-            // Subtitle positioning / styling
-            AsyncFunction("setSubtitlePosition") { view: ExoPlayerView, position: Int ->
-                view.setSubtitlePosition(position)
-            }
-
-            AsyncFunction("setSubtitleScale") { view: ExoPlayerView, scale: Double ->
-                view.setSubtitleScale(scale)
-            }
-
-            AsyncFunction("setSubtitleMarginY") { view: ExoPlayerView, margin: Int ->
-                view.setSubtitleMarginY(margin)
-            }
-
-            AsyncFunction("setSubtitleAlignX") { _: ExoPlayerView, _: String ->
-                // No-op — SubtitleView follows authored cue alignment.
-            }
-
-            AsyncFunction("setSubtitleAlignY") { view: ExoPlayerView, alignment: String ->
-                view.setSubtitleAlignY(alignment)
-            }
-
-            AsyncFunction("setSubtitleFontSize") { view: ExoPlayerView, size: Int ->
-                view.setSubtitleFontSize(size)
-            }
-
-            AsyncFunction("setSubtitleBorderStyle") { view: ExoPlayerView, style: String ->
-                view.setSubtitleBorderStyle(style)
-            }
-
-            AsyncFunction("setSubtitleBackgroundColor") { view: ExoPlayerView, color: String ->
-                view.setSubtitleBackgroundColor(color)
-            }
-
-            AsyncFunction("setSubtitleAssOverride") { _: ExoPlayerView, _: String ->
-                // No-op — libass-specific, no Media3 equivalent.
-            }
-
-            // Audio track functions
-            AsyncFunction("getAudioTracks") { view: ExoPlayerView ->
-                view.getAudioTracks()
-            }
-
-            AsyncFunction("setAudioTrack") { view: ExoPlayerView, trackId: Int ->
-                view.setAudioTrack(trackId)
-            }
-
-            AsyncFunction("getCurrentAudioTrack") { view: ExoPlayerView ->
-                view.getCurrentAudioTrack()
-            }
-
-            // Video scaling
-            AsyncFunction("setZoomedToFill") { view: ExoPlayerView, zoomed: Boolean ->
-                view.setZoomedToFill(zoomed)
-            }
-
-            AsyncFunction("isZoomedToFill") { view: ExoPlayerView ->
-                view.isZoomedToFill()
-            }
-
-            // Technical info
-            AsyncFunction("getTechnicalInfo") { view: ExoPlayerView ->
-                view.getTechnicalInfo()
-            }
-
-            // Events that the view can send to JavaScript — same set as MPV.
-            Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady", "onPictureInPictureChange")
-        }
-    }
-}

modules/exoplayer-player/android/src/main/java/expo/modules/exoplayerplayer/ExoPlayerView.kt

@@ -1,905 +0,0 @@
-@file:OptIn(androidx.media3.common.util.UnstableApi::class)
-
-package expo.modules.exoplayerplayer
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.net.Uri
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.view.ViewGroup
-import androidx.media3.common.AudioAttributes
-import androidx.media3.common.C
-import androidx.media3.common.ColorInfo
-import androidx.media3.common.Format
-import androidx.media3.common.MediaItem
-import androidx.media3.common.PlaybackParameters
-import androidx.media3.common.Player
-import androidx.media3.common.TrackSelectionOverride
-import androidx.media3.common.Tracks
-import androidx.media3.exoplayer.DefaultLoadControl
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.exoplayer.analytics.AnalyticsListener
-import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
-import androidx.media3.datasource.DefaultDataSource
-import androidx.media3.ui.CaptionStyleCompat
-import androidx.media3.ui.PlayerView
-import androidx.media3.ui.SubtitleView
-import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.viewevent.EventDispatcher
-import expo.modules.kotlin.views.ExpoView
-
-/**
- * Configuration for loading a video. Mirrors MpvPlayerView.VideoLoadConfig —
- * MPV-only fields are accepted and ignored.
- */
-data class VideoLoadConfig(
-    val url: String,
-    val headers: Map<String, String>? = null,
-    val externalSubtitles: List<String>? = null,
-    val startPosition: Double? = null,
-    val autoplay: Boolean = true,
-    val initialSubtitleId: Int? = null,
-    val initialAudioId: Int? = null,
-    val cacheEnabled: String? = null,
-    val cacheSeconds: Int? = null,
-    val demuxerMaxBytes: Int? = null,
-    val demuxerMaxBackBytes: Int? = null,
-)
-
-/**
- * ExoPlayerView — ExpoView that hosts a Media3 ExoPlayer instance.
- *
- * Implements the same JS contract (events, ref methods, 1-based track IDs)
- * as MpvPlayerView so the React layer can swap between the two without
- * changes. Subtitle styling is mapped to androidx.media3.ui.SubtitleView +
- * CaptionStyleCompat. PiP methods are no-ops (TV doesn't use PiP).
- */
-class ExoPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
-
-    companion object {
-        private const val TAG = "ExoPlayerView"
-        private const val PROGRESS_INTERVAL_MS = 1000L
-    }
-
-    // Event dispatchers — names must match the Events() declaration in the module.
-    val onLoad by EventDispatcher()
-    val onPlaybackStateChange by EventDispatcher()
-    val onProgress by EventDispatcher()
-    val onError by EventDispatcher()
-    val onTracksReady by EventDispatcher()
-    val onPictureInPictureChange by EventDispatcher()
-
-    private val mainHandler = Handler(Looper.getMainLooper())
-
-    private var player: ExoPlayer? = null
-    private val playerView: PlayerView
-    private val subtitleView: SubtitleView?
-
-    private var currentUrl: String? = null
-    private var pendingConfig: VideoLoadConfig? = null
-    private var tracksReadyFired: Boolean = false
-
-    // 1-based track ID mappings (matching MPV's contract).
-    // Each list is rebuilt on Tracks changed.
-    private var subtitleTrackList: List<TrackEntry> = emptyList()
-    private var audioTrackList: List<TrackEntry> = emptyList()
-    private var currentSubtitleId: Int = 0
-    private var currentAudioId: Int = 0
-
-    // Subtitle styling state — applied to the embedded SubtitleView.
-    private var subtitleScale: Float = 1f
-    private var subtitleFontSizePct: Int? = null // 0-100
-    // Last-write-wins override of the vertical position fraction
-    // (null = fall back to subtitleAlignY). Both setSubtitlePosition
-    // (0-100, MPV convention where 100 = bottom) and setSubtitleMarginY
-    // (px) funnel into this single SubtitleView API.
-    private var subtitleBottomFraction: Float? = null
-    private var subtitleAlignY: String = "bottom"
-    // Background color carries its own alpha (parsed from #RRGGBBAA in
-    // setSubtitleBackgroundColor) so no separate enabled/opacity flags.
-    private var subtitleBackgroundColor: Int = Color.argb(0, 0, 0, 0)
-    private var subtitleBorderStyle: String = "outline-and-shadow"
-
-    private var isZoomedToFill: Boolean = false
-
-    // Captured by analyticsListener; surfaced via getTechnicalInfo().
-    // Reset on destroy() and (for decoder names) on track changes.
-    private var videoDecoderName: String? = null
-    private var audioDecoderName: String? = null
-    private var cumulativeDroppedFrames: Int = 0
-
-    private val analyticsListener = object : AnalyticsListener {
-        override fun onVideoDecoderInitialized(
-            eventTime: AnalyticsListener.EventTime,
-            decoderName: String,
-            initializedTimestampMs: Long,
-        ) {
-            videoDecoderName = decoderName
-        }
-
-        override fun onAudioDecoderInitialized(
-            eventTime: AnalyticsListener.EventTime,
-            decoderName: String,
-            initializedTimestampMs: Long,
-        ) {
-            audioDecoderName = decoderName
-        }
-
-        override fun onDroppedVideoFrames(
-            eventTime: AnalyticsListener.EventTime,
-            droppedFrames: Int,
-            elapsedMs: Long,
-        ) {
-            // Incremental count since last call; accumulate for a cumulative
-            // total that matches MPV's droppedFrames semantics.
-            cumulativeDroppedFrames += droppedFrames
-        }
-    }
-
-    private val playerListener = object : Player.Listener {
-        override fun onPlaybackStateChanged(playbackState: Int) {
-            when (playbackState) {
-                Player.STATE_BUFFERING -> {
-                    onPlaybackStateChange(mapOf("isLoading" to true))
-                }
-                Player.STATE_READY -> {
-                    onPlaybackStateChange(mapOf(
-                        "isLoading" to false,
-                        "isReadyToSeek" to true
-                    ))
-                    if (!tracksReadyFired) {
-                        tracksReadyFired = true
-                        rebuildTrackMaps(player?.currentTracks)
-                        onTracksReady(emptyMap<String, Any>())
-                    }
-                }
-                Player.STATE_ENDED -> {
-                    onPlaybackStateChange(mapOf(
-                        "isPlaying" to false,
-                        "isPaused" to true
-                    ))
-                }
-                Player.STATE_IDLE -> {
-                    // no-op
-                }
-            }
-        }
-
-        override fun onIsPlayingChanged(isPlaying: Boolean) {
-            onPlaybackStateChange(mapOf(
-                "isPlaying" to isPlaying,
-                "isPaused" to !isPlaying
-            ))
-        }
-
-        override fun onPlayerErrorChanged(error: androidx.media3.common.PlaybackException?) {
-            val message = error?.message ?: "Unknown playback error"
-            Log.e(TAG, "Player error: $message", error)
-            onError(mapOf("error" to message))
-        }
-
-        override fun onTracksChanged(tracks: Tracks) {
-            rebuildTrackMaps(tracks)
-            applyInitialTrackSelections()
-            // A track change can re-initialize the codec under a different
-            // name (e.g. adaptive switch from HEVC to AV1). Clear stale
-            // decoder names so getTechnicalInfo() doesn't report the
-            // previous codec until the next onVideoDecoderInitialized fires.
-            videoDecoderName = null
-            audioDecoderName = null
-        }
-    }
-
-    private val progressRunnable = object : Runnable {
-        override fun run() {
-            val p = player ?: return
-            val positionMs = p.currentPosition
-            val durationMs = p.duration
-            val bufferedMs = p.bufferedPosition
-
-            val positionSec = positionMs / 1000.0
-            val durationSec = if (durationMs > 0) durationMs / 1000.0 else 0.0
-            val cacheSec = if (bufferedMs > positionMs) (bufferedMs - positionMs) / 1000.0 else 0.0
-
-            onProgress(mapOf(
-                "position" to positionSec,
-                "duration" to durationSec,
-                "progress" to if (durationSec > 0) positionSec / durationSec else 0.0,
-                "cacheSeconds" to cacheSec
-            ))
-
-            mainHandler.postDelayed(this, PROGRESS_INTERVAL_MS)
-        }
-    }
-
-    init {
-        setBackgroundColor(Color.BLACK)
-
-        playerView = PlayerView(context).apply {
-            layoutParams = ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT
-            )
-            // SurfaceView-backed for parity with MPV (direct surface to
-            // SurfaceFlinger). PlayerView defaults to a SurfaceView, so no
-            // explicit setSurfaceType() call is needed; the int constants
-            // backing it are @IntDef private in Media3.
-            setUseController(false)
-            setResizeMode(androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT)
-        }
-        subtitleView = playerView.subtitleView
-        addView(playerView)
-    }
-
-    // MARK: - Video Loading
-
-    fun loadVideo(config: VideoLoadConfig) {
-        if (currentUrl == config.url) return
-        currentUrl = config.url
-        pendingConfig = config
-        ensurePlayer(config)
-        loadInternal(config)
-    }
-
-    private fun ensurePlayer(config: VideoLoadConfig) {
-        if (player != null) return
-
-        val loadControl = buildLoadControl(config)
-
-        // PREFER extension renderers so the FFmpeg decoder (DTS / TrueHD /
-        // AC-4 / WMA / etc.) takes over when MediaCodec doesn't ship a
-        // hardware decoder for the format. MediaCodec remains the fallback.
-        val renderersFactory = androidx.media3.exoplayer.DefaultRenderersFactory(context)
-            .setExtensionRendererMode(
-                androidx.media3.exoplayer.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
-            )
-            .setEnableDecoderFallback(true)
-
-        val exo = ExoPlayer.Builder(context, renderersFactory)
-            .setLoadControl(loadControl)
-            .setAudioAttributes(
-                AudioAttributes.Builder()
-                    .setUsage(C.USAGE_MEDIA)
-                    .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
-                    .build(),
-                /* handleAudioFocus = */ true
-            )
-            .build()
-
-        exo.addListener(playerListener)
-        exo.addAnalyticsListener(analyticsListener)
-        exo.repeatMode = Player.REPEAT_MODE_OFF
-        player = exo
-        playerView.player = exo
-
-        applySubtitleStyle()
-    }
-
-    private fun buildLoadControl(config: VideoLoadConfig): DefaultLoadControl {
-        // Map MPV-style cache config to ExoPlayer's LoadControl.
-        val cacheEnabled = when (config.cacheEnabled) {
-            "no" -> false
-            "yes" -> true
-            else -> true // "auto"
-        }
-
-        // Buffer thresholds used as fallbacks when the user's cache config
-        // doesn't override them. Media3's own defaults changed in 1.6.0
-        // (bufferForPlaybackMs 2500→1000, afterRebuffer 5000→2000) for a
-        // faster start; we intentionally keep the older 2500/5000 here
-        // because low-RAM Android TVs with slow tuners benefit from the
-        // extra headroom before playback kicks in. Media3's DEFAULT_*
-        // IntDef fields are private, hence the literals.
-        val defaultMinBufferMs = 15000
-        val defaultBufferForPlaybackMs = 2500
-        val defaultBufferForPlaybackAfterRebufferMs = 5000
-
-        val targetBufferMs = if (!cacheEnabled) {
-            50000
-        } else {
-            val seconds = config.cacheSeconds?.coerceIn(5, 120) ?: 10
-            seconds * 1000
-        }
-
-        val backBufferMs = if (!cacheEnabled) {
-            0
-        } else {
-            val mb = config.demuxerMaxBackBytes ?: 50
-            // Heuristic: 1 MB ≈ 1s of typical 1080p bitrate.
-            (mb * 1000).coerceAtLeast(1000)
-        }
-
-        val builder = DefaultLoadControl.Builder()
-            .setTargetBufferBytes(if (!cacheEnabled) 0 else ((config.demuxerMaxBytes ?: 150) * 1024 * 1024))
-            .setBufferDurationsMs(
-                /* minBufferMs = */ defaultMinBufferMs,
-                /* maxBufferMs = */ targetBufferMs,
-                /* bufferForPlaybackMs = */ defaultBufferForPlaybackMs,
-                /* bufferForPlaybackAfterRebufferMs = */ defaultBufferForPlaybackAfterRebufferMs
-            )
-        if (cacheEnabled) {
-            builder.setBackBuffer(backBufferMs, /* retainBackBufferFromKeyframe = */ true)
-        }
-        return builder.build()
-    }
-
-    private fun loadInternal(config: VideoLoadConfig) {
-        val p = player ?: return
-
-        val httpFactory = androidx.media3.datasource.DefaultHttpDataSource.Factory()
-            .setDefaultRequestProperties(config.headers ?: emptyMap())
-        val dataSourceFactory = DefaultDataSource.Factory(context, httpFactory)
-
-        val mediaItem = buildMediaItem(config)
-
-        val mediaSource = DefaultMediaSourceFactory(dataSourceFactory)
-            .createMediaSource(mediaItem)
-
-        p.setMediaSource(mediaSource)
-        p.prepare()
-
-        // Apply initial playback position
-        config.startPosition?.let { startPosSec ->
-            if (startPosSec > 0) {
-                p.seekTo((startPosSec * 1000).toLong())
-            }
-        }
-
-        if (config.autoplay) {
-            p.play()
-        }
-
-        onLoad(mapOf("url" to config.url))
-        startProgressLoop()
-    }
-
-    private fun buildMediaItem(config: VideoLoadConfig): MediaItem {
-        val builder = MediaItem.Builder().setUri(config.url)
-
-        // External subtitles: add as side-loaded SubtitleConfigurations.
-        // MIME-type sniffed from the file extension.
-        val subs = config.externalSubtitles
-        if (!subs.isNullOrEmpty()) {
-            val subtitleConfigs = subs.mapNotNull { subUrl ->
-                val mime = mimeTypeForSubtitleUrl(subUrl) ?: return@mapNotNull null
-                MediaItem.SubtitleConfiguration.Builder(Uri.parse(subUrl))
-                    .setMimeType(mime)
-                    .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
-                    .build()
-            }
-            if (subtitleConfigs.isNotEmpty()) {
-                builder.setSubtitleConfigurations(subtitleConfigs)
-            }
-        }
-
-        return builder.build()
-    }
-
-    private fun mimeTypeForSubtitleUrl(url: String): String? {
-        val lower = url.substringBeforeLast('?').lowercase()
-        return when {
-            lower.endsWith(".vtt") || lower.endsWith(".webvtt") -> "text/vtt"
-            lower.endsWith(".srt") -> "application/x-subrip"
-            lower.endsWith(".ssa") || lower.endsWith(".ass") -> "text/x-ssa"
-            lower.endsWith(".ttml") || lower.endsWith(".xml") -> "application/ttml+xml"
-            else -> null
-        }
-    }
-
-    // MARK: - Playback Controls
-
-    fun play() {
-        player?.play()
-    }
-
-    fun pause() {
-        player?.pause()
-    }
-
-    fun destroy() {
-        stopProgressLoop()
-        player?.release()
-        player = null
-        playerView.player = null
-        tracksReadyFired = false
-        currentUrl = null
-        subtitleTrackList = emptyList()
-        audioTrackList = emptyList()
-        currentSubtitleId = 0
-        currentAudioId = 0
-        videoDecoderName = null
-        audioDecoderName = null
-        cumulativeDroppedFrames = 0
-    }
-
-    fun seekTo(positionSec: Double) {
-        player?.seekTo((positionSec * 1000).toLong())
-    }
-
-    fun seekBy(offsetSec: Double) {
-        val p = player ?: return
-        val target = (p.currentPosition + offsetSec * 1000).coerceAtLeast(0.0)
-        p.seekTo(target.toLong())
-    }
-
-    fun setSpeed(speed: Double) {
-        player?.playbackParameters = PlaybackParameters(speed.toFloat())
-    }
-
-    fun getSpeed(): Float {
-        return player?.playbackParameters?.speed ?: 1f
-    }
-
-    fun isPaused(): Boolean {
-        return player?.isPlaying == false
-    }
-
-    fun getCurrentPosition(): Double {
-        return (player?.currentPosition ?: 0L) / 1000.0
-    }
-
-    fun getDuration(): Double {
-        val d = player?.duration ?: 0L
-        return if (d > 0) d / 1000.0 else 0.0
-    }
-
-    // MARK: - Track Mapping (1-based IDs to match MPV's contract)
-
-    data class TrackEntry(
-        val id: Int,          // 1-based JS-facing ID
-        val trackGroupIndex: Int,
-        val trackIndex: Int,
-        val format: Format,
-    )
-
-    private fun rebuildTrackMaps(tracks: Tracks?) {
-        if (tracks == null) return
-
-        val subtitles = mutableListOf<TrackEntry>()
-        val audios = mutableListOf<TrackEntry>()
-
-        tracks.groups.forEachIndexed { groupIndex, group ->
-            val rendererType = group.type
-            // Skip groups that have no tracks the player supports
-            for (trackIdx in 0 until group.length) {
-                if (!group.isTrackSupported(trackIdx)) continue
-                val format = group.getTrackFormat(trackIdx)
-                val entry = TrackEntry(
-                    id = 0, // assigned per-list below
-                    trackGroupIndex = groupIndex,
-                    trackIndex = trackIdx,
-                    format = format
-                )
-                when (rendererType) {
-                    C.TRACK_TYPE_TEXT -> subtitles.add(entry)
-                    C.TRACK_TYPE_AUDIO -> audios.add(entry)
-                    else -> { /* video / metadata ignored */ }
-                }
-            }
-        }
-
-        // Assign 1-based IDs per track kind.
-        subtitles.forEachIndexed { i, e -> subtitles[i] = e.copy(id = i + 1) }
-        audios.forEachIndexed { i, e -> audios[i] = e.copy(id = i + 1) }
-
-        subtitleTrackList = subtitles
-        audioTrackList = audios
-    }
-
-    private fun applyInitialTrackSelections() {
-        val p = player ?: return
-        val cfg = pendingConfig ?: return
-
-        // Initial subtitle/audio selection by 1-based ID.
-        if (cfg.initialAudioId != null && cfg.initialAudioId > 0) {
-            setAudioTrack(cfg.initialAudioId)
-        }
-        if (cfg.initialSubtitleId == null || cfg.initialSubtitleId <= 0) {
-            disableSubtitles()
-        } else {
-            setSubtitleTrack(cfg.initialSubtitleId)
-        }
-
-        // Only apply once per source load.
-        pendingConfig = null
-    }
-
-    // MARK: - Subtitle Controls
-
-    fun getSubtitleTracks(): List<Map<String, Any>> {
-        return subtitleTrackList.map { entry ->
-            mapOf(
-                "id" to entry.id,
-                "title" to (entry.format.label ?: ""),
-                "lang" to (entry.format.language ?: "")
-            )
-        }
-    }
-
-    fun setSubtitleTrack(trackId: Int) {
-        val p = player ?: return
-        val entry = subtitleTrackList.firstOrNull { it.id == trackId } ?: return
-        val matchedGroup = p.currentTracks.groups[entry.trackGroupIndex].mediaTrackGroup
-
-        // setOverrideForType replaces any existing override of the same
-        // track type — exactly what we want for single-track subtitle pickers.
-        val params = p.trackSelectionParameters.buildUpon()
-            .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
-            .setOverrideForType(TrackSelectionOverride(matchedGroup, entry.trackIndex))
-            .build()
-        p.trackSelectionParameters = params
-        currentSubtitleId = trackId
-    }
-
-    fun disableSubtitles() {
-        val p = player ?: return
-        val params = p.trackSelectionParameters.buildUpon()
-            .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, true)
-            .build()
-        p.trackSelectionParameters = params
-        currentSubtitleId = 0
-    }
-
-    fun getCurrentSubtitleTrack(): Int = currentSubtitleId
-
-    fun addSubtitleFile(url: String, select: Boolean) {
-        val p = player ?: return
-        // Media3 does not expose the current MediaItem's existing
-        // SubtitleConfigurations, so we cannot append a side-loaded
-        // subtitle to a running item without losing the originals.
-        // For TV, external subs are bundled at load time via
-        // VideoLoadConfig.externalSubtitles (see buildMediaItem). This
-        // method rebuilds the current MediaItem with just the new
-        // subtitle config — acceptable when no other external subs are
-        // in play, which is the typical TV case.
-        val mime = mimeTypeForSubtitleUrl(url) ?: return
-        val currentMediaItem = p.currentMediaItem ?: return
-        val newSubConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(url))
-            .setMimeType(mime)
-            .setSelectionFlags(if (select) C.SELECTION_FLAG_DEFAULT else 0)
-            .build()
-
-        val rebuilt = currentMediaItem.buildUpon()
-            .setSubtitleConfigurations(listOf(newSubConfig))
-            .build()
-
-        val wasPlaying = p.isPlaying
-        val pos = p.currentPosition
-        p.setMediaItem(rebuilt, pos)
-        p.prepare()
-        if (wasPlaying) p.play()
-    }
-
-    // MARK: - Subtitle Positioning / Styling
-
-    fun setSubtitlePosition(position: Int) {
-        // position is 0-100 (MPV convention: 100 = bottom, 0 = top).
-        // Map to SubtitleView's bottom-padding fraction. Reserve a small
-        // margin so 100 doesn't hug the very bottom edge.
-        val clamped = position.coerceIn(0, 100)
-        subtitleBottomFraction = 0.95f - (clamped / 100f) * 0.87f
-        applySubtitleStyle()
-    }
-
-    fun setSubtitleScale(scale: Double) {
-        subtitleScale = scale.toFloat()
-        applySubtitleStyle()
-    }
-
-    fun setSubtitleMarginY(margin: Int) {
-        // Margin in px (approximate). SubtitleView only accepts a single
-        // bottom-padding fraction, so convert via a heuristic (1px ≈ 0.1%
-        // of view height, capped). Last-write-wins vs. setSubtitlePosition.
-        val fraction = (margin / 1000f).coerceIn(0.02f, 0.95f)
-        subtitleBottomFraction = fraction
-        applySubtitleStyle()
-    }
-
-    fun setSubtitleAlignY(alignment: String) {
-        subtitleAlignY = alignment
-        applySubtitleStyle()
-    }
-
-    fun setSubtitleFontSize(size: Int) {
-        subtitleFontSizePct = size
-        applySubtitleStyle()
-    }
-
-    fun setSubtitleBackgroundColor(colorHex: String) {
-        subtitleBackgroundColor = parseColor(colorHex, subtitleBackgroundColor)
-        applySubtitleStyle()
-    }
-
-    fun setSubtitleBorderStyle(style: String) {
-        subtitleBorderStyle = style
-        applySubtitleStyle()
-    }
-
-    private fun parseColor(hex: String, fallback: Int): Int {
-        return try {
-            when {
-                hex.startsWith("#") && hex.length == 9 -> {
-                    // #RRGGBBAA
-                    val r = hex.substring(1, 3).toInt(16)
-                    val g = hex.substring(3, 5).toInt(16)
-                    val b = hex.substring(5, 7).toInt(16)
-                    val a = hex.substring(7, 9).toInt(16)
-                    Color.argb(a, r, g, b)
-                }
-                hex.startsWith("#") && hex.length == 7 -> Color.parseColor(hex)
-                else -> fallback
-            }
-        } catch (_: Throwable) {
-            fallback
-        }
-    }
-
-    private fun applySubtitleStyle() {
-        val sv = subtitleView ?: return
-
-        // Text size: explicit % wins; otherwise scale the default.
-        val textSizeFraction = if (subtitleFontSizePct != null) {
-            (subtitleFontSizePct!! / 100f) * SubtitleView.DEFAULT_TEXT_SIZE_FRACTION
-        } else {
-            SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * subtitleScale
-        }
-        sv.setFractionalTextSize(textSizeFraction)
-
-        // Vertical position: explicit fraction (from setSubtitlePosition /
-        // setSubtitleMarginY) wins; otherwise fall back to alignY mapping.
-        val alignYFraction = when (subtitleAlignY) {
-            "top" -> 0.9f
-            "center" -> 0.5f
-            else -> 0.08f // bottom
-        }
-        val bottomFraction = subtitleBottomFraction ?: alignYFraction
-        sv.setBottomPaddingFraction(bottomFraction.coerceIn(0.02f, 0.95f))
-
-        // Edge / background style.
-        val foreground = Color.WHITE
-        val edgeType: Int
-        val backgroundColor: Int
-        when (subtitleBorderStyle) {
-            "background-box" -> {
-                edgeType = CaptionStyleCompat.EDGE_TYPE_NONE
-                // subtitleBackgroundColor already carries its own alpha
-                // (parsed from #RRGGBBAA by setSubtitleBackgroundColor).
-                // Alpha 0 → transparent, matching user intent.
-                backgroundColor = subtitleBackgroundColor
-            }
-            else -> {
-                // "outline-and-shadow"
-                edgeType = if (subtitleAlignY == "center")
-                    CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW
-                else
-                    CaptionStyleCompat.EDGE_TYPE_OUTLINE
-                backgroundColor = Color.TRANSPARENT
-            }
-        }
-
-        val style = CaptionStyleCompat(
-            foreground,
-            backgroundColor,
-            Color.TRANSPARENT,
-            edgeType,
-            Color.BLACK,
-            Typeface.SANS_SERIF
-        )
-        sv.setApplyEmbeddedStyles(false)
-        sv.setApplyEmbeddedFontSizes(false)
-        sv.setStyle(style)
-    }
-
-    // MARK: - Audio Track Controls
-
-    fun getAudioTracks(): List<Map<String, Any>> {
-        return audioTrackList.map { entry ->
-            // channelCount is Format.NO_VALUE (-1) when unknown — report 0.
-            val channels = if (entry.format.channelCount == Format.NO_VALUE) 0
-                else entry.format.channelCount
-            mapOf(
-                "id" to entry.id,
-                "title" to (entry.format.label ?: ""),
-                "lang" to (entry.format.language ?: ""),
-                "codec" to (entry.format.sampleMimeType ?: ""),
-                "channels" to channels
-            )
-        }
-    }
-
-    fun setAudioTrack(trackId: Int) {
-        val p = player ?: return
-        val entry = audioTrackList.firstOrNull { it.id == trackId } ?: return
-        val matchedGroup = p.currentTracks.groups[entry.trackGroupIndex].mediaTrackGroup
-
-        val params = p.trackSelectionParameters.buildUpon()
-            .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
-            .setOverrideForType(TrackSelectionOverride(matchedGroup, entry.trackIndex))
-            .build()
-        p.trackSelectionParameters = params
-        currentAudioId = trackId
-    }
-
-    fun getCurrentAudioTrack(): Int = currentAudioId
-
-    // MARK: - Video Scaling
-
-    fun setZoomedToFill(zoomed: Boolean) {
-        isZoomedToFill = zoomed
-        val resizeMode = if (zoomed) {
-            androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-        } else {
-            androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT
-        }
-        playerView.resizeMode = resizeMode
-    }
-
-    fun isZoomedToFill(): Boolean = isZoomedToFill
-
-    // MARK: - Technical Info
-
-    fun getTechnicalInfo(): Map<String, Any> {
-        val p = player ?: return emptyMap()
-        val tracks = p.currentTracks
-
-        // Prefer the currently-selected track within each renderer group;
-        // fall back to the first supported track if none is selected yet.
-        val videoFormat = pickFormat(tracks, C.TRACK_TYPE_VIDEO)
-        val audioFormat = pickFormat(tracks, C.TRACK_TYPE_AUDIO)
-
-        val cacheSec = if (p.bufferedPosition > p.currentPosition) {
-            (p.bufferedPosition - p.currentPosition) / 1000.0
-        } else 0.0
-
-        val info = LinkedHashMap<String, Any>()
-        info["cacheSeconds"] = cacheSec
-
-        // Dropped frames — populated by analyticsListener.onDroppedVideoFrames.
-        if (cumulativeDroppedFrames > 0) {
-            info["droppedFrames"] = cumulativeDroppedFrames
-        }
-
-        // Decoder info — populated by analyticsListener.onVideo/AudioDecoderInitialized.
-        // For ExoPlayer this replaces MPV's voDriver/hwdec pairing. The
-        // FFmpeg extension reports names beginning with "FFmpeg", which we
-        // classify as software; everything else is MediaCodec (hardware).
-        videoDecoderName?.let { name ->
-            info["decoderName"] = name
-            info["decoderType"] = if (name.lowercase().startsWith("ffmpeg")) {
-                "software"
-            } else {
-                "hardware"
-            }
-        }
-
-        videoFormat?.let { f ->
-            if (f.width != Format.NO_VALUE) info["videoWidth"] = f.width
-            if (f.height != Format.NO_VALUE) info["videoHeight"] = f.height
-            f.sampleMimeType?.let { info["videoCodec"] = it }
-            // FPS: Format.NO_VALUE (-1f) means unknown — omit so the
-            // overlay skips the row instead of showing "-1".
-            if (f.frameRate > 0f) {
-                info["fps"] = f.frameRate.toDouble()
-            }
-            // Bitrate: prefer average, fall back to peak. Both can be
-            // NO_VALUE for adaptive HLS renditions — omit when unknown
-            // rather than reporting 0 Kbps.
-            val vBitrate = if (f.averageBitrate != Format.NO_VALUE) {
-                f.averageBitrate
-            } else {
-                f.peakBitrate
-            }
-            if (vBitrate != Format.NO_VALUE && vBitrate > 0) {
-                info["videoBitrate"] = vBitrate.toDouble()
-            }
-
-            // Raw codec tag from the container (e.g. "hev1.2.4.L153.B0").
-            // Carries profile / tier / level / constraint bytes — power
-            // users can decode it manually to see why a stream hit our
-            // HEVC level cap.
-            f.codecs?.let { info["videoCodecs"] = it }
-
-            // HDR / color metadata. Format.colorInfo is the authoritative
-            // source — the file/Jellyfin may claim HDR but the player is
-            // what decides whether the decoder+surface path is HDR-capable.
-            f.colorInfo?.let { ci ->
-                val hdr = deriveHdrFormat(ci)
-                if (hdr != null) info["hdrFormat"] = hdr
-                colorSpaceName(ci.colorSpace)?.let { info["colorSpace"] = it }
-                colorRangeName(ci.colorRange)?.let { info["colorRange"] = it }
-                colorTransferName(ci.colorTransfer)?.let { info["colorTransfer"] = it }
-            }
-        }
-
-        audioFormat?.let { f ->
-            f.sampleMimeType?.let { info["audioCodec"] = it }
-            val aBitrate = if (f.averageBitrate != Format.NO_VALUE) {
-                f.averageBitrate
-            } else {
-                f.peakBitrate
-            }
-            if (aBitrate != Format.NO_VALUE && aBitrate > 0) {
-                info["audioBitrate"] = aBitrate.toDouble()
-            }
-            if (f.channelCount > 0) info["audioChannels"] = f.channelCount
-            if (f.sampleRate > 0) info["audioSampleRate"] = f.sampleRate
-        }
-
-        return info
-    }
-
-    /**
-     * Map the active color transfer to a human-readable HDR format string.
-     * Returns null for SDR / unknown so the overlay can skip the row.
-     *
-     * HDR10 vs HDR10+ distinction isn't possible from Format alone in
-     * Media3 — HDR10+ is signaled via ST2094-40 SEI metadata which isn't
-     * exposed on Format. Both report as "HDR10" here; that matches what
-     * Media3 actually decodes (no HDR10+ tone-mapping).
-     */
-    private fun deriveHdrFormat(ci: ColorInfo): String? {
-        return when (ci.colorTransfer) {
-            C.COLOR_TRANSFER_HLG -> "HLG"
-            C.COLOR_TRANSFER_ST2084 -> "HDR10"
-            else -> null
-        }
-    }
-
-    private fun colorSpaceName(value: Int): String? = when (value) {
-        Format.NO_VALUE -> null
-        C.COLOR_SPACE_BT709 -> "BT.709"
-        C.COLOR_SPACE_BT601 -> "BT.601"
-        C.COLOR_SPACE_BT2020 -> "BT.2020"
-        else -> "Unknown"
-    }
-
-    private fun colorRangeName(value: Int): String? = when (value) {
-        Format.NO_VALUE -> null
-        C.COLOR_RANGE_LIMITED -> "Limited"
-        C.COLOR_RANGE_FULL -> "Full"
-        else -> "Unknown"
-    }
-
-    private fun colorTransferName(value: Int): String? = when (value) {
-        Format.NO_VALUE -> null
-        C.COLOR_TRANSFER_SDR -> "SDR"
-        C.COLOR_TRANSFER_ST2084 -> "ST2084 (PQ)"
-        C.COLOR_TRANSFER_HLG -> "HLG"
-        C.COLOR_TRANSFER_GAMMA_2_2 -> "Gamma 2.2"
-        else -> "Unknown"
-    }
-
-    private fun pickFormat(tracks: Tracks, type: Int): Format? {
-        val group = tracks.groups.firstOrNull { it.type == type } ?: return null
-        // Selected track wins.
-        for (i in 0 until group.length) {
-            if (group.isTrackSelected(i)) return group.getTrackFormat(i)
-        }
-        // Otherwise the first supported track.
-        for (i in 0 until group.length) {
-            if (group.isTrackSupported(i)) return group.getTrackFormat(i)
-        }
-        return null
-    }
-
-    // MARK: - Progress Loop
-
-    private fun startProgressLoop() {
-        stopProgressLoop()
-        mainHandler.postDelayed(progressRunnable, PROGRESS_INTERVAL_MS)
-    }
-
-    private fun stopProgressLoop() {
-        mainHandler.removeCallbacks(progressRunnable)
-    }
-
-    // MARK: - Cleanup
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        destroy()
-    }
-}

modules/exoplayer-player/expo-module.config.json

@@ -1,6 +0,0 @@
-{
-  "platforms": ["android"],
-  "android": {
-    "modules": ["expo.modules.exoplayerplayer.ExoPlayerModule"]
-  }
-}

modules/exoplayer-player/index.ts

@@ -1,19 +0,0 @@
-// Re-export the shared player contract from mpv-player so ExoPlayer
-// and MPV present identical surfaces to React. The MPV-prefixed setting
-// keys keep their names to avoid migrating existing installs.
-export type {
-  AudioTrack,
-  MpvPlayerViewProps,
-  MpvPlayerViewRef,
-  NowPlayingMetadata,
-  OnErrorEventPayload,
-  OnLoadEventPayload,
-  OnPictureInPictureChangePayload,
-  OnPlaybackStateChangePayload,
-  OnProgressEventPayload,
-  OnTracksReadyEventPayload,
-  SubtitleTrack,
-  TechnicalInfo,
-  VideoSource,
-} from "../mpv-player/src/MpvPlayer.types";
-export { default as ExoPlayerView } from "./src/ExoPlayerView";

modules/exoplayer-player/src/ExoPlayerView.tsx

@@ -1,132 +0,0 @@
-import { requireNativeView } from "expo";
-import * as React from "react";
-import { useImperativeHandle, useRef } from "react";
-
-import type {
-  MpvPlayerViewProps,
-  MpvPlayerViewRef,
-} from "../mpv-player/src/MpvPlayer.types";
-
-const NativeView: React.ComponentType<MpvPlayerViewProps & { ref?: any }> =
-  requireNativeView("ExoPlayer");
-
-/**
- * ExoPlayer view wrapper. Exposes the same `MpvPlayerViewRef` interface as
- * `MpvPlayerView` so callers can swap between the two players without
- * changing code. PiP / ASS-override methods are forwarded to the native
- * module which implements them as no-ops.
- */
-export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
-  function ExoPlayerView(props, ref) {
-    const nativeRef = useRef<any>(null);
-
-    useImperativeHandle(ref, () => ({
-      play: async () => {
-        await nativeRef.current?.play();
-      },
-      pause: async () => {
-        await nativeRef.current?.pause();
-      },
-      destroy: async () => {
-        await nativeRef.current?.destroy();
-      },
-      seekTo: async (position: number) => {
-        await nativeRef.current?.seekTo(position);
-      },
-      seekBy: async (offset: number) => {
-        await nativeRef.current?.seekBy(offset);
-      },
-      setSpeed: async (speed: number) => {
-        await nativeRef.current?.setSpeed(speed);
-      },
-      getSpeed: async () => {
-        return await nativeRef.current?.getSpeed();
-      },
-      isPaused: async () => {
-        return await nativeRef.current?.isPaused();
-      },
-      getCurrentPosition: async () => {
-        return await nativeRef.current?.getCurrentPosition();
-      },
-      getDuration: async () => {
-        return await nativeRef.current?.getDuration();
-      },
-      startPictureInPicture: async () => {
-        await nativeRef.current?.startPictureInPicture();
-      },
-      stopPictureInPicture: async () => {
-        await nativeRef.current?.stopPictureInPicture();
-      },
-      isPictureInPictureSupported: async () => {
-        return await nativeRef.current?.isPictureInPictureSupported();
-      },
-      isPictureInPictureActive: async () => {
-        return await nativeRef.current?.isPictureInPictureActive();
-      },
-      getSubtitleTracks: async () => {
-        return await nativeRef.current?.getSubtitleTracks();
-      },
-      setSubtitleTrack: async (trackId: number) => {
-        await nativeRef.current?.setSubtitleTrack(trackId);
-      },
-      disableSubtitles: async () => {
-        await nativeRef.current?.disableSubtitles();
-      },
-      getCurrentSubtitleTrack: async () => {
-        return await nativeRef.current?.getCurrentSubtitleTrack();
-      },
-      addSubtitleFile: async (url: string, select = true) => {
-        await nativeRef.current?.addSubtitleFile(url, select);
-      },
-      setSubtitlePosition: async (position: number) => {
-        await nativeRef.current?.setSubtitlePosition(position);
-      },
-      setSubtitleScale: async (scale: number) => {
-        await nativeRef.current?.setSubtitleScale(scale);
-      },
-      setSubtitleMarginY: async (margin: number) => {
-        await nativeRef.current?.setSubtitleMarginY(margin);
-      },
-      setSubtitleAlignX: async (alignment: "left" | "center" | "right") => {
-        await nativeRef.current?.setSubtitleAlignX(alignment);
-      },
-      setSubtitleAlignY: async (alignment: "top" | "center" | "bottom") => {
-        await nativeRef.current?.setSubtitleAlignY(alignment);
-      },
-      setSubtitleFontSize: async (size: number) => {
-        await nativeRef.current?.setSubtitleFontSize(size);
-      },
-      setSubtitleBackgroundColor: async (color: string) => {
-        await nativeRef.current?.setSubtitleBackgroundColor(color);
-      },
-      setSubtitleBorderStyle: async (
-        style: "outline-and-shadow" | "background-box",
-      ) => {
-        await nativeRef.current?.setSubtitleBorderStyle(style);
-      },
-      setSubtitleAssOverride: async (mode: "no" | "force") => {
-        await nativeRef.current?.setSubtitleAssOverride(mode);
-      },
-      getAudioTracks: async () => {
-        return await nativeRef.current?.getAudioTracks();
-      },
-      setAudioTrack: async (trackId: number) => {
-        await nativeRef.current?.setAudioTrack(trackId);
-      },
-      getCurrentAudioTrack: async () => {
-        return await nativeRef.current?.getCurrentAudioTrack();
-      },
-      setZoomedToFill: async (zoomed: boolean) => {
-        await nativeRef.current?.setZoomedToFill(zoomed);
-      },
-      isZoomedToFill: async () => {
-        return await nativeRef.current?.isZoomedToFill();
-      },
-      getTechnicalInfo: async () => {
-        return await nativeRef.current?.getTechnicalInfo();
-      },
-    }));
-
-    return <NativeView ref={nativeRef} {...props} />;
-  },
-);

modules/index.ts

@@ -7,8 +7,6 @@ export type {
   DownloadStartedEvent,
 } from "./background-downloader";
 export { default as BackgroundDownloader } from "./background-downloader";
-// ExoPlayer (Android TV)
-export { ExoPlayerView } from "./exoplayer-player";
 // Glass Poster (tvOS 26+)
 export type { GlassPosterViewProps } from "./glass-poster";
 export { GlassPosterView, isGlassEffectAvailable } from "./glass-poster";

modules/mpv-player/android/build.gradle

@@ -53,5 +53,5 @@ android {
 
 dependencies {
   // libmpv from Maven Central
-  implementation 'dev.jdtech.mpv:libmpv:1.0.0'
+  implementation 'dev.jdtech.mpv:libmpv:0.5.1'
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt

@@ -3,14 +3,14 @@ package expo.modules.mpvplayer
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.AssetManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.system.Os
 import android.util.Log
 import android.view.Surface
 import java.io.File
-import java.util.Locale
+import java.io.FileOutputStream
 
 /**
  * MPV renderer that wraps libmpv for video playback.
@@ -76,15 +76,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     private var surface: Surface? = null
     private var isRunning = false
-
-    // This renderer's own mpv handle. Per-instance (not singleton) — each
-    // player screen gets a fresh mpv handle and drops the reference on stop.
-    // We intentionally do NOT call a destroy() equivalent: libmpv 1.0's
-    // nativeDestroy has an internal use-after-free we can't fix from Kotlin,
-    // so we mirror Findroid and let the JVM GC + native finalization path
-    // reclaim resources. Only one player is alive at a time in this app.
-    private var mpv: MPVLib? = null
-
+    private var isStopping = false
+    
     // Cached state
     private var cachedPosition: Double = 0.0
     private var cachedDuration: Double = 0.0
@@ -144,108 +137,106 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
 
     fun start(voDriver: String = "gpu-next") {
         if (isRunning) return
-
+        
         try {
-            // Per-instance handle — see class-level comment. Each player gets
-            // its own mpv; we drop the reference in stop().
-            val mpv = MPVLib.create(context)
-            this.mpv = mpv
-            mpv.addObserver(this)
-
-            // Resolved once — TV gets the memory-pressure customizations
-            // (SCUDO_OPTIONS, hwdec/profile, demuxer-seekable-cache, larger
-            // audio-buffer) that would be counterproductive on higher-RAM
-            // mobile devices. Demuxer cache sizes are NOT included here —
-            // those come from user settings via load().
-            val isTV = isTvDevice()
-
-            // mpv config directory — used by the config-dir option below and
-            // as XDG_CONFIG_HOME for fontconfig.
+            MPVLib.create(context)
+            MPVLib.addObserver(this)
+            
+            /**
+             * Create mpv config directory and copy font files to ensure SubRip subtitles load properly on Android.
+             *
+             * Technical Background:
+             * ====================
+             * On Android, mpv requires access to a font file to render text-based subtitles, particularly SubRip (.srt)
+             * format subtitles. Without an available font in the config directory, mpv will fail to display subtitles
+             * even when subtitle tracks are properly detected and loaded.
+             *
+             * Why This Is Necessary:
+             * =====================
+             * 1. Android's font system is isolated from native libraries like mpv. While Android has system fonts,
+             *    mpv cannot access them directly due to sandboxing and library isolation.
+             *
+             * 2. SubRip subtitles require a font to render text overlay on video. When no font is available in the
+             *    configured directory, mpv either:
+             *    - Fails silently (subtitles don't appear)
+             *    - Falls back to a default font that may not support the required character set
+             *    - Crashes or produces rendering errors
+             *
+             * 3. By placing a font file (font.ttf) in mpv's config directory and setting that directory via
+             *    MPVLib.setOptionString("config-dir", ...), we ensure mpv has a known, accessible font source.
+             *
+             * Reference:
+             * =========
+             * This workaround is documented in the mpv-android project:
+             * https://github.com/mpv-android/mpv-android/issues/96
+             *
+             * The issue discusses that without a font in the config directory, SubRip subtitles fail to load
+             * properly on Android, and the solution is to copy a font file to a known location that mpv can access.
+             */
+            // Create mpv config directory and copy font files
             val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
+            //Log.i(TAG, "mpv config dir: $mpvDir")
             if (!mpvDir.exists()) mpvDir.mkdirs()
-
-            // Point fontconfig (new in libmpv 1.0) at writable app dirs so it
-            // persists its font index across runs instead of re-walking
-            // /system/fonts on every subtitle/seek event. Each rebuild costs
-            // ~1-2 s and ~10-30 MB of scudo:primary memory that scudo then
-            // holds onto. Without this we see "No usable fontconfig
-            // configuration file found, using fallback" on every re-init.
-            try {
-                val cacheDir = context.cacheDir.absolutePath
-                val configDir = (context.getExternalFilesDir(null) ?: context.filesDir).absolutePath
-                Os.setenv("XDG_CACHE_HOME", cacheDir, true)
-                Os.setenv("XDG_CONFIG_HOME", configDir, true)
-                Os.setenv("HOME", configDir, true)
-            } catch (e: Exception) {
-                Log.w(TAG, "Could not set XDG/HOME env for fontconfig: ${e.message}")
+            // This needs to be named `subfont.ttf` else it won't work
+            arrayOf("subfont.ttf").forEach { fileName ->
+                val file = File(mpvDir, fileName)
+                if (file.exists()) return@forEach
+                context.assets
+                    .open(fileName, AssetManager.ACCESS_STREAMING)
+                    .copyTo(FileOutputStream(file))
             }
-
-            mpv?.setOptionString("config", "yes")
-            mpv?.setOptionString("config-dir", mpvDir.path)
+            MPVLib.setOptionString("config", "yes")
+            MPVLib.setOptionString("config-dir", mpvDir.path)
             
             // Configure mpv options before initialization (based on Findroid)
             this.voDriver = voDriver
-            mpv?.setOptionString("vo", voDriver)
-            mpv?.setOptionString("gpu-context", "android")
-            mpv?.setOptionString("opengl-es", "yes")
+            MPVLib.setOptionString("vo", voDriver)
+            MPVLib.setOptionString("gpu-context", "android")
+            MPVLib.setOptionString("opengl-es", "yes")
             
-            // Hardware decoder codecs (shared)
-            mpv?.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
-
-            // Pause on initial cache fill (shared default). The actual
-            // cache mode, cache-secs, and demuxer cache sizes come from
-            // user preferences and are applied per-load in load().
-            mpv?.setOptionString("cache-pause-initial", "yes")
-
-            // Hardware decode path + TV-only memory options. Demuxer cache
-            // sizes and cache-secs are NOT set here — they come from user
-            // preferences via load().
-            //  - Emulator: software decode. Its MediaCodec can't bind an
-            //    output surface (surface 0x0); HEVC then fails cleanly and
-            //    mpv auto-falls-back to software, but H.264 "opens"
-            //    deceptively and wedges the core with no fallback (black
-            //    video, then any command — seek/pause — deadlocks the UI
-            //    thread → ANR). hwdec=no makes every codec render via the
-            //    gpu-next VO. Real devices unaffected.
-            //  - Real TV hardware: zero-copy `mediacodec` (fastest on
-            //    low-power devices) + fast profile.
+            // Hardware decode path:
+            //  - Real TV hardware: zero-copy `mediacodec` (fastest on low-power devices).
             //  - Real phone: `mediacodec-copy` (broadest compatibility).
+            //  - Emulator: software decode. Its MediaCodec can't bind an output surface
+            //    (surface 0x0); HEVC then fails cleanly and mpv auto-falls-back to software,
+            //    but H.264 "opens" deceptively and wedges the core with no fallback (black
+            //    video, then any command — seek/pause — deadlocks the UI thread → ANR).
+            //    hwdec=no makes every codec render via the gpu-next VO. Real devices unaffected.
             when {
-                isEmulator() -> mpv?.setOptionString("hwdec", "no")
-                isTV -> {
-                    mpv?.setOptionString("hwdec", "mediacodec")
-                    mpv?.setOptionString("profile", "fast")
-                    // Don't retain already-played content for backward
-                    // seeking over a network source — Jellyfin can re-fetch
-                    // on demand. Saves up to ~30 MiB on long seeks and
-                    // reduces swap pressure.
-                    mpv?.setOptionString("demuxer-seekable-cache", "no")
-                    // Larger audio buffer to absorb page-fault stalls
-                    // (default ~0.2s). Cheap insurance against the audio
-                    // underruns that happen when the kernel is swap-thrashing.
-                    mpv?.setOptionString("audio-buffer", "0.5")
+                isEmulator() -> MPVLib.setOptionString("hwdec", "no")
+                isTvDevice() -> {
+                    MPVLib.setOptionString("hwdec", "mediacodec")
+                    MPVLib.setOptionString("profile", "fast")
                 }
-                else -> mpv?.setOptionString("hwdec", "mediacodec-copy")
+                else -> MPVLib.setOptionString("hwdec", "mediacodec-copy")
             }
+            MPVLib.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+            
+            // Cache settings for better network streaming
+            MPVLib.setOptionString("cache", "yes")
+            MPVLib.setOptionString("cache-pause-initial", "yes")
+            MPVLib.setOptionString("demuxer-max-bytes", "150MiB")
+            MPVLib.setOptionString("demuxer-max-back-bytes", "75MiB")
+            MPVLib.setOptionString("demuxer-readahead-secs", "20")
             
             // Seeking optimization - faster seeking at the cost of less precision
             // Use keyframe seeking by default (much faster for network streams)
-            mpv?.setOptionString("hr-seek", "no")
+            MPVLib.setOptionString("hr-seek", "no")
             // Drop frames during seeking for faster response
-            mpv?.setOptionString("hr-seek-framedrop", "yes")
+            MPVLib.setOptionString("hr-seek-framedrop", "yes")
             
             // Subtitle settings
-            mpv?.setOptionString("sub-scale-with-window", "no")
-            mpv?.setOptionString("sub-use-margins", "no")
-            mpv?.setOptionString("subs-match-os-language", "yes")
-            mpv?.setOptionString("subs-fallback", "yes")
+            MPVLib.setOptionString("sub-scale-with-window", "no")
+            MPVLib.setOptionString("sub-use-margins", "no")
+            MPVLib.setOptionString("subs-match-os-language", "yes")
+            MPVLib.setOptionString("subs-fallback", "yes")
             
             // Important: Start with force-window=no, will be set to yes when surface is attached
-            mpv?.setOptionString("force-window", "no")
-            mpv?.setOptionString("keep-open", "always")
-
-            mpv.initialize()
-
+            MPVLib.setOptionString("force-window", "no")
+            MPVLib.setOptionString("keep-open", "always")
+            
+            MPVLib.initialize()
+            
             // Observe properties
             observeProperties()
             
@@ -258,68 +249,21 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     }
     
     fun stop() {
+        if (isStopping) return
         if (!isRunning) return
+        
+        isStopping = true
         isRunning = false
-
-        val m = mpv
-        mpv = null
-
-        // Clear cached media state on the main thread so the next player
-        // screen doesn't observe stale position/duration values during the
-        // (async) teardown below.
-        currentUrl = null
-        currentHeaders = null
-        pendingExternalSubtitles = emptyList()
-        initialSubtitleId = null
-        initialAudioId = null
-        cachedPosition = 0.0
-        cachedDuration = 0.0
-        cachedCacheSeconds = 0.0
-
-        if (m == null) return
-
-        // Teardown runs on a background daemon thread. mpv's "stop" command
-        // flushes the demuxer queue and releases the MediaCodec hardware
-        // decoder — synchronous JNI work that can block for hundreds of ms
-        // on TV hardware. Running it on the main thread produced a visible
-        // delay/stutter between pressing "exit" and the confirm alert
-        // appearing. The local `m` keeps the MPVLib instance alive for the
-        // lifetime of this thread even though we've already nulled `mpv`.
-        Thread {
-            // Drop force-window BEFORE issuing stop. With keep-open=always +
-            // force-window=yes, mpv tears down the decoder at stop time but
-            // tries to keep the VO alive — which fires an internal
-            // video-reconfig. On libmpv 1.0's gpu-next/android backend that
-            // reconfig path crashes with "Missing surface pointer" because we
-            // detach the Surface below before mpv's worker reaches the
-            // reconfig step (command() is async). Setting force-window=no
-            // first makes mpv tear VO down cleanly instead of attempting a
-            // doomed re-init, eliminating the fatal VO error and the
-            // "playback won't restart" aftermath.
-            try {
-                m.setOptionString("force-window", "no")
-            } catch (e: Exception) {
-                Log.e(TAG, "Error clearing force-window: ${e.message}")
-            }
-            try {
-                // Stop playback — flushes demuxer queue and signals MediaCodec
-                // to release its hardware decoders. This is the bulk of what
-                // we can reclaim without calling destroy().
-                m.command(arrayOf("stop"))
-            } catch (e: Exception) {
-                Log.e(TAG, "Error stopping mpv playback: ${e.message}")
-            }
-            try {
-                m.removeObserver(this)
-            } catch (e: Exception) {
-                Log.e(TAG, "Error removing mpv observer: ${e.message}")
-            }
-            try {
-                m.detachSurface()
-            } catch (e: Exception) {
-                Log.e(TAG, "Error detaching mpv surface: ${e.message}")
-            }
-        }.also { it.isDaemon = true }.start()
+        
+        try {
+            MPVLib.removeObserver(this)
+            MPVLib.detachSurface()
+            MPVLib.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error stopping MPV: ${e.message}")
+        }
+        
+        isStopping = false
     }
     
     /**
@@ -334,10 +278,10 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = surface
         Log.i(TAG, "[PiP] attachSurface — isRunning=$isRunning, vo=$voDriver, surface=${surface.hashCode()}")
         if (isRunning) {
-            mpv?.attachSurface(surface)
-            mpv?.setOptionString("force-window", "yes")
+            MPVLib.attachSurface(surface)
+            MPVLib.setOptionString("force-window", "yes")
             // Read back vo to confirm it's still active
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
         }
     }
@@ -357,8 +301,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = null
         Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
         if (isRunning) {
-            mpv?.detachSurface()
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            MPVLib.detachSurface()
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
         }
     }
@@ -369,7 +313,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
      */
     fun updateSurfaceSize(width: Int, height: Int) {
         if (isRunning) {
-            mpv?.setPropertyString("android-surface-size", "${width}x$height")
+            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
             Log.i(TAG, "[PiP] updateSurfaceSize — ${width}x${height}")
         } else {
             Log.w(TAG, "[PiP] updateSurfaceSize — called but renderer not running")
@@ -385,9 +329,9 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         if (!isRunning) return
         val pos = cachedPosition
         Log.i(TAG, "[PiP] forceRedraw — stepping frame then seeking to $pos")
-        mpv?.command(arrayOf("frame-step"))
+        MPVLib.command(arrayOf("frame-step"))
         if (pos > 0) {
-            mpv?.command(arrayOf("seek", pos.toString(), "absolute"))
+            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
         }
     }
     
@@ -397,43 +341,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         startPosition: Double? = null,
         externalSubtitles: List<String>? = null,
         initialSubtitleId: Int? = null,
-        initialAudioId: Int? = null,
-        cacheEnabled: String? = null,
-        cacheSeconds: Int? = null,
-        demuxerMaxBytes: Int? = null,
-        demuxerMaxBackBytes: Int? = null
+        initialAudioId: Int? = null
     ) {
         currentUrl = url
         currentHeaders = headers
         pendingExternalSubtitles = externalSubtitles ?: emptyList()
         this.initialSubtitleId = initialSubtitleId
         this.initialAudioId = initialAudioId
-
+        
         _isLoading = true
         isReadyToSeek = false
         mainHandler.post { delegate?.onLoadingChanged(true) }
-
+        
         // Stop previous playback
-        mpv?.command(arrayOf("stop"))
-
+        MPVLib.command(arrayOf("stop"))
+        
         // Set HTTP headers if provided
         updateHttpHeaders(headers)
-
-        // Apply cache/buffer settings from user preferences (mirrors iOS).
-        // These override the conservative defaults applied in start() so the
-        // TV/mobile settings screen actually takes effect on Android.
-        cacheEnabled?.let { mpv?.setOptionString("cache", it) }
-        cacheSeconds?.let { mpv?.setOptionString("cache-secs", it.toString()) }
-        demuxerMaxBytes?.let { mpv?.setOptionString("demuxer-max-bytes", "${it}MiB") }
-        demuxerMaxBackBytes?.let { mpv?.setOptionString("demuxer-max-back-bytes", "${it}MiB") }
         
-        // Set start position. mpv's time parser requires '.' as the decimal
-        // separator; use Locale.US so devices with other default locales
-        // (e.g. ',' as decimal separator) don't break resume-from-position.
+        // Set start position
         if (startPosition != null && startPosition > 0) {
-            mpv?.setPropertyString("start", String.format(Locale.US, "%.2f", startPosition))
+            MPVLib.setPropertyString("start", String.format("%.2f", startPosition))
         } else {
-            mpv?.setPropertyString("start", "0")
+            MPVLib.setPropertyString("start", "0")
         }
         
         // Set initial audio track if specified
@@ -453,7 +383,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         // Load the file
-        mpv?.command(arrayOf("loadfile", url, "replace"))
+        MPVLib.command(arrayOf("loadfile", url, "replace"))
     }
     
     fun reloadCurrentItem() {
@@ -469,29 +399,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         val headerString = headers.entries.joinToString("\r\n") { "${it.key}: ${it.value}" }
-        mpv?.setPropertyString("http-header-fields", headerString)
+        MPVLib.setPropertyString("http-header-fields", headerString)
     }
     
     private fun observeProperties() {
-        mpv?.observeProperty("duration", MPV_FORMAT_DOUBLE)
-        mpv?.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
-        mpv?.observeProperty("pause", MPV_FORMAT_FLAG)
-        mpv?.observeProperty("track-list/count", MPV_FORMAT_INT64)
-        mpv?.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
-        mpv?.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("duration", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("pause", MPV_FORMAT_FLAG)
+        MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
+        MPVLib.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
         // Video dimensions for PiP aspect ratio
-        mpv?.observeProperty("video-params/w", MPV_FORMAT_INT64)
-        mpv?.observeProperty("video-params/h", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
     }
-
+    
     // MARK: - Playback Controls
     
     fun play() {
-        mpv?.setPropertyBoolean("pause", false)
+        MPVLib.setPropertyBoolean("pause", false)
     }
     
     fun pause() {
-        mpv?.setPropertyBoolean("pause", true)
+        MPVLib.setPropertyBoolean("pause", true)
     }
     
     fun togglePause() {
@@ -501,22 +431,22 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun seekTo(seconds: Double) {
         val clamped = maxOf(0.0, seconds)
         cachedPosition = clamped
-        mpv?.command(arrayOf("seek", clamped.toString(), "absolute"))
+        MPVLib.command(arrayOf("seek", clamped.toString(), "absolute"))
     }
     
     fun seekBy(seconds: Double) {
         val newPosition = maxOf(0.0, cachedPosition + seconds)
         cachedPosition = newPosition
-        mpv?.command(arrayOf("seek", seconds.toString(), "relative"))
+        MPVLib.command(arrayOf("seek", seconds.toString(), "relative"))
     }
     
     fun setSpeed(speed: Double) {
         _playbackSpeed = speed
-        mpv?.setPropertyDouble("speed", speed)
+        MPVLib.setPropertyDouble("speed", speed)
     }
     
     fun getSpeed(): Double {
-        return mpv?.getPropertyDouble("speed") ?: _playbackSpeed
+        return MPVLib.getPropertyDouble("speed") ?: _playbackSpeed
     }
     
     // MARK: - Subtitle Controls
@@ -524,19 +454,19 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getSubtitleTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "sub") continue
             
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
             
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -548,61 +478,61 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun setSubtitleTrack(trackId: Int) {
         Log.i(TAG, "setSubtitleTrack: setting sid to $trackId")
         if (trackId < 0) {
-            mpv?.setPropertyString("sid", "no")
+            MPVLib.setPropertyString("sid", "no")
         } else {
-            mpv?.setPropertyInt("sid", trackId)
+            MPVLib.setPropertyInt("sid", trackId)
         }
     }
     
     fun disableSubtitles() {
-        mpv?.setPropertyString("sid", "no")
+        MPVLib.setPropertyString("sid", "no")
     }
     
     fun getCurrentSubtitleTrack(): Int {
-        return mpv?.getPropertyInt("sid") ?: 0
+        return MPVLib.getPropertyInt("sid") ?: 0
     }
     
     fun addSubtitleFile(url: String, select: Boolean = true) {
         val flag = if (select) "select" else "cached"
-        mpv?.command(arrayOf("sub-add", url, flag))
+        MPVLib.command(arrayOf("sub-add", url, flag))
     }
     
     // MARK: - Subtitle Positioning
     
     fun setSubtitlePosition(position: Int) {
-        mpv?.setPropertyInt("sub-pos", position)
+        MPVLib.setPropertyInt("sub-pos", position)
     }
     
     fun setSubtitleScale(scale: Double) {
-        mpv?.setPropertyDouble("sub-scale", scale)
+        MPVLib.setPropertyDouble("sub-scale", scale)
     }
     
     fun setSubtitleMarginY(margin: Int) {
-        mpv?.setPropertyInt("sub-margin-y", margin)
+        MPVLib.setPropertyInt("sub-margin-y", margin)
     }
     
     fun setSubtitleAlignX(alignment: String) {
-        mpv?.setPropertyString("sub-align-x", alignment)
+        MPVLib.setPropertyString("sub-align-x", alignment)
     }
     
     fun setSubtitleAlignY(alignment: String) {
-        mpv?.setPropertyString("sub-align-y", alignment)
+        MPVLib.setPropertyString("sub-align-y", alignment)
     }
     
     fun setSubtitleFontSize(size: Int) {
-        mpv?.setPropertyInt("sub-font-size", size)
+        MPVLib.setPropertyInt("sub-font-size", size)
     }
 
     fun setSubtitleBorderStyle(style: String) {
-        mpv?.setPropertyString("sub-border-style", style)
+        MPVLib.setPropertyString("sub-border-style", style)
     }
 
     fun setSubtitleBackgroundColor(color: String) {
-        mpv?.setPropertyString("sub-back-color", color)
+        MPVLib.setPropertyString("sub-back-color", color)
     }
 
     fun setSubtitleAssOverride(mode: String) {
-        mpv?.setPropertyString("sub-ass-override", mode)
+        MPVLib.setPropertyString("sub-ass-override", mode)
     }
 
     // MARK: - Audio Track Controls
@@ -610,25 +540,25 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getAudioTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "audio") continue
             
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            MPVLib.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
             
-            val channels = mpv?.getPropertyInt("track-list/$i/audio-channels")
+            val channels = MPVLib.getPropertyInt("track-list/$i/audio-channels")
             if (channels != null && channels > 0) {
                 track["channels"] = channels
             }
             
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -639,11 +569,11 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     fun setAudioTrack(trackId: Int) {
         Log.i(TAG, "setAudioTrack: setting aid to $trackId")
-        mpv?.setPropertyInt("aid", trackId)
+        MPVLib.setPropertyInt("aid", trackId)
     }
     
     fun getCurrentAudioTrack(): Int {
-        return mpv?.getPropertyInt("aid") ?: 0
+        return MPVLib.getPropertyInt("aid") ?: 0
     }
 
     // MARK: - Video Scaling
@@ -652,7 +582,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         // panscan: 0.0 = fit (letterbox), 1.0 = fill (crop)
         val panscanValue = if (zoomed) 1.0 else 0.0
         Log.i(TAG, "setZoomedToFill: setting panscan to $panscanValue")
-        mpv?.setPropertyDouble("panscan", panscanValue)
+        MPVLib.setPropertyDouble("panscan", panscanValue)
     }
 
     // MARK: - Technical Info
@@ -661,79 +591,58 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         val info = mutableMapOf<String, Any>()
 
         // Video dimensions
-        mpv?.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
             info["videoWidth"] = it
         }
-        mpv?.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
             info["videoHeight"] = it
         }
 
         // Video codec
-        mpv?.getPropertyString("video-format")?.let {
+        MPVLib.getPropertyString("video-format")?.let {
             info["videoCodec"] = it
         }
 
         // Audio codec
-        mpv?.getPropertyString("audio-codec-name")?.let {
+        MPVLib.getPropertyString("audio-codec-name")?.let {
             info["audioCodec"] = it
         }
 
         // FPS (container fps)
-        mpv?.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
             info["fps"] = it
         }
 
         // Video bitrate (bits per second)
-        mpv?.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
             info["videoBitrate"] = it
         }
 
         // Audio bitrate (bits per second)
-        mpv?.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
             info["audioBitrate"] = it
         }
 
         // Demuxer cache duration (seconds of video buffered)
-        mpv?.getPropertyDouble("demuxer-cache-duration")?.let {
+        MPVLib.getPropertyDouble("demuxer-cache-duration")?.let {
             info["cacheSeconds"] = it
         }
 
-        // Configured cache limits — read back from mpv to confirm user
-        // settings actually took effect. mpv stores byte sizes as int64
-        // (bytes); convert to MiB for display.
-        mpv?.getPropertyInt("demuxer-max-bytes")?.let { bytes ->
-            info["demuxerMaxBytes"] = bytes / (1024 * 1024)
-        }
-        mpv?.getPropertyInt("demuxer-max-back-bytes")?.let { bytes ->
-            info["demuxerMaxBackBytes"] = bytes / (1024 * 1024)
-        }
-        mpv?.getPropertyDouble("cache-secs")?.let { secs ->
-            info["cacheSecsLimit"] = secs
-        }
-
         // Dropped frames
-        mpv?.getPropertyInt("frame-drop-count")?.let {
+        MPVLib.getPropertyInt("frame-drop-count")?.let {
             info["droppedFrames"] = it
         }
 
         // Active video output driver (read from MPV to confirm what's actually applied)
-        mpv?.getPropertyString("vo")?.let {
+        MPVLib.getPropertyString("vo")?.let {
             info["voDriver"] = it
         }
 
-        // Active hardware decoder.
-        // hwdec-current yields e.g. "mediacodec",
-        // "mediacodec-copy", "auto-copy" or empty when SW decoding.
-        mpv?.getPropertyString("hwdec-current")?.let {
+        // Active hardware decoder
+        MPVLib.getPropertyString("hwdec-active")?.let {
             info["hwdec"] = it
         }
 
-        // Estimated video output fps (renderer-side, after filtering).
-        // Useful for diagnosing display/pipeline drops vs container fps.
-        mpv?.getPropertyDouble("estimated-vf-fps")?.takeIf { it > 0 }?.let {
-            info["estimatedVfFps"] = it
-        }
-
         return info
     }
 
@@ -826,7 +735,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
                     pendingExternalSubtitles.forEachIndexed { index, subUrl ->
                         android.util.Log.d("MPVRenderer", "Adding external subtitle [$index]: $subUrl")
                         // "auto" flag = add without auto-selecting (order preserved, MPVLib.command is sync)
-                        mpv?.command(arrayOf("sub-add", subUrl, "auto"))
+                        MPVLib.command(arrayOf("sub-add", subUrl, "auto"))
                     }
                     pendingExternalSubtitles = emptyList()
                 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLib.kt

@@ -1,29 +1,20 @@
 package expo.modules.mpvplayer
 
 import android.content.Context
+import android.util.Log
+import android.view.Surface
 import dev.jdtech.mpv.MPVLib as LibMPV
 
 /**
- * Per-instance wrapper around the dev.jdtech.mpv.MPVLib class.
- *
- * libmpv 1.0 exposes an instance-based API: each `LibMPV.create(ctx)` returns
- * a fresh, independent handle. Each player creates its own MPVLib instance
- * (Findroid pattern) and on teardown we simply drop the reference. We do NOT
- * call `LibMPV.destroy()` — its native implementation has an internal
- * use-after-free on libmpv 1.0 that we cannot fix from Kotlin. Letting the
- * GC reach the JVM-level finalizer (or never reaching it, since the native
- * handle lives in process-global state until exit) is strictly safer than
- * crashing.
- *
- * Trade-off: mpv's native footprint (decoder + demuxer cache) for one player
- * stays allocated until the next player's allocation displaces it in scudo's
- * arena. On a TV app where the player is the dominant memory consumer and
- * only one player is alive at a time, this is acceptable.
+ * Wrapper around the dev.jdtech.mpv.MPVLib class.
+ * This provides a consistent interface for the rest of the app.
  */
-class MPVLib private constructor(private val instance: LibMPV) {
-
-    // Event observer interface — mirrors dev.jdtech.mpv.MPVLib.EventObserver
-    // so MPVLayerRenderer implements a stable, wrapper-owned signature.
+object MPVLib {
+    private const val TAG = "MPVLib"
+    
+    private var initialized = false
+    
+    // Event observer interface
     interface EventObserver {
         fun eventProperty(property: String)
         fun eventProperty(property: String, value: Long)
@@ -32,144 +23,198 @@ class MPVLib private constructor(private val instance: LibMPV) {
         fun eventProperty(property: String, value: Double)
         fun event(eventId: Int)
     }
-
+    
     private val observers = mutableListOf<EventObserver>()
-
-    // Library event observer that forwards LibMPV callbacks to our observers.
+    
+    // Library event observer that forwards to our observers
     private val libObserver = object : LibMPV.EventObserver {
-        override fun eventProperty(property: String) =
-            dispatch { it.eventProperty(property) }
-
-        override fun eventProperty(property: String, value: Long) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: Boolean) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: String) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: Double) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun event(eventId: Int) =
-            dispatch { it.event(eventId) }
-
-        private inline fun dispatch(block: (EventObserver) -> Unit) {
+        override fun eventProperty(property: String) {
             synchronized(observers) {
-                observers.forEach(block)
+                for (observer in observers) {
+                    observer.eventProperty(property)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Long) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Boolean) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: String) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Double) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun event(eventId: Int) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.event(eventId)
+                }
             }
         }
     }
-
+    
     fun addObserver(observer: EventObserver) {
-        synchronized(observers) { observers.add(observer) }
-    }
-
-    fun removeObserver(observer: EventObserver) {
-        synchronized(observers) { observers.remove(observer) }
-    }
-
-    fun initialize() {
-        instance.init()
-    }
-
-    fun attachSurface(surface: android.view.Surface) {
-        instance.attachSurface(surface)
-    }
-
-    fun detachSurface() {
-        instance.detachSurface()
-    }
-
-    fun command(cmd: Array<String>) {
-        instance.command(cmd)
-    }
-
-    fun setOptionString(name: String, value: String): Int {
-        return instance.setOptionString(name, value)
-    }
-
-    fun getPropertyInt(name: String): Int? = try {
-        instance.getPropertyInt(name)
-    } catch (e: Exception) { null }
-
-    fun getPropertyDouble(name: String): Double? = try {
-        instance.getPropertyDouble(name)
-    } catch (e: Exception) { null }
-
-    fun getPropertyBoolean(name: String): Boolean? = try {
-        instance.getPropertyBoolean(name)
-    } catch (e: Exception) { null }
-
-    fun getPropertyString(name: String): String? = try {
-        instance.getPropertyString(name)
-    } catch (e: Exception) { null }
-
-    fun setPropertyInt(name: String, value: Int) {
-        instance.setPropertyInt(name, value)
-    }
-
-    fun setPropertyDouble(name: String, value: Double) {
-        instance.setPropertyDouble(name, value)
-    }
-
-    fun setPropertyBoolean(name: String, value: Boolean) {
-        instance.setPropertyBoolean(name, value)
-    }
-
-    fun setPropertyString(name: String, value: String) {
-        instance.setPropertyString(name, value)
-    }
-
-    fun observeProperty(name: String, format: Int) {
-        instance.observeProperty(name, format)
-    }
-
-    companion object {
-        /**
-         * Create a fresh mpv handle. Each call returns an independent instance —
-         * do not share across players. Attach exactly one [EventObserver] per
-         * player via [addObserver].
-         */
-        fun create(context: Context): MPVLib {
-            val lib = LibMPV.create(context)
-                ?: throw IllegalStateException("LibMPV.create returned null")
-            val wrapper = MPVLib(lib)
-            // The libObserver is attached for the lifetime of this MPVLib
-            // instance and forwards every LibMPV callback to our observers
-            // list. Player-specific observers are added/removed via
-            // addObserver/removeObserver.
-            lib.addObserver(wrapper.libObserver)
-            return wrapper
+        synchronized(observers) {
+            observers.add(observer)
         }
-
-        // MPV Event IDs (kept here so observers can reference them without
-        // holding a reference to an instance).
-        const val MPV_EVENT_NONE = 0
-        const val MPV_EVENT_SHUTDOWN = 1
-        const val MPV_EVENT_LOG_MESSAGE = 2
-        const val MPV_EVENT_GET_PROPERTY_REPLY = 3
-        const val MPV_EVENT_SET_PROPERTY_REPLY = 4
-        const val MPV_EVENT_COMMAND_REPLY = 5
-        const val MPV_EVENT_START_FILE = 6
-        const val MPV_EVENT_END_FILE = 7
-        const val MPV_EVENT_FILE_LOADED = 8
-        const val MPV_EVENT_IDLE = 11
-        const val MPV_EVENT_TICK = 14
-        const val MPV_EVENT_CLIENT_MESSAGE = 16
-        const val MPV_EVENT_VIDEO_RECONFIG = 17
-        const val MPV_EVENT_AUDIO_RECONFIG = 18
-        const val MPV_EVENT_SEEK = 20
-        const val MPV_EVENT_PLAYBACK_RESTART = 21
-        const val MPV_EVENT_PROPERTY_CHANGE = 22
-        const val MPV_EVENT_QUEUE_OVERFLOW = 24
-
-        // End file reason
-        const val MPV_END_FILE_REASON_EOF = 0
-        const val MPV_END_FILE_REASON_STOP = 2
-        const val MPV_END_FILE_REASON_QUIT = 3
-        const val MPV_END_FILE_REASON_ERROR = 4
-        const val MPV_END_FILE_REASON_REDIRECT = 5
+    }
+    
+    fun removeObserver(observer: EventObserver) {
+        synchronized(observers) {
+            observers.remove(observer)
+        }
+    }
+    
+    // MPV Event IDs
+    const val MPV_EVENT_NONE = 0
+    const val MPV_EVENT_SHUTDOWN = 1
+    const val MPV_EVENT_LOG_MESSAGE = 2
+    const val MPV_EVENT_GET_PROPERTY_REPLY = 3
+    const val MPV_EVENT_SET_PROPERTY_REPLY = 4
+    const val MPV_EVENT_COMMAND_REPLY = 5
+    const val MPV_EVENT_START_FILE = 6
+    const val MPV_EVENT_END_FILE = 7
+    const val MPV_EVENT_FILE_LOADED = 8
+    const val MPV_EVENT_IDLE = 11
+    const val MPV_EVENT_TICK = 14
+    const val MPV_EVENT_CLIENT_MESSAGE = 16
+    const val MPV_EVENT_VIDEO_RECONFIG = 17
+    const val MPV_EVENT_AUDIO_RECONFIG = 18
+    const val MPV_EVENT_SEEK = 20
+    const val MPV_EVENT_PLAYBACK_RESTART = 21
+    const val MPV_EVENT_PROPERTY_CHANGE = 22
+    const val MPV_EVENT_QUEUE_OVERFLOW = 24
+    
+    // End file reason
+    const val MPV_END_FILE_REASON_EOF = 0
+    const val MPV_END_FILE_REASON_STOP = 2
+    const val MPV_END_FILE_REASON_QUIT = 3
+    const val MPV_END_FILE_REASON_ERROR = 4
+    const val MPV_END_FILE_REASON_REDIRECT = 5
+    
+    /**
+     * Create and initialize the MPV library
+     */
+    fun create(context: Context, configDir: String? = null) {
+        if (initialized) return
+        
+        try {
+            LibMPV.create(context)
+            LibMPV.addObserver(libObserver)
+            initialized = true
+            Log.i(TAG, "libmpv created successfully")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to create libmpv: ${e.message}")
+            throw e
+        }
+    }
+    
+    fun initialize() {
+        LibMPV.init()
+    }
+    
+    fun destroy() {
+        if (!initialized) return
+        try {
+            LibMPV.removeObserver(libObserver)
+            LibMPV.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error destroying mpv: ${e.message}")
+        }
+        initialized = false
+    }
+    
+    fun isInitialized(): Boolean = initialized
+    
+    fun attachSurface(surface: Surface) {
+        LibMPV.attachSurface(surface)
+    }
+    
+    fun detachSurface() {
+        LibMPV.detachSurface()
+    }
+    
+    fun command(cmd: Array<String?>) {
+        LibMPV.command(cmd)
+    }
+    
+    fun setOptionString(name: String, value: String): Int {
+        return LibMPV.setOptionString(name, value)
+    }
+    
+    fun getPropertyInt(name: String): Int? {
+        return try {
+            LibMPV.getPropertyInt(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun getPropertyDouble(name: String): Double? {
+        return try {
+            LibMPV.getPropertyDouble(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun getPropertyBoolean(name: String): Boolean? {
+        return try {
+            LibMPV.getPropertyBoolean(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun getPropertyString(name: String): String? {
+        return try {
+            LibMPV.getPropertyString(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun setPropertyInt(name: String, value: Int) {
+        LibMPV.setPropertyInt(name, value)
+    }
+    
+    fun setPropertyDouble(name: String, value: Double) {
+        LibMPV.setPropertyDouble(name, value)
+    }
+    
+    fun setPropertyBoolean(name: String, value: Boolean) {
+        LibMPV.setPropertyBoolean(name, value)
+    }
+    
+    fun setPropertyString(name: String, value: String) {
+        LibMPV.setPropertyString(name, value)
+    }
+    
+    fun observeProperty(name: String, format: Int) {
+        LibMPV.observeProperty(name, format)
     }
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt

@@ -28,11 +28,7 @@ class MpvPlayerModule : Module() {
                 if (source == null) return@Prop
                 
                 val urlString = source["url"] as? String ?: return@Prop
-
-                // Parse cache config if provided (mirrors iOS)
-                @Suppress("UNCHECKED_CAST")
-                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
-
+                
                 @Suppress("UNCHECKED_CAST")
                 val config = VideoLoadConfig(
                     url = urlString,
@@ -42,11 +38,7 @@ class MpvPlayerModule : Module() {
                     autoplay = (source["autoplay"] as? Boolean) ?: true,
                     initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
                     initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
-                    voDriver = source["voDriver"] as? String,
-                    cacheEnabled = cacheConfig?.get("enabled") as? String,
-                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
-                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
-                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
+                    voDriver = source["voDriver"] as? String
                 )
                 
                 view.loadVideo(config)
@@ -68,15 +60,6 @@ class MpvPlayerModule : Module() {
                 view.pause()
             }
 
-            // Stop playback and release the MediaCodec decoder + demuxer.
-            // Does not synchronously tear down the native mpv handle (see
-            // MPVLib / MpvPlayerView.destroy docs). Call before navigating
-            // away from the player screen to avoid OOM during screen
-            // transitions on low-RAM devices.
-            AsyncFunction("destroy") { view: MpvPlayerView ->
-                view.destroy()
-            }
-
             // Async function to seek to position
             AsyncFunction("seekTo") { view: MpvPlayerView, position: Double ->
                 view.seekTo(position)

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt

@@ -2,12 +2,14 @@ package expo.modules.mpvplayer
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Rect
+import android.graphics.SurfaceTexture
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.Surface
-import android.view.SurfaceHolder
-import android.view.SurfaceView
+import android.view.TextureView
+import android.view.View
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
@@ -24,30 +26,15 @@ data class VideoLoadConfig(
     val autoplay: Boolean = true,
     val initialSubtitleId: Int? = null,
     val initialAudioId: Int? = null,
-    val voDriver: String? = null,
-    val cacheEnabled: String? = null,
-    val cacheSeconds: Int? = null,
-    val demuxerMaxBytes: Int? = null,
-    val demuxerMaxBackBytes: Int? = null,
+    val voDriver: String? = null
 )
 
 /**
  * MpvPlayerView - ExpoView that hosts the MPV player.
- *
- * Uses SurfaceView (not TextureView) so the surface routes directly to
- * SurfaceFlinger (the OS compositor) rather than compositing into the
- * app's window surface. This matches mpv-android's architecture and
- * gives mpv a standalone surface.
- *
- * PiP black-screen mitigation: SurfaceView's surface is destroyed and
- * recreated on PiP entry/exit, and the new surface's initial dimensions
- * can be stale until the next layout pass. We push dimension updates to
- * mpv via both SurfaceHolder.Callback.surfaceChanged AND an
- * OnLayoutChangeListener, so the PiP transition (which fires layout
- * passes on the view itself) reaches mpv promptly.
+ * Uses TextureView for reliable Picture-in-Picture support.
  */
 class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext),
-    MPVLayerRenderer.Delegate, SurfaceHolder.Callback {
+    MPVLayerRenderer.Delegate, TextureView.SurfaceTextureListener {
 
     companion object {
         private const val TAG = "MpvPlayerView"
@@ -61,7 +48,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     val onTracksReady by EventDispatcher()
     val onPictureInPictureChange by EventDispatcher()
 
-    private var surfaceView: SurfaceView
+    private var textureView: TextureView
     private var renderer: MPVLayerRenderer? = null
     private var pipController: PiPController? = null
 
@@ -72,45 +59,30 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private var surfaceReady: Boolean = false
     private var pendingConfig: VideoLoadConfig? = null
     private var rendererStarted: Boolean = false
-    private var activeSurface: Surface? = null
+    private var pendingSurface: Surface? = null
+    private var surfaceTexture: SurfaceTexture? = null
 
     // PiP state tracking
+    private var isWaitingForPiPTransition: Boolean = false
+    private var isPiPSurfaceForced: Boolean = false
     private val pipHandler = Handler(Looper.getMainLooper())
 
     init {
         setBackgroundColor(Color.BLACK)
 
-        // SurfaceView for video rendering. Routes the surface directly to
-        // SurfaceFlinger (the OS compositor), giving mpv a standalone
-        // surface. TextureView composites into the app's window surface
-        // which is less efficient and breaks PiP transitions.
-        surfaceView = SurfaceView(context).apply {
+        // Create TextureView for video rendering (composites into app window for PiP support)
+        textureView = TextureView(context).apply {
             layoutParams = ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
+            surfaceTextureListener = this@MpvPlayerView
         }
-        surfaceView.holder.addCallback(this@MpvPlayerView)
-        addView(surfaceView)
-
-        // Push dimension updates to mpv on every view bounds change. This
-        // is the primary PiP black-screen fix: entering PiP fires a layout
-        // pass on the SurfaceView itself, and we proactively tell mpv the
-        // new size so it resizes its EGL swapchain before rendering.
-        surfaceView.addOnLayoutChangeListener { _, left, top, right, bottom,
-                                                  oldLeft, oldTop, oldRight, oldBottom ->
-            val w = right - left
-            val h = bottom - top
-            val oldW = oldRight - oldLeft
-            val oldH = oldBottom - oldTop
-            if (w > 0 && h > 0 && (w != oldW || h != oldH)) {
-                renderer?.updateSurfaceSize(w, h)
-            }
-        }
+        addView(textureView)
 
         // Initialize PiP controller with Expo's AppContext for proper activity access
         pipController = PiPController(context, appContext)
-        pipController?.setPlayerView(surfaceView)
+        pipController?.setPlayerView(textureView)
         pipController?.delegate = object : PiPController.Delegate {
             override fun onPlay() {
                 play()
@@ -126,17 +98,17 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
             override fun onPictureInPictureModeChanged(isInPiP: Boolean) {
                 if (isInPiP) {
-                    // Post size syncs after the PiP layout settles. Two passes
-                    // catch both the immediate surface re-attach and the
-                    // post-animation layout pass. Replaces the old TextureView
-                    // measure/layout polling hack (forcePiPBufferSize).
-                    pipHandler.removeCallbacksAndMessages(null)
-                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
-                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 500)
+                    if (!isWaitingForPiPTransition) {
+                        isWaitingForPiPTransition = true
+                        pipHandler.removeCallbacksAndMessages(null)
+                        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
+                            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
+                        }
+                    }
                 } else {
-                    // Restore from PiP: surface resized back to fullscreen.
+                    isWaitingForPiPTransition = false
                     pipHandler.removeCallbacksAndMessages(null)
-                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
+                    restoreFromPiP()
                 }
                 onPictureInPictureChange(mapOf("isActive" to isInPiP))
             }
@@ -149,7 +121,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     /**
      * Start the renderer with the given VO driver.
-     * Called lazily on first loadVideo so user settings are available.
+     * Called lazily on first loadVideo so the voDriver setting is available.
      */
     private fun ensureRendererStarted(voDriver: String?) {
         if (rendererStarted) return
@@ -158,14 +130,9 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             renderer?.start(voDriver ?: "gpu-next")
             rendererStarted = true
 
-            // If the surface is already alive (surfaceCreated fired before
-            // loadVideo), attach it now. With SurfaceView the surface is
-            // owned by the holder, so we read it from there directly rather
-            // than stashing it on the side.
-            surfaceView.holder.surface?.takeIf { it.isValid }?.let { surface ->
-                activeSurface = surface
+            pendingSurface?.let { surface ->
                 renderer?.attachSurface(surface)
-                syncSurfaceSizeToView()
+                pendingSurface = null
             }
         } catch (e: Exception) {
             Log.e(TAG, "Failed to start renderer: ${e.message}")
@@ -173,20 +140,18 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    // MARK: - SurfaceHolder.Callback
+    // MARK: - TextureView.SurfaceTextureListener
 
-    override fun surfaceCreated(holder: SurfaceHolder) {
-        val surface = holder.surface
+    override fun onSurfaceTextureAvailable(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+        this.surfaceTexture = surfaceTexture
+        val surface = Surface(surfaceTexture)
+        surfaceTexture.setDefaultBufferSize(width, height)
         surfaceReady = true
 
         if (rendererStarted) {
-            // The previous Surface reference is holder-owned; do NOT release
-            // it (SurfaceView manages its lifecycle). Just track the new one.
-            activeSurface = surface
             renderer?.attachSurface(surface)
-            // Push the actual view dimensions immediately so mpv doesn't
-            // render against stale full-screen geometry during PiP transitions.
-            syncSurfaceSizeToView()
+        } else {
+            pendingSurface = surface
         }
 
         // If we have a pending load, execute it now
@@ -197,36 +162,20 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-        if (width > 0 && height > 0) {
-            renderer?.updateSurfaceSize(width, height)
-        }
+    override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+        surfaceTexture.setDefaultBufferSize(width, height)
+        renderer?.updateSurfaceSize(width, height)
     }
 
-    override fun surfaceDestroyed(holder: SurfaceHolder) {
+    override fun onSurfaceTextureDestroyed(surfaceTexture: SurfaceTexture): Boolean {
+        this.surfaceTexture = null
         surfaceReady = false
         renderer?.detachSurface()
-        // Do NOT issue mpv "stop" here. Playback continues against the
-        // demuxer; when surfaceCreated fires again (PiP entry/exit, app
-        // background/foreground), we re-attach and frames resume. This
-        // matches the keep-open=always setting in MPVLayerRenderer.
-        //
-        // Do NOT release activeSurface — SurfaceView owns it via the holder.
-        activeSurface = null
+        return false // mpv manages the SurfaceTexture
     }
 
-    /**
-     * Read the actual SurfaceView width/height and push them to mpv.
-     * The PiP transition can fire surfaceCreated before the view's layout
-     * has settled to PiP dimensions, so we re-sync after layout passes.
-     */
-    private fun syncSurfaceSizeToView() {
-        if (!surfaceReady) return
-        val w = surfaceView.width
-        val h = surfaceView.height
-        if (w > 0 && h > 0) {
-            renderer?.updateSurfaceSize(w, h)
-        }
+    override fun onSurfaceTextureUpdated(surfaceTexture: SurfaceTexture) {
+        // Called every frame — no action needed, mpv drives rendering directly
     }
 
     // MARK: - Video Loading
@@ -258,11 +207,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             startPosition = config.startPosition,
             externalSubtitles = config.externalSubtitles,
             initialSubtitleId = config.initialSubtitleId,
-            initialAudioId = config.initialAudioId,
-            cacheEnabled = config.cacheEnabled,
-            cacheSeconds = config.cacheSeconds,
-            demuxerMaxBytes = config.demuxerMaxBytes,
-            demuxerMaxBackBytes = config.demuxerMaxBackBytes
+            initialAudioId = config.initialAudioId
         )
 
         if (config.autoplay) {
@@ -291,50 +236,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         pipController?.setPlaybackRate(0.0)
     }
 
-    /**
-     * Stop playback and release decoder resources.
-     *
-     * Delegates to [MPVLayerRenderer.stop], which issues mpv's "stop" command
-     * on a background thread (flushing the demuxer and releasing the
-     * MediaCodec hardware decoder) and drops the per-instance mpv handle.
-     *
-     * NOTE: this does NOT call `LibMPV.destroy()`. libmpv 1.0's
-     * nativeDestroy has an internal use-after-free on the JNI global ref
-     * path, so the native mpv handle is intentionally left for the JVM GC
-     * / native finalizer rather than torn down synchronously. See
-     * [MPVLib] class doc for the full rationale.
-     *
-     * Call this BEFORE navigating away from the player screen so the
-     * decoder is reclaimed before the next screen (or the next episode's
-     * player) mounts. Otherwise Expo Router renders the new screen first
-     * and you briefly have two mpv instances + two 4K decoders alive —
-     * instant OOM on a 2 GB device.
-     */
-    fun destroy() {
-        renderer?.stop()
-
-        // Reset view-level state so a subsequent loadVideo() on the SAME view
-        // instance re-creates the mpv handle and re-attaches the still-live
-        // SurfaceView surface. Without this, rendererStarted stays true and
-        // ensureRendererStarted() early-returns, so renderer.start() is never
-        // called again — but stop() already nulled the renderer's mpv handle.
-        // The next loadVideo() then runs loadVideoInternal() -> renderer.load()
-        // against mpv == null, where every mpv?.command() (including the
-        // "stop" and load commands) silently no-ops, leaving a black frame.
-        //
-        // This path is hit by direct-player.tsx's goToNextItem()/stop(),
-        // which call destroy() immediately before router.replace() to the
-        // same route — Expo Router reuses the same MpvPlayerView instance,
-        // so the next source load happens on this view without a remount.
-        //
-        // SurfaceView note: the surface is owned by the holder and survives
-        // across destroy()/loadVideo() on the same view instance. The next
-        // ensureRendererStarted() reads it from surfaceView.holder.surface.
-        rendererStarted = false
-        currentUrl = null
-        activeSurface = null
-    }
-
     fun seekTo(position: Double) {
         renderer?.seekTo(position)
     }
@@ -366,10 +267,59 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     // MARK: - Picture in Picture
 
     fun startPictureInPicture() {
+        isWaitingForPiPTransition = true
         pipController?.startPictureInPicture()
+
+        // Resize buffer to match PiP window after animation settles
+        pipHandler.removeCallbacksAndMessages(null)
+        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
+            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
+        }
+    }
+
+    /**
+     * Resize the SurfaceTexture buffer AND TextureView layout to match the PiP
+     * visible rect so mpv renders at the PiP window's actual dimensions.
+     */
+    private fun forcePiPBufferSize() {
+        if (!isWaitingForPiPTransition || !surfaceReady) return
+
+        val rect = Rect()
+        textureView.getGlobalVisibleRect(rect)
+        val visW = rect.width()
+        val visH = rect.height()
+        val vw = textureView.width
+        val vh = textureView.height
+
+        if (visW <= 0 || visH <= 0 || (vw == visW && vh == visH)) return
+
+        surfaceTexture?.setDefaultBufferSize(visW, visH)
+        renderer?.updateSurfaceSize(visW, visH)
+
+        // Force TextureView layout to match PiP visible area.
+        // layoutParams alone doesn't work during PiP because the parent
+        // never re-lays out its children.
+        textureView.measure(
+            View.MeasureSpec.makeMeasureSpec(visW, View.MeasureSpec.EXACTLY),
+            View.MeasureSpec.makeMeasureSpec(visH, View.MeasureSpec.EXACTLY)
+        )
+        textureView.layout(0, 0, visW, visH)
+        isPiPSurfaceForced = true
+    }
+
+    private fun restoreFromPiP() {
+        if (!isPiPSurfaceForced) return
+        isPiPSurfaceForced = false
+
+        val lp = textureView.layoutParams
+        lp.width = ViewGroup.LayoutParams.MATCH_PARENT
+        lp.height = ViewGroup.LayoutParams.MATCH_PARENT
+        textureView.layoutParams = lp
+        textureView.requestLayout()
     }
 
     fun stopPictureInPicture() {
+        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
     }
@@ -529,24 +479,13 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     // MARK: - Cleanup
 
-    /**
-     * Proactively tear down the player. Called from onDetachedFromWindow so
-     * the app releases mpv + decoder buffers when the View detaches from the
-     * window. The JS-facing destroy() is intentionally thinner (just
-     * renderer.stop()) — see this thread for why the full teardown was kept
-     * off the JS path.
-     */
     fun cleanup() {
+        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
         renderer?.stop()
-        renderer?.delegate = null
-
-        // SurfaceView owns the Surface via its holder — do NOT release it.
-        activeSurface = null
+        surfaceTexture = null
         surfaceReady = false
-        currentUrl = null
-        rendererStarted = false
     }
 
     override fun onDetachedFromWindow() {

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/PiPController.kt

@@ -44,11 +44,6 @@ class PiPController(private val context: Context, private val appContext: AppCon
     private var currentPosition: Double = 0.0
     private var currentDuration: Double = 0.0
     private var playbackRate: Double = 1.0
-    // Independently tracks whether the system should auto-enter PiP on home
-    // press. Decoupled from playbackRate so that disabling auto-enter
-    // (e.g. when the player unmounts) doesn't corrupt the play/pause icon
-    // state that buildPiPActions() derives from playbackRate.
-    private var autoEnterEnabled: Boolean = false
 
     private var videoWidth: Int = 0
     private var videoHeight: Int = 0
@@ -111,37 +106,15 @@ class PiPController(private val context: Context, private val appContext: AppCon
     }
 
     fun stopPictureInPicture() {
-        // Disable auto-enter eligibility without touching playbackRate.
-        // playbackRate drives the play/pause icon in buildPiPActions();
-        // mutating it here would cause a stale icon if PiP is re-entered
-        // before the next playback state callback corrects it.
-        autoEnterEnabled = false
         isInPiPMode = false
         pipEntryNotified = false
         unregisterLifecycleCallbacks()
-
-        val activity = getActivity() ?: return
-
-        // Push minimal params with just auto-enter disabled. Do NOT call
-        // buildPiPParams() — it calls ensurePiPReceiverRegistered() and
-        // setActions(), which would re-register the broadcast receiver
-        // (just unregistered above) and attach play/pause/skip actions to
-        // params being torn down. That leaves a live receiver + stale
-        // actions after the player has unmounted.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            try {
-                activity.setPictureInPictureParams(
-                    PictureInPictureParams.Builder()
-                        .setAutoEnterEnabled(false)
-                        .build()
-                )
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to clear PiP auto-enter params: ${e.message}")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val activity = getActivity()
+            if (activity?.isInPictureInPictureMode == true) {
+                activity.moveTaskToBack(false)
             }
         }
-        if (activity.isInPictureInPictureMode) {
-            activity.moveTaskToBack(false)
-        }
     }
 
     fun isCurrentlyInPiP(): Boolean = isInPiPMode
@@ -153,7 +126,6 @@ class PiPController(private val context: Context, private val appContext: AppCon
 
     fun setPlaybackRate(rate: Double) {
         playbackRate = rate
-        autoEnterEnabled = rate > 0
 
         if (rate > 0) {
             registerLifecycleCallbacks()
@@ -236,7 +208,7 @@ class PiPController(private val context: Context, private val appContext: AppCon
         builder.setActions(buildPiPActions())
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            builder.setAutoEnterEnabled(forEntering || autoEnterEnabled)
+            builder.setAutoEnterEnabled(forEntering || playbackRate > 0)
         }
 
         return builder.build()

modules/mpv-player/ios/MPVLayerRenderer.swift

@@ -1020,44 +1020,12 @@ final class MPVLayerRenderer {
             info["cacheSeconds"] = cacheSeconds
         }
 
-        // Configured cache limits — read back from mpv to confirm user
-        // settings actually took effect. mpv stores byte sizes as int64
-        // (bytes); convert to MiB for display.
-        var demuxerMaxBytes: Int64 = 0
-        if getProperty(handle: handle, name: "demuxer-max-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBytes) >= 0 {
-            info["demuxerMaxBytes"] = Int(demuxerMaxBytes / (1024 * 1024))
-        }
-        var demuxerMaxBackBytes: Int64 = 0
-        if getProperty(handle: handle, name: "demuxer-max-back-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBackBytes) >= 0 {
-            info["demuxerMaxBackBytes"] = Int(demuxerMaxBackBytes / (1024 * 1024))
-        }
-        var cacheSecsLimit: Double = 0
-        if getProperty(handle: handle, name: "cache-secs", format: MPV_FORMAT_DOUBLE, value: &cacheSecsLimit) >= 0 {
-            info["cacheSecsLimit"] = cacheSecsLimit
-        }
-
         // Dropped frames
         var droppedFrames: Int64 = 0
         if getProperty(handle: handle, name: "frame-drop-count", format: MPV_FORMAT_INT64, value: &droppedFrames) >= 0 {
             info["droppedFrames"] = Int(droppedFrames)
         }
 
-        // Active video output driver
-        if let voDriver = getStringProperty(handle: handle, name: "vo") {
-            info["voDriver"] = voDriver
-        }
-
-        // Active hardware decoder
-        if let hwdec = getStringProperty(handle: handle, name: "hwdec-current") {
-            info["hwdec"] = hwdec
-        }
-
-        // Estimated video output fps (post-filter)
-        var estimatedVfFps: Double = 0
-        if getProperty(handle: handle, name: "estimated-vf-fps", format: MPV_FORMAT_DOUBLE, value: &estimatedVfFps) >= 0 && estimatedVfFps > 0 {
-            info["estimatedVfFps"] = estimatedVfFps
-        }
-
         return info
     }
 }

modules/mpv-player/ios/MpvPlayerModule.swift

@@ -74,13 +74,7 @@ public class MpvPlayerModule: Module {
       AsyncFunction("pause") { (view: MpvPlayerView) in
         view.pause()
       }
-
-      // Synchronously destroy mpv instance + decoder before navigating
-      // away from the player screen (cross-platform; matches Android).
-      AsyncFunction("destroy") { (view: MpvPlayerView) in
-        view.destroy()
-      }
-
+      
       // Async function to seek to position
       AsyncFunction("seekTo") { (view: MpvPlayerView, position: Double) in
         view.seekTo(position: position)

modules/mpv-player/ios/MpvPlayerView.swift

@@ -289,49 +289,6 @@ class MpvPlayerView: ExpoView {
 		pipController?.updatePlaybackState()
 	}
 
-	/**
-	 * Synchronously stop and destroy the mpv instance + decoder so memory is
-	 * freed before the next screen mounts. Safe to call multiple times — the
-	 * underlying renderer.stop() guards against re-entry.
-	 *
-	 * Cross-platform counterpart of MpvPlayerView.destroy() on Android.
-	 */
-	func destroy() {
-		renderer?.stop()
-
-		// Reset view state and re-create the mpv handle so a subsequent
-		// loadVideo() on the SAME view instance can actually load.
-		// Without this, stop() leaves renderer.mpv == nil, and the next
-		// loadVideo(config:) calls renderer.load() which early-returns
-		// at `guard let handle = self.mpv else { return }` — but only
-		// after flipping isLoading = true and dispatching the loading
-		// delegate callback, so the JS layer is stuck in a perpetual
-		// "loading" state with no actual playback.
-		//
-		// This path is hit by direct-player.tsx's goToNextItem()/stop(),
-		// which call destroy() immediately before router.replace() to
-		// the same route — Expo Router reuses the same MpvPlayerView
-		// instance, so the next `source` prop update arrives on this
-		// view without a remount. setupView() is otherwise the only
-		// place start() is called, so without re-starting here the
-		// renderer stays dead until the whole view is unmounted and
-		// recreated.
-		//
-		// start() is idempotent (`guard !isRunning else { return }`)
-		// and stop() has already nulled mpv synchronously before
-		// dispatching the async mpv_terminate_destroy, so creating a
-		// fresh handle here is safe even while the old handle's
-		// teardown is still in flight on a background queue (libmpv
-		// handles are independent).
-		currentURL = nil
-		intendedPlayState = false
-		do {
-			try renderer?.start()
-		} catch {
-			onError(["error": "Failed to restart renderer after destroy: \(error.localizedDescription)"])
-		}
-	}
-
 	func seekTo(position: Double) {
 		// Update cached position and Now Playing immediately for smooth Control Center feedback
 		cachedPosition = position

modules/mpv-player/src/MpvPlayer.types.ts

@@ -89,14 +89,6 @@ export type MpvPlayerViewProps = {
 export interface MpvPlayerViewRef {
   play: () => Promise<void>;
   pause: () => Promise<void>;
-  /**
-   * Synchronously destroy the mpv instance + decoder + surface buffers.
-   * Call before navigating away from the player screen so memory is
-   * freed before the next screen mounts. Safe to call multiple times.
-   */
-  destroy: () => Promise<void>;
-  // Pre-libmpv-1.0 alias (kept for source-history reference):
-  // stop: () => Promise<void>;
   seekTo: (position: number) => Promise<void>;
   seekBy: (offset: number) => Promise<void>;
   setSpeed: (speed: number) => Promise<void>;
@@ -162,41 +154,9 @@ export type TechnicalInfo = {
   videoBitrate?: number;
   audioBitrate?: number;
   cacheSeconds?: number;
-  /** Configured demuxer forward cache cap (MiB), read back from mpv */
-  demuxerMaxBytes?: number;
-  /** Configured demuxer backward cache cap (MiB), read back from mpv */
-  demuxerMaxBackBytes?: number;
-  /** Configured cache-secs floor, read back from mpv */
-  cacheSecsLimit?: number;
   droppedFrames?: number;
   /** Active video output driver (read from MPV at runtime) */
   voDriver?: string;
   /** Active hardware decoder (read from MPV at runtime) */
   hwdec?: string;
-  /** Estimated video output fps (mpv "estimated-vf-fps") */
-  estimatedVfFps?: number;
-  // ---- Extended fields (primarily ExoPlayer-backed; MPV may fill some) ----
-  /** Derived HDR format: "SDR" | "HDR10" | "HDR10+" | "HLG" | null */
-  hdrFormat?: string;
-  /** Color space, e.g. "BT.709" / "BT.2020" */
-  colorSpace?: string;
-  /** Color range: "Limited" / "Full" */
-  colorRange?: string;
-  /** Color transfer: "SDR" / "ST2084 (PQ)" / "HLG" */
-  colorTransfer?: string;
-  /** Decoder path: "hardware" (MediaCodec) or "software" (FFmpeg extension) */
-  decoderType?: string;
-  /** Instantiated decoder name, e.g. "c2.amlogic.hevc.decoder" */
-  decoderName?: string;
-  /** Active audio channel count (2 = stereo, 6 = 5.1, 8 = 7.1) */
-  audioChannels?: number;
-  /** Active audio sample rate in Hz */
-  audioSampleRate?: number;
-  /**
-   * Raw codec tag from the container, e.g. "hev1.2.4.L153.B0". Encodes
-   * profile / tier / level / constraint bytes per ISO/IEC 14496-15. Power
-   * users can decode this manually; it's how Jellyfin's HEVC level cap
-   * (153 = Level 5.1) is checked against the file.
-   */
-  videoCodecs?: string;
 };

modules/mpv-player/src/MpvPlayerView.tsx

@@ -20,9 +20,6 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
       pause: async () => {
         await nativeRef.current?.pause();
       },
-      destroy: async () => {
-        await nativeRef.current?.destroy();
-      },
       seekTo: async (position: number) => {
         await nativeRef.current?.seekTo(position);
       },

package.json

@@ -17,13 +17,13 @@
     "ios:unsigned-build": "cross-env EXPO_TV=0 bun scripts/ios/build-ios.ts --production",
     "ios:unsigned-build:tv": "cross-env EXPO_TV=1 bun scripts/ios/build-ios.ts --production",
     "prepare": "husky",
-    "typecheck": "bun scripts/typecheck.ts",
+    "typecheck": "node scripts/typecheck.js",
     "check": "biome check . --max-diagnostics 1000",
     "lint": "biome check --write --unsafe --max-diagnostics 1000",
     "format": "biome format --write .",
     "doctor": "expo-doctor",
-    "i18n:check": "bun scripts/check-i18n-keys.ts",
-    "i18n:fix-unused": "bun scripts/check-i18n-keys.ts --fix-unused",
+    "i18n:check": "bun scripts/check-i18n-keys.mjs",
+    "i18n:fix-unused": "bun scripts/check-i18n-keys.mjs --fix-unused",
     "test": "bun run typecheck && bun run lint && bun run format && bun run i18n:check && bun run doctor",
     "postinstall": "patch-package"
   },
@@ -102,7 +102,7 @@
     "react-native-nitro-modules": "0.33.1",
     "react-native-pager-view": "8.0.1",
     "react-native-qrcode-svg": "^6.3.21",
-    "react-native-reanimated": "4.3.1",
+    "react-native-reanimated": "4.5.0",
     "react-native-reanimated-carousel": "4.0.3",
     "react-native-safe-area-context": "~5.7.0",
     "react-native-screens": "4.25.2",
@@ -136,7 +136,6 @@
     "husky": "9.1.7",
     "lint-staged": "17.0.8",
     "react-test-renderer": "19.2.3",
-    "tsx": "^4.22.4",
     "typescript": "6.0.3"
   },
   "expo": {

plugins/with-runtime-framework-headers.js

@@ -1,4 +1,4 @@
-import { type ConfigPlugin, withPodfile } from "expo/config-plugins";
+const { withPodfile } = require("expo/config-plugins");
 
 const PATCH_START = "## >>> runtime-framework headers";
 const PATCH_END = "## <<< runtime-framework headers";
@@ -13,7 +13,7 @@ const EXTRA_HDRS = [
   `\${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers`,
 ];
 
-function buildPatch(): string {
+function buildPatch() {
   return [
     PATCH_START,
     "  extra_hdrs = [",
@@ -91,7 +91,7 @@ function buildPatch(): string {
   ].join("\n");
 }
 
-const withRuntimeFrameworkHeaders: ConfigPlugin = (config) => {
+module.exports = function withRuntimeFrameworkHeaders(config) {
   return withPodfile(config, (config) => {
     let podfile = config.modResults.contents;
 
@@ -125,5 +125,3 @@ end
     return config;
   });
 };
-
-export default withRuntimeFrameworkHeaders;

plugins/withAndroidAlertColors.js

@@ -1,20 +1,10 @@
-import {
-  type ConfigPlugin,
+const {
   withAndroidColors,
   withAndroidColorsNight,
-} from "expo/config-plugins";
+} = require("expo/config-plugins");
 
-interface ColorResourceItem {
-  $: { name: string };
-  _: string;
-}
-
-const withAndroidAlertColors: ConfigPlugin = (config) => {
-  const setColor = (
-    colorsList: ColorResourceItem[],
-    name: string,
-    value: string,
-  ) => {
+const withAndroidAlertColors = (config) => {
+  const setColor = (colorsList, name, value) => {
     const existingColor = colorsList.find(
       (item) => item.$ && item.$.name === name,
     );
@@ -30,7 +20,7 @@ const withAndroidAlertColors: ConfigPlugin = (config) => {
 
   config = withAndroidColors(config, (config) => {
     const colors = config.modResults;
-    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
+    const colorsList = colors.resources.color || [];
     setColor(colorsList, "colorPrimary", "#000000");
     colors.resources.color = colorsList;
     return config;
@@ -38,7 +28,7 @@ const withAndroidAlertColors: ConfigPlugin = (config) => {
 
   config = withAndroidColorsNight(config, (config) => {
     const colors = config.modResults;
-    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
+    const colorsList = colors.resources.color || [];
     setColor(colorsList, "colorPrimary", "#FFFFFF");
     colors.resources.color = colorsList;
     return config;
@@ -47,4 +37,4 @@ const withAndroidAlertColors: ConfigPlugin = (config) => {
   return config;
 };
 
-export default withAndroidAlertColors;
+module.exports = withAndroidAlertColors;

plugins/withAndroidManifest.js

@@ -1,12 +1,8 @@
-import { type ConfigPlugin, withAndroidManifest } from "expo/config-plugins";
+const { withAndroidManifest } = require("expo/config-plugins");
 
-const withGoogleCastAndroidManifest: ConfigPlugin = (config) =>
+const _withGoogleCastAndroidManifest = (config) =>
   withAndroidManifest(config, async (mod) => {
-    const mainApplication = mod.modResults.manifest.application?.[0];
-
-    if (!mainApplication) {
-      return mod;
-    }
+    const mainApplication = mod.modResults.manifest.application[0];
 
     // Initialize activity array if it doesn't exist
     if (!mainApplication.activity) {
@@ -43,4 +39,4 @@ const withGoogleCastAndroidManifest: ConfigPlugin = (config) =>
     return mod;
   });
 
-export default withGoogleCastAndroidManifest;
+module.exports = _withGoogleCastAndroidManifest;

plugins/withChangeNativeAndroidTextToWhite.js

@@ -1,8 +1,8 @@
-import { readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";
+const { readFileSync, writeFileSync } = require("node:fs");
+const { join } = require("node:path");
+const { withDangerousMod } = require("expo/config-plugins");
 
-const withChangeNativeAndroidTextToWhite: ConfigPlugin = (expoConfig) =>
+const withChangeNativeAndroidTextToWhite = (expoConfig) =>
   withDangerousMod(expoConfig, [
     "android",
     (modConfig) => {
@@ -30,4 +30,4 @@ const withChangeNativeAndroidTextToWhite: ConfigPlugin = (expoConfig) =>
     },
   ]);
 
-export default withChangeNativeAndroidTextToWhite;
+module.exports = withChangeNativeAndroidTextToWhite;

plugins/withExcludeMedia3Dash.js

@@ -1,6 +1,6 @@
-import { type ConfigPlugin, withAppBuildGradle } from "expo/config-plugins";
+const { withAppBuildGradle } = require("expo/config-plugins");
 
-const withExcludeMedia3Dash: ConfigPlugin = (config) => {
+module.exports = function withExcludeMedia3Dash(config) {
   return withAppBuildGradle(config, (config) => {
     const contents = config.modResults.contents;
 
@@ -32,5 +32,3 @@ configurations.all {
     return config;
   });
 };
-
-export default withExcludeMedia3Dash;

plugins/withGitPod.js

@@ -1,14 +1,6 @@
-import { type ConfigPlugin, withPodfile } from "expo/config-plugins";
+const { withPodfile } = require("@expo/config-plugins");
 
-interface GitPodOptions {
-  podName: string;
-  podspecUrl: string;
-}
-
-const withGitPod: ConfigPlugin<GitPodOptions> = (
-  config,
-  { podName, podspecUrl },
-) => {
+const withGitPod = (config, { podName, podspecUrl }) => {
   return withPodfile(config, (config) => {
     const podfile = config.modResults.contents;
 
@@ -29,4 +21,4 @@ const withGitPod: ConfigPlugin<GitPodOptions> = (
   });
 };
 
-export default withGitPod;
+module.exports = withGitPod;

plugins/withGradleProperties.js

@@ -1,21 +1,12 @@
-import type { ExpoConfig } from "expo/config";
-import {
-  AndroidConfig,
-  type ConfigPlugin,
-  withGradleProperties,
-} from "expo/config-plugins";
+const { withGradleProperties } = require("expo/config-plugins");
 
-function setGradlePropertiesValue(
-  config: ExpoConfig,
-  key: string,
-  value: string,
-): ExpoConfig {
+function setGradlePropertiesValue(config, key, value) {
   return withGradleProperties(config, (exportedConfig) => {
     const props = exportedConfig.modResults;
     const keyIdx = props.findIndex(
       (item) => item.type === "property" && item.key === key,
     );
-    const property: AndroidConfig.Properties.PropertiesItem = {
+    const property = {
       type: "property",
       key,
       value,
@@ -31,14 +22,11 @@ function setGradlePropertiesValue(
   });
 }
 
-const withCustomGradleProperties: ConfigPlugin = (config) => {
+module.exports = function withCustomPlugin(config) {
   // Expo 52 is not setting this
   // https://github.com/expo/expo/issues/32558
   config = setGradlePropertiesValue(config, "android.enableJetifier", "true");
 
-  // NDK version required by libmpv 1.0.0
-  config = setGradlePropertiesValue(config, "ndkVersion", "29.0.14206865");
-
   // Increase memory
   config = setGradlePropertiesValue(
     config,
@@ -47,5 +35,3 @@ const withCustomGradleProperties: ConfigPlugin = (config) => {
   );
   return config;
 };
-
-export default withCustomGradleProperties;

plugins/withTVOSAppIcon.js

@@ -1,6 +1,6 @@
-import { type ConfigPlugin, withXcodeProject } from "expo/config-plugins";
+const { withXcodeProject } = require("@expo/config-plugins");
 
-const withTVOSAppIcon: ConfigPlugin = (config) => {
+const withTVOSAppIcon = (config) => {
   // Only apply for TV builds
   if (process.env.EXPO_TV !== "1") {
     return config;
@@ -28,4 +28,4 @@ const withTVOSAppIcon: ConfigPlugin = (config) => {
   });
 };
 
-export default withTVOSAppIcon;
+module.exports = withTVOSAppIcon;

plugins/withTVOSTopShelf.js

@@ -1,10 +1,8 @@
-import type { ExpoConfig } from "expo/config";
-import {
-  type ConfigPlugin,
+const {
   withEntitlementsPlist,
   withInfoPlist,
   withXcodeProject,
-} from "expo/config-plugins";
+} = require("@expo/config-plugins");
 
 const EXTENSION_TARGET_NAME = "StreamyfinTopShelf";
 const TARGET_SOURCE_DIR = "../targets/StreamyfinTopShelf";
@@ -12,29 +10,19 @@ const APP_GROUP_INFO_PLIST_KEY = "StreamyfinAppGroupIdentifier";
 const KEYCHAIN_ACCESS_GROUP_INFO_PLIST_KEY =
   "StreamyfinKeychainAccessGroupIdentifier";
 
-interface AppExtensionConfig {
-  targetName: string;
-  bundleIdentifier: string;
-  entitlements: {
-    "com.apple.security.application-groups": string[];
-    "keychain-access-groups": string[];
-  };
-}
-
-function getBundleIdentifier(config: ExpoConfig): string {
+function getBundleIdentifier(config) {
   return config.ios?.bundleIdentifier || "com.fredrikburmester.streamyfin";
 }
 
-function getAppGroupIdentifier(config: ExpoConfig): string {
+function getAppGroupIdentifier(config) {
   return `group.${getBundleIdentifier(config)}.tvtopshelf`;
 }
 
-function getKeychainAccessGroupIdentifier(config: ExpoConfig): string {
+function getKeychainAccessGroupIdentifier(config) {
   return `$(AppIdentifierPrefix)${getBundleIdentifier(config)}`;
 }
 
-// The xcode project object has no usable typings — keep `any` here.
-function getBuildConfigurations(project: any, configurationListId: string) {
+function getBuildConfigurations(project, configurationListId) {
   const configurationList =
     project.hash.project.objects.XCConfigurationList[configurationListId];
 
@@ -42,21 +30,18 @@ function getBuildConfigurations(project: any, configurationListId: string) {
 
   const buildConfigurations = project.pbxXCBuildConfigurationSection();
   return configurationList.buildConfigurations
-    .map((config: { value: string }) => buildConfigurations[config.value])
+    .map((config) => buildConfigurations[config.value])
     .filter(Boolean);
 }
 
-function ensureAppGroup(value: unknown, appGroupIdentifier: string): string[] {
+function ensureAppGroup(value, appGroupIdentifier) {
   const groups = Array.isArray(value) ? value : [];
   return groups.includes(appGroupIdentifier)
     ? groups
     : [...groups, appGroupIdentifier];
 }
 
-function ensureKeychainAccessGroup(
-  value: unknown,
-  keychainAccessGroupIdentifier: string,
-): string[] {
+function ensureKeychainAccessGroup(value, keychainAccessGroupIdentifier) {
   const groups = Array.isArray(value) ? value : [];
   return groups.includes(keychainAccessGroupIdentifier)
     ? groups
@@ -64,13 +49,13 @@ function ensureKeychainAccessGroup(
 }
 
 function ensureAppExtension(
-  appExtensions: unknown,
-  targetName: string,
-  bundleIdentifier: string,
-  appGroupIdentifier: string,
-  keychainAccessGroupIdentifier: string,
-): AppExtensionConfig[] {
-  const extensionConfig: AppExtensionConfig = {
+  appExtensions,
+  targetName,
+  bundleIdentifier,
+  appGroupIdentifier,
+  keychainAccessGroupIdentifier,
+) {
+  const extensionConfig = {
     targetName,
     bundleIdentifier,
     entitlements: {
@@ -78,9 +63,7 @@ function ensureAppExtension(
       "keychain-access-groups": [keychainAccessGroupIdentifier],
     },
   };
-  const extensions: AppExtensionConfig[] = Array.isArray(appExtensions)
-    ? appExtensions
-    : [];
+  const extensions = Array.isArray(appExtensions) ? appExtensions : [];
   // Keep plugin runs idempotent and preserve unrelated app extension entries.
   const existingIndex = extensions.findIndex(
     (appExtension) => appExtension?.targetName === targetName,
@@ -95,7 +78,7 @@ function ensureAppExtension(
   );
 }
 
-const withTVOSTopShelf: ConfigPlugin = (config) => {
+const withTVOSTopShelf = (config) => {
   const appGroupIdentifier = getAppGroupIdentifier(config);
   const keychainAccessGroupIdentifier =
     getKeychainAccessGroupIdentifier(config);
@@ -210,4 +193,4 @@ const withTVOSTopShelf: ConfigPlugin = (config) => {
   });
 };
 
-export default withTVOSTopShelf;
+module.exports = withTVOSTopShelf;

plugins/withTVUserManagement.js

@@ -1,9 +1,9 @@
-import { type ConfigPlugin, withEntitlementsPlist } from "expo/config-plugins";
+const { withEntitlementsPlist } = require("expo/config-plugins");
 
 /**
  * Expo config plugin to add User Management entitlement for tvOS profile linking
  */
-const withTVUserManagement: ConfigPlugin = (config) => {
+const withTVUserManagement = (config) => {
   // Only add for tvOS builds. The entitlement is restricted by Apple and must
   // be present in the provisioning profile, so injecting it into mobile builds
   // breaks signing ("Entitlement ... not found and could not be included in
@@ -24,4 +24,4 @@ const withTVUserManagement: ConfigPlugin = (config) => {
   });
 };
 
-export default withTVUserManagement;
+module.exports = withTVUserManagement;

plugins/withTVXcodeEnv.js

@@ -1,7 +1,7 @@
-import { execSync } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";
+const { withDangerousMod } = require("@expo/config-plugins");
+const { execSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
 
 /**
  * Expo config plugin that adds EXPO_TV=1 and NODE_BINARY to .xcode.env.local for TV builds.
@@ -12,7 +12,7 @@ import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";
  *
  * It also sets NODE_BINARY for nvm users since Xcode can't resolve shell functions.
  */
-const withTVXcodeEnv: ConfigPlugin = (config) => {
+const withTVXcodeEnv = (config) => {
   // Only apply for TV builds
   if (process.env.EXPO_TV !== "1") {
     return config;
@@ -70,7 +70,7 @@ const withTVXcodeEnv: ConfigPlugin = (config) => {
 /**
  * Get the actual node binary path, handling nvm installations.
  */
-function getNodeBinaryPath(): string | null {
+function getNodeBinaryPath() {
   try {
     // First try to get node path directly (works for non-nvm installs)
     const directPath = execSync("which node 2>/dev/null", {
@@ -114,4 +114,4 @@ function getNodeBinaryPath(): string | null {
   return null;
 }
 
-export default withTVXcodeEnv;
+module.exports = withTVXcodeEnv;

plugins/withTrustLocalCerts.js

@@ -1,29 +1,18 @@
-import fs from "node:fs";
-import path from "node:path";
-import {
-  AndroidConfig,
-  type ConfigPlugin,
-  type ExportedConfigWithProps,
-  withAndroidManifest,
-} from "expo/config-plugins";
-
+const { AndroidConfig, withAndroidManifest } = require("expo/config-plugins");
+const path = require("node:path");
+const fs = require("node:fs");
 const fsPromises = fs.promises;
 
 const { getMainApplicationOrThrow } = AndroidConfig.Manifest;
 
-type AndroidManifest = AndroidConfig.Manifest.AndroidManifest;
-
-const withTrustLocalCerts: ConfigPlugin = (config) => {
+const withTrustLocalCerts = (config) => {
   return withAndroidManifest(config, async (mod) => {
     mod.modResults = await setCustomConfigAsync(mod, mod.modResults);
     return mod;
   });
 };
 
-async function setCustomConfigAsync(
-  config: ExportedConfigWithProps<AndroidManifest>,
-  androidManifest: AndroidManifest,
-): Promise<AndroidManifest> {
+async function setCustomConfigAsync(config, androidManifest) {
   const src_file_path = path.join(__dirname, "network_security_config.xml");
   const res_file_path = path.join(
     await AndroidConfig.Paths.getResourceFolderAsync(
@@ -56,4 +45,4 @@ async function setCustomConfigAsync(
   return androidManifest;
 }
 
-export default withTrustLocalCerts;
+module.exports = withTrustLocalCerts;

providers/PlaySettingsProvider.tsx

@@ -7,7 +7,7 @@ import type React from "react";
 import { createContext, useCallback, useContext, useState } from "react";
 import { Platform } from "react-native";
 import type { Bitrate } from "@/components/BitrateSelector";
-import { getActivePlayerType, settingsAtom } from "@/utils/atoms/settings";
+import { settingsAtom } from "@/utils/atoms/settings";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { generateDeviceProfile } from "../utils/profiles/native";
 import { apiAtom, userAtom } from "./JellyfinProvider";
@@ -78,11 +78,10 @@ export const PlaySettingsProvider: React.FC<{ children: React.ReactNode }> = ({
       }
 
       try {
-        // Match the device profile to the actually-active player so the
-        // server picks codecs/containers the player can decode.
+        // Generate device profile for MPV player
         const native = generateDeviceProfile({
           platform: Platform.OS as "ios" | "android",
-          player: getActivePlayerType(settings),
+          player: "mpv",
           audioMode: settings.audioTranscodeMode,
         });
         const data = await getStreamUrl({

scripts/check-i18n-keys.mjs

@@ -18,11 +18,11 @@
  *   - Edge cases the static scan cannot see can be allow-listed in the config file.
  *
  * Usage:
- *   bun scripts/check-i18n-keys.ts                # report + exit 1 on missing OR unused
- *   bun scripts/check-i18n-keys.ts --unused=warn  # exit 1 only on missing; unused = warning
- *   bun scripts/check-i18n-keys.ts --unused=off   # ignore unused entirely
- *   bun scripts/check-i18n-keys.ts --json         # machine-readable output
- *   bun scripts/check-i18n-keys.ts --fix-unused   # remove dead keys from en.json (Crowdin syncs the rest)
+ *   bun scripts/check-i18n-keys.mjs                # report + exit 1 on missing OR unused
+ *   bun scripts/check-i18n-keys.mjs --unused=warn  # exit 1 only on missing; unused = warning
+ *   bun scripts/check-i18n-keys.mjs --unused=off   # ignore unused entirely
+ *   bun scripts/check-i18n-keys.mjs --json         # machine-readable output
+ *   bun scripts/check-i18n-keys.mjs --fix-unused   # remove dead keys from en.json (Crowdin syncs the rest)
  */
 
 import {
@@ -34,20 +34,9 @@ import {
 } from "node:fs";
 import { extname, join, relative } from "node:path";
 
-type LocaleTree = { [key: string]: LocaleTree | string };
-
-interface I18nConfig {
-  localesDir: string;
-  sourceLocale: string;
-  srcDirs: string[];
-  srcExtensions: string[];
-  excludeDirs: string[];
-  ignoreUnused: string[];
-}
-
 const ROOT = process.cwd();
 const args = process.argv.slice(2);
-const flag = (name: string, def: string | boolean): string | boolean => {
+const flag = (name, def) => {
   const a = args.find((x) => x === `--${name}` || x.startsWith(`--${name}=`));
   if (!a) return def;
   const [, v] = a.split("=");
@@ -59,7 +48,7 @@ const FIX_UNUSED = !!flag("fix-unused", false);
 
 // ---- config ----
 const CONFIG_PATH = join(ROOT, "scripts", "i18n-keys.config.json");
-const DEFAULT_CONFIG: I18nConfig = {
+const DEFAULT_CONFIG = {
   localesDir: "translations",
   sourceLocale: "en",
   // Scan the whole repo by default so keys referenced outside the obvious dirs
@@ -80,36 +69,29 @@ const DEFAULT_CONFIG: I18nConfig = {
   // Keys (or glob-ish prefixes ending with .* or *) known to be used dynamically / externally.
   ignoreUnused: [],
 };
-const config: I18nConfig = existsSync(CONFIG_PATH)
-  ? {
-      ...DEFAULT_CONFIG,
-      ...(JSON.parse(readFileSync(CONFIG_PATH, "utf8")) as Partial<I18nConfig>),
-    }
+const config = existsSync(CONFIG_PATH)
+  ? { ...DEFAULT_CONFIG, ...JSON.parse(readFileSync(CONFIG_PATH, "utf8")) }
   : DEFAULT_CONFIG;
 
 // ---- helpers ----
-const flatten = (
-  obj: LocaleTree,
-  prefix = "",
-  out: Record<string, string> = {},
-): Record<string, string> => {
+const flatten = (obj, prefix = "", out = {}) => {
   for (const [k, v] of Object.entries(obj)) {
     const key = prefix ? `${prefix}.${k}` : k;
     if (v && typeof v === "object" && !Array.isArray(v)) flatten(v, key, out);
-    else out[key] = v as string;
+    else out[key] = v;
   }
   return out;
 };
 
-const globMatch = (key: string, pattern: string): boolean => {
+const globMatch = (key, pattern) => {
   if (pattern.endsWith(".*"))
     return key === pattern.slice(0, -2) || key.startsWith(pattern.slice(0, -1));
   if (pattern.endsWith("*")) return key.startsWith(pattern.slice(0, -1));
   return key === pattern;
 };
 
-const walk = (dir: string, files: string[] = []): string[] => {
-  let entries: string[];
+const walk = (dir, files = []) => {
+  let entries;
   try {
     entries = readdirSync(dir);
   } catch {
@@ -117,7 +99,7 @@ const walk = (dir: string, files: string[] = []): string[] => {
   }
   for (const name of entries) {
     const full = join(dir, name);
-    let st: ReturnType<typeof statSync>;
+    let st;
     try {
       st = statSync(full);
     } catch {
@@ -136,7 +118,7 @@ const walk = (dir: string, files: string[] = []): string[] => {
 // ---- load source keys ----
 const sourcePath = join(ROOT, config.localesDir, `${config.sourceLocale}.json`);
 const sourceKeys = Object.keys(
-  flatten(JSON.parse(readFileSync(sourcePath, "utf8")) as LocaleTree),
+  flatten(JSON.parse(readFileSync(sourcePath, "utf8"))),
 );
 const sourceKeySet = new Set(sourceKeys);
 
@@ -147,16 +129,16 @@ const TPL_DYN_RE = /\bt\(\s*`([^`$]*)\$\{/g; // t(`a.b.${x}`) -> prefix "a.b."
 const I18NKEY_RE = /\bi18nKey\s*=\s*(?:\{\s*)?(['"])((?:\\.|(?!\1).)+?)\1/g; // <Trans i18nKey="a.b">
 const KEY_SHAPE = /^[A-Za-z0-9_]+(\.[A-Za-z0-9_]+)+$/; // dotted key, e.g. home.x.y
 
-const usedStatic = new Set<string>(); // keys passed to t(...) / i18nKey — used for MISSING detection
-const dynamicPrefixes = new Set<string>();
-const fullyDynamic: Array<{ file: string; line: number }> = [];
+const usedStatic = new Set(); // keys passed to t(...) / i18nKey — used for MISSING detection
+const dynamicPrefixes = new Set();
+const fullyDynamic = []; // { file, line }
 let codeBlob = ""; // all (comment-stripped) source text — searched for delimited key literals
 
 // Strip comments so keys mentioned in comments (e.g. `// t("old.key")`) are not counted as
 // usage. Block comments and JSX {/* */} are blanked (preserving newlines for line numbers);
 // line comments are only stripped when `//` follows start/whitespace/punctuation, which keeps
 // `://` inside string URLs intact.
-const stripComments = (src: string): string =>
+const stripComments = (src) =>
   src
     .replace(/\/\*[\s\S]*?\*\//g, (m) => m.replace(/[^\n]/g, " "))
     .replace(/(^|[\s;{}()[\],=>])\/\/[^\n]*/g, (_m, p) => p);
@@ -186,11 +168,11 @@ const prefixList = [...dynamicPrefixes];
 // the code (covers t("k"), <Trans i18nKey>, and keys stored as bare string constants in
 // arrays/config then resolved via t(variable)), or it is reached via a dynamic prefix, or
 // explicitly allow-listed. Delimited search avoids substring false-matches (e.g. a.b vs a.b_c).
-const literalUsed = (key: string): boolean =>
+const literalUsed = (key) =>
   codeBlob.includes(`"${key}"`) ||
   codeBlob.includes(`'${key}'`) ||
   codeBlob.includes(`\`${key}\``);
-const isUsed = (key: string): boolean =>
+const isUsed = (key) =>
   literalUsed(key) ||
   prefixList.some((p) => key.startsWith(p)) ||
   config.ignoreUnused.some((g) => globMatch(key, g));
@@ -209,22 +191,25 @@ const missing = [...usedStatic]
 // keys are static literals in practice; revisit if dynamic key constants become common.
 
 // ---- optional fix: strip dead keys from the source locale (en.json) ----
-const removeKey = (obj: LocaleTree, parts: string[]): void => {
+const removeKey = (obj, parts) => {
   const [head, ...rest] = parts;
   if (!(head in obj)) return;
   if (rest.length === 0) {
     delete obj[head];
     return;
   }
-  const child = obj[head];
-  if (!child || typeof child !== "object") return;
-  removeKey(child, rest);
-  if (Object.keys(child).length === 0) delete obj[head];
+  removeKey(obj[head], rest);
+  if (
+    obj[head] &&
+    typeof obj[head] === "object" &&
+    Object.keys(obj[head]).length === 0
+  )
+    delete obj[head];
 };
 if (FIX_UNUSED && unused.length) {
   // Only edit the SOURCE locale (en.json). Crowdin owns the target locales and removes
   // the keys from them automatically on the next sync once they disappear from the source.
-  const data = JSON.parse(readFileSync(sourcePath, "utf8")) as LocaleTree;
+  const data = JSON.parse(readFileSync(sourcePath, "utf8"));
   for (const key of unused) removeKey(data, key.split("."));
   writeFileSync(sourcePath, `${JSON.stringify(data, null, 2)}\n`);
   console.log(
@@ -274,7 +259,7 @@ if (JSON_OUT) {
       );
       for (const k of unused) console.log(`   - ${k}`);
       console.log(
-        `\n   → remove with: bun scripts/check-i18n-keys.ts --fix-unused`,
+        `\n   → remove with: bun scripts/check-i18n-keys.mjs --fix-unused`,
       );
       console.log(
         `   → or allow-list a dynamic key in scripts/i18n-keys.config.json ("ignoreUnused").`,

scripts/detect-duplicate-issue.mjs

@@ -21,14 +21,8 @@
 import { execFileSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 
-interface Issue {
-  number: number;
-  title: string;
-  body: string | null;
-}
-
 // Parse a numeric env var, falling back to `def` only when unset/empty/NaN so an explicit 0 is honoured.
-const numEnv = (name: string, def: number): number => {
+const numEnv = (name, def) => {
   const raw = process.env[name];
   if (raw === undefined || raw === "") return def;
   const n = Number(raw);
@@ -57,9 +51,9 @@ const STOP = new Set(
   ).split(/\s+/),
 );
 
-const stem = (w: string): string => w.replace(/(ing|ed|es|s)$/, "");
+const stem = (w) => w.replace(/(ing|ed|es|s)$/, "");
 
-const tokens = (s: string | null): string[] =>
+const tokens = (s) =>
   (s || "")
     .toLowerCase()
     .replace(/```[\s\S]*?```/g, " ") // drop code blocks
@@ -71,7 +65,7 @@ const tokens = (s: string | null): string[] =>
     .map(stem)
     .filter((w) => w.length > 2);
 
-const jaccard = (a: string[], b: string[]): number => {
+const jaccard = (a, b) => {
   const A = new Set(a);
   const B = new Set(b);
   if (!A.size || !B.size) return 0;
@@ -82,14 +76,14 @@ const jaccard = (a: string[], b: string[]): number => {
 
 const newTitle = tokens(TITLE);
 const newBody = tokens(BODY);
-const score = (o: Issue): number =>
+const score = (o) =>
   0.6 * jaccard(newTitle, tokens(o.title)) +
   0.4 * jaccard(newBody, tokens(o.body));
 
 // fetch open issues (excluding PRs and the new issue itself)
-let issues: Issue[];
+let issues;
 if (process.env.DUP_FIXTURE) {
-  issues = JSON.parse(readFileSync(process.env.DUP_FIXTURE, "utf8")) as Issue[];
+  issues = JSON.parse(readFileSync(process.env.DUP_FIXTURE, "utf8"));
 } else {
   const raw = execFileSync(
     "gh",
@@ -111,7 +105,7 @@ if (process.env.DUP_FIXTURE) {
   issues = raw
     .split("\n")
     .filter(Boolean)
-    .map((l) => JSON.parse(l) as Issue);
+    .map((l) => JSON.parse(l));
 }
 
 const matches = issues
@@ -129,7 +123,7 @@ if (!matches.length) {
 // Neutralise other issues' titles before echoing them back: break @mentions and
 // strip markdown/HTML control chars so a maliciously-named issue can't ping people
 // or inject formatting into our comment. GitHub linkifies "#123" on its own.
-const safeTitle = (t: string): string =>
+const safeTitle = (t) =>
   (t || "")
     .replace(/@/g, "@​")
     .replace(/[`<>|*_~[\]]/g, " ")

scripts/symlink-native-dirs.js

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+
+const _fs = require("node:fs");
+const path = require("node:path");
+const process = require("node:process");
+const { execSync } = require("node:child_process");
+
+const root = process.cwd();
+// const tvosPath = path.join(root, 'iostv');
+// const iosPath = path.join(root, 'iosmobile');
+// const androidPath = path.join(root, 'androidmobile');
+// const androidTVPath = path.join(root, 'androidtv');
+// const device = process.argv[2];
+// const platform = process.argv[2];
+const isTV = process.env.EXPO_TV || false;
+
+const paths = new Map([
+  ["tvos", path.join(root, "iostv")],
+  ["ios", path.join(root, "iosmobile")],
+  ["android", path.join(root, "androidmobile")],
+  ["androidtv", path.join(root, "androidtv")],
+]);
+
+// const platformPath = paths.get(platform);
+
+if (isTV) {
+  stdout = execSync(
+    `mkdir -p ${paths.get("tvos")}; ln -nsf ${paths.get("tvos")} ios`,
+  );
+  console.log(stdout.toString());
+  stdout = execSync(
+    `mkdir -p ${paths.get("androidtv")}; ln -nsf ${paths.get(
+      "androidtv",
+    )} android`,
+  );
+  console.log(stdout.toString());
+} else {
+  stdout = execSync(
+    `mkdir -p ${paths.get("ios")}; ln -nsf ${paths.get("ios")} ios`,
+  );
+  console.log(stdout.toString());
+  stdout = execSync(
+    `mkdir -p ${paths.get("android")}; ln -nsf ${paths.get("android")} android`,
+  );
+  console.log(stdout.toString());
+}
+
+// target = "";
+// switch (platform) {
+//   case "tvos":
+//     target = "ios";
+//     break;
+//   case "ios":
+//     target = "ios";
+//     break;
+//   case "android":
+//     target = "android";
+//     break;
+//   case "androidtv":
+//     target = "android";
+//     break;
+// }

scripts/typecheck.js

@@ -1,8 +1,5 @@
-import { execFileSync } from "node:child_process";
-import { createRequire } from "node:module";
-import process from "node:process";
-
-const require = createRequire(import.meta.url);
+const { execFileSync } = require("node:child_process");
+const process = require("node:process");
 
 // Enhanced ANSI color codes and styles
 const colors = {
@@ -35,7 +32,7 @@ const centeredTitle = " ".repeat(titlePadding) + title;
 
 const useColor = process.stdout.isTTY && !process.env.NO_COLOR;
 
-function log(message: string, color = "") {
+function log(message, color = "") {
   if (useColor && color) {
     console.log(`${color}${message}${colors.reset}`);
   } else {
@@ -43,7 +40,7 @@ function log(message: string, color = "") {
   }
 }
 
-function formatError(errorLine: string): string {
+function formatError(errorLine) {
   if (!useColor) return errorLine;
 
   // Color file paths in cyan
@@ -73,15 +70,12 @@ function formatError(errorLine: string): string {
   return formatted;
 }
 
-function parseErrorsAndCreateSummary(errorOutput: string): {
-  formattedErrors: string[];
-  errorsByFile: Map<string, number>;
-} {
+function parseErrorsAndCreateSummary(errorOutput) {
   const lines = errorOutput.split("\n").filter((line) => line.trim());
-  const errorsByFile = new Map<string, number>();
-  const formattedErrors: string[] = [];
+  const errorsByFile = new Map();
+  const formattedErrors = [];
 
-  let currentError: string[] = [];
+  let currentError = [];
 
   for (const line of lines) {
     const trimmedLine = line.trim();
@@ -102,7 +96,7 @@ function parseErrorsAndCreateSummary(errorOutput: string): {
       if (!errorsByFile.has(filePath)) {
         errorsByFile.set(filePath, 0);
       }
-      errorsByFile.set(filePath, (errorsByFile.get(filePath) ?? 0) + 1);
+      errorsByFile.set(filePath, errorsByFile.get(filePath) + 1);
 
       // Start new error
       currentError.push(formatError(line));
@@ -125,7 +119,7 @@ function parseErrorsAndCreateSummary(errorOutput: string): {
   return { formattedErrors, errorsByFile };
 }
 
-function createErrorSummaryTable(errorsByFile: Map<string, number>): string {
+function createErrorSummaryTable(errorsByFile) {
   if (errorsByFile.size === 0) return "";
 
   const sortedFiles = Array.from(errorsByFile.entries()).sort(
@@ -142,7 +136,7 @@ function createErrorSummaryTable(errorsByFile: Map<string, number>): string {
   return table;
 }
 
-function runTypeCheck(): { ok: boolean } {
+function runTypeCheck() {
   const extraArgs = process.argv.slice(2);
 
   // Prefer local TypeScript binary when available
@@ -156,13 +150,16 @@ function runTypeCheck(): { ok: boolean } {
     "false",
     ...extraArgs,
   ];
-  let execArgs: { cmd: string; args: string[] };
+  let execArgs = null;
   try {
     const tscBin = require.resolve("typescript/bin/tsc");
     execArgs = { cmd: process.execPath, args: [tscBin, ...runnerArgs] };
   } catch {
-    // fallback to PATH tsc (reuse runnerArgs so --pretty false is preserved)
-    execArgs = { cmd: "tsc", args: runnerArgs };
+    // fallback to PATH tsc
+    execArgs = {
+      cmd: "tsc",
+      args: ["-p", "tsconfig.json", "--noEmit", ...extraArgs],
+    };
   }
 
   try {
@@ -186,21 +183,7 @@ function runTypeCheck(): { ok: boolean } {
     );
     return { ok: true };
   } catch (error) {
-    const execError = error as { stderr?: string; stdout?: string };
-    const errorOutput = [execError.stdout, execError.stderr]
-      .filter((chunk): chunk is string => Boolean(chunk))
-      .join("\n");
-
-    // No compiler output = tsc never ran (e.g. binary missing). Don't let a
-    // launch failure fall through to the "passed" branch and green-light CI.
-    if (!errorOutput) {
-      const message = error instanceof Error ? error.message : String(error);
-      log(
-        `❌ ${colors.bold}TypeScript check failed to start${colors.reset} ${colors.gray}${message}${colors.reset}`,
-        colors.red,
-      );
-      return { ok: false };
-    }
+    const errorOutput = (error && (error.stderr || error.stdout)) || "";
 
     // Filter out jellyseerr utils errors - this is a third-party git submodule
     // that generates a large volume of known type errors

translations/en.json

@@ -199,13 +199,6 @@
         "rewind_length": "Rewind length",
         "seconds_unit": "s"
       },
-      "video_player": {
-        "title": "Video Player",
-        "exoplayer": "ExoPlayer",
-        "mpv": "MPV",
-        "exoplayer_note": "ExoPlayer does not support advanced ASS/SSA subtitle styling or horizontal subtitle alignment. Switch to MPV if you need those.",
-        "mpv_note": "MPV on TV does not currently pass HDR metadata to the display — HDR10/HDR10+ content is tone-mapped to SDR. Switch to ExoPlayer for HDR output."
-      },
       "buffer": {
         "title": "Buffer settings",
         "cache_mode": "Cache mode",

utils/atoms/settings.ts

@@ -9,7 +9,6 @@ import {
 import { t } from "i18next";
 import { atom, useAtom, useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
-import { Platform } from "react-native";
 import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom } from "@/providers/JellyfinProvider";
@@ -171,38 +170,11 @@ export type HomeSectionLatestResolver = {
   includeItemTypes?: Array<BaseItemKind>;
 };
 
-// Video player enum. MPV is the universal default; ExoPlayer is an
-// opt-in alternative on Android TV, selectable via settings.videoPlayer.
+// Video player enum - currently only MPV is supported
 export enum VideoPlayer {
   MPV = 0,
-  ExoPlayer = 1,
 }
 
-/**
- * Resolve the actually-active video player for the current settings.
- * MPV is the default on every platform; users can opt into ExoPlayer on
- * Android TV via settings.videoPlayer. Centralized here so the rule has
- * one source of truth (used by VideoPlayerView, direct-player's device
- * profile, and the TV settings UI).
- */
-export const getActiveVideoPlayer = (
-  settings: Pick<Settings, "videoPlayer"> | null | undefined,
-): VideoPlayer => {
-  return settings?.videoPlayer ?? VideoPlayer.MPV;
-};
-
-/**
- * Same selection as getActiveVideoPlayer but returns the lowercase
- * player-type identifier that `generateDeviceProfile` expects.
- */
-export const getActivePlayerType = (
-  settings: Pick<Settings, "videoPlayer"> | null | undefined,
-): "mpv" | "exoplayer" => {
-  return getActiveVideoPlayer(settings) === VideoPlayer.ExoPlayer
-    ? "exoplayer"
-    : "mpv";
-};
-
 // TV Typography scale presets
 export enum TVTypographyScale {
   Small = "small",
@@ -245,8 +217,6 @@ export type Settings = {
   mediaListCollectionIds?: string[];
   preferedLanguage?: string;
   searchEngine: "Marlin" | "Jellyfin" | "Streamystats";
-  /** Video player backend. Defaults to MPV when unset (see getActiveVideoPlayer). */
-  videoPlayer?: VideoPlayer;
   marlinServerUrl?: string;
   streamyStatsServerUrl?: string;
   streamyStatsMovieRecommendations?: boolean;
@@ -344,8 +314,6 @@ export const defaultValues: Settings = {
   mediaListCollectionIds: [],
   preferedLanguage: undefined,
   searchEngine: "Jellyfin",
-  // videoPlayer intentionally undefined — resolved at runtime via
-  // getActiveVideoPlayer() so existing installs are unaffected.
   marlinServerUrl: "",
   streamyStatsServerUrl: "",
   streamyStatsMovieRecommendations: false,
@@ -393,16 +361,11 @@ export const defaultValues: Settings = {
   mpvSubtitleFontSize: undefined,
   mpvSubtitleBackgroundEnabled: false,
   mpvSubtitleBackgroundOpacity: 75,
-  // MPV buffer/cache defaults.
-  // Android TV gets tighter caps — combined with libmpv 1.0's larger
-  // baseline (fontconfig + libxml2 + libplacebo HDR path + scudo
-  // retention) the larger mobile budget pushes 2 GB Android TV boxes
-  // into swap death during 4K HDR playback. Apple TV has more RAM and
-  // keeps the full budget. Users can override via the settings screen.
+  // MPV buffer/cache defaults
   mpvCacheEnabled: "auto",
   mpvCacheSeconds: 10,
-  mpvDemuxerMaxBytes: Platform.isTV && Platform.OS === "android" ? 75 : 150, // MB
-  mpvDemuxerMaxBackBytes: Platform.isTV && Platform.OS === "android" ? 30 : 50, // MB
+  mpvDemuxerMaxBytes: 150, // MB
+  mpvDemuxerMaxBackBytes: 50, // MB
   // MPV video output driver defaults (Android only)
   mpvVoDriver: "gpu-next",
   // Gesture controls

utils/profiles/download.js

@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import type {
-  DeviceProfile,
-  SubtitleProfile,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { type AudioTranscodeModeType, generateDeviceProfile } from "./native";
+import { generateDeviceProfile } from "./native";
+
+/**
+ * @typedef {"auto" | "stereo" | "5.1" | "passthrough"} AudioTranscodeModeType
+ */
 
 /**
  * Download-specific subtitle profiles.
  * These are more permissive than streaming profiles since we can embed subtitles.
  */
-const downloadSubtitleProfiles: SubtitleProfile[] = [
+const downloadSubtitleProfiles = [
   // Official formats
   { Format: "vtt", Method: "Encode" },
   { Format: "webvtt", Method: "Encode" },
@@ -46,10 +46,11 @@ const downloadSubtitleProfiles: SubtitleProfile[] = [
 /**
  * Generates a device profile optimized for downloads.
  * Uses the same audio codec logic as streaming but with download-specific bitrate limits.
+ *
+ * @param {AudioTranscodeModeType} [audioMode="auto"] - Audio transcoding mode
+ * @returns {Object} Jellyfin device profile for downloads
  */
-export const generateDownloadProfile = (
-  audioMode: AudioTranscodeModeType = "auto",
-): DeviceProfile => {
+export const generateDownloadProfile = (audioMode = "auto") => {
   // Get the base profile with proper audio codec configuration
   const baseProfile = generateDeviceProfile({ audioMode });
 

utils/profiles/native.ts

@@ -3,13 +3,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import type { DeviceProfile } from "@jellyfin/sdk/lib/generated-client/models";
 import { Platform } from "react-native";
 import MediaTypes from "../../constants/MediaTypes";
 import { getSubtitleProfiles } from "./subtitles";
 
 export type PlatformType = "ios" | "android";
-export type PlayerType = "mpv" | "exoplayer";
+export type PlayerType = "mpv";
 export type AudioTranscodeModeType = "auto" | "stereo" | "5.1" | "passthrough";
 
 export interface ProfileOptions {
@@ -63,26 +62,6 @@ const getAudioCodecProfile = (platform: PlatformType) => {
   };
 };
 
-/**
- * Resolves the MaxAudioChannels string for a given audio transcoding mode.
- * Used by both the MPV and ExoPlayer profile branches — the channel-cap
- * rule is player-agnostic (the player decodes; the cap just tells the
- * server when to transcode down).
- */
-const maxChannelsForMode = (audioMode: AudioTranscodeModeType): string => {
-  switch (audioMode) {
-    case "stereo":
-      return "2";
-    case "5.1":
-      return "6";
-    case "passthrough":
-      return "8";
-    default:
-      // Auto: default to 5.1 (6 channels)
-      return "6";
-  }
-};
-
 /**
  * Gets the video audio codec configuration based on platform and audio mode.
  *
@@ -109,59 +88,35 @@ const getVideoAudioCodecs = (
   // MPV can decode all codecs - only channel count varies by mode
   const allCodecs = `${baseCodecs},${surroundCodecs},${losslessHdCodecs},${platformCodecs}`;
 
-  return {
-    directPlayCodec: allCodecs,
-    maxAudioChannels: maxChannelsForMode(audioMode),
-  };
-};
+  switch (audioMode) {
+    case "stereo":
+      // Limit to 2 channels - MPV will decode and downmix
+      return {
+        directPlayCodec: allCodecs,
+        maxAudioChannels: "2",
+      };
 
-/**
- * ExoPlayer (Media3 1.10.1) direct-play profile for Android TV.
- *
- * Codec set aligned with Media3's documented supported-formats list:
- *   - Video: H.263, H.264, H.265, VP8, VP9, AV1
- *   - Audio: Vorbis, Opus, FLAC, ALAC, PCM, MP3, AAC, AC-3, E-AC-3, DTS,
- *     DTS-HD, TrueHD
- *
- * Hardware decode (MediaCodec) handles whatever the device ships with;
- * the rest fall through to FFmpeg software decode via the Jellyfin-published
- * `org.jellyfin.media3:media3-ffmpeg-decoder` extension wired up with
- * `DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER` (see
- * ExoPlayerView.kt:ensurePlayer).
- *
- * Cross-checked against the reference-device probe in
- * docs/research/hdr-dv-atmos-tv-plan.md (Amlogic Android 14 TV; HDMI sink
- * accepts AC3/EAC3 as bitstream and multichannel PCM up to 7.1 @ 192 kHz,
- * so software-decoded DTS/DTS-HD/TrueHD reach the sink as PCM).
- *
- * Dolby Vision: the CodecProfile below uses `NotEquals VideoRangeType
- * DOVI`, which in Jellyfin's semantics blocks ONLY pure Profile 5
- * (IPTPQc2 — the stream that renders purple/green without a DV-aware
- * decoder). DV Profiles 7/8 with HDR10 or SDR base layers (Jellyfin
- * reports these as `DOVIWithHDR10`, `DOVIWithHDR10Plus`, `DOVIWithEL`)
- * are NOT blocked — Media3 1.9.1+ correctly falls back to the AVC/HEVC
- * base layer.
- *
- * Containers limited to Media3's bundled extractors. FLV is intentionally
- * absent — Media3 has no FLV extractor (MPV claims it via FFmpeg).
- */
-const getExoPlayerDirectPlayProfile = () => {
-  const audioCodecs =
-    "vorbis,opus,flac,alac,pcm,mp3,aac,ac3,eac3,dts,dtshd,truehd";
+    case "5.1":
+      // Limit to 6 channels
+      return {
+        directPlayCodec: allCodecs,
+        maxAudioChannels: "6",
+      };
 
-  return {
-    video: {
-      Type: MediaTypes.Video,
-      Container: "mp4,mkv,webm,ts,mpegts,mov",
-      VideoCodec: "h263,h264,hevc,vp8,vp9,av1",
-      AudioCodec: audioCodecs,
-    },
-    audio: {
-      Type: MediaTypes.Audio,
-      Container: "mp3,m4a,aac,ogg,flac,wav,webm,mka",
-      AudioCodec: "vorbis,opus,flac,alac,pcm,mp3,aac",
-    },
-  };
+    case "passthrough":
+      // Allow up to 8 channels - for external DAC/receiver setups
+      return {
+        directPlayCodec: allCodecs,
+        maxAudioChannels: "8",
+      };
+
+    default:
+      // Auto mode: default to 5.1 (6 channels)
+      return {
+        directPlayCodec: allCodecs,
+        maxAudioChannels: "6",
+      };
+  }
 };
 
 /**
@@ -170,63 +125,6 @@ const getExoPlayerDirectPlayProfile = () => {
 export const generateDeviceProfile = (options: ProfileOptions = {}) => {
   const platform = (options.platform || Platform.OS) as PlatformType;
   const audioMode = options.audioMode || "auto";
-  const player = options.player || "mpv";
-
-  // ExoPlayer branch — Media3 capabilities on Android TV.
-  if (player === "exoplayer" && platform === "android") {
-    const exoDirect = getExoPlayerDirectPlayProfile();
-
-    return {
-      Name: "1. ExoPlayer",
-      MaxStaticBitrate: 999_999_999,
-      MaxStreamingBitrate: 999_999_999,
-      CodecProfiles: [
-        {
-          Type: MediaTypes.Video,
-          Codec: "h263,h264,hevc,vp8,vp9,av1",
-        },
-        {
-          Type: MediaTypes.Video,
-          Codec: "hevc,h265",
-          Conditions: [
-            {
-              Condition: "NotEquals",
-              Property: "VideoRangeType",
-              // Blocks ONLY pure DV Profile 5 (IPTPQc2). Profiles 7/8 with
-              // HDR10/SDR base layers fall through to Media3's HEVC fallback
-              // (1.9.1+). See getExoPlayerDirectPlayProfile doc above.
-              Value: "DOVI",
-              IsRequired: true,
-            },
-          ],
-        },
-        {
-          Type: MediaTypes.Audio,
-          Codec: "vorbis,opus,flac,alac,pcm,mp3,aac,ac3,eac3,dts,dtshd,truehd",
-        },
-      ],
-      DirectPlayProfiles: [exoDirect.video, exoDirect.audio],
-      TranscodingProfiles: [
-        {
-          Type: MediaTypes.Video,
-          Context: "Streaming",
-          Protocol: "hls",
-          Container: "ts",
-          VideoCodec: "h264,hevc",
-          AudioCodec: "aac,mp3,ac3",
-          MaxAudioChannels: maxChannelsForMode(audioMode),
-        },
-      ],
-      // Text-only subtitles for direct play. PGS delivered as Encode
-      // (burn-in) because Media3's PGS support is inconsistent.
-      SubtitleProfiles: [
-        { Format: "srt", Method: "External" },
-        { Format: "vtt", Method: "External" },
-        { Format: "ttml", Method: "External" },
-        { Format: "pgssub", Method: "Encode" },
-      ],
-    };
-  }
 
   const { directPlayCodec, maxAudioChannels } = getVideoAudioCodecs(
     platform,
@@ -295,7 +193,10 @@ export const generateDeviceProfile = (options: ProfileOptions = {}) => {
       },
     ],
     SubtitleProfiles: getSubtitleProfiles(),
-  } satisfies DeviceProfile;
+  };
 
   return profile;
 };
+
+// Default export for backward compatibility
+export default generateDeviceProfile();

utils/profiles/subtitles.js

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import type { SubtitleProfile } from "@jellyfin/sdk/lib/generated-client/models";
 
 // Image-based formats - these need to be burned in by Jellyfin (Encode method)
 // because MPV cannot load them externally over HTTP
@@ -14,7 +13,7 @@ const IMAGE_BASED_FORMATS = [
   "pgssub",
   "teletext",
   "vobsub",
-] as const;
+];
 
 // Text-based formats - these can be loaded externally by MPV
 const TEXT_BASED_FORMATS = [
@@ -38,10 +37,10 @@ const TEXT_BASED_FORMATS = [
   "text",
   "vplayer",
   "xsub",
-] as const;
+];
 
-export const getSubtitleProfiles = (): SubtitleProfile[] => {
-  const profiles: SubtitleProfile[] = [];
+export const getSubtitleProfiles = () => {
+  const profiles = [];
 
   // Image-based formats: Embed or Encode (burn-in), NOT External
   for (const format of IMAGE_BASED_FORMATS) {
@@ -59,4 +58,4 @@ export const getSubtitleProfiles = (): SubtitleProfile[] => {
 };
 
 // Export for use in player filtering
-export const IMAGE_SUBTITLE_CODECS: readonly string[] = IMAGE_BASED_FORMATS;
+export const IMAGE_SUBTITLE_CODECS = IMAGE_BASED_FORMATS;

utils/profiles/trackplayer.d.ts

@@ -0,0 +1,19 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+export type PlatformType = "ios" | "android";
+
+export interface TrackPlayerProfileOptions {
+  /** Target platform */
+  platform?: PlatformType;
+}
+
+export function generateTrackPlayerProfile(
+  options?: TrackPlayerProfileOptions,
+): any;
+
+declare const _default: any;
+export default _default;

utils/profiles/trackplayer.js

@@ -3,25 +3,23 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-import type {
-  CodecProfile,
-  DeviceProfile,
-  DirectPlayProfile,
-} from "@jellyfin/sdk/lib/generated-client/models";
 import { Platform } from "react-native";
 import MediaTypes from "../../constants/MediaTypes";
-import type { PlatformType } from "./native";
 
-export interface TrackPlayerProfileOptions {
-  /** Target platform */
-  platform?: PlatformType;
-}
+/**
+ * @typedef {"ios" | "android"} PlatformType
+ *
+ * @typedef {Object} TrackPlayerProfileOptions
+ * @property {PlatformType} [platform] - Target platform
+ */
 
 /**
  * Audio direct play profiles for react-native-track-player.
  * iOS uses AVPlayer, Android uses ExoPlayer - each has different codec support.
+ *
+ * @param {PlatformType} platform
  */
-const getDirectPlayProfile = (platform: PlatformType): DirectPlayProfile => {
+const getDirectPlayProfile = (platform) => {
   if (platform === "ios") {
     // iOS AVPlayer supported formats
     return {
@@ -41,8 +39,10 @@ const getDirectPlayProfile = (platform: PlatformType): DirectPlayProfile => {
 
 /**
  * Audio codec profiles for react-native-track-player.
+ *
+ * @param {PlatformType} platform
  */
-const getCodecProfile = (platform: PlatformType): CodecProfile => {
+const getCodecProfile = (platform) => {
   if (platform === "ios") {
     // iOS AVPlayer codec constraints
     return {
@@ -64,11 +64,12 @@ const getCodecProfile = (platform: PlatformType): CodecProfile => {
  * This profile is specifically for standalone audio playback using:
  * - AVPlayer on iOS
  * - ExoPlayer on Android
+ *
+ * @param {TrackPlayerProfileOptions} [options] - Profile configuration options
+ * @returns {Object} Jellyfin device profile for track player
  */
-export const generateTrackPlayerProfile = (
-  options: TrackPlayerProfileOptions = {},
-): DeviceProfile => {
-  const platform = (options.platform || Platform.OS) as PlatformType;
+export const generateTrackPlayerProfile = (options = {}) => {
+  const platform = options.platform || Platform.OS;
 
   return {
     Name: "Track Player",

utils/version.ts

@@ -5,7 +5,7 @@ import Constants from "expo-constants";
  * clientInfo auto-tracks the app version instead of a hardcoded string. */
 export const APP_VERSION = Application.nativeApplicationVersion ?? "unknown";
 
-/** Build metadata injected at build time by `app.config.ts` into `extra.build`. */
+/** Build metadata injected at build time by `app.config.js` into `extra.build`. */
 export interface BuildMeta {
   commit?: string | null;
   branch?: string | null;