Skip to content

Commit 892904e

Browse files
fix(mobile): defer iOS audio release and pause inline video under fullscreen
1 parent 8d794d1 commit 892904e

4 files changed

Lines changed: 104 additions & 9 deletions

File tree

‎apps/mobile/src/components/MediaVideoPlayer.tsx‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useIsFocused } from "@react-navigation/native";
22
import { useEvent } from "expo";
33
import { useVideoPlayer, VideoView } from "expo-video";
4-
import { useEffect, useEffectEvent, useRef, useState } from "react";
4+
import { useEffect, useEffectEvent, useRef, useState, useSyncExternalStore } from "react";
55
import { AppState, Pressable, View } from "react-native";
66

77
import { AppActivityIndicator } from "./AppActivityIndicator";
@@ -10,7 +10,12 @@ import { SymbolView } from "./AppSymbol";
1010
import { VideoThumbnailImage } from "./VideoThumbnailImage";
1111
import { useMediaActions } from "../state/mediaActions";
1212
import { type MediaActionsSource } from "../lib/mediaActionsSource";
13-
import { videoPlaybackStarted, videoPlaybackStopped } from "../lib/videoAudioSession";
13+
import {
14+
isFullscreenVideoOpen,
15+
subscribeFullscreenVideo,
16+
videoPlaybackStarted,
17+
videoPlaybackStopped,
18+
} from "../lib/videoAudioSession";
1419
import { MediaActionsMenu } from "./MediaActionsMenu";
1520

1621
/** Loads only after Play or opening the viewer. Source replacement never starts playback itself. */
@@ -21,6 +26,10 @@ function LoadedMediaVideo(props: {
2126
readonly paused: boolean;
2227
}) {
2328
const focused = useIsFocused();
29+
// The native fullscreen player (iOS) owns playback while open; inline
30+
// players pause instead of playing underneath it.
31+
const nativeVideoOpen = useSyncExternalStore(subscribeFullscreenVideo, isFullscreenVideoOpen);
32+
const paused = props.paused || nativeVideoOpen;
2433
const active = useRef(focused && AppState.currentState === "active");
2534
const fullscreen = useRef(false);
2635
const [attempt, setAttempt] = useState(0);
@@ -49,16 +58,16 @@ function LoadedMediaVideo(props: {
4958
});
5059

5160
useEffect(() => {
52-
active.current = focused && !props.paused && AppState.currentState === "active";
53-
if (!focused || props.paused || (!active.current && !fullscreen.current)) player.pause();
61+
active.current = focused && !paused && AppState.currentState === "active";
62+
if (!focused || paused || (!active.current && !fullscreen.current)) player.pause();
5463
// Native background handling distinguishes Android's fullscreen activity
5564
// from leaving the app; React Native reports both as background.
5665
const subscription = AppState.addEventListener("change", (state) => {
57-
active.current = focused && !props.paused && state === "active";
66+
active.current = focused && !paused && state === "active";
5867
if (state === "inactive" || (state === "background" && !fullscreen.current)) player.pause();
5968
});
6069
return () => subscription.remove();
61-
}, [focused, player, props.paused]);
70+
}, [focused, player, paused]);
6271

