alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-24 01:28:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into gzip

Browse Source
This commit is contained in:
adrez99
2022-08-04 17:22:35 +02:00
committed by GitHub
parent aadd8ee971 63d943aab9
commit b8afdd892a
64 changed files with 483 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Model/Entities/MediaStream.cs
View File

@@ -588,15 +588,22 @@ namespace MediaBrowser.Model.Entities
return Width switch
{
<= 720 when Height <= 480 => IsInterlaced ? "480i" : "480p",
// 720x576 (PAL) (768 when rescaled for square pixels)
<= 768 when Height <= 576 => IsInterlaced ? "576i" : "576p",
// 960x540 (sometimes 544 which is multiple of 16)
// 256x144 (16:9 square pixel format)
<= 256 when Height <= 144 => IsInterlaced ? "144i" : "144p",
// 426x240 (16:9 square pixel format)
<= 426 when Height <= 240 => IsInterlaced ? "240i" : "240p",
// 640x360 (16:9 square pixel format)
<= 640 when Height <= 360 => IsInterlaced ? "360i" : "360p",
// 854x480 (16:9 square pixel format)
<= 854 when Height <= 480 => IsInterlaced ? "480i" : "480p",
// 960x544 (16:9 square pixel format)
<= 960 when Height <= 544 => IsInterlaced ? "540i" : "540p",
// 1024x576 (16:9 square pixel format)
<= 1024 when Height <= 576 => IsInterlaced ? "576i" : "576p",
// 1280x720
<= 1280 when Height <= 962 => IsInterlaced ? "720i" : "720p",
// 1920x1080
<= 1920 when Height <= 1440 => IsInterlaced ? "1080i" : "1080p",
// 2560x1080 (FHD ultra wide 21:9) using 1440px width to accomodate WQHD
<= 2560 when Height <= 1440 => IsInterlaced ? "1080i" : "1080p",
// 4K
<= 4096 when Height <= 3072 => "4K",
// 8K

6
MediaBrowser.Model/Entities/MetadataProvider.cs
View File

@@ -7,6 +7,12 @@ namespace MediaBrowser.Model.Entities
/// </summary>
public enum MetadataProvider
{
/// <summary>
/// This metadata provider is for users and/or plugins to override the
/// default merging behaviour.
/// </summary>
Custom = 0,
/// <summary>
/// The imdb.
/// </summary>

2
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@@ -8,7 +8,7 @@
<PropertyGroup>
<Authors>Jellyfin Contributors</Authors>
<PackageId>Jellyfin.Model</PackageId>
<VersionPrefix>10.8.0</VersionPrefix>
<VersionPrefix>10.9.0</VersionPrefix>
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
</PropertyGroup>