From 55d5382ee666976b9361ffe94eb2d17d95314855 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sun, 1 Nov 2026 23:46:47 -0500 Subject: [PATCH] fix(mobile): disable Dolby Atmos on Android (#62) --- .../mobile/app/(app)/(tabs)/home/settings.tsx | 2 +- apps/mobile/lib/playback-capabilities.ts | 19 ++----------------- apps/mobile/lib/urls.ts | 5 +++-- .../modules/audiooutput/AudioOutputModule.kt | 11 ----------- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/apps/mobile/app/(app)/(tabs)/home/settings.tsx b/apps/mobile/app/(app)/(tabs)/home/settings.tsx index 0d5aa17..5d86e35 100644 --- a/apps/mobile/app/(app)/(tabs)/home/settings.tsx +++ b/apps/mobile/app/(app)/(tabs)/home/settings.tsx @@ -382,7 +382,7 @@ function QualitySection({ user }: { user: CurrentUser }) { : "This device does not support Dolby Atmos playback." } disabled={!dolbyAtmosSupported} - value={user.preferAtmos ?? false} + value={dolbyAtmosSupported && (user.preferAtmos ?? false)} onValueChange={(checked) => void updateAtmos({ preferAtmos: checked }).catch((error: Error) => showError(error.message) diff --git a/apps/mobile/lib/playback-capabilities.ts b/apps/mobile/lib/playback-capabilities.ts index 20c4435..fbab2a9 100644 --- a/apps/mobile/lib/playback-capabilities.ts +++ b/apps/mobile/lib/playback-capabilities.ts @@ -1,19 +1,4 @@ -import { requireOptionalNativeModule } from "expo" import { Platform } from "react-native" -// E-AC-3 support varies by Android device. Older native builds fail closed. -function supportsDolbyAtmos(): boolean { - if (Platform.OS === "ios") return true - if (Platform.OS !== "android") return false - try { - return ( - requireOptionalNativeModule<{ - supportsDolbyAtmos?: () => boolean - }>("AudioOutput")?.supportsDolbyAtmos?.() ?? false - ) - } catch { - return false - } -} - -export const dolbyAtmosSupported = supportsDolbyAtmos() +// Android Dolby decoder reports do not reliably indicate working Atmos playback. +export const dolbyAtmosSupported = Platform.OS === "ios" diff --git a/apps/mobile/lib/urls.ts b/apps/mobile/lib/urls.ts index 26f99cc..3cedc74 100644 --- a/apps/mobile/lib/urls.ts +++ b/apps/mobile/lib/urls.ts @@ -1,3 +1,4 @@ +import { dolbyAtmosSupported } from "@/lib/playback-capabilities" import { Platform } from "react-native" import type { AudioSource } from "expo-audio" @@ -53,7 +54,7 @@ export function songPlayUrl( const params = new URLSearchParams() if (Platform.OS === "ios") params.set("losslessFormat", "alac") if (quality) params.set("quality", quality) - if (preferAtmos) params.set("preferAtmos", "true") + if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true") const query = params.toString() return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}` } @@ -66,7 +67,7 @@ export function songHlsPlaylistUrl( ) { const params = new URLSearchParams() if (quality) params.set("quality", quality) - if (preferAtmos) params.set("preferAtmos", "true") + if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true") const query = params.toString() return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}` } 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 501050e..155ed54 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,6 +1,5 @@ package expo.modules.audiooutput -import android.media.MediaCodecList import android.os.Build import androidx.mediarouter.app.SystemOutputSwitcherDialogController import expo.modules.kotlin.functions.Queues @@ -11,16 +10,6 @@ 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) {