alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-14 03:30:25 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Only reselect audio streams when user preference is respected (#13832)
Some checks are pending
CodeQL / Analyze (csharp) (push) Waiting to run
Details
OpenAPI / OpenAPI - HEAD (push) Waiting to run
Details
OpenAPI / OpenAPI - BASE (push) Waiting to run
Details
OpenAPI / OpenAPI - Difference (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Blocked by required conditions
Details
Tests / run-tests (macos-latest) (push) Waiting to run
Details
Tests / run-tests (ubuntu-latest) (push) Waiting to run
Details
Tests / run-tests (windows-latest) (push) Waiting to run
Details
Project Automation / Project board (push) Waiting to run
Details
Merge Conflict Labeler / Labeling (push) Waiting to run
Details

Browse Source
This commit is contained in:
gnattu
2025-04-09 09:22:30 +08:00
committed by GitHub
parent c152f610ce
commit 32fe92d8f5
5 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -665,15 +665,39 @@ namespace MediaBrowser.Model.Dlna
// Collect candidate audio streams
ICollection<MediaStream> candidateAudioStreams = audioStream is null ? [] : [audioStream];
if (!options.AudioStreamIndex.HasValue || options.AudioStreamIndex < 0)
// When the index is explicitly required by client or the default is specified by user, don't do any stream reselection.
if (!item.DefaultAudioIndexSource.HasFlag(AudioIndexSource.User) && (options.AudioStreamIndex is null or < 0))
{
if (audioStream?.IsDefault == true)
// When user has no preferences allow stream selection on all streams.
if (item.DefaultAudioIndexSource == AudioIndexSource.None && audioStream is not null)
{
candidateAudioStreams = item.MediaStreams.Where(stream => stream.Type == MediaStreamType.Audio && stream.IsDefault).ToArray();
candidateAudioStreams = item.MediaStreams.Where(stream => stream.Type == MediaStreamType.Audio).ToArray();
if (audioStream.IsDefault)
{
// If default is picked, only allow selection within default streams.
candidateAudioStreams = candidateAudioStreams.Where(stream => stream.IsDefault).ToArray();
}
}
else
if (item.DefaultAudioIndexSource.HasFlag(AudioIndexSource.Language))
{
// If user has language preference, only allow stream selection within the same language.
candidateAudioStreams = item.MediaStreams.Where(stream => stream.Type == MediaStreamType.Audio && stream.Language == audioStream?.Language).ToArray();
if (item.DefaultAudioIndexSource.HasFlag(AudioIndexSource.Default))
{
var defaultStreamsInPreferredLanguage = candidateAudioStreams.Where(stream => stream.IsDefault).ToArray();
// If the user also prefers default streams, try limit selection within default tracks in the same language.
// If there is no default stream in the preferred language, allow selection on all default streams to match the "Play default audio track regardless of language" setting.
candidateAudioStreams = defaultStreamsInPreferredLanguage.Length > 0
? defaultStreamsInPreferredLanguage
: item.MediaStreams.Where(stream => stream.Type == MediaStreamType.Audio && stream.IsDefault).ToArray();
}
}
else if (item.DefaultAudioIndexSource.HasFlag(AudioIndexSource.Default))
{
// If user prefers default streams, only allow stream selection on default streams.
candidateAudioStreams = item.MediaStreams.Where(stream => stream.Type == MediaStreamType.Audio && stream.IsDefault).ToArray();
}
}