From f8953fb200ba927b24c18feb01ddf212314dd488 Mon Sep 17 00:00:00 2001 From: TapTap Date: Sun, 15 Nov 2026 08:08:58 +0000 Subject: [PATCH] fix(desktop): decode mp3 to pcm before opening the audio line MP3SPI returns a stream whose format is MPEG1L3, and AudioSystem.getLine was asked for a SourceDataLine supporting that compressed format. Java Sound has no such line, so playback failed with "No line matching interface SourceDataLine supporting format MPEG1L3 ...". Convert the decoded stream to 16-bit signed PCM at the source sample rate before opening the line, which is the format the mixer actually supports. Add a regression test with a one-second MP3 fixture that asserts the decoded format is PCM_SIGNED before the line is opened. --- .../musicmanager/client/DesktopAudioPlayer.kt | 39 +++++++++++++++++- .../client/DesktopAudioPlayerTest.kt | 34 +++++++++++++++ .../src/desktopTest/resources/sample.mp3 | Bin 0 -> 8611 bytes 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 composeApp/src/desktopTest/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayerTest.kt create mode 100644 composeApp/src/desktopTest/resources/sample.mp3 diff --git a/composeApp/src/desktopMain/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayer.kt b/composeApp/src/desktopMain/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayer.kt index e758b15..f3e7b6b 100644 --- a/composeApp/src/desktopMain/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayer.kt +++ b/composeApp/src/desktopMain/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayer.kt @@ -5,6 +5,8 @@ import java.io.File import java.io.FileInputStream import java.io.InputStream import java.net.URI +import javax.sound.sampled.AudioFormat +import javax.sound.sampled.AudioInputStream import javax.sound.sampled.AudioSystem import javax.sound.sampled.SourceDataLine import kotlin.concurrent.thread @@ -14,10 +16,16 @@ import win.taptap.musicmanager.client.playback.AudioPlayer /** * Desktop playback through the MP3SPI decoder and a PCM line. Pause/resume is a * decoder loop gate, so no audio device is reopened. Seeking is not supported. + * + * Java Sound cannot open a line for the compressed MP3 format itself; the + * decoded stream has to be converted to PCM_SIGNED first. Opening the encoded + * format fails with "No line matching interface SourceDataLine supporting + * format MPEG1L3 ...". */ class DesktopAudioPlayer : AudioPlayer { private var input: InputStream? = null + private var stream: AudioInputStream? = null private var line: SourceDataLine? = null private var worker: Thread? = null private val lock = Object() @@ -41,7 +49,9 @@ class DesktopAudioPlayer : AudioPlayer { val raw = if (local) FileInputStream(File(source)) else URI(source).toURL().openStream() val buffered = BufferedInputStream(raw, 128 * 1024) input = buffered - val audio = AudioSystem.getAudioInputStream(buffered) + val encoded = AudioSystem.getAudioInputStream(buffered) + val audio = decodeToPcm(encoded) + stream = audio frameSize = audio.format.frameSize.takeIf { it > 0 } ?: 4 frameRate = audio.format.frameRate.takeIf { it > 0 } ?: 44_100f @@ -98,8 +108,10 @@ class DesktopAudioPlayer : AudioPlayer { runCatching { line?.flush() } worker?.interrupt() runCatching { worker?.join(400) } + runCatching { stream?.close() } runCatching { input?.close() } line = null + stream = null input = null worker = null } @@ -124,3 +136,28 @@ class DesktopAudioPlayer : AudioPlayer { stop() } } + +/** + * MP3SPI hands back a stream whose format is the compressed MPEG one. The audio + * device only understands uncompressed PCM, so convert to 16-bit signed PCM at + * the source sample rate before opening the line. + */ +internal fun decodeToPcm(encoded: AudioInputStream): AudioInputStream { + val pcm = encoded.format.toPcmFormat() + if (encoded.format.encoding == AudioFormat.Encoding.PCM_SIGNED) return encoded + return AudioSystem.getAudioInputStream(pcm, encoded) +} + +internal fun AudioFormat.toPcmFormat(): AudioFormat { + val rate = sampleRate.takeIf { it > 0 } ?: 44_100f + val channelCount = channels.takeIf { it > 0 } ?: 2 + return AudioFormat( + AudioFormat.Encoding.PCM_SIGNED, + rate, + 16, + channelCount, + channelCount * 2, + rate, + false, + ) +} diff --git a/composeApp/src/desktopTest/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayerTest.kt b/composeApp/src/desktopTest/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayerTest.kt new file mode 100644 index 0000000..4b6595e --- /dev/null +++ b/composeApp/src/desktopTest/kotlin/win/taptap/musicmanager/client/DesktopAudioPlayerTest.kt @@ -0,0 +1,34 @@ +package win.taptap.musicmanager.client + +import java.io.ByteArrayInputStream +import javax.sound.sampled.AudioFormat +import javax.sound.sampled.AudioSystem +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue + +class DesktopAudioPlayerTest { + + @Test + fun `mp3 is decoded to pcm before opening an audio line`() { + val bytes = checkNotNull(javaClass.getResourceAsStream("/sample.mp3")) { + "missing test fixture sample.mp3" + }.use { it.readBytes() } + + val encoded = AudioSystem.getAudioInputStream(ByteArrayInputStream(bytes)) + assertEquals("MPEG1L3", encoded.format.encoding.toString()) + + // Java Sound has no line for the compressed format; the player must + // convert to PCM_SIGNED first. + val pcm = decodeToPcm(encoded) + assertEquals(AudioFormat.Encoding.PCM_SIGNED, pcm.format.encoding) + assertEquals(44_100f, pcm.format.sampleRate) + assertEquals(16, pcm.format.sampleSizeInBits) + assertEquals(2, pcm.format.channels) + assertEquals(4, pcm.format.frameSize) + + val buffer = ByteArray(4_096) + assertTrue(pcm.read(buffer) > 0) + pcm.close() + } +} diff --git a/composeApp/src/desktopTest/resources/sample.mp3 b/composeApp/src/desktopTest/resources/sample.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..ddbe1c37e03abf9ffec17a2ef282630280c1f2ea GIT binary patch literal 8611 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 YTf5*}`^MQ@Ai}>C`ac}rfB)(K0ZEnV3;+NC literal 0 HcmV?d00001