fix: choose default/selected audio streams first

chrisbenincasa · Dec 27, 2024 · 732e81d · 732e81d
1 parent 2f39648
commit 732e81d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/server/src/stream/jellyfin/JellyfinStreamDetails.ts b/server/src/stream/jellyfin/JellyfinStreamDetails.ts
@@ -24,6 +24,7 @@ import {
   isUndefined,
   map,
   replace,
+  sortBy,
   takeWhile,
   trimEnd,
   trimStart,
@@ -254,9 +255,12 @@ export class JellyfinStreamDetails {
     }
 
     const audioStreamDetails = map(
-      filter(
-        firstMediaSource?.MediaStreams,
-        (stream) => stream.Type === 'Audio',
+      sortBy(
+        filter(
+          firstMediaSource?.MediaStreams,
+          (stream) => stream.Type === 'Audio',
+        ),
+        (stream) => [stream.Index ?? 0, !!stream.IsDefault],
       ),
       (audioStream) => {
         return {

diff --git a/server/src/stream/plex/PlexStreamDetails.ts b/server/src/stream/plex/PlexStreamDetails.ts
@@ -33,6 +33,7 @@ import {
   maxBy,
   replace,
   round,
+  sortBy,
   trimEnd,
 } from 'lodash-es';
 import { NonEmptyArray } from 'ts-essentials';
@@ -304,9 +305,12 @@ export class PlexStreamDetails {
     }
 
     const audioStreamDetails = map(
-      filter(mediaStreams, (stream): stream is PlexMediaAudioStream => {
-        return stream.streamType === 2;
-      }),
+      sortBy(
+        filter(mediaStreams, (stream): stream is PlexMediaAudioStream => {
+          return stream.streamType === 2;
+        }),
+        (stream) => [stream.index, stream.selected ?? stream.default ?? false],
+      ),
       (audioStream) => {
         return {
           bitrate: audioStream.bitrate,