From 5b06ddabbb23a7b50c9cddc7a52e61d1f46da31a Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Fri, 30 Oct 2026 14:09:16 -0400 Subject: [PATCH] fix(mobile): serve iOS lossless audio and gate Android Atmos --- .../mobile/app/(app)/(tabs)/home/settings.tsx | 11 ++++++++++- apps/mobile/app/(app)/player.tsx | 3 ++- apps/mobile/contexts/playback.tsx | 7 ++++--- apps/mobile/lib/playback-capabilities.ts | 19 +++++++++++++++++++ apps/mobile/lib/urls.ts | 2 ++ .../modules/audiooutput/AudioOutputModule.kt | 11 +++++++++++ apps/web/app/api/song/[id]/play/route.ts | 12 ++++++------ 7 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 apps/mobile/lib/playback-capabilities.ts diff --git a/apps/mobile/app/(app)/(tabs)/home/settings.tsx b/apps/mobile/app/(app)/(tabs)/home/settings.tsx index 27e053b..59161d6 100644 --- a/apps/mobile/app/(app)/(tabs)/home/settings.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/settings.tsx @@ -1,3 +1,4 @@ +import { dolbyAtmosSupported } from "@/lib/playback-capabilities" import { Ionicons } from "@expo/vector-icons" import { useAction, useMutation, useQuery } from "convex/react" import { Image } from "expo-image" @@ -374,7 +375,12 @@ function QualitySection({ user }: { user: CurrentUser }) { void updateAtmos({ preferAtmos: checked }).catch((error: Error) => @@ -636,10 +642,12 @@ function SwitchRow({ subtitle, value, onValueChange, + disabled, }: { title: string subtitle?: string value: boolean + disabled?: boolean onValueChange: (checked: boolean) => void }) { const colors = useThemeColors() @@ -656,6 +664,7 @@ function SwitchRow({ boolean + }>("AudioOutput")?.supportsDolbyAtmos?.() ?? false + ) + } catch { + return false + } +} + +export const dolbyAtmosSupported = supportsDolbyAtmos() diff --git a/apps/mobile/lib/urls.ts b/apps/mobile/lib/urls.ts index 50da4ed..26f99cc 100644 --- a/apps/mobile/lib/urls.ts +++ b/apps/mobile/lib/urls.ts @@ -1,3 +1,4 @@ +import { Platform } from "react-native" import type { AudioSource } from "expo-audio" export type PlaybackQuality = "low" | "medium" | "high" | "lossless" @@ -50,6 +51,7 @@ export function songPlayUrl( preferAtmos: boolean | undefined ) { const params = new URLSearchParams() + if (Platform.OS === "ios") params.set("losslessFormat", "alac") if (quality) params.set("quality", quality) if (preferAtmos) params.set("preferAtmos", "true") const query = params.toString() diff --git a/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt b/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt index 155ed54..501050e 100644 --- a/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt +++ b/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt @@ -1,5 +1,6 @@ package expo.modules.audiooutput +import android.media.MediaCodecList import android.os.Build import androidx.mediarouter.app.SystemOutputSwitcherDialogController import expo.modules.kotlin.functions.Queues @@ -10,6 +11,16 @@ class AudioOutputModule : Module() { override fun definition() = ModuleDefinition { Name("AudioOutput") + Function("supportsDolbyAtmos") { + // Library Atmos tracks use E-AC-3. ExoPlayer needs a device decoder. + MediaCodecList(MediaCodecList.REGULAR_CODECS).codecInfos.any { codec -> + !codec.isEncoder && codec.supportedTypes.any { type -> + type.equals("audio/eac3", ignoreCase = true) || + type.equals("audio/eac3-joc", ignoreCase = true) + } + } + } + AsyncFunction("showPicker") { val activity = appContext.currentActivity if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || activity == null) { diff --git a/apps/web/app/api/song/[id]/play/route.ts b/apps/web/app/api/song/[id]/play/route.ts index 603b319..54dfb86 100644 --- a/apps/web/app/api/song/[id]/play/route.ts +++ b/apps/web/app/api/song/[id]/play/route.ts @@ -122,11 +122,7 @@ export async function GET( }))! const quality = request.nextUrl.searchParams.get("quality") as - | "low" - | "medium" - | "high" - | "lossless" - | null + "low" | "medium" | "high" | "lossless" | null const preferAtmos = request.nextUrl.searchParams.get("preferAtmos") === "true" @@ -157,7 +153,11 @@ export async function GET( const metadata = await music.parseFile(song.files[originalCodec]) if (!transcodeNeeded && originalCodec === "lossless") { - if (browser.name === "Safari" && metadata.format.codec === "ALAC") { + // Native iOS playback does not identify itself as Safari. + const acceptsAlac = + browser.name === "Safari" || + request.nextUrl.searchParams.get("losslessFormat") === "alac" + if (acceptsAlac && metadata.format.codec === "ALAC") { try { return await streamFileResponse( request,