6372
useEffect(() => {
6473
const controller = new AbortController();

‎apps/mobile/src/components/VideoPreviewModal.ios.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { useEffect, useEffectEvent, useId, useState } from "react";
44
import { Alert, Keyboard } from "react-native";
55

66
import { loadLocalAttachmentPreview } from "../lib/localAttachmentPreview";
7+
import { fullscreenVideoClosed, fullscreenVideoOpened } from "../lib/videoAudioSession";
78
import { mediaVideoPreviewUri, type VideoPreviewSource } from "../lib/videoPreviewSource";
89
import { useAssetUrlState, useRefreshAssetUrl } from "../state/assets";
910
import { usePreparedConnection } from "../state/session";
@@ -51,6 +52,11 @@ function NativeVideoPreview(props: {
5152
: null;
5253

5354
useEffect(() => Keyboard.dismiss(), []);
55+
// Inline players pause while this presentation owns playback and audio.
56+
useEffect(() => {
57+
fullscreenVideoOpened();
58+
return () => fullscreenVideoClosed();
59+
}, []);
5460
useEffect(() => {
5561
if (playbackUrl === null && resolvedUrl !== null) setPlaybackUrl(resolvedUrl);
5662
}, [playbackUrl, resolvedUrl]);

‎apps/mobile/src/lib/videoAudioSession.test.ts‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
1+
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
22

33
const mocks = vi.hoisted(() => ({
44
platform: { OS: "ios" as "ios" | "android" },
@@ -13,43 +13,80 @@ let session: typeof import("./videoAudioSession");
1313

1414
beforeEach(async () => {
1515
vi.resetModules();
16+
vi.useFakeTimers();
1617
mocks.platform.OS = "ios";
1718
mocks.release.mockClear().mockResolvedValue(undefined);
1819
session = await import("./videoAudioSession");
1920
});
2021

22+
afterEach(() => vi.useRealTimers());
23+
2124
describe("video audio session", () => {
2225
it("releases the session only when the last playing player stops", () => {
2326
session.videoPlaybackStarted();
2427
session.videoPlaybackStarted();
2528
session.videoPlaybackStopped();
29+
vi.advanceTimersByTime(1_000);
30+
expect(mocks.release).not.toHaveBeenCalled();
31+
session.videoPlaybackStopped();
32+
expect(mocks.release).not.toHaveBeenCalled();
33+
vi.advanceTimersByTime(1_000);
34+
expect(mocks.release).toHaveBeenCalledTimes(1);
35+
});
36+
37+
it("cancels a pending release when playback restarts", () => {
38+
session.videoPlaybackStarted();
39+
session.videoPlaybackStopped();
40+
session.videoPlaybackStarted();
41+
vi.advanceTimersByTime(1_000);
2642
expect(mocks.release).not.toHaveBeenCalled();
2743
session.videoPlaybackStopped();
44+
vi.advanceTimersByTime(1_000);
2845
expect(mocks.release).toHaveBeenCalledTimes(1);
2946
});
3047

3148
it("ignores unmatched stops and still releases on a later cycle", () => {
3249
session.videoPlaybackStopped();
3350
session.videoPlaybackStopped();
51+
vi.advanceTimersByTime(1_000);
3452
expect(mocks.release).not.toHaveBeenCalled();
3553
session.videoPlaybackStarted();
3654
session.videoPlaybackStopped();
55+
vi.advanceTimersByTime(1_000);
3756
expect(mocks.release).toHaveBeenCalledTimes(1);
3857
});
3958

4059
it("leaves the session alone off iOS", () => {
4160
mocks.platform.OS = "android";
4261
session.videoPlaybackStarted();
4362
session.videoPlaybackStopped();
63+
vi.advanceTimersByTime(1_000);
4464
expect(mocks.release).not.toHaveBeenCalled();
4565
});
4666

4767
it("keeps counting after a failed release", () => {
4868
mocks.release.mockRejectedValueOnce(new Error("session busy"));
4969
session.videoPlaybackStarted();
5070
session.videoPlaybackStopped();
71+
vi.advanceTimersByTime(1_000);
5172
session.videoPlaybackStarted();
5273
session.videoPlaybackStopped();
74+
vi.advanceTimersByTime(1_000);
5375
expect(mocks.release).toHaveBeenCalledTimes(2);
5476
});
77+
78+
it("tracks overlapping fullscreen presentations for inline pausing", () => {
79+
const listener = vi.fn();
80+
const unsubscribe = session.subscribeFullscreenVideo(listener);
81+
expect(session.isFullscreenVideoOpen()).toBe(false);
82+
session.fullscreenVideoOpened();
83+
session.fullscreenVideoOpened();
84+
session.fullscreenVideoClosed();
85+
expect(session.isFullscreenVideoOpen()).toBe(true);
86+
session.fullscreenVideoClosed();
87+
session.fullscreenVideoClosed();
88+
expect(session.isFullscreenVideoOpen()).toBe(false);
89+
expect(listener).toHaveBeenCalledTimes(4);
90+
unsubscribe();
91+
});
5592
});

‎apps/mobile/src/lib/videoAudioSession.ts‎

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,19 @@ interface VideoAudioSessionControls {
55
releaseVideoAudioSession(): Promise<void>;
66
}
77

8+
// A player that starts right after another stops must not lose the session
9+
// to the pending release, so the native call is deferred and rechecked.
10+
const RELEASE_DELAY_MS = 100;
11+
812
let playingCount = 0;
13+
let releaseTimer: ReturnType<typeof setTimeout> | undefined;
914
let nativeControls: VideoAudioSessionControls | null | undefined;
1015

1116
/** Pairs with `videoPlaybackStopped` for each inline player that starts playing. */
1217
export function videoPlaybackStarted(): void {
1318
playingCount += 1;
19+
clearTimeout(releaseTimer);
20+
releaseTimer = undefined;
1421
}
1522

1623
/**
@@ -22,6 +29,42 @@ export function videoPlaybackStopped(): void {
2229
if (playingCount === 0) return;
2330
playingCount -= 1;
2431
if (playingCount > 0 || Platform.OS !== "ios") return;
25-
nativeControls ??= requireOptionalNativeModule<VideoAudioSessionControls>("T3NativeControls");
26-
void nativeControls?.releaseVideoAudioSession().catch(() => undefined);
32+
clearTimeout(releaseTimer);
33+
releaseTimer = setTimeout(() => {
34+
releaseTimer = undefined;
35+
if (playingCount > 0) return;
36+
nativeControls ??= requireOptionalNativeModule<VideoAudioSessionControls>("T3NativeControls");
37+
void nativeControls?.releaseVideoAudioSession().catch(() => undefined);
38+
}, RELEASE_DELAY_MS);
39+
}
40+
41+
let fullscreenCount = 0;
42+
const fullscreenListeners = new Set<() => void>();
43+
44+
function emitFullscreenChange(): void {
45+
for (const listener of fullscreenListeners) listener();
46+
}
47+
48+
/** Pairs with `fullscreenVideoClosed` while the native fullscreen player is open. */
49+
export function fullscreenVideoOpened(): void {
50+
fullscreenCount += 1;
51+
emitFullscreenChange();
52+
}
53+
54+
export function fullscreenVideoClosed(): void {
55+
if (fullscreenCount === 0) return;
56+
fullscreenCount -= 1;
57+
emitFullscreenChange();
58+
}
59+
60+
/** `useSyncExternalStore` source: inline players pause while fullscreen owns playback. */
61+
export function subscribeFullscreenVideo(listener: () => void): () => void {
62+
fullscreenListeners.add(listener);
63+
return () => {
64+
fullscreenListeners.delete(listener);
65+
};
66+
}
67+
68+
export function isFullscreenVideoOpen(): boolean {
69+
return fullscreenCount > 0;
2770
}

0 commit comments

Comments
 (0)