alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-08 16:58:50 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into search-rebased

Browse Source
This commit is contained in:
Shadowghost
2026-05-24 18:25:12 +02:00
parent ea8f6c51fd 31f4ce93a6
commit 1175846120
211 changed files with 1529 additions and 2484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1451,7 +1451,7 @@ namespace MediaBrowser.Model.Dlna
string? outputContainer,
MediaStreamProtocol? transcodingSubProtocol)
{
if (!subtitleStream.IsExternal && (playMethod != PlayMethod.Transcode || transcodingSubProtocol != MediaStreamProtocol.hls))
if (CanConsiderEmbedSubtitle(subtitleStream, playMethod, transcodingSubProtocol, outputContainer))
{
// Look for supported embedded subs of the same format
foreach (var profile in subtitleProfiles)
@@ -1540,6 +1540,19 @@ namespace MediaBrowser.Model.Dlna
return false;
}
private static bool CanConsiderEmbedSubtitle(MediaStream subtitleStream, PlayMethod playMethod, MediaStreamProtocol? transcodingSubProtocol, string? outputContainer)
{
if (subtitleStream.IsExternal)
{
return playMethod == PlayMethod.Transcode
&& transcodingSubProtocol != MediaStreamProtocol.hls
&& IsSubtitleEmbedSupported(outputContainer);
}
return playMethod != PlayMethod.Transcode
|| transcodingSubProtocol != MediaStreamProtocol.hls;
}
private static SubtitleProfile? GetExternalSubtitleProfile(MediaSourceInfo mediaSource, MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, ITranscoderSupport transcoderSupport, bool allowConversion)
{
foreach (var profile in subtitleProfiles)

2
MediaBrowser.Model/Extensions/EnumerableExtensions.cs
View File

@@ -50,7 +50,7 @@ namespace MediaBrowser.Model.Extensions
return 0;
})
.ThenByDescending(i => Math.Round(i.CommunityRating ?? 0, 1) )
.ThenByDescending(i => Math.Round(i.CommunityRating ?? 0, 1))
.ThenByDescending(i => i.VoteCount ?? 0);
}
}

2
MediaBrowser.Model/MediaSegments/MediaSegmentGenerationRequest.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using Jellyfin.Database.Implementations.Entities;
using MediaBrowser.Model.MediaSegments;

2
MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
View File

@@ -50,7 +50,7 @@ namespace MediaBrowser.Model.SyncPlay
/// </summary>
Seek = 8,
/// <summary>
/// <summary>
/// A user is signaling that playback is buffering.
/// </summary>
Buffer = 9,

2
MediaBrowser.Model/SyncPlay/SyncPlayGroupDoesNotExistUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayGroupJoinedUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayGroupLeftUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayLibraryAccessDeniedUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayNotInGroupUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayPlayQueueUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayStateUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayUserJoinedUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/SyncPlay/SyncPlayUserLeftUpdate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.ComponentModel;
namespace MediaBrowser.Model.SyncPlay;

2
MediaBrowser.Model/Users/UserPolicy.cs
View File

@@ -187,7 +187,7 @@ namespace MediaBrowser.Model.Users
[Required(AllowEmptyStrings = false)]
public string AuthenticationProviderId { get; set; }
[Required(AllowEmptyStrings= false)]
[Required(AllowEmptyStrings = false)]
public string PasswordResetProviderId { get; set; }
/// <summary>