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.
This commit is contained in:
1 parent
8f94bb18e7
commit
f8953fb200
3 files changed
+72
-1
No files matched your search
+38
-1
@@ -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,
|
||||
)
|
||||
}
|
||||
Reference in new issue
Block a user