pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix default audio selection ignoring type

This commit is contained in:
Joe Rogers 2022-05-17 21:03:51 +02:00
parent 052a59ac3e
commit 5d66c84f2d
No known key found for this signature in database
GPG Key ID: 0074AD57B8FDBBB4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/Library/MediaStreamSelector.cs
View File

@ -13,11 +13,11 @@ namespace Emby.Server.Implementations.Library
{ {
public static int? GetDefaultAudioStreamIndex(IReadOnlyList<MediaStream> streams, IReadOnlyList<string> preferredLanguages, bool preferDefaultTrack) public static int? GetDefaultAudioStreamIndex(IReadOnlyList<MediaStream> streams, IReadOnlyList<string> preferredLanguages, bool preferDefaultTrack)
{ {
var sortedStreams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages); var sortedStreams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages).ToList();
if (preferDefaultTrack) if (preferDefaultTrack)
{ {
var defaultStream = streams.FirstOrDefault(i => i.IsDefault); var defaultStream = sortedStreams.FirstOrDefault(i => i.IsDefault);
if (defaultStream != null) if (defaultStream != null)
{ {

8
tests/Jellyfin.Server.Implementations.Tests/Library/MediaStreamSelectorTests.cs
View File

@ -27,15 +27,23 @@ public class MediaStreamSelectorTests
{ {
var streams = new MediaStream[] var streams = new MediaStream[]
{ {
new()
{
Index = 0,
Type = MediaStreamType.Video,
IsDefault = true
},
new() new()
{ {
Index = 1, Index = 1,
Type = MediaStreamType.Audio,
Language = "fre", Language = "fre",
IsDefault = true IsDefault = true
}, },
new() new()
{ {
Index = 2, Index = 2,
Type = MediaStreamType.Audio,
Language = "eng", Language = "eng",
IsDefault = false IsDefault = false
} }