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

Merge remote-tracking branch 'jellyfinorigin/master' into feature/pgsql_provider

Browse Source
This commit is contained in:
JPVenson
2025-02-02 02:09:14 +00:00
parent ebe89c07b3 ce64dbc034
commit 17003f4d76
126 changed files with 336 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
View File

@@ -12,7 +12,7 @@ public class SplashscreenBuilder
{
private const int FinalWidth = 1920;
private const int FinalHeight = 1080;
// generated collage resolution should be higher than the final resolution
// generated collage resolution should be greater than the final resolution
private const int WallWidth = FinalWidth * 3;
private const int WallHeight = FinalHeight * 2;
private const int Rows = 6;

2
src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
View File

@@ -52,7 +52,7 @@ namespace Jellyfin.Extensions.Json.Converters
}
catch (FormatException)
{
// Ignore unconvertable inputs
// Ignore unconvertible inputs
}
}

30
src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
View File

@@ -124,22 +124,7 @@ namespace Jellyfin.LiveTv.IO
private string GetCommandLineArgs(MediaSourceInfo mediaSource, string inputTempFile, string targetFile)
{
string videoArgs;
if (EncodeVideo(mediaSource))
{
const int MaxBitrate = 25000000;
videoArgs = string.Format(
CultureInfo.InvariantCulture,
"-codec:v:0 libx264 -force_key_frames \"expr:gte(t,n_forced*5)\" {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -profile:v high -level 41",
GetOutputSizeParam(),
MaxBitrate);
}
else
{
videoArgs = "-codec:v:0 copy";
}
videoArgs += " -fflags +genpts";
string videoArgs = "-codec:v:0 copy -fflags +genpts";
var flags = new List<string>();
if (mediaSource.IgnoreDts)
@@ -205,19 +190,6 @@ namespace Jellyfin.LiveTv.IO
private static string GetAudioArgs(MediaSourceInfo mediaSource)
{
return "-codec:a:0 copy";
// var audioChannels = 2;
// var audioStream = mediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Audio);
// if (audioStream is not null)
// {
// audioChannels = audioStream.Channels ?? audioChannels;
// }
// return "-codec:a:0 aac -strict experimental -ab 320000";
}
private static bool EncodeVideo(MediaSourceInfo mediaSource)
{
return false;
}
protected string GetOutputSizeParam()

2
src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs
View File

@@ -138,7 +138,7 @@ namespace Jellyfin.LiveTv.Listings
var programsInfo = new List<ProgramInfo>();
foreach (ProgramDto schedule in dailySchedules.SelectMany(d => d.Programs))
{
// _logger.LogDebug("Proccesing Schedule for statio ID " + stationID +
// _logger.LogDebug("Processing Schedule for station ID " + stationID +
// " which corresponds to channel " + channelNumber + " and program id " +
// schedule.ProgramId + " which says it has images? " +
// programDict[schedule.ProgramId].hasImageArtwork);

2
src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
View File

@@ -8,7 +8,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
public class LineupDto
{
/// <summary>
/// Gets or sets the linup.
/// Gets or sets the lineup.
/// </summary>
[JsonPropertyName("lineup")]
public string? Lineup { get; set; }

2
src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
View File

@@ -23,7 +23,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
/// Gets or sets the provider callsign.
/// </summary>
[JsonPropertyName("providerCallsign")]
public string? ProvderCallsign { get; set; }
public string? ProviderCallsign { get; set; }
/// <summary>
/// Gets or sets the logical channel number.

2
src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
View File

@@ -8,7 +8,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
public class MetadataDto
{
/// <summary>
/// Gets or sets the linup.
/// Gets or sets the lineup.
/// </summary>
[JsonPropertyName("lineup")]
public string? Lineup { get; set; }

2
src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
View File

@@ -64,7 +64,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
public IReadOnlyList<MetadataProgramsDto> Metadata { get; set; } = Array.Empty<MetadataProgramsDto>();
/// <summary>
/// Gets or sets the list of content raitings.
/// Gets or sets the list of content ratings.
/// </summary>
[JsonPropertyName("contentRating")]
public IReadOnlyList<ContentRatingDto> ContentRating { get; set; } = Array.Empty<ContentRatingDto>();

4
src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
View File

@@ -93,7 +93,7 @@ namespace Jellyfin.LiveTv.TunerHosts
}
else if (!string.IsNullOrWhiteSpace(extInf) && !trimmedLine.StartsWith('#'))
{
var channel = GetChannelnfo(extInf, tunerHostId, trimmedLine);
var channel = GetChannelInfo(extInf, tunerHostId, trimmedLine);
channel.Id = channelIdPrefix + trimmedLine.GetMD5().ToString("N", CultureInfo.InvariantCulture);
channel.Path = trimmedLine;
@@ -106,7 +106,7 @@ namespace Jellyfin.LiveTv.TunerHosts
return channels;
}
private ChannelInfo GetChannelnfo(string extInf, string tunerHostId, string mediaUrl)
private ChannelInfo GetChannelInfo(string extInf, string tunerHostId, string mediaUrl)
{
var channel = new ChannelInfo()
{

2
src/Jellyfin.Networking/Manager/NetworkManager.cs
View File

@@ -973,7 +973,7 @@ public class NetworkManager : INetworkManager, IDisposable
bindPreference = string.Empty;
int? port = null;
// Only consider subnets including the source IP, prefering specific overrides
// Only consider subnets including the source IP, preferring specific overrides
List<PublishedServerUriOverride> validPublishedServerUrls;
if (!isInExternalSubnet)
{