Merge pull request #5115 from rktjmp/fix-mka-opus-desktop-streaming

Force AAC transcode when streaming mka+opus to desktop client
Update comments on matroska
2026-04-18 04:59:44 +00:00 · 2026-04-10 16:54:18 -05:00 · 2026-04-10 16:42:39 -05:00 · 2026-04-09 21:07:14 +10:00 · 2026-03-11 00:35:12 +11:00
3 changed files with 17 additions and 2 deletions
--- a/client/players/LocalAudioPlayer.js
+++ b/client/players/LocalAudioPlayer.js
@ -46,7 +46,20 @@ export default class LocalAudioPlayer extends EventEmitter {
    this.player.addEventListener('loadedmetadata', this.evtLoadedMetadata.bind(this))
    this.player.addEventListener('timeupdate', this.evtTimeupdate.bind(this))

-    var mimeTypes = ['audio/flac', 'audio/mpeg', 'audio/mp4', 'audio/ogg', 'audio/aac', 'audio/x-ms-wma', 'audio/x-aiff', 'audio/webm']
+    var mimeTypes = [
+      'audio/flac',
+      'audio/mpeg',
+      'audio/mp4',
+      'audio/ogg',
+      'audio/aac',
+      'audio/x-ms-wma',
+      'audio/x-aiff',
+      'audio/webm',
+      // `audio/matroska` is the correct mimetype, but the server still uses `audio/x-matroska`
+      // ref: https://www.iana.org/assignments/media-types/media-types.xhtml
+      'audio/matroska',
+      'audio/x-matroska'
+    ]
    var mimeTypeCanPlayMap = {}
    mimeTypes.forEach((mt) => {
      var canPlay = this.player.canPlayType(mt)
--- a/server/objects/Stream.js
+++ b/server/objects/Stream.js
@ -73,7 +73,7 @@ class Stream extends EventEmitter {
    return [AudioMimeType.FLAC, AudioMimeType.OPUS, AudioMimeType.WMA, AudioMimeType.AIFF, AudioMimeType.WEBM, AudioMimeType.WEBMA, AudioMimeType.AWB, AudioMimeType.CAF]
  }
  get codecsToForceAAC() {
-    return ['alac', 'ac3', 'eac3']
+    return ['alac', 'ac3', 'eac3', 'opus']
  }
  get userToken() {
    return this.user.token
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@ -48,6 +48,8 @@ module.exports.AudioMimeType = {
  AIF: 'audio/x-aiff',
  WEBM: 'audio/webm',
  WEBMA: 'audio/webm',
+  // TODO: Switch to `audio/matroska`? marked as deprecated in IANA registry
+  // ref: https://datatracker.ietf.org/doc/html/rfc9559
  MKA: 'audio/x-matroska',
  AWB: 'audio/amr-wb',
  CAF: 'audio/x-caf',
Author	SHA1	Message	Date
advplyr	88667d00a1	Merge pull request #5115 from rktjmp/fix-mka-opus-desktop-streaming Some checks failed CodeQL / Analyze (push) Has been cancelled Details Run Component Tests / Run Component Tests (push) Has been cancelled Details Build and Push Docker Image / build (push) Has been cancelled Details Integration Test / build and test (push) Has been cancelled Details Run Unit Tests / Run Unit Tests (push) Has been cancelled Details Force AAC transcode when streaming mka+opus to desktop client	2026-04-10 16:54:18 -05:00
advplyr	94c426bd97	Update comments on matroska	2026-04-10 16:42:39 -05:00
Oliver Marriott	522b9735e2	Add `audio/(x-)matroska` to client player MIME types to avoid transcode Firefox, at least, supports playing `matroska/audio` containers natively but the client was not checking for support. Clients that do not support playing `matroska/audio` containers will fallback to transcoding.	2026-04-09 21:07:14 +10:00
Oliver Marriott	d9355ac3aa	Force AAC transcode when streaming mka+opus to desktop client Matroska audio containers (aka mka files) with Opus codec streams inside were unplayable on the desktop client because hls.js was unable to decode the stream, resulting in an infinitely "spinning" play button. When configuring a stream, we now check for the opus codec and force AAC transcoding. Matroska containers support other codecs besides Opus, eg: mp3, which do not require transcoding and work fine before this patch, which is why we check for opus in codecsToForceAAC instead of AudioMimeType.MKA in mimeTypesToForceAAC. The AudioMimeType.OPUS mimetype is already marked as requiring transcoding but since its inside a container this check does not evaluate to true, we must check the codec explicitly.	2026-03-11 00:35:12 +11:00